@stack-spot/portal-network 0.45.0 → 0.46.0

package/src/api/ai.ts

@@ -81,6 +81,7 @@ export type QuickActionsRequest = {
     context?: object | null;
     action: string;
     code: string;
+    qc_execution_id?: string | null;
 };
 export type SimpleResponse = {
     answer: string;
@@ -99,12 +100,13 @@ export type SourceStackAi = {
     id: string;
 };
 export type SourceKnowledgeSource = {
-    "type": "knowledge_source";
+    "type": "knowledge_source" | "cross_account";
     name: string;
     slug: string;
-    document_type?: string | null;
+    document_type: string;
     document_score: number;
     document_id: string;
+    id?: string | null;
 };
 export type SourceProjectFile = {
     "type"?: "project_file";
@@ -114,22 +116,23 @@ export type SourceProjectFile = {
     document_id: string;
     path: string;
 };
+export type KnowledgeSourceEvent = {
+    "type": "knowledge_source";
+    document_type?: string | null;
+    name: string;
+    slug: string;
+    document_score?: number | null;
+    document_id?: string | null;
+    id?: string | null;
+};
 export type ChatResponse = {
     answer: string;
     prompt_tokens: number;
     completion_tokens: number;
     total_cost?: string | null;
-    sources: (SourceStackAi | SourceKnowledgeSource | SourceProjectFile)[];
-};
-export type EventTypeEnum = "code_injected" | "code_copied" | "custom_quick_command_execution" | "user_feedback_provided";
-export type SourceKnowledgeSource2 = {
-    "type": "knowledge_source";
-    name: string;
-    slug: string;
-    document_type?: string | null;
-    document_score: number;
-    document_id: string;
+    sources: (SourceStackAi | SourceKnowledgeSource | SourceProjectFile | KnowledgeSourceEvent)[];
 };
+export type EventTypeEnum = "code_injected" | "code_copied" | "custom_quick_command_execution" | "user_feedback_provided" | "copied_all";
 export type SourceProjectFile2 = {
     "type"?: "project_file";
     name: string;
@@ -146,6 +149,8 @@ export type QuickCommandEvent = {
     message_error?: string | null;
     tokens_consumed?: string | null;
     execution_id?: string | null;
+    qc_execution_id?: string | null;
+    id?: string | null;
 };
 export type GenericEventRequest = {
     "type": EventTypeEnum;
@@ -156,7 +161,7 @@ export type GenericEventRequest = {
     chosen_feedback_options?: string[] | null;
     additional_feedback?: string | null;
     message_id?: string | null;
-    knowledge_sources?: (string | SourceStackAi | SourceKnowledgeSource2 | SourceProjectFile2)[] | null;
+    knowledge_sources?: (string | SourceStackAi | SourceKnowledgeSource | SourceProjectFile2 | KnowledgeSourceEvent)[] | null;
     quick_command_event?: QuickCommandEvent | null;
     context?: object | null;
 };
@@ -278,6 +283,16 @@ export type AccountSettingsChangeLlmRequest = {
 export type AccountSettingsChangeLimitRequest = {
     limit: number;
 };
+export type AccountSettingsChangeErqcRequest = {
+    active: boolean;
+    endpoint: string;
+    headers?: object | null;
+    auth_endpoint?: string | null;
+    client_id?: string | null;
+    client_secret?: string | null;
+    client_cert?: string | null;
+    client_key?: string | null;
+};
 export type TokensCurrentUsageResponse = {
     used: number;
     limit: number;
@@ -343,6 +358,7 @@ export type QuickCommandListResponse = {
     return_type?: QuickCommandsReturnType | null;
     creator: string | null;
     visibility_level: string;
+    id: string;
 };
 export type QuickCommandsUpdateRequest = {
     name?: string | null;
@@ -430,6 +446,7 @@ export type QuickCommandResponse = {
     creator: string | null;
     visibility_level: string;
     custom_inputs?: CustomInputResponse[] | null;
+    id: string;
 };
 export type QuickCommandsMakeACopyRequest = {
     suggested_slug: string;
@@ -442,7 +459,7 @@ export type QuickCommandDependenciesResponse = {
 };
 export type QuickCommandPromptResponse = {
     answer: string;
-    sources?: (SourceStackAi | SourceKnowledgeSource2 | SourceProjectFile2)[] | null;
+    sources?: (SourceStackAi | SourceKnowledgeSource | SourceProjectFile2 | KnowledgeSourceEvent)[] | null;
 };
 export type QuickCommandFetchResponseResult = {
     headers?: {
@@ -459,10 +476,11 @@ export type QuickCommandsExecutionRequest = {
     slugs_executions?: {
         [key: string]: string | QuickCommandPromptResponse | QuickCommandFetchResponseResult;
     } | null;
+    qc_execution_id?: string | null;
 };
 export type QuickCommandPromptResponse2 = {
     answer: string;
-    sources?: (SourceStackAi | SourceKnowledgeSource | SourceProjectFile)[] | null;
+    sources?: (SourceStackAi | SourceKnowledgeSource | SourceProjectFile | KnowledgeSourceEvent)[] | null;
 };
 export type QuickCommandFinalResultResponse = {
     result: string;
@@ -489,7 +507,7 @@ export type StepFetch = {
 };
 export type StepLlm = {
     answer: string;
-    sources: (SourceStackAi | SourceKnowledgeSource | SourceProjectFile)[];
+    sources: (SourceStackAi | SourceKnowledgeSource | SourceProjectFile | KnowledgeSourceEvent)[];
 };
 export type Step = {
     step_name: string;
@@ -542,14 +560,6 @@ export type ChatRequest2 = {
     user_prompt: string;
     project_id?: string | null;
 };
-export type SourceKnowledgeSource3 = {
-    "type": "knowledge_source";
-    name: string;
-    slug: string;
-    document_type: string;
-    document_score: number;
-    document_id: string;
-};
 export type SourceProjectFile3 = {
     "type": "project_file";
     path: string;
@@ -557,7 +567,7 @@ export type SourceProjectFile3 = {
 };
 export type ChatResponse2 = {
     answer: string;
-    sources: (SourceStackAi | SourceKnowledgeSource3 | SourceProjectFile3)[];
+    sources: (SourceStackAi | SourceKnowledgeSource | SourceProjectFile3)[];
 };
 export type QuickCommandDependenciesResponseV2 = {
     ks_names?: string[] | null;
@@ -570,14 +580,6 @@ export type BodyVectorizeObjectsFromFileV2KnowledgeSourcesSlugObjectsPost = {
 export type BodyUploadKnowledgeObjectsZipV2KnowledgeSourcesSlugObjectsBatchPost = {
     objects_zip: Blob;
 };
-export type SourceKnowledgeSource4 = {
-    "type": "knowledge_source";
-    name: string;
-    slug: string;
-    document_type: string;
-    document_score: number;
-    document_id: string;
-};
 export type SourceProjectFile4 = {
     "type": "project_file";
     path: string;
@@ -585,7 +587,7 @@ export type SourceProjectFile4 = {
 };
 export type ChatResponse3 = {
     answer: string;
-    sources: (SourceStackAi | SourceKnowledgeSource4 | SourceProjectFile4)[];
+    sources: (SourceStackAi | SourceKnowledgeSource | SourceProjectFile4)[];
     message_id: string | null;
 };
 /**
@@ -728,6 +730,29 @@ export function removeAiStackV1AiStacksStackIdDelete({ stackId, authorization, x
         })
     }));
 }
+/**
+ * Get Ai Stack
+ */
+export function getAiStackV1AiStacksStackNameExistsGet({ stackName, authorization, xAccountId }: {
+    stackName: string;
+    authorization: string;
+    xAccountId?: string | null;
+}, opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 204;
+    } | {
+        status: 404;
+    } | {
+        status: 422;
+        data: HttpValidationError;
+    }>(`/v1/ai-stacks/${encodeURIComponent(stackName)}/exists`, {
+        ...opts,
+        headers: oazapfts.mergeHeaders(opts?.headers, {
+            authorization,
+            "x-account-id": xAccountId
+        })
+    }));
+}
 /**
  * Fork
  */
@@ -1807,6 +1832,31 @@ export function resetLimitV1AccountsTokenLimitsDelete({ authorization, xAccountI
         })
     }));
 }
+/**
+ * Change External Rqc
+ */
+export function changeExternalRqcV1AccountsExternalRqcPatch({ authorization, xAccountId, accountSettingsChangeErqcRequest }: {
+    authorization: string;
+    xAccountId?: string | null;
+    accountSettingsChangeErqcRequest: AccountSettingsChangeErqcRequest;
+}, opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 204;
+    } | {
+        status: 404;
+    } | {
+        status: 422;
+        data: HttpValidationError;
+    }>("/v1/accounts/external-rqc", oazapfts.json({
+        ...opts,
+        method: "PATCH",
+        body: accountSettingsChangeErqcRequest,
+        headers: oazapfts.mergeHeaders(opts?.headers, {
+            authorization,
+            "x-account-id": xAccountId
+        })
+    })));
+}
 /**
  * Current
  */
@@ -2224,6 +2274,30 @@ export function getQuickCommandByKsSlugV1QuickCommandsKnowledgeSourcesSlugGet({
         })
     }));
 }
+/**
+ * Get Quick Commands By Agent Id
+ */
+export function getQuickCommandsByAgentIdV1QuickCommandsAgentsAgentIdGet({ agentId, authorization, xAccountId }: {
+    agentId: string;
+    authorization: string;
+    xAccountId?: string | null;
+}, opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 200;
+        data: QuickCommandListResponse[];
+    } | {
+        status: 404;
+    } | {
+        status: 422;
+        data: HttpValidationError;
+    }>(`/v1/quick-commands/agents/${encodeURIComponent(agentId)}`, {
+        ...opts,
+        headers: oazapfts.mergeHeaders(opts?.headers, {
+            authorization,
+            "x-account-id": xAccountId
+        })
+    }));
+}
 /**
  * List By Workspace Id
  */

package/src/client/ai.ts

@@ -6,6 +6,8 @@ import {
   deleteConversationV1ConversationsConversationIdDelete,
   downloadConversationV1ConversationsConversationIdDownloadGet,
   findKnowledgeObjectByCustomIdV1KnowledgeSourcesSlugObjectsCustomIdGet,
+  formatFetchStepV1QuickCommandsSlugStepsStepSlugFetchFormatPost,
+  formatResultV1QuickCommandsSlugResultFormatPost,
   getQuickCommandV1QuickCommandsSlugGet,
   HttpValidationError,
   listAiStacksV1AiStacksGet,
@@ -15,6 +17,7 @@ import {
   listKnowledgeSourcesV1KnowledgeSourcesGet,
   postEventV1EventsPost,
   quickActionsV1QuickActionsPost,
+  quickCommandsRunV2V2QuickCommandsSlugStepsStepSlugRunPost,
   updateTitleV1ConversationsConversationIdPatch,
 } from '../api/ai'
 import apis from '../apis.json'
@@ -56,6 +59,9 @@ class AIClient extends ReactQueryNetworkClient {
   downloadChat = this.mutation(removeAuthorizationParam(downloadConversationV1ConversationsConversationIdDownloadGet))
   renameChat = this.mutation(removeAuthorizationParam(updateTitleV1ConversationsConversationIdPatch))
   createEvent = this.mutation(removeAuthorizationParam(postEventV1EventsPost))
+  fetchStepOfQuickCommand = this.mutation(removeAuthorizationParam(formatFetchStepV1QuickCommandsSlugStepsStepSlugFetchFormatPost))
+  llmStepOfQuickCommand = this.mutation(removeAuthorizationParam(quickCommandsRunV2V2QuickCommandsSlugStepsStepSlugRunPost))
+  formatResultOfQuickCommand = this.mutation(removeAuthorizationParam(formatResultV1QuickCommandsSlugResultFormatPost))
 
   sendChatMessage(request: FixedChatRequest, minChangeIntervalMS?: number): StreamedJson<ChatResponse3> {
     const abortController = new AbortController()

package/src/client/types.ts

@@ -122,7 +122,8 @@ export interface FixedPluginForAppCreationV2Response extends Omit<PluginForAppCr
   inputs: FixedPluginInputValuesInConsolidatedContextResponse[],
 }
 
-export type InputType = 'BOOL' | 'INT' | 'MULTISELECT' | 'OBJECT' | 'LIST' | 'REQUIRED-CONNECTION' | 'PASSWORD' | 'SELECT' | 'TEXT'
+export type InputType = 'BOOL' | 'INT' | 'MULTISELECT' | 'OBJECT' | 'LIST' | 'REQUIRED-CONNECTION' | 'PASSWORD' |
+ 'SELECT' | 'TEXT' | 'GENERATED-CONNECTION'
 
 export interface FixedInputConditionResponse extends Omit<InputConditionResponse, 'value'> {
   value?: any,

package/src/index.ts

@@ -1,3 +1,4 @@
+export { CancelledError } from '@tanstack/react-query'
 export { accountClient } from './client/account'
 export { agentClient } from './client/agent'
 export { aiClient } from './client/ai'

package/src/network/AutoInfiniteQuery.ts

@@ -32,15 +32,12 @@ export class AutoInfiniteQuery<Variables, Result, PageParamName extends keyof Va
   private createInfiniteQueryFn(
     variables: Variables | undefined,
   ): (context: QueryFunctionContext<QueryKey, Variables[PageParamName]>) => Promise<Result> {
-    return async ({ pageParam }) => {
+    return ({ pageParam, signal }) => {
       const paginatedVariables = {
         ...variables,
         [this.options.pageParamName]: pageParam ?? variables?.[this.options.pageParamName],
       } as Variables
-      if (!this.currentRequests.has(paginatedVariables)) this.currentRequests.set(paginatedVariables, this.callFn(paginatedVariables))
-      const result = await this.currentRequests.get(paginatedVariables)
-      this.currentRequests.delete(paginatedVariables)
-      return result!
+      return this.callFn(paginatedVariables, signal)
     }
   }
 
@@ -59,7 +56,7 @@ export class AutoInfiniteQuery<Variables, Result, PageParamName extends keyof Va
     const use = suspense ? useSuspenseInfiniteQuery : useInfiniteQuery
     return use<any, any, any, any, any>({
       ...options,
-      queryKey: ['infinite', ...this.getKey(variables)],
+      queryKey: this.getInfiniteKey(variables),
       queryFn: this.createInfiniteQueryFn(variables),
       initialPageParam: this.options.initialPageParam,
       getNextPageParam: (lastPage, allPages, lastPageParam, allPageParams) =>
@@ -102,7 +99,16 @@ export class AutoInfiniteQuery<Variables, Result, PageParamName extends keyof Va
   async invalidate(variables?: Partial<Variables> | undefined): Promise<void> {
     await Promise.all([
       super.invalidate(variables),
-      queryClient.invalidateQueries({ queryKey: ['infinite', ...this.getKey(variables)] }),
+      queryClient.invalidateQueries({ queryKey: this.getInfiniteKey(variables) }),
     ])
   }
+
+  private getInfiniteKey(variables?: Partial<Variables> | undefined) {
+    return ['infinite', ...this.getKey(variables)]
+  }
+
+  async cancel(variables?: Partial<Variables> | undefined) {
+    super.cancel(variables)
+    queryClient.cancelQueries({ queryKey: this.getInfiniteKey() })
+  }
 }

package/src/network/AutoMutation.ts

@@ -11,14 +11,16 @@ export class AutoMutation<Variables, Result> extends AutoOperation<Variables> im
     super(params)
   }
 
-  mutate(...[variables]: Variables extends void ? [] : [variables: Variables]) {
-    return this.callFn(variables)
+  mutate(...args: Variables extends void ? [signal?: AbortSignal] : [variables: Variables, signal?: AbortSignal]) {
+    const variables = args[0] instanceof AbortSignal ? undefined : args[0]
+    const signal = args[0] instanceof AbortSignal ? args[0] : args[1]
+    return this.callFn(variables, signal)
   }
 
-  useMutation(options?: Omit<UseMutationOptions<Result, StackspotAPIError, Variables>, 'mutationFn'>) {
+  useMutation(options?: Omit<UseMutationOptions<Result, StackspotAPIError, Variables>, 'mutationFn'> & { signal?: AbortSignal }) {
     const result = useMutation<Result, StackspotAPIError, Variables>({
       ...options,
-      mutationFn: variables => this.callFn(variables),
+      mutationFn: (variables) => this.callFn(variables, options?.signal),
     }, queryClient)
     return [result.mutateAsync as any, result.isPending, result.error as StackspotAPIError | undefined, result as any] as const
   }

package/src/network/AutoOperation.ts

@@ -2,7 +2,6 @@
 
 import { type RequestOpts } from '@oazapfts/runtime'
 import { UseQueryOptions, UseQueryResult, useQuery } from '@tanstack/react-query'
-import { CanceledError } from '../error/CanceledError'
 import { StackspotAPIError } from '../error/StackspotAPIError'
 import { queryClient } from './react-query-client'
 import { AutoQueryObjectParams, OperationObject } from './types'
@@ -12,7 +11,6 @@ export abstract class AutoOperation<Variables> implements OperationObject<Variab
   protected apiName: string
   protected onFetchPermission: typeof fetch
   private transformError?: (error: any) => StackspotAPIError
-  private abortMap = new Map<Partial<Variables> | undefined, AbortController[]>()
 
   constructor({ apiName, onFetchPermission, fn, transformError }: AutoQueryObjectParams<Variables, any>) {
     this.fn = fn
@@ -24,29 +22,22 @@ export abstract class AutoOperation<Variables> implements OperationObject<Variab
     }
   }
 
-  protected async callFn(variables: Partial<Variables> | undefined, fetchFn?: typeof fetch) {
-    const abortController = new AbortController()
-    if (fetchFn !== this.onFetchPermission) {
-      if (!this.abortMap.has(variables)) this.abortMap.set(variables, [])
-      this.abortMap.get(variables)?.push(abortController)
-    }
+  protected async callFn(variables: Partial<Variables> | undefined, signal: AbortSignal | undefined, fetchFn?: typeof fetch) {
     const fn = this.fn as (...args: any[]) => Promise<any>
     try {
       const result = await (
         fn.length === 2
-          ? fn(variables ?? {}, fetchFn ? { fetch: fetchFn, signal: abortController.signal } : undefined)
-          : fn(fetchFn ? { fetch: fetchFn, signal: abortController.signal } : undefined)
+          ? fn(variables ?? {}, fetchFn ? { fetch: fetchFn, signal } : { signal })
+          : fn(fetchFn ? { fetch: fetchFn, signal } : { signal })
       )
       return result
     } catch (error) {
       throw this.transformError ? this.transformError(error) : error
-    } finally {
-      this.abortMap.delete(variables)
     }
   }
 
   private createPermissionQueryFn(variables: Partial<Variables> | undefined) {
-    return () => this.callFn(variables, this.onFetchPermission)
+    return () => this.callFn(variables, undefined, this.onFetchPermission)
   }
 
   isAllowed(...[variables]: Variables extends void ? [] : [variables?: Partial<Variables>]) {
@@ -79,16 +70,4 @@ export abstract class AutoOperation<Variables> implements OperationObject<Variab
   getPermissionKey(variables?: Partial<Variables>) {
     return [this.apiName, `${this.fn.name}.permission`, variables]
   }
-
-  cancel(variables?: Partial<Variables> | undefined) {
-    if (variables && this.abortMap.has(variables)) {
-      this.abortMap.get(variables)?.forEach(c => c.abort(new CanceledError()))
-      return true
-    }
-    if (!variables && this.abortMap.size) {
-      this.abortMap.forEach(controllers => controllers.forEach(c => c.abort(new CanceledError())))
-      return true
-    }
-    return false
-  }
 }

package/src/network/AutoQuery.ts

@@ -7,28 +7,14 @@ import { queryClient } from './react-query-client'
 import { AutoQueryObjectParams, QueryObject, UseQueryObjectOptions } from './types'
 
 export class AutoQuery<Variables, Result> extends AutoOperation<Variables> implements QueryObject<Variables, Result> {
-  /**
-   * Prevents the same request from being triggered more than once if subsequent calls are made before the first ends.
-   */
-  protected currentRequests = new Map<Variables | undefined, Promise<Result>>()
-  
   constructor(params: AutoQueryObjectParams<Variables, Result>) {
     super(params)
   }
 
-  private createQueryFn(variables: Variables | undefined) {
-    return async () => {
-      if (!this.currentRequests.has(variables)) this.currentRequests.set(variables, this.callFn(variables))
-      const result = await this.currentRequests.get(variables)
-      this.currentRequests.delete(variables)
-      return result!
-    }
-  }
-
   query(...[variables]: Variables extends void ? [] : [variables: Variables]) {
     return queryClient.fetchQuery({
       queryKey: this.getKey(variables),
-      queryFn: this.createQueryFn(variables),
+      queryFn: ({ signal }) => this.callFn(variables, signal),
     })
   }
 
@@ -48,8 +34,10 @@ export class AutoQuery<Variables, Result> extends AutoOperation<Variables> imple
     const use = suspense ? useSuspenseQuery : useQuery
     return use({
       ...options,
+      // without this, this lib won't work in React's strict mode, since every request will be immediately aborted (component unmounted).
+      gcTime: 60000,
       queryKey: this.getKey(variables),
-      queryFn: this.createQueryFn(variables),
+      queryFn: ({ signal }) => this.callFn(variables, signal),
     }, queryClient) as T extends true ? UseSuspenseQueryResult<Result, StackspotAPIError> : DefinedUseQueryResult<Result, StackspotAPIError>
   }
 
@@ -80,4 +68,8 @@ export class AutoQuery<Variables, Result> extends AutoOperation<Variables> imple
     if (variables) key.push(variables)
     return key
   }
+
+  cancel(variables?: Partial<Variables>) {
+    queryClient.cancelQueries({ queryKey: this.getKey(variables) })
+  }
 }

package/src/network/ManualInfiniteQuery.ts

@@ -26,15 +26,12 @@ export class ManualInfiniteQuery<
   private createInfiniteQueryFn(
     variables: Variables,
   ): (context: QueryFunctionContext<QueryKey, Variables[PageParamName]>) => Promise<Result> {
-    return async ({ pageParam }) => {
+    return ({ pageParam, signal }) => {
       const paginatedVariables = {
         ...variables,
         [this.getConfig().pageParamName]: pageParam ?? variables?.[this.getConfig().pageParamName],
       } as Variables
-      if (!this.currentRequests.has(paginatedVariables)) this.currentRequests.set(paginatedVariables, this.makeRequest(paginatedVariables))
-      const result = await this.currentRequests.get(paginatedVariables)
-      this.currentRequests.delete(paginatedVariables)
-      return result!
+      return this.makeRequest(paginatedVariables, signal)
     }
   }
 

package/src/network/ManualMutation.ts

@@ -14,29 +14,26 @@ export class ManualMutation<
     super(config)
   }
 
-  private async makeRequest(variables?: Record<string, any>) {
-    const abortController = new AbortController()
-    if (!this.abortMap.has(variables)) this.abortMap.set(variables, [])
-    this.abortMap.get(variables)?.push(abortController)
+  private async makeRequest(variables?: Record<string, any>, signal: AbortSignal = new AbortController().signal) {
     try {
       return await this.config.request(
-        ...[abortController.signal, variables] as Variables extends void ? [AbortSignal] : [AbortSignal, Variables],
+        ...[signal, variables] as Variables extends void ? [AbortSignal] : [AbortSignal, Variables],
       )
     } catch (error) {
       throw this.config.transformError(error)
-    } finally {
-      this.abortMap.delete(variables)
     }
   }
 
-  mutate(...args: Variables extends void ? [] : [variables: Variables]) {
-    return this.makeRequest(...args)
+  mutate(...args: Variables extends void ? [signal?: AbortSignal] : [variables: Variables, signal?: AbortSignal]) {
+    const variables = args[0] instanceof AbortSignal ? undefined : args[0]
+    const signal = args[0] instanceof AbortSignal ? args[0] : args[1]
+    return this.makeRequest(variables, signal)
   }
 
-  useMutation(options?: Omit<UseMutationOptions<Result, StackspotAPIError, Variables>, 'mutationFn'>) {
+  useMutation(options?: Omit<UseMutationOptions<Result, StackspotAPIError, Variables>, 'mutationFn'> & { signal?: AbortSignal }) {
     const result = useMutation<Result, StackspotAPIError, Variables>({
       ...options,
-      mutationFn: (...args: any) => this.makeRequest(...args),
+      mutationFn: (variables: any) => this.makeRequest(variables, options?.signal),
     }, queryClient)
     return [result.mutateAsync as any, result.isPending, result.error as StackspotAPIError | undefined, result as any] as const
   }

package/src/network/ManualOperation.ts

@@ -1,14 +1,12 @@
 /* eslint-disable react-hooks/rules-of-hooks */
 
 import { UseQueryOptions, UseQueryResult, useQuery } from '@tanstack/react-query'
-import { CanceledError } from '../error/CanceledError'
 import { StackspotAPIError } from '../error/StackspotAPIError'
 import { queryClient } from './react-query-client'
 import { FullOperationConfig, OperationObject } from './types'
 
 export abstract class ManualOperation<Variables extends Record<string, any> | void> implements OperationObject<Variables> {
   protected config: FullOperationConfig<Variables extends void ? [AbortSignal] : [AbortSignal, Variables], any>
-  protected abortMap = new Map<Record<string, any> | undefined, AbortController[]>()
 
   constructor(config: FullOperationConfig<Variables extends void ? [AbortSignal] : [AbortSignal, Variables], any>) {
     this.config = config
@@ -51,16 +49,4 @@ export abstract class ManualOperation<Variables extends Record<string, any> | vo
   getPermissionKey(variables?: Partial<Variables>) {
     return [this.config.apiName, `${this.config.name}.permission`, variables]
   }
-
-  cancel(variables?: Partial<Variables> | undefined) {
-    if (variables && this.abortMap.has(variables)) {
-      this.abortMap.get(variables)?.forEach(c => c.abort(new CanceledError()))
-      return true
-    }
-    if (!variables && this.abortMap.size) {
-      this.abortMap.forEach(controllers => controllers.forEach(c => c.abort(new CanceledError())))
-      return true
-    }
-    return false
-  }
 }

package/src/network/ManualQuery.ts

@@ -10,41 +10,24 @@ export class ManualQuery<
   Variables extends Record<string, any> | void,
   Result
 > extends ManualOperation<Variables> implements QueryObject<Variables, Result> {
-  /**
-   * Prevents the same request from being triggered more than once if subsequent calls are made before the first ends.
-   */
-  protected currentRequests = new Map<Record<string, any> | undefined, Promise<Result>>()
-
   constructor(config: FullOperationConfig<Variables extends void ? [AbortSignal] : [AbortSignal, Variables], Result>) {
     super(config)
   }
 
-  protected async makeRequest(variables: Record<string, any> | undefined) {
-    const abortController = new AbortController()
-    this.abortMap.set(variables, [abortController])
+  protected async makeRequest(variables: Record<string, any> | undefined, signal: AbortSignal) {
     try {
       return await this.config.request(
-        ...[abortController.signal, variables] as Variables extends void ? [AbortSignal] : [AbortSignal, Variables],
+        ...[signal, variables] as Variables extends void ? [AbortSignal] : [AbortSignal, Variables],
       )
     } catch (error) {
       throw this.config.transformError(error)
-    } finally {
-      this.abortMap.delete(variables)
-      this.currentRequests.delete(variables)
-    }
-  }
-
-  private createQueryFn(variables: Record<string, any> | undefined) {
-    return () => {
-      if (!this.currentRequests.has(variables)) this.currentRequests.set(variables, this.makeRequest(variables))
-      return this.currentRequests.get(variables)!
     }
   }
 
   query(...[variables]: Variables extends void ? [] : [variables: Variables]) {
     return queryClient.fetchQuery({
       queryKey: this.getKey(variables as Variables),
-      queryFn: this.createQueryFn(variables),
+      queryFn: ({ signal }) => this.makeRequest(variables, signal),
     })
   }
 
@@ -63,7 +46,7 @@ export class ManualQuery<
     return use({
       ...options,
       queryKey: this.getKey(variables as Variables),
-      queryFn: this.createQueryFn(variables),
+      queryFn: ({ signal }) => this.makeRequest(variables, signal),
     }, queryClient) as T extends true ? UseSuspenseQueryResult<Result, StackspotAPIError> : DefinedUseQueryResult<Result, StackspotAPIError>
   }
 
@@ -89,7 +72,11 @@ export class ManualQuery<
     return queryClient.invalidateQueries({ queryKey: this.getKey(variables) })
   }
 
-  getKey(variables?: Partial<Variables>)  {
+  getKey(variables?: Partial<Variables>) {
     return [this.config.apiName, this.config.name, variables]
   }
+
+  cancel(variables?: Partial<Variables>) {
+    queryClient.cancelQueries({ queryKey: this.getKey(variables) })
+  }
 }

package/src/network/ReactQueryNetworkClient.ts

@@ -39,6 +39,7 @@ export abstract class ReactQueryNetworkClient extends NetworkClient {
   }
 
   #transformError(error: any): StackspotAPIError {
+    if (error instanceof StackspotAPIError) return error
     if (!(error instanceof HttpError)) throw new StackspotAPIError({ status: 0, message: error?.message || `${error}`, stack: error.stack })
     const data = this.#parseErrorData(error)
     if (data.type === PERMISSION_ERROR) {