Skip to content

fix: specify API version in query parameter #35

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

Open
edward-ly wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: specify API version in query parameter #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cc018f
fix(WatsonxAPIService): specify API version in query parameter
edward-ly Dec 26, 2025
4569404
fix(WatsonxAPIService): encode parameters for IAM requests to self-ho…
edward-ly Dec 26, 2025
d1af5f9
fix(AdminSettings): specify API version in query parameter
edward-ly Dec 26, 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
7 changes: 2 additions & 5 deletions lib/Service/WatsonxAPIService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,7 @@ public function getModels(string $userId): array {

try {
$this->logger->debug('Actually getting watsonx.ai models with a network request');
$params = [
'version' => Application::WATSONX_API_VERSION,
];
$modelsResponse = $this->request($userId, '/ml/v1/foundation_model_specs', $params);
$modelsResponse = $this->request($userId, '/ml/v1/foundation_model_specs?version=' . Application::WATSONX_API_VERSION);
} catch (Exception $e) {
$this->logger->warning('Error retrieving models (exc): ' . $e->getMessage());
$this->areCredsValid = false;
Expand Down Expand Up @@ -771,7 +768,7 @@ public function requestIAM(array $params = [], string $method = 'POST'): array {
$paramsContent = http_build_query($params);
$url .= '?' . $paramsContent;
} else {
$options['body'] = $params;
$options['body'] = $this->watsonxSettingsService->isUsingIbmCloud() ? $params : json_encode($params);
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/components/AdminSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,7 @@ import { confirmPassword } from '@nextcloud/password-confirmation'
import { generateUrl } from '@nextcloud/router'
import debounce from 'debounce'

const API_VERSION = '2024-03-14'
const DEFAULT_MODEL_ITEM = { id: 'Default', value: 'Default', label: 'Default' }

export default {
Expand Down Expand Up @@ -452,9 +453,9 @@ export default {
computed: {
modelEndpointUrl() {
if (this.state.url === '') {
return 'https://us-south.ml.cloud.ibm.com/ml/v1/foundation_model_specs'
return 'https://us-south.ml.cloud.ibm.com/ml/v1/foundation_model_specs?version=' + API_VERSION
}
return this.state.url.replace(/\/*$/, '/ml/v1/foundation_model_specs')
return this.state.url.replace(/\/*$/, '/ml/v1/foundation_model_specs?version=' + API_VERSION)
},
configured() {
return !!this.state.api_key && (this.isUsingIbmCloud || !!this.state.username)
Expand Down