Skip to content

Commit 1b1850b

Browse files
julien-ncjulien-nc
committed
switch to IAppConfig
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
1 parent e34a385 commit 1b1850b

File tree

9 files changed

+42
-28
lines changed

9 files changed

+42
-28
lines changed

‎lib/Capabilities.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
use OCA\Assistant\AppInfo\Application;
88
use OCP\App\IAppManager;
99
use OCP\Capabilities\IPublicCapability;
10+
use OCP\IAppConfig;
1011
use OCP\IConfig;
1112

1213
class Capabilities implements IPublicCapability {
1314

1415
public function __construct(
1516
private IAppManager $appManager,
1617
private IConfig $config,
18+
private IAppConfig $appConfig,
1719
private ?string $userId,
1820
) {
1921
}
@@ -34,7 +36,7 @@ public function getCapabilities(): array {
3436
],
3537
];
3638
if ($this->userId !== null) {
37-
$adminAssistantEnabled = $this->config->getAppValue(Application::APP_ID, 'assistant_enabled', '1') === '1';
39+
$adminAssistantEnabled = $this->appConfig->getValueString(Application::APP_ID, 'assistant_enabled', '1') === '1';
3840
$userAssistantEnabled = $this->config->getUserValue($this->userId, Application::APP_ID, 'assistant_enabled', '1') === '1';
3941
$assistantEnabled = $adminAssistantEnabled && $userAssistantEnabled;
4042
$capability[Application::APP_ID]['enabled'] = $assistantEnabled;

‎lib/Controller/ChattyLLMController.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
1515
use OCP\AppFramework\Http\Attribute\OpenAPI;
1616
use OCP\AppFramework\Http\JSONResponse;
17-
use OCP\IConfig;
17+
use OCP\IAppConfig;
1818
use OCP\IL10N;
1919
use OCP\IRequest;
2020
use OCP\IUserManager;
@@ -39,7 +39,7 @@ public function __construct(
3939
private IL10N $l10n,
4040
private LoggerInterface $logger,
4141
private ITaskProcessingManager $taskProcessingManager,
42-
private IConfig $config,
42+
private IAppConfig $appConfig,
4343
private IUserManager $userManager,
4444
private ?string $userId,
4545
) {
@@ -64,7 +64,7 @@ public function newSession(int $timestamp, ?string $title = null): JSONResponse
6464
return new JSONResponse(['error' => $this->l10n->t('User not found')], Http::STATUS_UNAUTHORIZED);
6565
}
6666

67-
$userInstructions = $this->config->getAppValue(
67+
$userInstructions = $this->appConfig->getValueString(
6868
Application::APP_ID,
6969
'chat_user_instructions',
7070
Application::CHAT_USER_INSTRUCTIONS,
@@ -419,7 +419,7 @@ public function generateTitle(int $sessionId): JSONResponse {
419419
}
420420

421421
try {
422-
$userInstructions = $this->config->getAppValue(
422+
$userInstructions = $this->appConfig->getValueString(
423423
Application::APP_ID,
424424
'chat_user_instructions_title',
425425
Application::CHAT_USER_INSTRUCTIONS_TITLE,
@@ -465,7 +465,7 @@ public function checkTitleGenerationTask(int $taskId, int $sessionId): JSONRespo
465465
if ($task->getStatus() === Task::STATUS_SUCCESSFUL) {
466466
try {
467467
$taskOutput = trim($task->getOutput()['output'] ?? '');
468-
$userInstructions = $this->config->getAppValue(
468+
$userInstructions = $this->appConfig->getValueString(
469469
Application::APP_ID,
470470
'chat_user_instructions_title',
471471
Application::CHAT_USER_INSTRUCTIONS_TITLE,
@@ -510,7 +510,7 @@ private function getStichedMessages(int $sessionId): string {
510510
$stichedPrompt = $firstMessage->getContent() . PHP_EOL;
511511
}
512512

513-
$lastNMessages = intval($this->config->getAppValue(Application::APP_ID, 'chat_last_n_messages', '10'));
513+
$lastNMessages = intval($this->appConfig->getValueString(Application::APP_ID, 'chat_last_n_messages', '10'));
514514
$messages = $this->messageMapper->getMessages($sessionId, 0, $lastNMessages);
515515

516516
if ($messages[0]->getRole() === 'system') {

‎lib/Controller/ConfigController.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
88
use OCP\AppFramework\Http\Attribute\OpenAPI;
99
use OCP\AppFramework\Http\DataResponse;
10+
use OCP\IAppConfig;
1011
use OCP\IConfig;
1112

1213
use OCP\IRequest;
@@ -19,6 +20,7 @@ public function __construct(
1920
string $appName,
2021
IRequest $request,
2122
private IConfig $config,
23+
private IAppConfig $appConfig,
2224
private ?string $userId
2325
) {
2426
parent::__construct($appName, $request);
@@ -57,7 +59,7 @@ public function getConfigValue(string $key): DataResponse {
5759
*/
5860
public function setAdminConfig(array $values): DataResponse {
5961
foreach ($values as $key => $value) {
60-
$this->config->setAppValue(Application::APP_ID, $key, $value);
62+
$this->appConfig->setValueString(Application::APP_ID, $key, $value);
6163
}
6264
return new DataResponse(1);
6365
}

‎lib/Listener/BeforeTemplateRenderedListener.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use OCP\EventDispatcher\Event;
1313
use OCP\EventDispatcher\IEventDispatcher;
1414
use OCP\EventDispatcher\IEventListener;
15+
use OCP\IAppConfig;
1516
use OCP\IConfig;
1617
use OCP\IUser;
1718
use OCP\IUserSession;
@@ -25,6 +26,7 @@ class BeforeTemplateRenderedListener implements IEventListener {
2526
public function __construct(
2627
private IUserSession $userSession,
2728
private IConfig $config,
29+
private IAppConfig $appConfig,
2830
private IInitialState $initialStateService,
2931
private IEventDispatcher $eventDispatcher,
3032
private ?string $userId,
@@ -47,7 +49,7 @@ public function handle(Event $event): void {
4749

4850
$this->eventDispatcher->dispatchTyped(new RenderReferenceEvent());
4951

50-
$adminAssistantEnabled = $this->config->getAppValue(Application::APP_ID, 'assistant_enabled', '1') === '1';
52+
$adminAssistantEnabled = $this->appConfig->getValueString(Application::APP_ID, 'assistant_enabled', '1') === '1';
5153
$userAssistantEnabled = $this->config->getUserValue($this->userId, Application::APP_ID, 'assistant_enabled', '1') === '1';
5254
$assistantEnabled = $adminAssistantEnabled && $userAssistantEnabled;
5355
$this->initialStateService->provideInitialState('assistant-enabled', $assistantEnabled);

‎lib/Listener/FreePrompt/FreePromptReferenceListener.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use OCP\Collaboration\Reference\RenderReferenceEvent;
1010
use OCP\EventDispatcher\Event;
1111
use OCP\EventDispatcher\IEventListener;
12+
use OCP\IAppConfig;
1213
use OCP\IConfig;
1314
use OCP\TaskProcessing\IManager as ITaskProcessingManager;
1415
use OCP\TaskProcessing\TaskTypes\TextToText;
@@ -20,6 +21,7 @@
2021
class FreePromptReferenceListener implements IEventListener {
2122
public function __construct(
2223
private IConfig $config,
24+
private IAppConfig $appConfig,
2325
private ?string $userId,
2426
private ITaskProcessingManager $taskProcessingManager,
2527
) {
@@ -32,8 +34,8 @@ public function handle(Event $event): void {
3234
return;
3335
}
3436

35-
if ($this->config->getAppValue(Application::APP_ID, 'free_prompt_picker_enabled', '1') === '1' &&
36-
$this->config->getUserValue($this->userId, Application::APP_ID, 'free_prompt_picker_enabled', '1') === '1') {
37+
if ($this->appConfig->getValueString(Application::APP_ID, 'free_prompt_picker_enabled', '1') === '1'
38+
&& $this->config->getUserValue($this->userId, Application::APP_ID, 'free_prompt_picker_enabled', '1') === '1') {
3739

3840
// Double check that at least one provider is registered
3941
$availableTaskTypes = $this->taskProcessingManager->getAvailableTaskTypes();

‎lib/Listener/SpeechToText/SpeechToTextReferenceListener.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
use OCP\Collaboration\Reference\RenderReferenceEvent;
2828
use OCP\EventDispatcher\Event;
2929
use OCP\EventDispatcher\IEventListener;
30+
use OCP\IAppConfig;
3031
use OCP\IConfig;
3132
use OCP\TaskProcessing\IManager as ITaskProcessingManager;
3233
use OCP\TaskProcessing\TaskTypes\AudioToText;
@@ -38,6 +39,7 @@
3839
class SpeechToTextReferenceListener implements IEventListener {
3940
public function __construct(
4041
private IConfig $config,
42+
private IAppConfig $appConfig,
4143
private ?string $userId,
4244
private ITaskProcessingManager $taskProcessingManager,
4345
) {
@@ -47,8 +49,8 @@ public function handle(Event $event): void {
4749
if (!$event instanceof RenderReferenceEvent) {
4850
return;
4951
}
50-
if ($this->config->getAppValue(Application::APP_ID, 'speech_to_text_picker_enabled', '1') === '1' &&
51-
($this->userId === null || $this->config->getUserValue($this->userId, Application::APP_ID, 'speech_to_text_picker_enabled', '1') === '1')) {
52+
if ($this->appConfig->getValueString(Application::APP_ID, 'speech_to_text_picker_enabled', '1') === '1'
53+
&& ($this->userId === null || $this->config->getUserValue($this->userId, Application::APP_ID, 'speech_to_text_picker_enabled', '1') === '1')) {
5254

5355
// Double check that at least one provider is registered
5456
$availableTaskTypes = $this->taskProcessingManager->getAvailableTaskTypes();

‎lib/Listener/Text2Image/Text2ImageReferenceListener.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use OCP\Collaboration\Reference\RenderReferenceEvent;
1010
use OCP\EventDispatcher\Event;
1111
use OCP\EventDispatcher\IEventListener;
12+
use OCP\IAppConfig;
1213
use OCP\IConfig;
1314
use OCP\TaskProcessing\IManager as ITaskProcessingManager;
1415
use OCP\TaskProcessing\TaskTypes\TextToImage;
@@ -20,6 +21,7 @@
2021
class Text2ImageReferenceListener implements IEventListener {
2122
public function __construct(
2223
private IConfig $config,
24+
private IAppConfig $appConfig,
2325
private ?string $userId,
2426
private ITaskProcessingManager $taskProcessingManager,
2527
) {
@@ -31,8 +33,8 @@ public function handle(Event $event): void {
3133
return;
3234
}
3335

34-
if ($this->config->getAppValue(Application::APP_ID, 'text_to_image_picker_enabled', '1') === '1' &&
35-
$this->config->getUserValue($this->userId, Application::APP_ID, 'text_to_image_picker_enabled', '1') === '1') {
36+
if ($this->appConfig->getValueString(Application::APP_ID, 'text_to_image_picker_enabled', '1') === '1'
37+
&& $this->config->getUserValue($this->userId, Application::APP_ID, 'text_to_image_picker_enabled', '1') === '1') {
3638

3739
// Double check that atleast one provider is registered
3840
$availableTaskTypes = $this->taskProcessingManager->getAvailableTaskTypes();

‎lib/Settings/Admin.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use OCA\Assistant\AppInfo\Application;
66
use OCP\AppFramework\Http\TemplateResponse;
77
use OCP\AppFramework\Services\IInitialState;
8-
use OCP\IConfig;
8+
use OCP\IAppConfig;
99
use OCP\Settings\ISettings;
1010
use OCP\TaskProcessing\IManager as ITaskProcessingManager;
1111
use OCP\TaskProcessing\TaskTypes\AudioToText;
@@ -15,7 +15,7 @@
1515
class Admin implements ISettings {
1616

1717
public function __construct(
18-
private IConfig $config,
18+
private IAppConfig $appConfig,
1919
private IInitialState $initialStateService,
2020
private ITaskProcessingManager $taskProcessingManager,
2121
) {
@@ -33,15 +33,15 @@ public function getForm(): TemplateResponse {
3333
$speechToTextAvailable = array_key_exists(AudioToText::ID, $availableTaskTypes);
3434
$textToImageAvailable = array_key_exists(TextToImage::ID, $availableTaskTypes);
3535

36-
$assistantEnabled = $this->config->getAppValue(Application::APP_ID, 'assistant_enabled', '1') === '1';
36+
$assistantEnabled = $this->appConfig->getValueString(Application::APP_ID, 'assistant_enabled', '1') === '1';
3737

38-
$freePromptPickerEnabled = $this->config->getAppValue(Application::APP_ID, 'free_prompt_picker_enabled', '1') === '1';
39-
$textToImagePickerEnabled = $this->config->getAppValue(Application::APP_ID, 'text_to_image_picker_enabled', '1') === '1';
38+
$freePromptPickerEnabled = $this->appConfig->getValueString(Application::APP_ID, 'free_prompt_picker_enabled', '1') === '1';
39+
$textToImagePickerEnabled = $this->appConfig->getValueString(Application::APP_ID, 'text_to_image_picker_enabled', '1') === '1';
4040

41-
$speechToTextEnabled = $this->config->getAppValue(Application::APP_ID, 'speech_to_text_picker_enabled', '1') === '1';
42-
$chattyLLMUserInstructions = $this->config->getAppValue(Application::APP_ID, 'chat_user_instructions', Application::CHAT_USER_INSTRUCTIONS);
43-
$chattyLLMUserInstructionsTitle = $this->config->getAppValue(Application::APP_ID, 'chat_user_instructions_title', Application::CHAT_USER_INSTRUCTIONS_TITLE);
44-
$chattyLLMLastNMessages = (int) $this->config->getAppValue(Application::APP_ID, 'chat_last_n_messages', '10');
41+
$speechToTextEnabled = $this->appConfig->getValueString(Application::APP_ID, 'speech_to_text_picker_enabled', '1') === '1';
42+
$chattyLLMUserInstructions = $this->appConfig->getValueString(Application::APP_ID, 'chat_user_instructions', Application::CHAT_USER_INSTRUCTIONS);
43+
$chattyLLMUserInstructionsTitle = $this->appConfig->getValueString(Application::APP_ID, 'chat_user_instructions_title', Application::CHAT_USER_INSTRUCTIONS_TITLE);
44+
$chattyLLMLastNMessages = (int) $this->appConfig->getValueString(Application::APP_ID, 'chat_last_n_messages', '10');
4545

4646
$adminConfig = [
4747
'text_processing_available' => $taskProcessingAvailable,

‎lib/Settings/Personal.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use OCA\Assistant\AppInfo\Application;
66
use OCP\AppFramework\Http\TemplateResponse;
77
use OCP\AppFramework\Services\IInitialState;
8+
use OCP\IAppConfig;
89
use OCP\IConfig;
910
use OCP\Settings\ISettings;
1011
use OCP\TaskProcessing\Exception\Exception;
@@ -17,6 +18,7 @@ class Personal implements ISettings {
1718

1819
public function __construct(
1920
private IConfig $config,
21+
private IAppConfig $appConfig,
2022
private IInitialState $initialStateService,
2123
private ?string $userId,
2224
private ITaskProcessingManager $taskProcessingManager,
@@ -35,16 +37,16 @@ public function getForm(): TemplateResponse {
3537
$speechToTextAvailable = in_array(AudioToText::ID, $availableTaskTypes);
3638
$textToImageAvailable = in_array(TextToImage::ID, $availableTaskTypes);
3739

38-
$assistantAvailable = $taskProcessingAvailable && $this->config->getAppValue(Application::APP_ID, 'assistant_enabled', '1') === '1';
40+
$assistantAvailable = $taskProcessingAvailable && $this->appConfig->getValueString(Application::APP_ID, 'assistant_enabled', '1') === '1';
3941
$assistantEnabled = $this->config->getUserValue($this->userId, Application::APP_ID, 'assistant_enabled', '1') === '1';
4042

41-
$textToImagePickerAvailable = $textToImageAvailable && $this->config->getAppValue(Application::APP_ID, 'text_to_image_picker_enabled', '1') === '1';
43+
$textToImagePickerAvailable = $textToImageAvailable && $this->appConfig->getValueString(Application::APP_ID, 'text_to_image_picker_enabled', '1') === '1';
4244
$textToImagePickerEnabled = $this->config->getUserValue($this->userId, Application::APP_ID, 'text_to_image_picker_enabled', '1') === '1';
4345

44-
$freePromptPickerAvailable = $freePromptTaskTypeAvailable && $this->config->getAppValue(Application::APP_ID, 'free_prompt_picker_enabled', '1') === '1';
46+
$freePromptPickerAvailable = $freePromptTaskTypeAvailable && $this->appConfig->getValueString(Application::APP_ID, 'free_prompt_picker_enabled', '1') === '1';
4547
$freePromptPickerEnabled = $this->config->getUserValue($this->userId, Application::APP_ID, 'free_prompt_picker_enabled', '1') === '1';
4648

47-
$speechToTextPickerAvailable = $speechToTextAvailable && $this->config->getAppValue(Application::APP_ID, 'speech_to_text_picker_enabled', '1') === '1';
49+
$speechToTextPickerAvailable = $speechToTextAvailable && $this->appConfig->getValueString(Application::APP_ID, 'speech_to_text_picker_enabled', '1') === '1';
4850
$speechToTextPickerEnabled = $this->config->getUserValue($this->userId, Application::APP_ID, 'speech_to_text_picker_enabled', '1') === '1';
4951

5052
$userConfig = [

0 commit comments

Comments
 (0)