@@ -2,12 +2,10 @@ import { URLExt } from '@jupyterlab/coreutils';
22
33import { ServerConnection } from '@jupyterlab/services' ;
44
5- const API_NAMESPACE = 'api/jupyternaut' ;
6-
75/**
86 * Call the API extension
97 *
10- * @param endPoint API REST end point for the extension
8+ * @param endPoint Full API REST end point path for the extension
119 * @param init Initial values for the request
1210 * @returns The response body interpreted as JSON
1311 */
@@ -17,7 +15,7 @@ export async function requestAPI<T>(
1715) : Promise < T > {
1816 // Make request to Jupyter API
1917 const settings = ServerConnection . makeSettings ( ) ;
20- const requestUrl = URLExt . join ( settings . baseUrl , API_NAMESPACE , endPoint ) ;
18+ const requestUrl = URLExt . join ( settings . baseUrl , endPoint ) ;
2119
2220 let response : Response ;
2321 try {
@@ -76,7 +74,7 @@ export namespace AiService {
7674 } ;
7775
7876 export async function getConfig ( ) : Promise < DescribeConfigResponse > {
79- return requestAPI < DescribeConfigResponse > ( 'config' ) ;
77+ return requestAPI < DescribeConfigResponse > ( 'api/jupyternaut/ config' ) ;
8078 }
8179
8280 export type EnvAuthStrategy = {
@@ -120,17 +118,19 @@ export namespace AiService {
120118 } ;
121119
122120 export async function listLmProviders ( ) : Promise < ListProvidersResponse > {
123- return requestAPI < ListProvidersResponse > ( 'providers' ) ;
121+ return requestAPI < ListProvidersResponse > ( 'api/jupyternaut/ providers' ) ;
124122 }
125123
126124 export async function listEmProviders ( ) : Promise < ListProvidersResponse > {
127- return requestAPI < ListProvidersResponse > ( 'providers/embeddings' ) ;
125+ return requestAPI < ListProvidersResponse > (
126+ 'api/jupyternaut/providers/embeddings'
127+ ) ;
128128 }
129129
130130 export async function updateConfig (
131131 config : UpdateConfigRequest
132132 ) : Promise < void > {
133- return requestAPI < void > ( 'config' , {
133+ return requestAPI < void > ( 'api/jupyternaut/ config' , {
134134 method : 'POST' ,
135135 body : JSON . stringify ( config )
136136 } ) ;
@@ -142,7 +142,7 @@ export namespace AiService {
142142 } ;
143143
144144 export async function listSecrets ( ) : Promise < SecretsList > {
145- return requestAPI < SecretsList > ( 'secrets/' , {
145+ return requestAPI < SecretsList > ( 'api/jupyternaut/ secrets/' , {
146146 method : 'GET'
147147 } ) ;
148148 }
@@ -154,7 +154,7 @@ export namespace AiService {
154154 export async function updateSecrets (
155155 updatedSecrets : Record < string , string | null >
156156 ) : Promise < void > {
157- return requestAPI < void > ( 'secrets/' , {
157+ return requestAPI < void > ( 'api/jupyternaut/ secrets/' , {
158158 method : 'PUT' ,
159159 body : JSON . stringify ( {
160160 updated_secrets : updatedSecrets
@@ -167,14 +167,19 @@ export namespace AiService {
167167 }
168168
169169 export async function listChatModels ( ) : Promise < string [ ] > {
170- const response = await requestAPI < ListChatModelsResponse > ( 'models/chat/' , {
171- method : 'GET'
172- } ) ;
170+ const response = await requestAPI < ListChatModelsResponse > (
171+ 'api/ai/models/chat/' ,
172+ {
173+ method : 'GET'
174+ }
175+ ) ;
173176 return response . chat_models ;
174177 }
175178
176179 export async function getChatModel ( ) : Promise < string | null > {
177- const response = await requestAPI < DescribeConfigResponse > ( 'config/' ) ;
180+ const response = await requestAPI < DescribeConfigResponse > (
181+ 'api/jupyternaut/config/'
182+ ) ;
178183 return response . model_provider_id ;
179184 }
180185
@@ -185,7 +190,9 @@ export namespace AiService {
185190 }
186191
187192 export async function getCompletionModel ( ) : Promise < string | null > {
188- const response = await requestAPI < DescribeConfigResponse > ( 'config/' ) ;
193+ const response = await requestAPI < DescribeConfigResponse > (
194+ 'api/jupyternaut/config/'
195+ ) ;
189196 return response . completions_model_provider_id ;
190197 }
191198
@@ -228,22 +235,27 @@ export namespace AiService {
228235 const endpoint = `model-parameters${
229236 params . toString ( ) ? `?${ params . toString ( ) } ` : ''
230237 } `;
231- return await requestAPI < GetModelParametersResponse > ( endpoint ) ;
238+ return await requestAPI < GetModelParametersResponse > (
239+ `api/jupyternaut/${ endpoint } `
240+ ) ;
232241 }
233242
234243 export async function saveModelParameters (
235244 modelId : string ,
236245 parameters : Record < string , any >
237246 ) : Promise < UpdateModelParametersResponse > {
238- return await requestAPI < UpdateModelParametersResponse > ( 'model-parameters' , {
239- method : 'PUT' ,
240- headers : {
241- 'Content-Type' : 'application/json'
242- } ,
243- body : JSON . stringify ( {
244- model_id : modelId ,
245- parameters : parameters
246- } )
247- } ) ;
247+ return await requestAPI < UpdateModelParametersResponse > (
248+ 'api/jupyternaut/model-parameters' ,
249+ {
250+ method : 'PUT' ,
251+ headers : {
252+ 'Content-Type' : 'application/json'
253+ } ,
254+ body : JSON . stringify ( {
255+ model_id : modelId ,
256+ parameters : parameters
257+ } )
258+ }
259+ ) ;
248260 }
249261}
0 commit comments