@stack-spot/portal-network 0.191.0 → 0.192.0-beta.1

package/src/client/ai.ts

@@ -38,6 +38,8 @@ import {
   resetKnowledgeObjectsV1KnowledgeSourcesSlugObjectsDelete,
   runFetchStepV1QuickCommandsSlugStepsStepSlugFetchRunPost,
   searchKnowledgeSourcesV1KnowledgeSourcesSearchPost,
+  tokensByUserV1AnalyticsTokensByUserGet,
+  tokensDailyUsageV1AnalyticsTokensDailyUsageGet,
   updateQuickCommandV1QuickCommandsSlugPatch,
   updateTitleV1ConversationsConversationIdPatch,
   vectorizeCustomKnowledgeSourceV1KnowledgeSourcesSlugCustomPost,
@@ -257,6 +259,14 @@ class AIClient extends ReactQueryNetworkClient {
    * Removes the resource of type Quick Command from the list of favorites.
    */
   removeFavoriteQuickCommand = this.mutation(removeAuthorizationParam(deleteFavoriteV1QuickCommandsSlugFavoriteDelete))
+  /**
+   * Get Tokens Daily usage
+   */
+  analyticsTokensDailyUsage = this.query(removeAuthorizationParam(tokensDailyUsageV1AnalyticsTokensDailyUsageGet))
+  /**
+   * Get Tokens By User
+   */
+  analyticsTokensByUser = this.query(tokensByUserV1AnalyticsTokensByUserGet)
 
   private static async toolsOfAgent(agentId?: string) {
     try {
@@ -266,6 +276,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 []
@@ -290,7 +303,9 @@ class AIClient extends ReactQueryNetworkClient {
      */
     async function transform(event: Partial<FixedChatResponse>, data: Partial<ChatResponseWithSteps>) {
       const info = event.agent_info
+
       if (!info) return
+
       const tools = await AIClient.toolsOfAgent(request.context?.agent_id)
       data.steps = data.steps ? [...data.steps] : []
 
@@ -303,6 +318,59 @@ 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',
+          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 +380,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 +403,80 @@ 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,
+              executionId: info.id,
+              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,
+                executionId: info.id,
+                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
@@ -366,7 +488,7 @@ class AIClient extends ReactQueryNetworkClient {
         if (answerStep) answerStep.status = 'running'
       }
 
-      if (info.type === 'final_answer' && info.action === 'end') {
+      if (info.type === 'chat' && info.action === 'end') {
         const answerStep = last(data.steps)
         if (answerStep) {
           answerStep.status = 'success'
@@ -393,3 +515,4 @@ class AIClient extends ReactQueryNetworkClient {
 }
 
 export const aiClient = new AIClient()
+

package/src/client/cloud-platform.ts

@@ -1,36 +1,49 @@
 import { HttpError } from '@oazapfts/runtime'
 import {
-  acceptNetworkConnection,
   createCertificate,
   createCidr,
   createDnsRecord,
   createDnsZone,
   createFolder,
   createFoundation,
-  createInbound,
   createNetwork,
-  createNetworkConnection,
   createProject,
+  createRuntime,
   createTenant,
   createVpn,
   defaults,
+  deleteCertificate,
+  deleteCidr,
+  deleteDnsRecord,
+  deleteDnsZone,
+  deleteFolder,
+  deleteNetwork,
+  deleteProject,
+  deleteVpn,
   getCertificate,
   getFolder,
+  getFolderTags,
   getFoundation,
   getNetwork,
-  getProject1,
+  getProject,
   getVpnConfiguration,
   listCertificates,
   listCidr,
   listDnsRecord,
   listDnsZone,
   listFoundations,
-  listInbound,
   listNetwork,
-  listNetworkConnection,
+  listRuntime,
   listTenant,
   listVpns,
   providers,
+  putCertificateTags,
+  putCidrTags,
+  putDnsZoneTags,
+  putFolderTags,
+  putNetworkTags,
+  putProjectTags,
+  putVpnTags,
 } from '../api/cloudPlatform'
 import { DefaultAPIError } from '../error/DefaultAPIError'
 import { StackspotAPIError } from '../error/StackspotAPIError'
@@ -106,7 +119,7 @@ class CloudPlatformClient extends ReactQueryNetworkClient {
   /**
    * Get a project by id
    */
-  getProjectById = this.query(removeAuthorizationParam(getProject1))
+  getProjectById = this.query(removeAuthorizationParam(getProject))
   /**
    * Get a list of dns records
    */
@@ -123,26 +136,6 @@ class CloudPlatformClient extends ReactQueryNetworkClient {
    * Create a network
    */
   createNetwork = this.mutation(removeAuthorizationParam(createNetwork))
-  /**
-   * Get a list of inbounds
-   */
-  listInbounds = this.query(removeAuthorizationParam(listInbound))
-  /**
-   * Create a inbound
-   */
-  createInbound = this.mutation(removeAuthorizationParam(createInbound))
-  /**
-   * Add a network connection
-   */
-  addNetworkConnection = this.mutation(removeAuthorizationParam(createNetworkConnection))
-  /**
-   * Get a network connection request
-   */
-  getNetworkConnections = this.query(removeAuthorizationParam(listNetworkConnection))
-  /**
-   * Accept a network connection
-   */
-  acceptNetworkConnection = this.mutation(removeAuthorizationParam(acceptNetworkConnection))
   /**
    * Get a list of vpn's
    */
@@ -167,6 +160,78 @@ class CloudPlatformClient extends ReactQueryNetworkClient {
  * Create a tenant
  */
   createTenant = this.mutation(removeAuthorizationParam(createTenant))
+  /**
+  * Get a list of runtimes
+  */
+  listRuntimes = this.query(removeAuthorizationParam(listRuntime))
+  /**
+  * Create a runtime
+  */
+  createRuntime = this.mutation(removeAuthorizationParam(createRuntime))
+  /**
+  * Get a list of tags in folder
+  */
+  getFolderTags = this.query(removeAuthorizationParam(getFolderTags))
+  /**
+  * Update folder tags
+  */
+  updateFolderTags = this.mutation(removeAuthorizationParam(putFolderTags))
+  /**
+  * Update project tags
+  */
+  updateProjectTags = this.mutation(removeAuthorizationParam(putProjectTags))
+  /**
+  * Update network tags
+  */
+  updateNetworkTags = this.mutation(removeAuthorizationParam(putNetworkTags))
+  /**
+  * Update cidr tags
+  */
+  updateCidrTags = this.mutation(removeAuthorizationParam(putCidrTags))
+  /**
+  * Update dns zone tags
+  */
+  updateDnsZoneTags = this.mutation(removeAuthorizationParam(putDnsZoneTags))
+  /**
+  * Update certificate tags
+  */
+  updateCertificateTags = this.mutation(removeAuthorizationParam(putCertificateTags))
+  /**
+  * Update vpn tags
+  */
+  updateVpnTags = this.mutation(removeAuthorizationParam(putVpnTags))
+  /**
+  * Delete a folder
+  */
+  deleteFolder = this.mutation(removeAuthorizationParam(deleteFolder))
+  /**
+  * Delete a project
+  */
+  deleteProject = this.mutation(removeAuthorizationParam(deleteProject))
+  /**
+  * Delete a network
+  */
+  deleteNetwork = this.mutation(removeAuthorizationParam(deleteNetwork))
+  /**
+  * Delete a certificate
+  */
+  deleteCertificate = this.mutation(removeAuthorizationParam(deleteCertificate))
+  /**
+  * Delete a dns zone
+  */
+  deleteDnsZone = this.mutation(removeAuthorizationParam(deleteDnsZone))
+  /**
+  * Delete a dns record
+  */
+  deleteDnsRecord = this.mutation(removeAuthorizationParam(deleteDnsRecord))
+  /**
+* Delete a VPN
+*/
+  deleteVPN = this.mutation(removeAuthorizationParam(deleteVpn))
+  /**
+* Delete a CIDR
+*/
+  deleteCidr = this.mutation(removeAuthorizationParam(deleteCidr))
 }
 
 export const cloudPlatformClient = new CloudPlatformClient()

package/src/client/code-shift.ts

@@ -58,14 +58,17 @@ import {
   getModuleV1ModulesModuleIdGet,
   analyticsProgramGroupsTargetDetailsV1AnalyticsProgramGroupsTargetDetailsGet,
   analyticsProgramGroupsTargetDetailsDownloadV1AnalyticsProgramGroupsTargetDetailsDownloadGet,
+  putCustomerRatingReportV1ReportsReportIdCustomerRatingPut,
   searchReposScmServiceV2ReposSearchScmPost,
   importReposWithTagsScmServiceV2ReposSearchScmSearchIdPost,
   searchReposScmV2V2ReposSearchScmSearchIdGet,
   analyticsRepositoryTargetDetailsV1AnalyticsRepositoriesTargetDetailsGet,
   analyticsRepositoryTargetDetailsDownloadV1AnalyticsRepositoriesTargetDetailsDownloadGet,
-  putCustomerRatingReportV1ReportsReportIdCustomerRatingPut,
   updateModuleServiceV1ModulesModuleIdPut,
   downloadSearchReposScmV2V2ReposSearchScmSearchIdDownloadGet,
+  moduleFavoriteServiceAddV1ModulesModuleIdFavoritesPost,
+  moduleFavoriteServiceDeleteV1ModulesModuleIdFavoritesDelete,
+  patHealthCheckV1ScmPatHealthCheckGet,
 } from '../api/codeShift'
 import { DefaultAPIError } from '../error/DefaultAPIError'
 import { codeShiftDictionary } from '../error/dictionary/code-shift'
@@ -123,6 +126,14 @@ class CodeShift extends ReactQueryNetworkClient {
    * Gets module by id.
    */
   module = this.query(removeAuthorizationParam(getModuleV1ModulesModuleIdGet))
+  /**
+  * Add a module in favorites.
+  */
+  addFavoriteModule = this.mutation(removeAuthorizationParam(moduleFavoriteServiceAddV1ModulesModuleIdFavoritesPost))
+  /**
+  * Remove a module from favorites.
+  */
+  removeFavoriteModule = this.mutation(removeAuthorizationParam(moduleFavoriteServiceDeleteV1ModulesModuleIdFavoritesDelete))
   /**
    * Gets module inputs.
    */
@@ -135,6 +146,10 @@ class CodeShift extends ReactQueryNetworkClient {
    * Updates a module.
    */
   updateModule = this.mutation(removeAuthorizationParam(updateModuleServiceV1ModulesModuleIdPut))
+  /**
+   * Adds a module to favorites.
+   */
+  addModuleToFavorites = this.mutation(removeAuthorizationParam(moduleFavoriteServiceAddV1ModulesModuleIdFavoritesPost))
   /**
    * Generates a report.
    */
@@ -263,6 +278,10 @@ class CodeShift extends ReactQueryNetworkClient {
    * Validates a SCM URL.
    */
   validateSCMUrl = this.mutation(removeAuthorizationParam(validateScmUrlServiceV1ReposValidateScmUrlPost))
+  /**
+   * PAT Health Check
+   */
+  checkScmPatHealth = this.query(removeAuthorizationParam(patHealthCheckV1ScmPatHealthCheckGet))
   /**
    * Get Branches for a Repository
    */

package/src/client/types.ts

@@ -185,6 +185,7 @@ export interface FixedChatRequest extends ChatRequest {
     stackspot_ai_version?: string,
     os?: string,
     upload_ids?: string[],
+    selected_model_id?: string,
   },
 }
 
@@ -245,6 +246,7 @@ export interface ChatAgentTool {
   image?: string,
   input?: string,
   output?: string,
+  goal?: string,
 }
 
 export interface ChatStepAttempt {
@@ -256,8 +258,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 +268,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 +305,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 +330,7 @@ export interface PlanningAgentInfo extends BaseAgentInfo {
       goal: string,
       tools?: AgentTool[],
     }[],
+    user_question?: string,
   },
 }
 
@@ -326,6 +346,8 @@ export interface ToolAgentInfo extends BaseAgentInfo {
     input?: any,
     attempt: number,
     output?: string,
+    user_question?: string,
+    tool_id: string,
   },
 }