@squonk/data-manager-client 3.3.0 → 3.3.1

package/src/dataset/dataset.ts

@@ -1,6 +1,6 @@
 // @ts-nocheck
 /**
- * Generated by orval v7.2.0 🍺
+ * Generated by orval v7.4.1 🍺
  * Do not edit manually.
  * Dataset Manager API
  * The Dataset Manager API service.
@@ -15,6 +15,7 @@ import {
   useSuspenseQuery
 } from '@tanstack/react-query'
 import type {
+  DataTag,
   DefinedInitialDataOptions,
   DefinedUseQueryResult,
   MutationFunction,
@@ -89,10 +90,15 @@ if(datasetPutBodyBody.unit_id !== undefined) {
   
 
 
-export const getCreateDatasetFromFileMutationOptions = <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 {mutation: mutationOptions, request: requestOptions} = 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>}
+) => {
+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};
 
       
 
@@ -106,7 +112,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{data: DatasetPutBodyBody}, TContext>}
 
     export type CreateDatasetFromFileMutationResult = NonNullable<Awaited<ReturnType<typeof createDatasetFromFile>>>
     export type CreateDatasetFromFileMutationBody = DatasetPutBodyBody
@@ -115,10 +121,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Create a Dataset from a file in a Project
  */
-export const useCreateDatasetFromFile = <TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createDatasetFromFile>>, TError,{data: DatasetPutBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+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>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof createDatasetFromFile>>,
+        TData,
         TError,
         {data: DatasetPutBodyBody},
         TContext
@@ -143,7 +149,8 @@ Datasets undergo some processing in an asynchronous **Task** after control retur
  */
 export const uploadDataset = (
     datasetPostBodyBody: DatasetPostBodyBody,
- options?: SecondParameter<typeof customInstance>,) => {
+ options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+) => {
       
       const formData = new FormData();
 formData.append('dataset_file', datasetPostBodyBody.dataset_file)
@@ -165,17 +172,22 @@ formData.append('unit_id', datasetPostBodyBody.unit_id)
       return customInstance<DatasetPutPostResponse>(
       {url: `/dataset`, method: 'POST',
       headers: {'Content-Type': 'multipart/form-data', },
-       data: formData
+       data: formData, signal
     },
       options);
     }
   
 
 
-export const getUploadDatasetMutationOptions = <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 {mutation: mutationOptions, request: requestOptions} = 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};
 
       
 
@@ -189,7 +201,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{data: DatasetPostBodyBody}, TContext>}
 
     export type UploadDatasetMutationResult = NonNullable<Awaited<ReturnType<typeof uploadDataset>>>
     export type UploadDatasetMutationBody = DatasetPostBodyBody
@@ -198,10 +210,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Upload an external file as a Dataset
  */
-export const useUploadDataset = <TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof uploadDataset>>, TError,{data: DatasetPostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+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>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof uploadDataset>>,
+        TData,
         TError,
         {data: DatasetPostBodyBody},
         TContext
@@ -256,7 +268,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData> & { queryKey: QueryKey }
+   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>>>
@@ -272,7 +284,7 @@ export function useGetDatasets<TData = Awaited<ReturnType<typeof getDatasets>>,
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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<
@@ -282,11 +294,11 @@ export function useGetDatasets<TData = Awaited<ReturnType<typeof getDatasets>>,
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get Datasets that are available to you
  */
@@ -294,11 +306,11 @@ export function useGetDatasets<TData = Awaited<ReturnType<typeof getDatasets>>,
 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: QueryKey } {
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getGetDatasetsQueryOptions(params,options)
 
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -322,7 +334,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDatasets>>, TError, TData> & { queryKey: QueryKey }
+   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>>>
@@ -332,15 +344,15 @@ 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: QueryKey }
+  ):  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: QueryKey }
+  ):  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: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get Datasets that are available to you
  */
@@ -348,11 +360,11 @@ export function useGetDatasetsSuspense<TData = Awaited<ReturnType<typeof getData
 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: QueryKey } {
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getGetDatasetsSuspenseQueryOptions(params,options)
 
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -405,7 +417,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, enabled: !!(datasetId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData> & { queryKey: QueryKey }
+   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>>>
@@ -422,7 +434,7 @@ export function useGetVersions<TData = Awaited<ReturnType<typeof getVersions>>,
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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<
@@ -433,12 +445,12 @@ export function useGetVersions<TData = Awaited<ReturnType<typeof getVersions>>,
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Gets all the Versions of a specific Dataset
  */
@@ -447,11 +459,11 @@ export function useGetVersions<TData = Awaited<ReturnType<typeof getVersions>>,
  datasetId: string,
     params?: GetVersionsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getGetVersionsQueryOptions(datasetId,params,options)
 
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -476,7 +488,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, enabled: !!(datasetId), ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData> & { queryKey: QueryKey }
+   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>>>
@@ -487,17 +499,17 @@ export function useGetVersionsSuspense<TData = Awaited<ReturnType<typeof getVers
  datasetId: string,
     params: undefined |  GetVersionsParams, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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: QueryKey }
+  ):  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: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Gets all the Versions of a specific Dataset
  */
@@ -506,11 +518,11 @@ export function useGetVersionsSuspense<TData = Awaited<ReturnType<typeof getVers
  datasetId: string,
     params?: GetVersionsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getGetVersionsSuspenseQueryOptions(datasetId,params,options)
 
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -544,10 +556,15 @@ export const deleteDataset = (
   
 
 
-export const getDeleteDatasetMutationOptions = <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 {mutation: mutationOptions, request: requestOptions} = 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>}
+) => {
+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};
 
       
 
@@ -561,7 +578,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{datasetId: string;datasetVersion: number;params?: DeleteDatasetParams}, TContext>}
 
     export type DeleteDatasetMutationResult = NonNullable<Awaited<ReturnType<typeof deleteDataset>>>
     
@@ -570,10 +587,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Delete a Dataset
  */
-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>}
+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>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof deleteDataset>>,
+        TData,
         TError,
         {datasetId: string;datasetVersion: number;params?: DeleteDatasetParams},
         TContext
@@ -626,7 +643,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, enabled: !!(datasetId && datasetVersion), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData> & { queryKey: QueryKey }
+   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>>>
@@ -643,7 +660,7 @@ export function useDownloadDataset<TData = Awaited<ReturnType<typeof downloadDat
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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<
@@ -654,12 +671,12 @@ export function useDownloadDataset<TData = Awaited<ReturnType<typeof downloadDat
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Download a Dataset
  */
@@ -668,11 +685,11 @@ export function useDownloadDataset<TData = Awaited<ReturnType<typeof downloadDat
  datasetId: string,
     datasetVersion: number, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getDownloadDatasetQueryOptions(datasetId,datasetVersion,options)
 
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -697,7 +714,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, enabled: !!(datasetId && datasetVersion), ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData> & { queryKey: QueryKey }
+   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>>>
@@ -708,17 +725,17 @@ export function useDownloadDatasetSuspense<TData = Awaited<ReturnType<typeof dow
  datasetId: string,
     datasetVersion: number, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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: QueryKey }
+  ):  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: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Download a Dataset
  */
@@ -727,11 +744,11 @@ export function useDownloadDatasetSuspense<TData = Awaited<ReturnType<typeof dow
  datasetId: string,
     datasetVersion: number, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getDownloadDatasetSuspenseQueryOptions(datasetId,datasetVersion,options)
 
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -763,10 +780,15 @@ export const removeEditorFromDataset = (
   
 
 
-export const getRemoveEditorFromDatasetMutationOptions = <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 {mutation: mutationOptions, request: requestOptions} = 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>}
+) => {
+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};
 
       
 
@@ -780,7 +802,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{datasetId: string;userId: string}, TContext>}
 
     export type RemoveEditorFromDatasetMutationResult = NonNullable<Awaited<ReturnType<typeof removeEditorFromDataset>>>
     
@@ -789,10 +811,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Remove a user's edit permission for a Dataset
  */
-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>}
+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>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof removeEditorFromDataset>>,
+        TData,
         TError,
         {datasetId: string;userId: string},
         TContext
@@ -825,10 +847,15 @@ export const addEditorToDataset = (
   
 
 
-export const getAddEditorToDatasetMutationOptions = <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 {mutation: mutationOptions, request: requestOptions} = 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>}
+) => {
+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};
 
       
 
@@ -842,7 +869,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{datasetId: string;userId: string}, TContext>}
 
     export type AddEditorToDatasetMutationResult = NonNullable<Awaited<ReturnType<typeof addEditorToDataset>>>
     
@@ -851,10 +878,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Give a user edit permission for a Dataset
  */
-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>}
+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>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof addEditorToDataset>>,
+        TData,
         TError,
         {datasetId: string;userId: string},
         TContext
@@ -905,7 +932,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, enabled: !!(datasetId && datasetVersion), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData> & { queryKey: QueryKey }
+   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>>>
@@ -922,7 +949,7 @@ export function useGetSchema<TData = Awaited<ReturnType<typeof getSchema>>, TErr
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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<
@@ -933,12 +960,12 @@ export function useGetSchema<TData = Awaited<ReturnType<typeof getSchema>>, TErr
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Gets the property schema for a specific Dataset
  */
@@ -947,11 +974,11 @@ export function useGetSchema<TData = Awaited<ReturnType<typeof getSchema>>, TErr
  datasetId: string,
     datasetVersion: number, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getGetSchemaQueryOptions(datasetId,datasetVersion,options)
 
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -976,7 +1003,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, enabled: !!(datasetId && datasetVersion), ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData> & { queryKey: QueryKey }
+   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>>>
@@ -987,17 +1014,17 @@ export function useGetSchemaSuspense<TData = Awaited<ReturnType<typeof getSchema
  datasetId: string,
     datasetVersion: number, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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: QueryKey }
+  ):  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: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Gets the property schema for a specific Dataset
  */
@@ -1006,11 +1033,11 @@ export function useGetSchemaSuspense<TData = Awaited<ReturnType<typeof getSchema
  datasetId: string,
     datasetVersion: number, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getGetSchemaSuspenseQueryOptions(datasetId,datasetVersion,options)
 
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;