@squonk/data-manager-client 4.2.0 → 4.3.0

package/src/instance/instance.ts

@@ -1,6 +1,5 @@
-// @ts-nocheck
 /**
- * Generated by orval v7.4.1 🍺
+ * Generated by orval v7.10.0 🍺
  * Do not edit manually.
  * Dataset Manager API
  * The Dataset Manager API service.
@@ -9,16 +8,13 @@ A service that allows *registered* users to make **Datasets** and associated **M
 
  * OpenAPI spec version: 4.1
  */
-import {
-  useMutation,
-  useQuery,
-  useSuspenseQuery
-} from '@tanstack/react-query'
+import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
   DataTag,
   DefinedInitialDataOptions,
   DefinedUseQueryResult,
   MutationFunction,
+  QueryClient,
   QueryFunction,
   QueryKey,
   UndefinedInitialDataOptions,
@@ -27,8 +23,9 @@ import type {
   UseQueryOptions,
   UseQueryResult,
   UseSuspenseQueryOptions,
-  UseSuspenseQueryResult
-} from '@tanstack/react-query'
+  UseSuspenseQueryResult,
+} from "@tanstack/react-query";
+
 import type {
   DmError,
   GetInstancesParams,
@@ -38,14 +35,15 @@ import type {
   InstancePostResponse,
   InstancesGetResponse,
   PatchInstanceParams,
-  TaskIdentity
-} from '../data-manager-api.schemas'
-import { customInstance } from '.././custom-instance';
-import type { ErrorType } from '.././custom-instance';
-
+  TaskIdentity,
+} from "../data-manager-api.schemas";
 
-type SecondParameter<T extends (...args: any) => any> = Parameters<T>[1];
+import { customInstance } from ".././custom-instance";
+import type { ErrorType } from ".././custom-instance";
+import { mutationMutator } from ".././options-mutator";
+import { queryMutator } from ".././options-mutator";
 
+type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
 /**
  * Launches a new Application or Job instance, returning an Instance and Task ID. The Task ID should be used against the `/task` endpoint to determine the availability of the the running instance.
@@ -59,88 +57,115 @@ A Job instance typically runs to completion, reaching the **TaskState** _SUCCESS
  * @summary Creates a new Job or Application instance
  */
 export const createInstance = (
-    instancePostBodyBody: InstancePostBodyBody,
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  instancePostBodyBody: InstancePostBodyBody,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      const formUrlEncoded = new URLSearchParams();
-formUrlEncoded.append('application_id', instancePostBodyBody.application_id)
-formUrlEncoded.append('project_id', instancePostBodyBody.project_id)
-formUrlEncoded.append('as_name', instancePostBodyBody.as_name)
-if(instancePostBodyBody.callback_url !== undefined) {
- formUrlEncoded.append('callback_url', instancePostBodyBody.callback_url)
- }
-if(instancePostBodyBody.callback_context !== undefined) {
- formUrlEncoded.append('callback_context', instancePostBodyBody.callback_context)
- }
-if(instancePostBodyBody.generate_callback_token !== undefined) {
- formUrlEncoded.append('generate_callback_token', instancePostBodyBody.generate_callback_token.toString())
- }
-if(instancePostBodyBody.callback_token !== undefined) {
- formUrlEncoded.append('callback_token', instancePostBodyBody.callback_token)
- }
-if(instancePostBodyBody.debug !== undefined) {
- formUrlEncoded.append('debug', instancePostBodyBody.debug)
- }
-if(instancePostBodyBody.specification !== undefined) {
- formUrlEncoded.append('specification', instancePostBodyBody.specification)
- }
-
-      return customInstance<InstancePostResponse>(
-      {url: `/instance`, method: 'POST',
-      headers: {'Content-Type': 'application/x-www-form-urlencoded', },
-       data: formUrlEncoded, signal
+  const formUrlEncoded = new URLSearchParams();
+  formUrlEncoded.append(`application_id`, instancePostBodyBody.application_id);
+  formUrlEncoded.append(`project_id`, instancePostBodyBody.project_id);
+  formUrlEncoded.append(`as_name`, instancePostBodyBody.as_name);
+  if (instancePostBodyBody.callback_url !== undefined) {
+    formUrlEncoded.append(`callback_url`, instancePostBodyBody.callback_url);
+  }
+  if (instancePostBodyBody.callback_context !== undefined) {
+    formUrlEncoded.append(`callback_context`, instancePostBodyBody.callback_context);
+  }
+  if (instancePostBodyBody.generate_callback_token !== undefined) {
+    formUrlEncoded.append(
+      `generate_callback_token`,
+      instancePostBodyBody.generate_callback_token.toString(),
+    );
+  }
+  if (instancePostBodyBody.callback_token !== undefined) {
+    formUrlEncoded.append(`callback_token`, instancePostBodyBody.callback_token);
+  }
+  if (instancePostBodyBody.debug !== undefined) {
+    formUrlEncoded.append(`debug`, instancePostBodyBody.debug);
+  }
+  if (instancePostBodyBody.specification !== undefined) {
+    formUrlEncoded.append(`specification`, instancePostBodyBody.specification);
+  }
+
+  return customInstance<InstancePostResponse>(
+    {
+      url: `/instance`,
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      data: formUrlEncoded,
+      signal,
     },
-      options);
-    }
-  
-
-
-export const getCreateInstanceMutationOptions = <TData = Awaited<ReturnType<typeof createInstance>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{data: InstancePostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
-) => {
-const mutationKey = ['createInstance'];
-const {mutation: mutationOptions, request: requestOptions} = options ?
-      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
-      options
-      : {...options, mutation: {...options.mutation, mutationKey}}
-      : {mutation: { mutationKey, }, request: undefined};
-
-      
-
-
-      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createInstance>>, {data: InstancePostBodyBody}> = (props) => {
-          const {data} = props ?? {};
-
-          return  createInstance(data,requestOptions)
-        }
-
-        
+    options,
+  );
+};
+
+export const useCreateInstanceMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof createInstance>>,
+    TError,
+    { data: InstancePostBodyBody },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof createInstance>>,
+  TError,
+  { data: InstancePostBodyBody },
+  TContext
+> => {
+  const mutationKey = ["createInstance"];
+  const { mutation: mutationOptions, request: requestOptions } = options
+    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
+      ? options
+      : { ...options, mutation: { ...options.mutation, mutationKey } }
+    : { mutation: { mutationKey }, request: undefined };
+
+  const mutationFn: MutationFunction<
+    Awaited<ReturnType<typeof createInstance>>,
+    { data: InstancePostBodyBody }
+  > = (props) => {
+    const { data } = props ?? {};
+
+    return createInstance(data, requestOptions);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type CreateInstanceMutationResult = NonNullable<Awaited<ReturnType<typeof createInstance>>>;
+export type CreateInstanceMutationBody = InstancePostBodyBody;
+export type CreateInstanceMutationError = ErrorType<void | DmError>;
 
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{data: InstancePostBodyBody}, TContext>}
-
-    export type CreateInstanceMutationResult = NonNullable<Awaited<ReturnType<typeof createInstance>>>
-    export type CreateInstanceMutationBody = InstancePostBodyBody
-    export type CreateInstanceMutationError = ErrorType<void | DmError>
-
-    /**
+/**
  * @summary Creates a new Job or Application instance
  */
-export const useCreateInstance = <TData = Awaited<ReturnType<typeof createInstance>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{data: InstancePostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useCreateInstance = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof createInstance>>,
+      TError,
+      { data: InstancePostBodyBody },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {data: InstancePostBodyBody},
-        TContext
-      > => {
-
-      const mutationOptions = getCreateInstanceMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof createInstance>>,
+  TError,
+  { data: InstancePostBodyBody },
+  TContext
+> => {
+  const mutationOptions = useCreateInstanceMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * Returns a summary of all running instances. Instances can be running as an Application or as a Job. The response will contain an `application_type` field that is either `job` or `application`
 
 Results can be filtered by **Project**, **Unit** or **Organisation**.
@@ -148,144 +173,223 @@ Results can be filtered by **Project**, **Unit** or **Organisation**.
  * @summary Get summary information about all Job and Application instances
  */
 export const getInstances = (
-    params?: GetInstancesParams,
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  params?: GetInstancesParams,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      
-      return customInstance<InstancesGetResponse>(
-      {url: `/instance`, method: 'GET',
-        params, signal
-    },
-      options);
-    }
-  
-
-export const getGetInstancesQueryKey = (params?: GetInstancesParams,) => {
-    return ["data-manager-api", `/instance`, ...(params ? [params]: [])] as const;
-    }
-
-    
-export const getGetInstancesQueryOptions = <TData = Awaited<ReturnType<typeof getInstances>>, TError = ErrorType<void | DmError>>(params?: GetInstancesParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+  return customInstance<InstancesGetResponse>(
+    { url: `/instance`, method: "GET", params, signal },
+    options,
+  );
+};
+
+export const getGetInstancesQueryKey = (params?: GetInstancesParams) => {
+  return [`/instance`, ...(params ? [params] : [])] as const;
+};
+
+export const useGetInstancesQueryOptions = <
+  TData = Awaited<ReturnType<typeof getInstances>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetInstancesParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetInstancesQueryKey(params);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getInstances>>> = ({ signal }) => getInstances(params, requestOptions, signal);
-
-      
+  const queryKey = queryOptions?.queryKey ?? getGetInstancesQueryKey(params);
 
-      
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getInstances>>> = ({ signal }) =>
+    getInstances(params, requestOptions, signal);
 
-   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
 
-export type GetInstancesQueryResult = NonNullable<Awaited<ReturnType<typeof getInstances>>>
-export type GetInstancesQueryError = ErrorType<void | DmError>
+  return customOptions as UseQueryOptions<
+    Awaited<ReturnType<typeof getInstances>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
 
+export type GetInstancesQueryResult = NonNullable<Awaited<ReturnType<typeof getInstances>>>;
+export type GetInstancesQueryError = ErrorType<void | DmError>;
 
-export function useGetInstances<TData = Awaited<ReturnType<typeof getInstances>>, TError = ErrorType<void | DmError>>(
- params: undefined |  GetInstancesParams, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>> & Pick<
+export function useGetInstances<
+  TData = Awaited<ReturnType<typeof getInstances>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params: undefined | GetInstancesParams,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>> &
+      Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getInstances>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetInstances<TData = Awaited<ReturnType<typeof getInstances>>, TError = ErrorType<void | DmError>>(
- params?: GetInstancesParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>> & Pick<
+          Awaited<ReturnType<typeof getInstances>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetInstances<
+  TData = Awaited<ReturnType<typeof getInstances>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetInstancesParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>> &
+      Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getInstances>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetInstances<TData = Awaited<ReturnType<typeof getInstances>>, TError = ErrorType<void | DmError>>(
- params?: GetInstancesParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+          Awaited<ReturnType<typeof getInstances>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetInstances<
+  TData = Awaited<ReturnType<typeof getInstances>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetInstancesParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get summary information about all Job and Application instances
  */
 
-export function useGetInstances<TData = Awaited<ReturnType<typeof getInstances>>, TError = ErrorType<void | DmError>>(
- params?: GetInstancesParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetInstancesQueryOptions(params,options)
-
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetInstances<
+  TData = Awaited<ReturnType<typeof getInstances>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetInstancesParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetInstancesQueryOptions(params, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
-export const getGetInstancesSuspenseQueryOptions = <TData = Awaited<ReturnType<typeof getInstances>>, TError = ErrorType<void | DmError>>(params?: GetInstancesParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+export const useGetInstancesSuspenseQueryOptions = <
+  TData = Awaited<ReturnType<typeof getInstances>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetInstancesParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetInstancesQueryKey(params);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getInstances>>> = ({ signal }) => getInstances(params, requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type GetInstancesSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getInstances>>>
-export type GetInstancesSuspenseQueryError = ErrorType<void | DmError>
-
-
-export function useGetInstancesSuspense<TData = Awaited<ReturnType<typeof getInstances>>, TError = ErrorType<void | DmError>>(
- params: undefined |  GetInstancesParams, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetInstancesSuspense<TData = Awaited<ReturnType<typeof getInstances>>, TError = ErrorType<void | DmError>>(
- params?: GetInstancesParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetInstancesSuspense<TData = Awaited<ReturnType<typeof getInstances>>, TError = ErrorType<void | DmError>>(
- params?: GetInstancesParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getGetInstancesQueryKey(params);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getInstances>>> = ({ signal }) =>
+    getInstances(params, requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseSuspenseQueryOptions<
+    Awaited<ReturnType<typeof getInstances>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type GetInstancesSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getInstances>>>;
+export type GetInstancesSuspenseQueryError = ErrorType<void | DmError>;
+
+export function useGetInstancesSuspense<
+  TData = Awaited<ReturnType<typeof getInstances>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params: undefined | GetInstancesParams,
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetInstancesSuspense<
+  TData = Awaited<ReturnType<typeof getInstances>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetInstancesParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetInstancesSuspense<
+  TData = Awaited<ReturnType<typeof getInstances>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetInstancesParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get summary information about all Job and Application instances
  */
 
-export function useGetInstancesSuspense<TData = Awaited<ReturnType<typeof getInstances>>, TError = ErrorType<void | DmError>>(
- params?: GetInstancesParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetInstancesSuspenseQueryOptions(params,options)
-
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetInstancesSuspense<
+  TData = Awaited<ReturnType<typeof getInstances>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetInstancesParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstances>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetInstancesSuspenseQueryOptions(params, options);
+
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
 /**
  * Similar to the `/instance [POST]` endpoint this one is used to check whether a new **Application** or **Job** instance can be launched. Rather than returning an **Instance** (or **Task**) ID this endpoint is simply used to ensure that the Job/Application is runnable while also returning the compiled `command` (if the Instance is a Job).
 
@@ -294,228 +398,333 @@ The test result is only valid at the time of the call, whether an actual instanc
  * @summary Used to check the execution of new Job or Application instance
  */
 export const dryRunInstance = (
-    instancePostBodyBody: InstancePostBodyBody,
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  instancePostBodyBody: InstancePostBodyBody,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      const formUrlEncoded = new URLSearchParams();
-formUrlEncoded.append('application_id', instancePostBodyBody.application_id)
-formUrlEncoded.append('project_id', instancePostBodyBody.project_id)
-formUrlEncoded.append('as_name', instancePostBodyBody.as_name)
-if(instancePostBodyBody.callback_url !== undefined) {
- formUrlEncoded.append('callback_url', instancePostBodyBody.callback_url)
- }
-if(instancePostBodyBody.callback_context !== undefined) {
- formUrlEncoded.append('callback_context', instancePostBodyBody.callback_context)
- }
-if(instancePostBodyBody.generate_callback_token !== undefined) {
- formUrlEncoded.append('generate_callback_token', instancePostBodyBody.generate_callback_token.toString())
- }
-if(instancePostBodyBody.callback_token !== undefined) {
- formUrlEncoded.append('callback_token', instancePostBodyBody.callback_token)
- }
-if(instancePostBodyBody.debug !== undefined) {
- formUrlEncoded.append('debug', instancePostBodyBody.debug)
- }
-if(instancePostBodyBody.specification !== undefined) {
- formUrlEncoded.append('specification', instancePostBodyBody.specification)
- }
-
-      return customInstance<InstanceDryRunPostResponse>(
-      {url: `/instance/dry-run`, method: 'POST',
-      headers: {'Content-Type': 'application/x-www-form-urlencoded', },
-       data: formUrlEncoded, signal
+  const formUrlEncoded = new URLSearchParams();
+  formUrlEncoded.append(`application_id`, instancePostBodyBody.application_id);
+  formUrlEncoded.append(`project_id`, instancePostBodyBody.project_id);
+  formUrlEncoded.append(`as_name`, instancePostBodyBody.as_name);
+  if (instancePostBodyBody.callback_url !== undefined) {
+    formUrlEncoded.append(`callback_url`, instancePostBodyBody.callback_url);
+  }
+  if (instancePostBodyBody.callback_context !== undefined) {
+    formUrlEncoded.append(`callback_context`, instancePostBodyBody.callback_context);
+  }
+  if (instancePostBodyBody.generate_callback_token !== undefined) {
+    formUrlEncoded.append(
+      `generate_callback_token`,
+      instancePostBodyBody.generate_callback_token.toString(),
+    );
+  }
+  if (instancePostBodyBody.callback_token !== undefined) {
+    formUrlEncoded.append(`callback_token`, instancePostBodyBody.callback_token);
+  }
+  if (instancePostBodyBody.debug !== undefined) {
+    formUrlEncoded.append(`debug`, instancePostBodyBody.debug);
+  }
+  if (instancePostBodyBody.specification !== undefined) {
+    formUrlEncoded.append(`specification`, instancePostBodyBody.specification);
+  }
+
+  return customInstance<InstanceDryRunPostResponse>(
+    {
+      url: `/instance/dry-run`,
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      data: formUrlEncoded,
+      signal,
     },
-      options);
-    }
-  
-
-
-export const getDryRunInstanceMutationOptions = <TData = Awaited<ReturnType<typeof dryRunInstance>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{data: InstancePostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
-) => {
-const mutationKey = ['dryRunInstance'];
-const {mutation: mutationOptions, request: requestOptions} = options ?
-      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
-      options
-      : {...options, mutation: {...options.mutation, mutationKey}}
-      : {mutation: { mutationKey, }, request: undefined};
+    options,
+  );
+};
+
+export const useDryRunInstanceMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof dryRunInstance>>,
+    TError,
+    { data: InstancePostBodyBody },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof dryRunInstance>>,
+  TError,
+  { data: InstancePostBodyBody },
+  TContext
+> => {
+  const mutationKey = ["dryRunInstance"];
+  const { mutation: mutationOptions, request: requestOptions } = options
+    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
+      ? options
+      : { ...options, mutation: { ...options.mutation, mutationKey } }
+    : { mutation: { mutationKey }, request: undefined };
+
+  const mutationFn: MutationFunction<
+    Awaited<ReturnType<typeof dryRunInstance>>,
+    { data: InstancePostBodyBody }
+  > = (props) => {
+    const { data } = props ?? {};
+
+    return dryRunInstance(data, requestOptions);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type DryRunInstanceMutationResult = NonNullable<Awaited<ReturnType<typeof dryRunInstance>>>;
+export type DryRunInstanceMutationBody = InstancePostBodyBody;
+export type DryRunInstanceMutationError = ErrorType<void | DmError>;
 
-      
-
-
-      const mutationFn: MutationFunction<Awaited<ReturnType<typeof dryRunInstance>>, {data: InstancePostBodyBody}> = (props) => {
-          const {data} = props ?? {};
-
-          return  dryRunInstance(data,requestOptions)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{data: InstancePostBodyBody}, TContext>}
-
-    export type DryRunInstanceMutationResult = NonNullable<Awaited<ReturnType<typeof dryRunInstance>>>
-    export type DryRunInstanceMutationBody = InstancePostBodyBody
-    export type DryRunInstanceMutationError = ErrorType<void | DmError>
-
-    /**
+/**
  * @summary Used to check the execution of new Job or Application instance
  */
-export const useDryRunInstance = <TData = Awaited<ReturnType<typeof dryRunInstance>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{data: InstancePostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useDryRunInstance = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof dryRunInstance>>,
+      TError,
+      { data: InstancePostBodyBody },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {data: InstancePostBodyBody},
-        TContext
-      > => {
-
-      const mutationOptions = getDryRunInstanceMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof dryRunInstance>>,
+  TError,
+  { data: InstancePostBodyBody },
+  TContext
+> => {
+  const mutationOptions = useDryRunInstanceMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * @summary Get detailed information about an Instance
  */
 export const getInstance = (
-    instanceId: string,
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  instanceId: string,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      
-      return customInstance<InstanceGetResponse>(
-      {url: `/instance/${instanceId}`, method: 'GET', signal
-    },
-      options);
-    }
-  
-
-export const getGetInstanceQueryKey = (instanceId: string,) => {
-    return ["data-manager-api", `/instance/${instanceId}`] as const;
-    }
-
-    
-export const getGetInstanceQueryOptions = <TData = Awaited<ReturnType<typeof getInstance>>, TError = ErrorType<void | DmError>>(instanceId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+  return customInstance<InstanceGetResponse>(
+    { url: `/instance/${instanceId}`, method: "GET", signal },
+    options,
+  );
+};
+
+export const getGetInstanceQueryKey = (instanceId: string) => {
+  return [`/instance/${instanceId}`] as const;
+};
+
+export const useGetInstanceQueryOptions = <
+  TData = Awaited<ReturnType<typeof getInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetInstanceQueryKey(instanceId);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getInstance>>> = ({ signal }) => getInstance(instanceId, requestOptions, signal);
+  const queryKey = queryOptions?.queryKey ?? getGetInstanceQueryKey(instanceId);
 
-      
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getInstance>>> = ({ signal }) =>
+    getInstance(instanceId, requestOptions, signal);
 
-      
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
 
-   return  { queryKey, queryFn, enabled: !!(instanceId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type GetInstanceQueryResult = NonNullable<Awaited<ReturnType<typeof getInstance>>>
-export type GetInstanceQueryError = ErrorType<void | DmError>
+  return customOptions as UseQueryOptions<
+    Awaited<ReturnType<typeof getInstance>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
 
+export type GetInstanceQueryResult = NonNullable<Awaited<ReturnType<typeof getInstance>>>;
+export type GetInstanceQueryError = ErrorType<void | DmError>;
 
-export function useGetInstance<TData = Awaited<ReturnType<typeof getInstance>>, TError = ErrorType<void | DmError>>(
- instanceId: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>> & Pick<
+export function useGetInstance<
+  TData = Awaited<ReturnType<typeof getInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>> &
+      Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getInstance>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetInstance<TData = Awaited<ReturnType<typeof getInstance>>, TError = ErrorType<void | DmError>>(
- instanceId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>> & Pick<
+          Awaited<ReturnType<typeof getInstance>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetInstance<
+  TData = Awaited<ReturnType<typeof getInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>> &
+      Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getInstance>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetInstance<TData = Awaited<ReturnType<typeof getInstance>>, TError = ErrorType<void | DmError>>(
- instanceId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+          Awaited<ReturnType<typeof getInstance>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetInstance<
+  TData = Awaited<ReturnType<typeof getInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get detailed information about an Instance
  */
 
-export function useGetInstance<TData = Awaited<ReturnType<typeof getInstance>>, TError = ErrorType<void | DmError>>(
- instanceId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetInstanceQueryOptions(instanceId,options)
-
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetInstance<
+  TData = Awaited<ReturnType<typeof getInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetInstanceQueryOptions(instanceId, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
-export const getGetInstanceSuspenseQueryOptions = <TData = Awaited<ReturnType<typeof getInstance>>, TError = ErrorType<void | DmError>>(instanceId: string, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+export const useGetInstanceSuspenseQueryOptions = <
+  TData = Awaited<ReturnType<typeof getInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetInstanceQueryKey(instanceId);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getInstance>>> = ({ signal }) => getInstance(instanceId, requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type GetInstanceSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getInstance>>>
-export type GetInstanceSuspenseQueryError = ErrorType<void | DmError>
-
-
-export function useGetInstanceSuspense<TData = Awaited<ReturnType<typeof getInstance>>, TError = ErrorType<void | DmError>>(
- instanceId: string, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetInstanceSuspense<TData = Awaited<ReturnType<typeof getInstance>>, TError = ErrorType<void | DmError>>(
- instanceId: string, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetInstanceSuspense<TData = Awaited<ReturnType<typeof getInstance>>, TError = ErrorType<void | DmError>>(
- instanceId: string, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getGetInstanceQueryKey(instanceId);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getInstance>>> = ({ signal }) =>
+    getInstance(instanceId, requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseSuspenseQueryOptions<
+    Awaited<ReturnType<typeof getInstance>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type GetInstanceSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getInstance>>>;
+export type GetInstanceSuspenseQueryError = ErrorType<void | DmError>;
+
+export function useGetInstanceSuspense<
+  TData = Awaited<ReturnType<typeof getInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  options: {
+    query: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetInstanceSuspense<
+  TData = Awaited<ReturnType<typeof getInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetInstanceSuspense<
+  TData = Awaited<ReturnType<typeof getInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get detailed information about an Instance
  */
 
-export function useGetInstanceSuspense<TData = Awaited<ReturnType<typeof getInstance>>, TError = ErrorType<void | DmError>>(
- instanceId: string, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetInstanceSuspenseQueryOptions(instanceId,options)
-
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetInstanceSuspense<
+  TData = Awaited<ReturnType<typeof getInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetInstanceSuspenseQueryOptions(instanceId, options);
+
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
 /**
  * The Application or Job Instance is terminated.
 
@@ -524,63 +733,84 @@ You must be the `owner` or an `editor` of the Instance to delete it
  * @summary Delete a Job or Application Instance
  */
 export const terminateInstance = (
-    instanceId: string,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      
-      return customInstance<TaskIdentity>(
-      {url: `/instance/${instanceId}`, method: 'DELETE'
-    },
-      options);
-    }
-  
-
-
-export const getTerminateInstanceMutationOptions = <TData = Awaited<ReturnType<typeof terminateInstance>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{instanceId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+  instanceId: string,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-const mutationKey = ['terminateInstance'];
-const {mutation: mutationOptions, request: requestOptions} = options ?
-      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
-      options
-      : {...options, mutation: {...options.mutation, mutationKey}}
-      : {mutation: { mutationKey, }, request: undefined};
-
-      
-
-
-      const mutationFn: MutationFunction<Awaited<ReturnType<typeof terminateInstance>>, {instanceId: string}> = (props) => {
-          const {instanceId} = props ?? {};
-
-          return  terminateInstance(instanceId,requestOptions)
-        }
+  return customInstance<TaskIdentity>(
+    { url: `/instance/${instanceId}`, method: "DELETE" },
+    options,
+  );
+};
+
+export const useTerminateInstanceMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof terminateInstance>>,
+    TError,
+    { instanceId: string },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof terminateInstance>>,
+  TError,
+  { instanceId: string },
+  TContext
+> => {
+  const mutationKey = ["terminateInstance"];
+  const { mutation: mutationOptions, request: requestOptions } = options
+    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
+      ? options
+      : { ...options, mutation: { ...options.mutation, mutationKey } }
+    : { mutation: { mutationKey }, request: undefined };
+
+  const mutationFn: MutationFunction<
+    Awaited<ReturnType<typeof terminateInstance>>,
+    { instanceId: string }
+  > = (props) => {
+    const { instanceId } = props ?? {};
+
+    return terminateInstance(instanceId, requestOptions);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type TerminateInstanceMutationResult = NonNullable<
+  Awaited<ReturnType<typeof terminateInstance>>
+>;
+
+export type TerminateInstanceMutationError = ErrorType<void | DmError>;
 
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{instanceId: string}, TContext>}
-
-    export type TerminateInstanceMutationResult = NonNullable<Awaited<ReturnType<typeof terminateInstance>>>
-    
-    export type TerminateInstanceMutationError = ErrorType<void | DmError>
-
-    /**
+/**
  * @summary Delete a Job or Application Instance
  */
-export const useTerminateInstance = <TData = Awaited<ReturnType<typeof terminateInstance>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{instanceId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useTerminateInstance = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof terminateInstance>>,
+      TError,
+      { instanceId: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {instanceId: string},
-        TContext
-      > => {
-
-      const mutationOptions = getTerminateInstanceMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof terminateInstance>>,
+  TError,
+  { instanceId: string },
+  TContext
+> => {
+  const mutationOptions = useTerminateInstanceMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * The Application or Job Instance is updated according to the patch parameters.
 
 You must be the `owner` or an `editor` of the Instance to patch it
@@ -588,65 +818,80 @@ You must be the `owner` or an `editor` of the Instance to patch it
  * @summary Update a Job or Application Instance
  */
 export const patchInstance = (
-    instanceId: string,
-    params?: PatchInstanceParams,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      
-      return customInstance<void>(
-      {url: `/instance/${instanceId}`, method: 'PATCH',
-        params
-    },
-      options);
-    }
-  
-
-
-export const getPatchInstanceMutationOptions = <TData = Awaited<ReturnType<typeof patchInstance>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{instanceId: string;params?: PatchInstanceParams}, TContext>, request?: SecondParameter<typeof customInstance>}
+  instanceId: string,
+  params?: PatchInstanceParams,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-const mutationKey = ['patchInstance'];
-const {mutation: mutationOptions, request: requestOptions} = options ?
-      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
-      options
-      : {...options, mutation: {...options.mutation, mutationKey}}
-      : {mutation: { mutationKey, }, request: undefined};
-
-      
-
-
-      const mutationFn: MutationFunction<Awaited<ReturnType<typeof patchInstance>>, {instanceId: string;params?: PatchInstanceParams}> = (props) => {
-          const {instanceId,params} = props ?? {};
-
-          return  patchInstance(instanceId,params,requestOptions)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{instanceId: string;params?: PatchInstanceParams}, TContext>}
-
-    export type PatchInstanceMutationResult = NonNullable<Awaited<ReturnType<typeof patchInstance>>>
-    
-    export type PatchInstanceMutationError = ErrorType<void | DmError>
+  return customInstance<void>({ url: `/instance/${instanceId}`, method: "PATCH", params }, options);
+};
+
+export const usePatchInstanceMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof patchInstance>>,
+    TError,
+    { instanceId: string; params?: PatchInstanceParams },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof patchInstance>>,
+  TError,
+  { instanceId: string; params?: PatchInstanceParams },
+  TContext
+> => {
+  const mutationKey = ["patchInstance"];
+  const { mutation: mutationOptions, request: requestOptions } = options
+    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
+      ? options
+      : { ...options, mutation: { ...options.mutation, mutationKey } }
+    : { mutation: { mutationKey }, request: undefined };
+
+  const mutationFn: MutationFunction<
+    Awaited<ReturnType<typeof patchInstance>>,
+    { instanceId: string; params?: PatchInstanceParams }
+  > = (props) => {
+    const { instanceId, params } = props ?? {};
+
+    return patchInstance(instanceId, params, requestOptions);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type PatchInstanceMutationResult = NonNullable<Awaited<ReturnType<typeof patchInstance>>>;
+
+export type PatchInstanceMutationError = ErrorType<void | DmError>;
 
-    /**
+/**
  * @summary Update a Job or Application Instance
  */
-export const usePatchInstance = <TData = Awaited<ReturnType<typeof patchInstance>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{instanceId: string;params?: PatchInstanceParams}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const usePatchInstance = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof patchInstance>>,
+      TError,
+      { instanceId: string; params?: PatchInstanceParams },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {instanceId: string;params?: PatchInstanceParams},
-        TContext
-      > => {
-
-      const mutationOptions = getPatchInstanceMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof patchInstance>>,
+  TError,
+  { instanceId: string; params?: PatchInstanceParams },
+  TContext
+> => {
+  const mutationOptions = usePatchInstanceMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * This revokes the instance **Token**, which was optionally generated when the instance was launched. No authentication is required to use this endpoint, which is typically used by a remote system driven by instance callbacks.
 
 Tokens automatically expire after a period of time but can be revoked instantly with this endpoint.
@@ -656,61 +901,81 @@ The remote system will revoke the token when it's finished with it
  * @summary Delete (revoke) the Instance Token
  */
 export const deleteInstanceToken = (
-    instanceId: string,
-    token: string,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      
-      return customInstance<void>(
-      {url: `/instance/${instanceId}/token/${token}`, method: 'DELETE'
-    },
-      options);
-    }
-  
-
-
-export const getDeleteInstanceTokenMutationOptions = <TData = Awaited<ReturnType<typeof deleteInstanceToken>>, TError = ErrorType<DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{instanceId: string;token: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+  instanceId: string,
+  token: string,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-const mutationKey = ['deleteInstanceToken'];
-const {mutation: mutationOptions, request: requestOptions} = options ?
-      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
-      options
-      : {...options, mutation: {...options.mutation, mutationKey}}
-      : {mutation: { mutationKey, }, request: undefined};
-
-      
-
+  return customInstance<void>(
+    { url: `/instance/${instanceId}/token/${token}`, method: "DELETE" },
+    options,
+  );
+};
+
+export const useDeleteInstanceTokenMutationOptions = <
+  TError = ErrorType<DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof deleteInstanceToken>>,
+    TError,
+    { instanceId: string; token: string },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof deleteInstanceToken>>,
+  TError,
+  { instanceId: string; token: string },
+  TContext
+> => {
+  const mutationKey = ["deleteInstanceToken"];
+  const { mutation: mutationOptions, request: requestOptions } = options
+    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
+      ? options
+      : { ...options, mutation: { ...options.mutation, mutationKey } }
+    : { mutation: { mutationKey }, request: undefined };
+
+  const mutationFn: MutationFunction<
+    Awaited<ReturnType<typeof deleteInstanceToken>>,
+    { instanceId: string; token: string }
+  > = (props) => {
+    const { instanceId, token } = props ?? {};
+
+    return deleteInstanceToken(instanceId, token, requestOptions);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type DeleteInstanceTokenMutationResult = NonNullable<
+  Awaited<ReturnType<typeof deleteInstanceToken>>
+>;
+
+export type DeleteInstanceTokenMutationError = ErrorType<DmError>;
 
-      const mutationFn: MutationFunction<Awaited<ReturnType<typeof deleteInstanceToken>>, {instanceId: string;token: string}> = (props) => {
-          const {instanceId,token} = props ?? {};
-
-          return  deleteInstanceToken(instanceId,token,requestOptions)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{instanceId: string;token: string}, TContext>}
-
-    export type DeleteInstanceTokenMutationResult = NonNullable<Awaited<ReturnType<typeof deleteInstanceToken>>>
-    
-    export type DeleteInstanceTokenMutationError = ErrorType<DmError>
-
-    /**
+/**
  * @summary Delete (revoke) the Instance Token
  */
-export const useDeleteInstanceToken = <TData = Awaited<ReturnType<typeof deleteInstanceToken>>, TError = ErrorType<DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{instanceId: string;token: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useDeleteInstanceToken = <TError = ErrorType<DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteInstanceToken>>,
+      TError,
+      { instanceId: string; token: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {instanceId: string;token: string},
-        TContext
-      > => {
-
-      const mutationOptions = getDeleteInstanceTokenMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    
+  Awaited<ReturnType<typeof deleteInstanceToken>>,
+  TError,
+  { instanceId: string; token: string },
+  TContext
+> => {
+  const mutationOptions = useDeleteInstanceTokenMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};