feat: change /_plugins/_ml to a constant

Signed-off-by: SuZhou-Joe <[email protected]>
opensearch-project · Dec 1, 2023 · 34c6e9c · 34c6e9c
1 parent 5ca502e
commit 34c6e9c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/server/services/chat/olly_chat_service.ts b/server/services/chat/olly_chat_service.ts
@@ -12,6 +12,7 @@ import { LLMModelFactory } from '../../olly/models/llm_model_factory';
 import { PPLTools } from '../../olly/tools/tool_sets/ppl';
 import { PPLGenerationRequestSchema } from '../../routes/langchain_routes';
 import { ChatService } from './chat_service';
+import { ML_COMMONS_BASE_API } from '../../olly/models/constants';
 
 const MEMORY_ID_FIELD = 'memory_id';
 
@@ -49,7 +50,7 @@ export class OllyChatService implements ChatService {
       }
       const agentFrameworkResponse = (await opensearchClient.transport.request({
         method: 'POST',
-        path: `/_plugins/_ml/agents/${rootAgentId}/_execute`,
+        path: `${ML_COMMONS_BASE_API}/agents/${rootAgentId}/_execute`,
         body: {
           parameters: parametersPayload,
         },

diff --git a/server/services/storage/agent_framework_storage_service.ts b/server/services/storage/agent_framework_storage_service.ts
@@ -17,6 +17,7 @@ import { GetSessionsSchema } from '../../routes/chat_routes';
 import { StorageService } from './storage_service';
 import { MessageParser } from '../../types';
 import { MessageParserRunner } from '../../utils/message_parser_runner';
+import { ML_COMMONS_BASE_API } from '../../olly/models/constants';
 
 export interface SessionOptResponse {
   success: boolean;
@@ -33,15 +34,15 @@ export class AgentFrameworkStorageService implements StorageService {
     const [interactionsResp, conversation] = await Promise.all([
       this.client.transport.request({
         method: 'GET',
-        path: `/_plugins/_ml/memory/conversation/${sessionId}/_list`,
+        path: `${ML_COMMONS_BASE_API}/memory/conversation/${sessionId}/_list`,
       }) as TransportRequestPromise<
         ApiResponse<{
           interactions: Interaction[];
         }>
       >,
       this.client.transport.request({
         method: 'GET',
-        path: `/_plugins/_ml/memory/conversation/${sessionId}`,
+        path: `${ML_COMMONS_BASE_API}/memory/conversation/${sessionId}`,
       }) as TransportRequestPromise<
         ApiResponse<{
           conversation_id: string;
@@ -103,7 +104,7 @@ export class AgentFrameworkStorageService implements StorageService {
 
     const sessions = await this.client.transport.request({
       method: 'GET',
-      path: `/_plugins/_ml/memory/conversation/_search`,
+      path: `${ML_COMMONS_BASE_API}/memory/conversation/_search`,
       body: requestParams,
     });
 
@@ -142,7 +143,7 @@ export class AgentFrameworkStorageService implements StorageService {
     try {
       const response = await this.client.transport.request({
         method: 'DELETE',
-        path: `/_plugins/_ml/memory/conversation/${sessionId}/_delete`,
+        path: `${ML_COMMONS_BASE_API}/memory/conversation/${sessionId}/_delete`,
       });
       if (response.statusCode === 200) {
         return {
@@ -164,7 +165,7 @@ export class AgentFrameworkStorageService implements StorageService {
     try {
       const response = await this.client.transport.request({
         method: 'PUT',
-        path: `/_plugins/_ml/memory/conversation/${sessionId}/_update`,
+        path: `${ML_COMMONS_BASE_API}/memory/conversation/${sessionId}/_update`,
         body: {
           name: title,
         },
@@ -189,7 +190,7 @@ export class AgentFrameworkStorageService implements StorageService {
     try {
       const response = (await this.client.transport.request({
         method: 'GET',
-        path: `/_plugins/_ml/memory/trace/${interactionId}/_list`,
+        path: `${ML_COMMONS_BASE_API}/memory/trace/${interactionId}/_list`,
       })) as ApiResponse<{
         traces: Array<{
           conversation_id: string;