switch wav to mp3 and remove elses

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

Author: lukasdotcom

lib/Service/OpenAiAPIService.php

@@ -28,6 +28,8 @@
 use OCP\TaskProcessing\ShapeEnumValue;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
+use Throwable;
+use function json_encode;
 
 /**
  * Service to make requests to OpenAI/LocalAI REST API
@@ -132,7 +134,7 @@ public function getModels(string $userId): array {
 			throw $e;
 		}
 		if (isset($modelsResponse['error'])) {
-			$this->logger->warning('Error retrieving models: ' . \json_encode($modelsResponse));
+			$this->logger->warning('Error retrieving models: ' . json_encode($modelsResponse));
 			$this->areCredsValid = false;
 			throw new Exception($modelsResponse['error'], Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
@@ -142,7 +144,7 @@ public function getModels(string $userId): array {
 		}
 
 		if (!$this->isModelListValid($modelsResponse['data'])) {
-			$this->logger->warning('Invalid models response: ' . \json_encode($modelsResponse));
+			$this->logger->warning('Invalid models response: ' . json_encode($modelsResponse));
 			$this->areCredsValid = false;
 			throw new Exception($this->l10n->t('Invalid models response received'), Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
@@ -185,7 +187,7 @@ public function getModelEnumValues(?string $userId): array {
 				array_unshift($modelEnumValues, new ShapeEnumValue($this->l10n->t('Default'), 'Default'));
 			}
 			return $modelEnumValues;
-		} catch (\Throwable $e) {
+		} catch (Throwable $e) {
 			// avoid flooding the logs with errors from calls of task processing
 			$this->logger->info('Error getting model enum values', ['exception' => $e]);
 			return [];
@@ -767,7 +769,7 @@ public function requestSpeechCreation(
 			'input' => $prompt,
 			'voice' => $voice === Application::DEFAULT_MODEL_ID ? Application::DEFAULT_SPEECH_VOICE : $voice,
 			'model' => $model === Application::DEFAULT_MODEL_ID ? Application::DEFAULT_SPEECH_MODEL_ID : $model,
-			'response_format' => 'wav',
+			'response_format' => 'mp3',
 			'speed' => $speed,
 		];
 
@@ -933,18 +935,16 @@ public function request(?string $userId, string $endPoint, array $params = [], s
 
 			if ($respCode >= 400) {
 				return ['error' => $this->l10n->t('Bad credentials')];
-			} else {
-				if ($response->getHeader('Content-Type') === 'application/json') {
-					$parsedBody = json_decode($body, true);
-					if ($parsedBody === null) {
-						$this->logger->warning('Could not JSON parse the response', ['body' => $body]);
-						return ['error' => 'Could not JSON parse the response'];
-					}
-					return $parsedBody;
-				} else {
-					return ['body' => $body];
+			}
+			if ($response->getHeader('Content-Type') === 'application/json') {
+				$parsedBody = json_decode($body, true);
+				if ($parsedBody === null) {
+					$this->logger->warning('Could not JSON parse the response', ['body' => $body]);
+					return ['error' => 'Could not JSON parse the response'];
 				}
+				return $parsedBody;
 			}
+			return ['body' => $body];
 		} catch (ClientException|ServerException $e) {
 			$responseBody = $e->getResponse()->getBody();
 			$parsedResponseBody = json_decode($responseBody, true);

tests/unit/Providers/OpenAiProviderTest.php

@@ -576,7 +576,8 @@ public function testTextToSpeechProvider(): void {
 			'input' => $inputText,
 			'voice' => Application::DEFAULT_SPEECH_VOICE,
 			'model' => Application::DEFAULT_SPEECH_MODEL_ID,
-			'response_format' => 'wav',
+			'response_format' => 'mp3',
+			'speed' => 1,
 		]);
 
 		$iResponse = $this->createMock(\OCP\Http\Client\IResponse::class);