@squonk/data-manager-client 4.2.0 → 4.3.0

package/src/dataset/dataset.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 {
   DatasetDetail,
   DatasetPostBodyBody,
@@ -40,14 +37,15 @@ import type {
   DmError,
   GetDatasetsParams,
   GetVersionsParams,
-  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];
 
 /**
  * Using an unmanaged file in a Project as a source a Dataset (or new Dataset Version) is created.
@@ -59,82 +57,107 @@ Behaves like the corresponding **POST** method except the file is expected to ex
  * @summary Create a Dataset from a file in a Project
  */
 export const createDatasetFromFile = (
-    datasetPutBodyBody: DatasetPutBodyBody,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      const formUrlEncoded = new URLSearchParams();
-formUrlEncoded.append('dataset_type', datasetPutBodyBody.dataset_type)
-if(datasetPutBodyBody.format_extra_variables !== undefined) {
- formUrlEncoded.append('format_extra_variables', datasetPutBodyBody.format_extra_variables)
- }
-if(datasetPutBodyBody.skip_molecule_load !== undefined) {
- formUrlEncoded.append('skip_molecule_load', datasetPutBodyBody.skip_molecule_load.toString())
- }
-formUrlEncoded.append('project_id', datasetPutBodyBody.project_id)
-formUrlEncoded.append('path', datasetPutBodyBody.path)
-formUrlEncoded.append('file_name', datasetPutBodyBody.file_name)
-if(datasetPutBodyBody.dataset_id !== undefined) {
- formUrlEncoded.append('dataset_id', datasetPutBodyBody.dataset_id)
- }
-if(datasetPutBodyBody.unit_id !== undefined) {
- formUrlEncoded.append('unit_id', datasetPutBodyBody.unit_id)
- }
-
-      return customInstance<DatasetPutPostResponse>(
-      {url: `/dataset`, method: 'PUT',
-      headers: {'Content-Type': 'application/x-www-form-urlencoded', },
-       data: formUrlEncoded
-    },
-      options);
-    }
-  
-
-
-export const getCreateDatasetFromFileMutationOptions = <TData = Awaited<ReturnType<typeof createDatasetFromFile>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{data: DatasetPutBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+  datasetPutBodyBody: DatasetPutBodyBody,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-const mutationKey = ['createDatasetFromFile'];
-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 createDatasetFromFile>>, {data: DatasetPutBodyBody}> = (props) => {
-          const {data} = props ?? {};
-
-          return  createDatasetFromFile(data,requestOptions)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{data: DatasetPutBodyBody}, TContext>}
-
-    export type CreateDatasetFromFileMutationResult = NonNullable<Awaited<ReturnType<typeof createDatasetFromFile>>>
-    export type CreateDatasetFromFileMutationBody = DatasetPutBodyBody
-    export type CreateDatasetFromFileMutationError = ErrorType<void | DmError>
+  const formUrlEncoded = new URLSearchParams();
+  formUrlEncoded.append(`dataset_type`, datasetPutBodyBody.dataset_type);
+  if (datasetPutBodyBody.format_extra_variables !== undefined) {
+    formUrlEncoded.append(`format_extra_variables`, datasetPutBodyBody.format_extra_variables);
+  }
+  if (datasetPutBodyBody.skip_molecule_load !== undefined) {
+    formUrlEncoded.append(`skip_molecule_load`, datasetPutBodyBody.skip_molecule_load.toString());
+  }
+  formUrlEncoded.append(`project_id`, datasetPutBodyBody.project_id);
+  formUrlEncoded.append(`path`, datasetPutBodyBody.path);
+  formUrlEncoded.append(`file_name`, datasetPutBodyBody.file_name);
+  if (datasetPutBodyBody.dataset_id !== undefined) {
+    formUrlEncoded.append(`dataset_id`, datasetPutBodyBody.dataset_id);
+  }
+  if (datasetPutBodyBody.unit_id !== undefined) {
+    formUrlEncoded.append(`unit_id`, datasetPutBodyBody.unit_id);
+  }
+
+  return customInstance<DatasetPutPostResponse>(
+    {
+      url: `/dataset`,
+      method: "PUT",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      data: formUrlEncoded,
+    },
+    options,
+  );
+};
+
+export const useCreateDatasetFromFileMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof createDatasetFromFile>>,
+    TError,
+    { data: DatasetPutBodyBody },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof createDatasetFromFile>>,
+  TError,
+  { data: DatasetPutBodyBody },
+  TContext
+> => {
+  const mutationKey = ["createDatasetFromFile"];
+  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 createDatasetFromFile>>,
+    { data: DatasetPutBodyBody }
+  > = (props) => {
+    const { data } = props ?? {};
+
+    return createDatasetFromFile(data, requestOptions);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type CreateDatasetFromFileMutationResult = NonNullable<
+  Awaited<ReturnType<typeof createDatasetFromFile>>
+>;
+export type CreateDatasetFromFileMutationBody = DatasetPutBodyBody;
+export type CreateDatasetFromFileMutationError = ErrorType<void | DmError>;
 
-    /**
+/**
  * @summary Create a Dataset from a file in a Project
  */
-export const useCreateDatasetFromFile = <TData = Awaited<ReturnType<typeof createDatasetFromFile>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{data: DatasetPutBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useCreateDatasetFromFile = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof createDatasetFromFile>>,
+      TError,
+      { data: DatasetPutBodyBody },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {data: DatasetPutBodyBody},
-        TContext
-      > => {
-
-      const mutationOptions = getCreateDatasetFromFileMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof createDatasetFromFile>>,
+  TError,
+  { data: DatasetPutBodyBody },
+  TContext
+> => {
+  const mutationOptions = useCreateDatasetFromFileMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * Uploads a dataset.
 
 Dataset file-naming is strictly limited to a fixed set of extensions based on the Dataset **Type**. You can obtain the supported types (and their extensions) via the `/type` endpoint. Filenames that do not comply with the supported filename extensions will be rejected.
@@ -148,82 +171,106 @@ Datasets undergo some processing in an asynchronous **Task** after control retur
  * @summary Upload an external file as a Dataset
  */
 export const uploadDataset = (
-    datasetPostBodyBody: DatasetPostBodyBody,
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  datasetPostBodyBody: DatasetPostBodyBody,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      const formData = new FormData();
-formData.append('dataset_file', datasetPostBodyBody.dataset_file)
-formData.append('dataset_type', datasetPostBodyBody.dataset_type)
-if(datasetPostBodyBody.format_extra_variables !== undefined) {
- formData.append('format_extra_variables', datasetPostBodyBody.format_extra_variables)
- }
-if(datasetPostBodyBody.skip_molecule_load !== undefined) {
- formData.append('skip_molecule_load', datasetPostBodyBody.skip_molecule_load.toString())
- }
-if(datasetPostBodyBody.as_filename !== undefined) {
- formData.append('as_filename', datasetPostBodyBody.as_filename)
- }
-if(datasetPostBodyBody.dataset_id !== undefined) {
- formData.append('dataset_id', datasetPostBodyBody.dataset_id)
- }
-formData.append('unit_id', datasetPostBodyBody.unit_id)
-
-      return customInstance<DatasetPutPostResponse>(
-      {url: `/dataset`, method: 'POST',
-      headers: {'Content-Type': 'multipart/form-data', },
-       data: formData, signal
+  const formData = new FormData();
+  formData.append(`dataset_file`, datasetPostBodyBody.dataset_file);
+  formData.append(`dataset_type`, datasetPostBodyBody.dataset_type);
+  if (datasetPostBodyBody.format_extra_variables !== undefined) {
+    formData.append(`format_extra_variables`, datasetPostBodyBody.format_extra_variables);
+  }
+  if (datasetPostBodyBody.skip_molecule_load !== undefined) {
+    formData.append(`skip_molecule_load`, datasetPostBodyBody.skip_molecule_load.toString());
+  }
+  if (datasetPostBodyBody.as_filename !== undefined) {
+    formData.append(`as_filename`, datasetPostBodyBody.as_filename);
+  }
+  if (datasetPostBodyBody.dataset_id !== undefined) {
+    formData.append(`dataset_id`, datasetPostBodyBody.dataset_id);
+  }
+  formData.append(`unit_id`, datasetPostBodyBody.unit_id);
+
+  return customInstance<DatasetPutPostResponse>(
+    {
+      url: `/dataset`,
+      method: "POST",
+      headers: { "Content-Type": "multipart/form-data" },
+      data: formData,
+      signal,
     },
-      options);
-    }
-  
-
-
-export const getUploadDatasetMutationOptions = <TData = Awaited<ReturnType<typeof uploadDataset>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{data: DatasetPostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
-) => {
-const mutationKey = ['uploadDataset'];
-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 uploadDataset>>, {data: DatasetPostBodyBody}> = (props) => {
-          const {data} = props ?? {};
-
-          return  uploadDataset(data,requestOptions)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{data: DatasetPostBodyBody}, TContext>}
-
-    export type UploadDatasetMutationResult = NonNullable<Awaited<ReturnType<typeof uploadDataset>>>
-    export type UploadDatasetMutationBody = DatasetPostBodyBody
-    export type UploadDatasetMutationError = ErrorType<void | DmError>
+    options,
+  );
+};
+
+export const useUploadDatasetMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof uploadDataset>>,
+    TError,
+    { data: DatasetPostBodyBody },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof uploadDataset>>,
+  TError,
+  { data: DatasetPostBodyBody },
+  TContext
+> => {
+  const mutationKey = ["uploadDataset"];
+  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 uploadDataset>>,
+    { data: DatasetPostBodyBody }
+  > = (props) => {
+    const { data } = props ?? {};
+
+    return uploadDataset(data, requestOptions);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type UploadDatasetMutationResult = NonNullable<Awaited<ReturnType<typeof uploadDataset>>>;
+export type UploadDatasetMutationBody = DatasetPostBodyBody;
+export type UploadDatasetMutationError = ErrorType<void | DmError>;
 
-    /**
+/**
  * @summary Upload an external file as a Dataset
  */
-export const useUploadDataset = <TData = Awaited<ReturnType<typeof uploadDataset>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{data: DatasetPostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useUploadDataset = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof uploadDataset>>,
+      TError,
+      { data: DatasetPostBodyBody },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {data: DatasetPostBodyBody},
-        TContext
-      > => {
-
-      const mutationOptions = getUploadDatasetMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof uploadDataset>>,
+  TError,
+  { data: DatasetPostBodyBody },
+  TContext
+> => {
+  const mutationOptions = useUploadDatasetMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * Returns datasets that you have access to, whether attached to a project or not.
 
 You will not see Datasets while their upload is still in progress.
@@ -235,144 +282,221 @@ Note that if `editors` are combined with `owner username`, then the datasets wil
  * @summary Get Datasets that are available to you
  */
 export const getDatasets = (
-    params?: GetDatasetsParams,
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  params?: GetDatasetsParams,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      
-      return customInstance<DatasetsGetResponse>(
-      {url: `/dataset`, method: 'GET',
-        params, signal
-    },
-      options);
-    }
-  
-
-export const getGetDatasetsQueryKey = (params?: GetDatasetsParams,) => {
-    return ["data-manager-api", `/dataset`, ...(params ? [params]: [])] as const;
-    }
-
-    
-export const getGetDatasetsQueryOptions = <TData = Awaited<ReturnType<typeof getDatasets>>, TError = ErrorType<void | DmError>>(params?: GetDatasetsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+  return customInstance<DatasetsGetResponse>(
+    { url: `/dataset`, method: "GET", params, signal },
+    options,
+  );
+};
+
+export const getGetDatasetsQueryKey = (params?: GetDatasetsParams) => {
+  return [`/dataset`, ...(params ? [params] : [])] as const;
+};
+
+export const useGetDatasetsQueryOptions = <
+  TData = Awaited<ReturnType<typeof getDatasets>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetDatasetsParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetDatasetsQueryKey(params);
+  const queryKey = queryOptions?.queryKey ?? getGetDatasetsQueryKey(params);
 
-  
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getDatasets>>> = ({ signal }) =>
+    getDatasets(params, requestOptions, signal);
 
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getDatasets>>> = ({ signal }) => getDatasets(params, requestOptions, signal);
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
 
-      
+  return customOptions as UseQueryOptions<
+    Awaited<ReturnType<typeof getDatasets>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
 
-      
+export type GetDatasetsQueryResult = NonNullable<Awaited<ReturnType<typeof getDatasets>>>;
+export type GetDatasetsQueryError = ErrorType<void | DmError>;
 
-   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type GetDatasetsQueryResult = NonNullable<Awaited<ReturnType<typeof getDatasets>>>
-export type GetDatasetsQueryError = ErrorType<void | DmError>
-
-
-export function useGetDatasets<TData = Awaited<ReturnType<typeof getDatasets>>, TError = ErrorType<void | DmError>>(
- params: undefined |  GetDatasetsParams, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>> & Pick<
+export function useGetDatasets<
+  TData = Awaited<ReturnType<typeof getDatasets>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params: undefined | GetDatasetsParams,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>> &
+      Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getDatasets>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetDatasets<TData = Awaited<ReturnType<typeof getDatasets>>, TError = ErrorType<void | DmError>>(
- params?: GetDatasetsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>> & Pick<
+          Awaited<ReturnType<typeof getDatasets>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetDatasets<
+  TData = Awaited<ReturnType<typeof getDatasets>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetDatasetsParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>> &
+      Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getDatasets>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetDatasets<TData = Awaited<ReturnType<typeof getDatasets>>, TError = ErrorType<void | DmError>>(
- params?: GetDatasetsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+          Awaited<ReturnType<typeof getDatasets>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetDatasets<
+  TData = Awaited<ReturnType<typeof getDatasets>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetDatasetsParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get Datasets that are available to you
  */
 
-export function useGetDatasets<TData = Awaited<ReturnType<typeof getDatasets>>, TError = ErrorType<void | DmError>>(
- params?: GetDatasetsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetDatasetsQueryOptions(params,options)
-
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetDatasets<
+  TData = Awaited<ReturnType<typeof getDatasets>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetDatasetsParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetDatasetsQueryOptions(params, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
-export const getGetDatasetsSuspenseQueryOptions = <TData = Awaited<ReturnType<typeof getDatasets>>, TError = ErrorType<void | DmError>>(params?: GetDatasetsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+export const useGetDatasetsSuspenseQueryOptions = <
+  TData = Awaited<ReturnType<typeof getDatasets>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetDatasetsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetDatasetsQueryKey(params);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getDatasets>>> = ({ signal }) => getDatasets(params, requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type GetDatasetsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getDatasets>>>
-export type GetDatasetsSuspenseQueryError = ErrorType<void | DmError>
-
-
-export function useGetDatasetsSuspense<TData = Awaited<ReturnType<typeof getDatasets>>, TError = ErrorType<void | DmError>>(
- params: undefined |  GetDatasetsParams, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetDatasetsSuspense<TData = Awaited<ReturnType<typeof getDatasets>>, TError = ErrorType<void | DmError>>(
- params?: GetDatasetsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetDatasetsSuspense<TData = Awaited<ReturnType<typeof getDatasets>>, TError = ErrorType<void | DmError>>(
- params?: GetDatasetsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getGetDatasetsQueryKey(params);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getDatasets>>> = ({ signal }) =>
+    getDatasets(params, requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseSuspenseQueryOptions<
+    Awaited<ReturnType<typeof getDatasets>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type GetDatasetsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getDatasets>>>;
+export type GetDatasetsSuspenseQueryError = ErrorType<void | DmError>;
+
+export function useGetDatasetsSuspense<
+  TData = Awaited<ReturnType<typeof getDatasets>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params: undefined | GetDatasetsParams,
+  options: {
+    query: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetDatasetsSuspense<
+  TData = Awaited<ReturnType<typeof getDatasets>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetDatasetsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetDatasetsSuspense<
+  TData = Awaited<ReturnType<typeof getDatasets>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetDatasetsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get Datasets that are available to you
  */
 
-export function useGetDatasetsSuspense<TData = Awaited<ReturnType<typeof getDatasets>>, TError = ErrorType<void | DmError>>(
- params?: GetDatasetsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetDatasetsSuspenseQueryOptions(params,options)
-
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetDatasetsSuspense<
+  TData = Awaited<ReturnType<typeof getDatasets>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: GetDatasetsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetDatasetsSuspenseQueryOptions(params, options);
+
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
 /**
  * Returns a list of Dataset Versions.
 
@@ -381,156 +505,232 @@ You will not see Datasets while their upload is still in progress.
  * @summary Gets all the Versions of a specific Dataset
  */
 export const getVersions = (
-    datasetId: string,
-    params?: GetVersionsParams,
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  datasetId: string,
+  params?: GetVersionsParams,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      
-      return customInstance<DatasetDetail>(
-      {url: `/dataset/${datasetId}/versions`, method: 'GET',
-        params, signal
-    },
-      options);
-    }
-  
-
-export const getGetVersionsQueryKey = (datasetId: string,
-    params?: GetVersionsParams,) => {
-    return ["data-manager-api", `/dataset/${datasetId}/versions`, ...(params ? [params]: [])] as const;
-    }
-
-    
-export const getGetVersionsQueryOptions = <TData = Awaited<ReturnType<typeof getVersions>>, TError = ErrorType<void | DmError>>(datasetId: string,
-    params?: GetVersionsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+  return customInstance<DatasetDetail>(
+    { url: `/dataset/${datasetId}/versions`, method: "GET", params, signal },
+    options,
+  );
+};
+
+export const getGetVersionsQueryKey = (datasetId: string, params?: GetVersionsParams) => {
+  return [`/dataset/${datasetId}/versions`, ...(params ? [params] : [])] as const;
+};
+
+export const useGetVersionsQueryOptions = <
+  TData = Awaited<ReturnType<typeof getVersions>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  params?: GetVersionsParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetVersionsQueryKey(datasetId,params);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getVersions>>> = ({ signal }) => getVersions(datasetId,params, requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, enabled: !!(datasetId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type GetVersionsQueryResult = NonNullable<Awaited<ReturnType<typeof getVersions>>>
-export type GetVersionsQueryError = ErrorType<void | DmError>
-
-
-export function useGetVersions<TData = Awaited<ReturnType<typeof getVersions>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    params: undefined |  GetVersionsParams, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>> & Pick<
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getGetVersionsQueryKey(datasetId, params);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getVersions>>> = ({ signal }) =>
+    getVersions(datasetId, params, requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseQueryOptions<
+    Awaited<ReturnType<typeof getVersions>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type GetVersionsQueryResult = NonNullable<Awaited<ReturnType<typeof getVersions>>>;
+export type GetVersionsQueryError = ErrorType<void | DmError>;
+
+export function useGetVersions<
+  TData = Awaited<ReturnType<typeof getVersions>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  params: undefined | GetVersionsParams,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>> &
+      Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getVersions>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetVersions<TData = Awaited<ReturnType<typeof getVersions>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    params?: GetVersionsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>> & Pick<
+          Awaited<ReturnType<typeof getVersions>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetVersions<
+  TData = Awaited<ReturnType<typeof getVersions>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  params?: GetVersionsParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>> &
+      Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getVersions>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetVersions<TData = Awaited<ReturnType<typeof getVersions>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    params?: GetVersionsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+          Awaited<ReturnType<typeof getVersions>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetVersions<
+  TData = Awaited<ReturnType<typeof getVersions>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  params?: GetVersionsParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all the Versions of a specific Dataset
  */
 
-export function useGetVersions<TData = Awaited<ReturnType<typeof getVersions>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    params?: GetVersionsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetVersionsQueryOptions(datasetId,params,options)
-
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetVersions<
+  TData = Awaited<ReturnType<typeof getVersions>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  params?: GetVersionsParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetVersionsQueryOptions(datasetId, params, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
-export const getGetVersionsSuspenseQueryOptions = <TData = Awaited<ReturnType<typeof getVersions>>, TError = ErrorType<void | DmError>>(datasetId: string,
-    params?: GetVersionsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+export const useGetVersionsSuspenseQueryOptions = <
+  TData = Awaited<ReturnType<typeof getVersions>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  params?: GetVersionsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetVersionsQueryKey(datasetId,params);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getVersions>>> = ({ signal }) => getVersions(datasetId,params, requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type GetVersionsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getVersions>>>
-export type GetVersionsSuspenseQueryError = ErrorType<void | DmError>
-
-
-export function useGetVersionsSuspense<TData = Awaited<ReturnType<typeof getVersions>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    params: undefined |  GetVersionsParams, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetVersionsSuspense<TData = Awaited<ReturnType<typeof getVersions>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    params?: GetVersionsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetVersionsSuspense<TData = Awaited<ReturnType<typeof getVersions>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    params?: GetVersionsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getGetVersionsQueryKey(datasetId, params);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getVersions>>> = ({ signal }) =>
+    getVersions(datasetId, params, requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseSuspenseQueryOptions<
+    Awaited<ReturnType<typeof getVersions>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type GetVersionsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getVersions>>>;
+export type GetVersionsSuspenseQueryError = ErrorType<void | DmError>;
+
+export function useGetVersionsSuspense<
+  TData = Awaited<ReturnType<typeof getVersions>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  params: undefined | GetVersionsParams,
+  options: {
+    query: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetVersionsSuspense<
+  TData = Awaited<ReturnType<typeof getVersions>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  params?: GetVersionsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetVersionsSuspense<
+  TData = Awaited<ReturnType<typeof getVersions>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  params?: GetVersionsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all the Versions of a specific Dataset
  */
 
-export function useGetVersionsSuspense<TData = Awaited<ReturnType<typeof getVersions>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    params?: GetVersionsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetVersionsSuspenseQueryOptions(datasetId,params,options)
-
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetVersionsSuspense<
+  TData = Awaited<ReturnType<typeof getVersions>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  params?: GetVersionsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetVersionsSuspenseQueryOptions(datasetId, params, options);
+
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
 /**
  * Given the Dataset `id` and `version` the Dataset will be removed. The API does not prevent you removing a Dataset that's been used in a **Project**. When removed using this endpoint the Dataset is automatically detached from any and all Projects that it was attached to and any corresponding Project Files relating to the Dataset are also removed.
 
@@ -541,66 +741,84 @@ You cannot delete a Dataset until its upload is complete.
  * @summary Delete a Dataset
  */
 export const deleteDataset = (
-    datasetId: string,
-    datasetVersion: number,
-    params?: DeleteDatasetParams,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      
-      return customInstance<TaskIdentity>(
-      {url: `/dataset/${datasetId}/${datasetVersion}`, method: 'DELETE',
-        params
-    },
-      options);
-    }
-  
-
-
-export const getDeleteDatasetMutationOptions = <TData = Awaited<ReturnType<typeof deleteDataset>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{datasetId: string;datasetVersion: number;params?: DeleteDatasetParams}, TContext>, request?: SecondParameter<typeof customInstance>}
+  datasetId: string,
+  datasetVersion: number,
+  params?: DeleteDatasetParams,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-const mutationKey = ['deleteDataset'];
-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<TaskIdentity>(
+    { url: `/dataset/${datasetId}/${datasetVersion}`, method: "DELETE", params },
+    options,
+  );
+};
+
+export const useDeleteDatasetMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof deleteDataset>>,
+    TError,
+    { datasetId: string; datasetVersion: number; params?: DeleteDatasetParams },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof deleteDataset>>,
+  TError,
+  { datasetId: string; datasetVersion: number; params?: DeleteDatasetParams },
+  TContext
+> => {
+  const mutationKey = ["deleteDataset"];
+  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 deleteDataset>>,
+    { datasetId: string; datasetVersion: number; params?: DeleteDatasetParams }
+  > = (props) => {
+    const { datasetId, datasetVersion, params } = props ?? {};
+
+    return deleteDataset(datasetId, datasetVersion, params, requestOptions);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type DeleteDatasetMutationResult = NonNullable<Awaited<ReturnType<typeof deleteDataset>>>;
+
+export type DeleteDatasetMutationError = ErrorType<void | DmError>;
 
-      const mutationFn: MutationFunction<Awaited<ReturnType<typeof deleteDataset>>, {datasetId: string;datasetVersion: number;params?: DeleteDatasetParams}> = (props) => {
-          const {datasetId,datasetVersion,params} = props ?? {};
-
-          return  deleteDataset(datasetId,datasetVersion,params,requestOptions)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{datasetId: string;datasetVersion: number;params?: DeleteDatasetParams}, TContext>}
-
-    export type DeleteDatasetMutationResult = NonNullable<Awaited<ReturnType<typeof deleteDataset>>>
-    
-    export type DeleteDatasetMutationError = ErrorType<void | DmError>
-
-    /**
+/**
  * @summary Delete a Dataset
  */
-export const useDeleteDataset = <TData = Awaited<ReturnType<typeof deleteDataset>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{datasetId: string;datasetVersion: number;params?: DeleteDatasetParams}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useDeleteDataset = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteDataset>>,
+      TError,
+      { datasetId: string; datasetVersion: number; params?: DeleteDatasetParams },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {datasetId: string;datasetVersion: number;params?: DeleteDatasetParams},
-        TContext
-      > => {
-
-      const mutationOptions = getDeleteDatasetMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof deleteDataset>>,
+  TError,
+  { datasetId: string; datasetVersion: number; params?: DeleteDatasetParams },
+  TContext
+> => {
+  const mutationOptions = useDeleteDatasetMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * Given a `dataset_id` the dataset will be returned if available.
 
 You cannot get a Dataset until its upload is complete.
@@ -608,155 +826,236 @@ You cannot get a Dataset until its upload is complete.
  * @summary Download a Dataset
  */
 export const downloadDataset = (
-    datasetId: string,
-    datasetVersion: number,
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  datasetId: string,
+  datasetVersion: number,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      
-      return customInstance<void>(
-      {url: `/dataset/${datasetId}/${datasetVersion}`, method: 'GET', signal
-    },
-      options);
-    }
-  
-
-export const getDownloadDatasetQueryKey = (datasetId: string,
-    datasetVersion: number,) => {
-    return ["data-manager-api", `/dataset/${datasetId}/${datasetVersion}`] as const;
-    }
-
-    
-export const getDownloadDatasetQueryOptions = <TData = Awaited<ReturnType<typeof downloadDataset>>, TError = ErrorType<void | DmError>>(datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+  return customInstance<void>(
+    { url: `/dataset/${datasetId}/${datasetVersion}`, method: "GET", signal },
+    options,
+  );
+};
+
+export const getDownloadDatasetQueryKey = (datasetId: string, datasetVersion: number) => {
+  return [`/dataset/${datasetId}/${datasetVersion}`] as const;
+};
+
+export const useDownloadDatasetQueryOptions = <
+  TData = Awaited<ReturnType<typeof downloadDataset>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getDownloadDatasetQueryKey(datasetId,datasetVersion);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof downloadDataset>>> = ({ signal }) => downloadDataset(datasetId,datasetVersion, requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, enabled: !!(datasetId && datasetVersion), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type DownloadDatasetQueryResult = NonNullable<Awaited<ReturnType<typeof downloadDataset>>>
-export type DownloadDatasetQueryError = ErrorType<void | DmError>
-
-
-export function useDownloadDataset<TData = Awaited<ReturnType<typeof downloadDataset>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>> & Pick<
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getDownloadDatasetQueryKey(datasetId, datasetVersion);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof downloadDataset>>> = ({ signal }) =>
+    downloadDataset(datasetId, datasetVersion, requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseQueryOptions<
+    Awaited<ReturnType<typeof downloadDataset>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type DownloadDatasetQueryResult = NonNullable<Awaited<ReturnType<typeof downloadDataset>>>;
+export type DownloadDatasetQueryError = ErrorType<void | DmError>;
+
+export function useDownloadDataset<
+  TData = Awaited<ReturnType<typeof downloadDataset>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>> &
+      Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof downloadDataset>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useDownloadDataset<TData = Awaited<ReturnType<typeof downloadDataset>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>> & Pick<
+          Awaited<ReturnType<typeof downloadDataset>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useDownloadDataset<
+  TData = Awaited<ReturnType<typeof downloadDataset>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>> &
+      Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof downloadDataset>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useDownloadDataset<TData = Awaited<ReturnType<typeof downloadDataset>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+          Awaited<ReturnType<typeof downloadDataset>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useDownloadDataset<
+  TData = Awaited<ReturnType<typeof downloadDataset>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Download a Dataset
  */
 
-export function useDownloadDataset<TData = Awaited<ReturnType<typeof downloadDataset>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getDownloadDatasetQueryOptions(datasetId,datasetVersion,options)
-
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useDownloadDataset<
+  TData = Awaited<ReturnType<typeof downloadDataset>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useDownloadDatasetQueryOptions(datasetId, datasetVersion, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
-export const getDownloadDatasetSuspenseQueryOptions = <TData = Awaited<ReturnType<typeof downloadDataset>>, TError = ErrorType<void | DmError>>(datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+export const useDownloadDatasetSuspenseQueryOptions = <
+  TData = Awaited<ReturnType<typeof downloadDataset>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getDownloadDatasetQueryKey(datasetId,datasetVersion);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof downloadDataset>>> = ({ signal }) => downloadDataset(datasetId,datasetVersion, requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type DownloadDatasetSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof downloadDataset>>>
-export type DownloadDatasetSuspenseQueryError = ErrorType<void | DmError>
-
-
-export function useDownloadDatasetSuspense<TData = Awaited<ReturnType<typeof downloadDataset>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useDownloadDatasetSuspense<TData = Awaited<ReturnType<typeof downloadDataset>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useDownloadDatasetSuspense<TData = Awaited<ReturnType<typeof downloadDataset>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getDownloadDatasetQueryKey(datasetId, datasetVersion);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof downloadDataset>>> = ({ signal }) =>
+    downloadDataset(datasetId, datasetVersion, requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseSuspenseQueryOptions<
+    Awaited<ReturnType<typeof downloadDataset>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type DownloadDatasetSuspenseQueryResult = NonNullable<
+  Awaited<ReturnType<typeof downloadDataset>>
+>;
+export type DownloadDatasetSuspenseQueryError = ErrorType<void | DmError>;
+
+export function useDownloadDatasetSuspense<
+  TData = Awaited<ReturnType<typeof downloadDataset>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useDownloadDatasetSuspense<
+  TData = Awaited<ReturnType<typeof downloadDataset>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useDownloadDatasetSuspense<
+  TData = Awaited<ReturnType<typeof downloadDataset>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Download a Dataset
  */
 
-export function useDownloadDatasetSuspense<TData = Awaited<ReturnType<typeof downloadDataset>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getDownloadDatasetSuspenseQueryOptions(datasetId,datasetVersion,options)
-
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useDownloadDatasetSuspense<
+  TData = Awaited<ReturnType<typeof downloadDataset>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useDownloadDatasetSuspenseQueryOptions(datasetId, datasetVersion, options);
+
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
 /**
  * The user is removed from the Dataset's `editor` list. The user is removed from all versions of a dataset. You can remove yourself but an `owner` (creator) will always have access to the dataset.
 
@@ -767,64 +1066,85 @@ You cannot modify Dataset editors until its upload is complete.
  * @summary Remove a user's edit permission for a Dataset
  */
 export const removeEditorFromDataset = (
-    datasetId: string,
-    userId: string,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      
-      return customInstance<void>(
-      {url: `/dataset/${datasetId}/editor/${userId}`, method: 'DELETE'
-    },
-      options);
-    }
-  
-
-
-export const getRemoveEditorFromDatasetMutationOptions = <TData = Awaited<ReturnType<typeof removeEditorFromDataset>>, TError = ErrorType<DmError | void>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{datasetId: string;userId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+  datasetId: string,
+  userId: string,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-const mutationKey = ['removeEditorFromDataset'];
-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 removeEditorFromDataset>>, {datasetId: string;userId: string}> = (props) => {
-          const {datasetId,userId} = props ?? {};
-
-          return  removeEditorFromDataset(datasetId,userId,requestOptions)
-        }
-
-        
+  return customInstance<void>(
+    { url: `/dataset/${datasetId}/editor/${userId}`, method: "DELETE" },
+    options,
+  );
+};
+
+export const useRemoveEditorFromDatasetMutationOptions = <
+  TError = ErrorType<DmError | void>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof removeEditorFromDataset>>,
+    TError,
+    { datasetId: string; userId: string },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof removeEditorFromDataset>>,
+  TError,
+  { datasetId: string; userId: string },
+  TContext
+> => {
+  const mutationKey = ["removeEditorFromDataset"];
+  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 removeEditorFromDataset>>,
+    { datasetId: string; userId: string }
+  > = (props) => {
+    const { datasetId, userId } = props ?? {};
+
+    return removeEditorFromDataset(datasetId, userId, requestOptions);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type RemoveEditorFromDatasetMutationResult = NonNullable<
+  Awaited<ReturnType<typeof removeEditorFromDataset>>
+>;
+
+export type RemoveEditorFromDatasetMutationError = ErrorType<DmError | void>;
 
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{datasetId: string;userId: string}, TContext>}
-
-    export type RemoveEditorFromDatasetMutationResult = NonNullable<Awaited<ReturnType<typeof removeEditorFromDataset>>>
-    
-    export type RemoveEditorFromDatasetMutationError = ErrorType<DmError | void>
-
-    /**
+/**
  * @summary Remove a user's edit permission for a Dataset
  */
-export const useRemoveEditorFromDataset = <TData = Awaited<ReturnType<typeof removeEditorFromDataset>>, TError = ErrorType<DmError | void>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{datasetId: string;userId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useRemoveEditorFromDataset = <TError = ErrorType<DmError | void>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof removeEditorFromDataset>>,
+      TError,
+      { datasetId: string; userId: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {datasetId: string;userId: string},
-        TContext
-      > => {
-
-      const mutationOptions = getRemoveEditorFromDatasetMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof removeEditorFromDataset>>,
+  TError,
+  { datasetId: string; userId: string },
+  TContext
+> => {
+  const mutationOptions = useRemoveEditorFromDatasetMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * The user is added to the dataset's `editor`` list. The dataset `owner` is automatically an editor and so does not need to be added as an `editor`.
 
 You must be an `editor` or `owner` of the dataset.
@@ -834,215 +1154,302 @@ You cannot modify Dataset editors until its upload is complete.
  * @summary Give a user edit permission for a Dataset
  */
 export const addEditorToDataset = (
-    datasetId: string,
-    userId: string,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      
-      return customInstance<void>(
-      {url: `/dataset/${datasetId}/editor/${userId}`, method: 'PUT'
-    },
-      options);
-    }
-  
-
-
-export const getAddEditorToDatasetMutationOptions = <TData = Awaited<ReturnType<typeof addEditorToDataset>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{datasetId: string;userId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+  datasetId: string,
+  userId: string,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-const mutationKey = ['addEditorToDataset'];
-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 addEditorToDataset>>, {datasetId: string;userId: string}> = (props) => {
-          const {datasetId,userId} = props ?? {};
-
-          return  addEditorToDataset(datasetId,userId,requestOptions)
-        }
-
-        
+  return customInstance<void>(
+    { url: `/dataset/${datasetId}/editor/${userId}`, method: "PUT" },
+    options,
+  );
+};
+
+export const useAddEditorToDatasetMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof addEditorToDataset>>,
+    TError,
+    { datasetId: string; userId: string },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof addEditorToDataset>>,
+  TError,
+  { datasetId: string; userId: string },
+  TContext
+> => {
+  const mutationKey = ["addEditorToDataset"];
+  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 addEditorToDataset>>,
+    { datasetId: string; userId: string }
+  > = (props) => {
+    const { datasetId, userId } = props ?? {};
+
+    return addEditorToDataset(datasetId, userId, requestOptions);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type AddEditorToDatasetMutationResult = NonNullable<
+  Awaited<ReturnType<typeof addEditorToDataset>>
+>;
+
+export type AddEditorToDatasetMutationError = ErrorType<void | DmError>;
 
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{datasetId: string;userId: string}, TContext>}
-
-    export type AddEditorToDatasetMutationResult = NonNullable<Awaited<ReturnType<typeof addEditorToDataset>>>
-    
-    export type AddEditorToDatasetMutationError = ErrorType<void | DmError>
-
-    /**
+/**
  * @summary Give a user edit permission for a Dataset
  */
-export const useAddEditorToDataset = <TData = Awaited<ReturnType<typeof addEditorToDataset>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{datasetId: string;userId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useAddEditorToDataset = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof addEditorToDataset>>,
+      TError,
+      { datasetId: string; userId: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {datasetId: string;userId: string},
-        TContext
-      > => {
-
-      const mutationOptions = getAddEditorToDatasetMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof addEditorToDataset>>,
+  TError,
+  { datasetId: string; userId: string },
+  TContext
+> => {
+  const mutationOptions = useAddEditorToDatasetMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * Returns the property schema for a Dataset versions in JSON format (if available).
 
  * @summary Gets the property schema for a specific Dataset
  */
 export const getSchema = (
-    datasetId: string,
-    datasetVersion: number,
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  datasetId: string,
+  datasetVersion: number,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      
-      return customInstance<DatasetSchemaGetResponse>(
-      {url: `/dataset/${datasetId}/schema/${datasetVersion}`, method: 'GET', signal
-    },
-      options);
-    }
-  
-
-export const getGetSchemaQueryKey = (datasetId: string,
-    datasetVersion: number,) => {
-    return ["data-manager-api", `/dataset/${datasetId}/schema/${datasetVersion}`] as const;
-    }
-
-    
-export const getGetSchemaQueryOptions = <TData = Awaited<ReturnType<typeof getSchema>>, TError = ErrorType<void | DmError>>(datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+  return customInstance<DatasetSchemaGetResponse>(
+    { url: `/dataset/${datasetId}/schema/${datasetVersion}`, method: "GET", signal },
+    options,
+  );
+};
+
+export const getGetSchemaQueryKey = (datasetId: string, datasetVersion: number) => {
+  return [`/dataset/${datasetId}/schema/${datasetVersion}`] as const;
+};
+
+export const useGetSchemaQueryOptions = <
+  TData = Awaited<ReturnType<typeof getSchema>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetSchemaQueryKey(datasetId,datasetVersion);
+  const queryKey = queryOptions?.queryKey ?? getGetSchemaQueryKey(datasetId, datasetVersion);
 
-  
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getSchema>>> = ({ signal }) =>
+    getSchema(datasetId, datasetVersion, requestOptions, signal);
 
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getSchema>>> = ({ signal }) => getSchema(datasetId,datasetVersion, requestOptions, signal);
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
 
-      
+  return customOptions as UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+};
 
-      
-
-   return  { queryKey, queryFn, enabled: !!(datasetId && datasetVersion), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
+export type GetSchemaQueryResult = NonNullable<Awaited<ReturnType<typeof getSchema>>>;
+export type GetSchemaQueryError = ErrorType<void | DmError>;
 
-export type GetSchemaQueryResult = NonNullable<Awaited<ReturnType<typeof getSchema>>>
-export type GetSchemaQueryError = ErrorType<void | DmError>
-
-
-export function useGetSchema<TData = Awaited<ReturnType<typeof getSchema>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>> & Pick<
+export function useGetSchema<
+  TData = Awaited<ReturnType<typeof getSchema>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>> &
+      Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getSchema>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetSchema<TData = Awaited<ReturnType<typeof getSchema>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>> & Pick<
+          Awaited<ReturnType<typeof getSchema>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetSchema<
+  TData = Awaited<ReturnType<typeof getSchema>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>> &
+      Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getSchema>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetSchema<TData = Awaited<ReturnType<typeof getSchema>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+          Awaited<ReturnType<typeof getSchema>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetSchema<
+  TData = Awaited<ReturnType<typeof getSchema>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the property schema for a specific Dataset
  */
 
-export function useGetSchema<TData = Awaited<ReturnType<typeof getSchema>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetSchemaQueryOptions(datasetId,datasetVersion,options)
-
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetSchema<
+  TData = Awaited<ReturnType<typeof getSchema>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetSchemaQueryOptions(datasetId, datasetVersion, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
-export const getGetSchemaSuspenseQueryOptions = <TData = Awaited<ReturnType<typeof getSchema>>, TError = ErrorType<void | DmError>>(datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+export const useGetSchemaSuspenseQueryOptions = <
+  TData = Awaited<ReturnType<typeof getSchema>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetSchemaQueryKey(datasetId,datasetVersion);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getSchema>>> = ({ signal }) => getSchema(datasetId,datasetVersion, requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type GetSchemaSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getSchema>>>
-export type GetSchemaSuspenseQueryError = ErrorType<void | DmError>
-
-
-export function useGetSchemaSuspense<TData = Awaited<ReturnType<typeof getSchema>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetSchemaSuspense<TData = Awaited<ReturnType<typeof getSchema>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetSchemaSuspense<TData = Awaited<ReturnType<typeof getSchema>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getGetSchemaQueryKey(datasetId, datasetVersion);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getSchema>>> = ({ signal }) =>
+    getSchema(datasetId, datasetVersion, requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseSuspenseQueryOptions<
+    Awaited<ReturnType<typeof getSchema>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type GetSchemaSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getSchema>>>;
+export type GetSchemaSuspenseQueryError = ErrorType<void | DmError>;
+
+export function useGetSchemaSuspense<
+  TData = Awaited<ReturnType<typeof getSchema>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options: {
+    query: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetSchemaSuspense<
+  TData = Awaited<ReturnType<typeof getSchema>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetSchemaSuspense<
+  TData = Awaited<ReturnType<typeof getSchema>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the property schema for a specific Dataset
  */
 
-export function useGetSchemaSuspense<TData = Awaited<ReturnType<typeof getSchema>>, TError = ErrorType<void | DmError>>(
- datasetId: string,
-    datasetVersion: number, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetSchemaSuspenseQueryOptions(datasetId,datasetVersion,options)
-
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetSchemaSuspense<
+  TData = Awaited<ReturnType<typeof getSchema>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  options?: {
+    query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetSchemaSuspenseQueryOptions(datasetId, datasetVersion, options);
+
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
-
-
-