@stack-spot/portal-network 0.187.0 → 0.187.1-beta.1

package/src/client/ai.ts

@@ -266,6 +266,9 @@ class AIClient extends ReactQueryNetworkClient {
       agent.toolkits?.builtin_toolkits?.forEach(kit => kit.tools?.forEach(({ id, name, description }) => {
         if (id) tools.push({ image: kit.image_url, id, name: name || id, description })
       }))
+      agent.toolkits?.custom_toolkits?.forEach(kit => kit.tools?.forEach(({ id, name, description }) => {
+        if (id) tools.push({ image: kit.avatar ?? undefined, id, name: name || id, description })
+      }))
       return tools
     } catch {
       return []
@@ -303,6 +306,33 @@ class AIClient extends ReactQueryNetworkClient {
           steps: info.data?.steps?.map(s => s.goal) ?? [],
           goal: info.data?.plan_goal ?? '',
         })
+        
+        info.data?.steps.forEach(s => data.steps?.push({
+          id: s.id,
+          type: 'step',
+          status: 'pending',
+          input: s.goal,
+          attempts: [{
+            tools: s.tools?.map(t => ({
+              ...(tools.find(({ id }) => id === t.tool_id) ?? { id: t.tool_id, name: t.tool_id }),
+              executionId: t.tool_execution_id,
+              goal: t.goal,
+            })),
+          }],
+        }))
+        data.steps.push({ id: 'answer', type: 'answer', status: 'pending' })
+      }
+
+      if (info.type === 'planning' && info.action === 'awaiting_approval') {
+        data.steps.push({
+          id: 'planning',
+          type: 'planning',
+          status: 'awaiting_approval',
+          user_question: info.data?.user_question,
+          duration: info.duration || 0,
+          steps: info.data?.steps?.map(s => s.goal) ?? [],
+          goal: info.data?.plan_goal ?? '',
+        })
         info.data?.steps.forEach(s => data.steps?.push({
           id: s.id,
           type: 'step',
@@ -312,6 +342,7 @@ class AIClient extends ReactQueryNetworkClient {
             tools: s.tools?.map(t => ({
               ...(tools.find(({ id }) => id === t.tool_id) ?? { id: t.tool_id, name: t.tool_id }),
               executionId: t.tool_execution_id,
+              goal: t.goal,
             })),
           }],
         }))
@@ -334,27 +365,78 @@ class AIClient extends ReactQueryNetworkClient {
         }
       }
 
+      if (info.type === 'tool' && info.action === 'awaiting_approval') {
+        const tool = tools.find(({ id }) => id === info.data?.tool_id) 
+        data.steps.push({
+          id: info.id,
+          type: 'tool',
+          status: 'awaiting_approval',
+          duration: info.duration || 0,
+          input: info.data?.input,
+          user_question: info.data?.user_question,
+          attempts: [{
+            tools: [{
+              executionId: info.id,
+              id: info.data?.tool_id ?? '',
+              name: tool?.name ?? '',
+              goal: tool?.goal,
+              ...tool,
+            }],
+          }],
+        })
+        data.steps.push({ id: 'answer', type: 'answer', status: 'pending' })
+      }
+
       if (info.type === 'tool' && info.action === 'start') {
         const currentStep = data.steps.find(s => s.status === 'running') as StepChatStep
-        if (!currentStep || !info.data || !currentStep.attempts[0].tools) return
-        const toolInFirstAttempt = currentStep.attempts[0].tools.find(t => t.executionId === info.id)
-        if (!toolInFirstAttempt) return
-        const input = formatJson(info.data.input)
-        if (info.data.attempt === 0) {
-          toolInFirstAttempt.input = input
-        } else {
-          currentStep.attempts[info.data.attempt] ??= { tools: [] }
-          currentStep.attempts[info.data.attempt].tools?.push({
-            ...toolInFirstAttempt,
-            input,
+        if (!info.data) return
+        
+        //There might be a tool with status awaiting_approval, so we want to inform tool has already started
+        if (!currentStep || !currentStep.attempts[0].tools) {
+          const input = formatJson(info.data.input)
+          const tool = tools.find(({ id }) => id === info.data?.tool_id) ?? { id: info.data?.tool_id, name: info.data?.tool_id }
+          data.steps.push({
+            id: info.id,
+            type: 'tool',
+            status: 'running',
+            duration: info.duration || 0,
+            input: info.data?.input,
+            user_question: info.data?.user_question,
+            attempts: [{
+              tools:[{ ...tool, executionId: info.id, input }],
+            }],
           })
+        } else {
+          const toolInFirstAttempt = currentStep.attempts[0].tools?.find(t => t.executionId === info.id)
+          //One step might have multiple tools. When in an approval mode, we might not have all the tools in the array yet.
+          //So we make sure to add any tools that are not in there.
+          if (!toolInFirstAttempt) {
+            const input = formatJson(info.data.input)
+            const tool = tools?.find(({ id }) => id === info.data?.tool_id) ?? { id: info.data?.tool_id, name: info.data?.tool_id }
+            currentStep.attempts[info.data.attempt-1].tools?.push({
+              ...tool,
+              input,
+            })
+          } else {
+            const input = formatJson(info.data.input)
+            if (info.data.attempt === 1) {
+              toolInFirstAttempt.input = input
+            } else {
+              const tool = tools.find(({ id }) => id === info.data?.tool_id) ?? { id: info.data?.tool_id, name: info.data?.tool_id }
+              currentStep.attempts[info.data.attempt-1] ??= { tools: [] }
+              currentStep.attempts[info.data.attempt-1].tools?.push({
+                ...tool,
+                input,
+              })
+            }
+          }
         }
       }
 
       if (info.type === 'tool' && info.action === 'end') {
         const currentStep = data.steps.find(s => s.status === 'running') as StepChatStep
         if (!currentStep || !info.data) return
-        const tool = currentStep.attempts[info.data.attempt]?.tools?.find(t => t.executionId === info.id)
+        const tool = currentStep.attempts[info.data.attempt-1]?.tools?.find(t => t.executionId === info.id)
         if (tool) {
           tool.output = formatJson(info.data.output)
           tool.duration = info.duration
@@ -393,3 +475,4 @@ class AIClient extends ReactQueryNetworkClient {
 }
 
 export const aiClient = new AIClient()
+

package/src/client/code-shift.ts

@@ -58,11 +58,13 @@ import {
   getModuleV1ModulesModuleIdGet,
   analyticsProgramGroupsTargetDetailsV1AnalyticsProgramGroupsTargetDetailsGet,
   analyticsProgramGroupsTargetDetailsDownloadV1AnalyticsProgramGroupsTargetDetailsDownloadGet,
+  putCustomerRatingReportV1ReportsReportIdCustomerRatingPut,
   searchReposScmServiceV2ReposSearchScmPost,
   importReposWithTagsScmServiceV2ReposSearchScmSearchIdPost,
   searchReposScmV2V2ReposSearchScmSearchIdGet,
   analyticsRepositoryTargetDetailsV1AnalyticsRepositoriesTargetDetailsGet,
   analyticsRepositoryTargetDetailsDownloadV1AnalyticsRepositoriesTargetDetailsDownloadGet,
+  updateModuleServiceV1ModulesModuleIdPut,
 } from '../api/codeShift'
 import { DefaultAPIError } from '../error/DefaultAPIError'
 import { codeShiftDictionary } from '../error/dictionary/code-shift'
@@ -128,6 +130,10 @@ class CodeShift extends ReactQueryNetworkClient {
    * Creates a module.
    */
   createModule = this.mutation(removeAuthorizationParam(createModuleServiceV1ModulesPost))
+  /**
+   * Updates a module.
+   */
+  updateModule = this.mutation(removeAuthorizationParam(updateModuleServiceV1ModulesModuleIdPut))
   /**
    * Generates a report.
    */
@@ -144,6 +150,12 @@ class CodeShift extends ReactQueryNetworkClient {
    * Downloads a report as a csv file.
    */
   downloadReport = this.query(removeAuthorizationParam(downloadReportV1ReportsReportIdDownloadGet))
+  /**
+   * Put Customer Rating Report
+   */
+  updateReportRating = this.mutation(
+    removeAuthorizationParam(putCustomerRatingReportV1ReportsReportIdCustomerRatingPut),
+  )
   /**
    * Gets code shift settings
    */

package/src/client/types.ts

@@ -245,6 +245,7 @@ export interface ChatAgentTool {
   image?: string,
   input?: string,
   output?: string,
+  goal?: string,
 }
 
 export interface ChatStepAttempt {
@@ -256,8 +257,8 @@ export interface ChatStepAttempt {
 
 export interface BaseChatStep {
   id: string,
-  type: 'planning' | 'step' | 'answer',
-  status: 'pending' | 'running' | 'success' | 'error',
+  type: 'planning' | 'step' | 'answer' | 'tool',
+  status: 'pending' | 'running' | 'success' | 'error' | 'awaiting_approval',
   /**
    * Duration in seconds.
    */
@@ -266,9 +267,24 @@ export interface BaseChatStep {
 
 export interface PlanningChatStep extends BaseChatStep {
   type: 'planning',
-  status: 'success',
+  status: 'success' | 'awaiting_approval',
   steps: string[],
   goal: string,
+  user_question?: string,
+}
+
+export interface ToolChatStep extends BaseChatStep {
+  type: 'tool',
+  status: 'running' | 'success' | 'error' | 'awaiting_approval',
+  /**
+   * Each step might attempt to run for multiple times, with different inputs and outputs. If first attempt succeeds, this array will have
+   * only one element.
+   * 
+   * This array never has less than one element, despite the step's status.
+   */
+  attempts: ChatStepAttempt[],
+  input?: Record<string, any>,
+  user_question?: string,
 }
 
 export interface StepChatStep extends BaseChatStep {
@@ -288,17 +304,19 @@ export interface AnswerChatStep extends BaseChatStep {
   type: 'answer',
 }
 
-export type ChatStep = PlanningChatStep | StepChatStep | AnswerChatStep
+export type ChatStep = PlanningChatStep | StepChatStep | AnswerChatStep | ToolChatStep
 
 export interface BaseAgentInfo {
   type: 'chat' | 'planning' | 'step' | 'tool' | 'final_answer',
-  action: 'start' | 'end',
+  action: 'start' | 'end' | 'awaiting_approval',
   duration?: number,
+  id: string,
 }
 
 export interface AgentTool {
   tool_id: string,
   tool_execution_id: string,
+  goal: string,
 }
 
 export interface PlanningAgentInfo extends BaseAgentInfo {
@@ -311,6 +329,7 @@ export interface PlanningAgentInfo extends BaseAgentInfo {
       goal: string,
       tools?: AgentTool[],
     }[],
+    user_question?: string,
   },
 }
 
@@ -326,6 +345,8 @@ export interface ToolAgentInfo extends BaseAgentInfo {
     input?: any,
     attempt: number,
     output?: string,
+    user_question?: string,
+    tool_id: string,
   },
 }