Skip to content

feat: add support for together ai #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kyteinsky merged 4 commits into from
Mar 5, 2025
Merged

feat: add support for together ai #197

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a2ce8c
feat: add support for together ai
kyteinsky Feb 28, 2025
2a44085
validate model list
kyteinsky Mar 5, 2025
bb256d1
fix psalm
kyteinsky Mar 5, 2025
374f631
Update lib/Service/OpenAiAPIService.php
kyteinsky Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions lib/Service/OpenAiAPIService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,26 @@ public function getServiceName(): string {
}
}

/**
* @param mixed $models
* @return boolean
*/
private function isModelListValid($models): bool {
if (!is_array($models) || !array_is_list($models)) {
return false;
}
if (count($models) === 0) {
return false;
}
foreach ($models as $model) {
if (!isset($model['id'])) {
return false;
}
}

return true;
}

/**
* @param string $userId
* @return array|string[]
Expand Down Expand Up @@ -111,11 +131,22 @@ public function getModels(string $userId): array {
$this->areCredsValid = false;
throw $e;
}
if (!isset($modelsResponse['data'])) {
if (isset($modelsResponse['error'])) {
$this->logger->warning('Error retrieving models: ' . \json_encode($modelsResponse));
$this->areCredsValid = false;
throw new Exception($this->l10n->t('Unknown models error'), Http::STATUS_INTERNAL_SERVER_ERROR);
throw new Exception($modelsResponse['error'], Http::STATUS_INTERNAL_SERVER_ERROR);
}
if (!isset($modelsResponse['data'])) {
// also consider responses without 'data' as valid
$modelsResponse = ['data' => $modelsResponse];
}

if (!$this->isModelListValid($modelsResponse['data'])) {
$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);
}

$cache->set($cacheKey, $modelsResponse, Application::MODELS_CACHE_TTL);
$this->modelsMemoryCache = $modelsResponse;
$this->areCredsValid = true;
Expand Down