Vue 3 and other minor changes

Signed-off-by: Lukas Schaefer <[email protected]>

Author: lukasdotcom

lib/Service/OpenAiAPIService.php

@@ -758,9 +758,8 @@ public function getImageRequestOptions(?string $userId): array {
 	 * @throws Exception
 	 */
 	public function requestSpeechCreation(
-		?string $userId, string $prompt, string $model, string $voice, int $speed = 1,
+		?string $userId, string $prompt, string $model, string $voice, float $speed = 1,
 	): array {
-		$this->logger->error('speed is ' . $speed);
 		if ($this->isQuotaExceeded($userId, Application::QUOTA_TYPE_SPEECH)) {
 			throw new Exception($this->l10n->t('Speech generation quota exceeded'), Http::STATUS_TOO_MANY_REQUESTS);
 		}
@@ -779,7 +778,7 @@ public function requestSpeechCreation(
 			$charCount = mb_strlen($prompt);
 			$this->quotaUsageMapper->createQuotaUsage($userId ?? '', Application::QUOTA_TYPE_SPEECH, $charCount);
 		} catch (DBException $e) {
-			$this->logger->warning('Could not create quota usage for user: ' . $userId . ' and quota type: ' . Application::QUOTA_TYPE_IMAGE . '. Error: ' . $e->getMessage(), ['app' => Application::APP_ID]);
+			$this->logger->warning('Could not create quota usage for user: ' . $userId . ' and quota type: ' . Application::QUOTA_TYPE_SPEECH . '. Error: ' . $e->getMessage());
 		}
 		return $apiResponse;
 	}

lib/TaskProcessing/TextToSpeechProvider.php

@@ -123,14 +123,14 @@ public function process(?string $userId, array $input, callable $reportProgress)
 		if (isset($input['model']) && is_string($input['model'])) {
 			$model = $input['model'];
 		} else {
-			$model = $this->appConfig->getValueString(Application::APP_ID, 'default_speech_model_id', Application::DEFAULT_MODEL_ID) ?: Application::DEFAULT_SPEECH_MODEL_ID;
+			$model = $this->appConfig->getValueString(Application::APP_ID, 'default_speech_model_id', Application::DEFAULT_SPEECH_MODEL_ID) ?: Application::DEFAULT_SPEECH_MODEL_ID;
 		}
 
 
 		if (isset($input['voice']) && is_string($input['voice'])) {
 			$voice = $input['voice'];
 		} else {
-			$voice = $this->appConfig->getValueString(Application::APP_ID, 'default_speech_voice', Application::DEFAULT_MODEL_ID) ?: Application::DEFAULT_SPEECH_VOICE;
+			$voice = $this->appConfig->getValueString(Application::APP_ID, 'default_speech_voice', Application::DEFAULT_SPEECH_VOICE) ?: Application::DEFAULT_SPEECH_VOICE;
 		}
 
 		$speed = 1;

src/components/AdminSettings.vue

@@ -406,7 +406,7 @@
 					:title="t('integration_openai', 'More information about OpenAI models')"
 					href="https://beta.openai.com/docs/models"
 					target="_blank">
-					<NcButton type="tertiary" aria-label="openai-info">
+					<NcButton variant="tertiary" aria-label="openai-info">
 						<template #icon>
 							<HelpCircleIcon />
 						</template>
@@ -416,7 +416,7 @@
 					:title="t('integration_openai', 'More information about LocalAI models')"
 					href="https://localai.io/model-compatibility/index.html"
 					target="_blank">
-					<NcButton type="tertiary" aria-label="localai-info">
+					<NcButton variant="tertiary" aria-label="localai-info">
 						<template #icon>
 							<HelpCircleIcon />
 						</template>
@@ -430,7 +430,7 @@
 				<label>{{ t('integration_openai', 'TTS Voices') }}
 					<NcButton
 						:title="t('integration_openai', 'A list of voices supported by the endpoint you are using. Defaults to openai\'s list.')"
-						type="tertiary"
+						variant="tertiary"
 						aria-label="voices-info">
 						<template #icon>
 							<HelpCircleIcon />
@@ -445,13 +445,13 @@
 					@input="onInput()" />
 			</div>
 			<NcSelect
-				v-model="state.default_tts_voice"
+				:model-value="state.default_tts_voice"
 				class="model-select"
 				:options="state.tts_voices"
 				:input-label="t('integration_openai', 'Default voice to use')"
 				:no-wrap="true"
 				input-id="openai-tts-voices-select"
-				@input="onInput()" />
+				@click="onInput()" />
 			<div>
 				<h2>
 					{{ t('integration_openai', 'Usage limits') }}
@@ -564,8 +564,8 @@
 					{{ t('integration_openai', 'Speech-to-text provider (to transcribe Talk recordings for example)') }}
 				</NcCheckboxRadioSwitch>
 				<NcCheckboxRadioSwitch
-					:checked="state.tts_provider_enabled"
-					@update:checked="onCheckboxChanged($event, 'tts_provider_enabled', false)">
+					:model-value="state.tts_provider_enabled"
+					@update:model-value="onCheckboxChanged($event, 'tts_provider_enabled', false)">
 					{{ t('integration_openai', 'Text-to-speech provider') }}
 				</NcCheckboxRadioSwitch>
 			</div>
@@ -715,9 +715,9 @@ export default {
 
 					const defaultTtsModelId = this.state.default_tts_model_id || response.data?.default_tts_model_id
 					const ttsModelToSelect = this.models.find(m => m.id === defaultTtsModelId)
-							|| this.models.find(m => m.id.match(/tts/i))
-							|| this.models[1]
-							|| this.models[0]
+						|| this.models.find(m => m.id.match(/tts/i))
+						|| this.models[1]
+						|| this.models[0]
 
 					this.selectedModel.text = this.modelToNcSelectObject(completionModelToSelect)
 					this.selectedModel.image = this.modelToNcSelectObject(imageModelToSelect)

tests/unit/Providers/OpenAiProviderTest.php

@@ -557,7 +557,7 @@ public function testTranslationProvider(): void {
 	}
 
 	public function testTextToSpeechProvider(): void {
-		$translationProvider = new TextToSpeechProvider(
+		$TTSProvider = new TextToSpeechProvider(
 			$this->openAiApiService,
 			$this->createMock(\OCP\IL10N::class),
 			$this->createMock(\Psr\Log\LoggerInterface::class),