@squonk/data-manager-client 3.3.0 → 3.3.1

package/src/data-manager-api.schemas.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.
@@ -638,6 +638,9 @@ export type UserPatchBodyBody = {
 };
 
 export type UserAccountPatchBodyBody = {
+  /** If set the user account becomes private, if provided but false the user account becomes public. Public Users show up in user searches
+ */
+  private?: boolean;
   /** For `admin` accounts, if set the user account is able to read anything, i.e. `GET` API calls (i.e. endpoints that do not change the Data Manager state) behave as though the caller is acting as *everyone*. An `admin` user would set ths parameter in order to browse the system, and then switch to `impersonate` mode in order to change things as the chosen user
  */
   become_admin?: boolean;
@@ -648,9 +651,6 @@ export type UserAccountPatchBodyBody = {
    * @pattern ^(\w(?:\w*(?:[@.-]\w+)?)*|)$
    */
   impersonate?: string;
-  /** If set the user account becomes private, if provided but false the user account becomes public. Public Users show up in user searches
- */
-  private?: boolean;
   /** For `admin` accounts, if this is set the account for the user being impersonated is patched, rather then the user's own account. To use this you must have a value for `impersonate`
  */
   use_impersonation?: boolean;
@@ -674,13 +674,14 @@ export type ProjectPostBodyBody = {
 };
 
 export type ProjectPatchBodyBody = {
+  private?: boolean;
   /** The new name of the ptojct
  */
   name?: string;
-  private?: boolean;
 };
 
 export type ProjectFilePutBodyBody = {
+  file: Blob;
   /**
    * An alternative filename to use for the uploaded File
 
@@ -688,7 +689,6 @@ export type ProjectFilePutBodyBody = {
    * @maxLength 128
    */
   as_filename?: string;
-  file: Blob;
   /**
    * The Project path of the file.
 
@@ -700,18 +700,20 @@ export type ProjectFilePutBodyBody = {
 };
 
 export type ExchangeRatePutBodyBody = {
+  /** A decimal value used as the new Exchange Rate. Application _raw_ **costs** are multiplied by this value to covert costs to **coins**. A string is used to avoid rounding errors. Internally the value is treated as a Python Decimal.
+ */
+  rate: string;
   /**
    * A brief comment relating to the new rate
 
    * @maxLength 80
    */
   comment?: string;
-  /** A decimal value used as the new Exchange Rate. Application _raw_ **costs** are multiplied by this value to covert costs to **coins**. A string is used to avoid rounding errors. Internally the value is treated as a Python Decimal.
- */
-  rate: string;
 };
 
 export type JobManifestPutBodyBody = {
+  /** The URL of the Job Manifest */
+  url: string;
   /**
    * Optional URL header values (a JSON string)
    * @pattern ^|{.*}$
@@ -722,8 +724,6 @@ export type JobManifestPutBodyBody = {
    * @pattern ^|{.*}$
    */
   params?: string;
-  /** The URL of the Job Manifest */
-  url: string;
 };
 
 export type InstancePostBodyBody = {
@@ -736,6 +736,12 @@ Application IDs currently supported include `datamanagerjobs.squonk.it` and `jup
    * @maxLength 80
    */
   application_id: string;
+  /**
+   * The project to attach
+
+   * @pattern ^project-[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$
+   */
+  project_id: string;
   /**
    * The name to use for the instance
 
@@ -744,6 +750,9 @@ Application IDs currently supported include `datamanagerjobs.squonk.it` and `jup
    * @pattern ^[A-Za-z0-9]+[A-Za-z0-9-_. ]*[A-Za-z0-9]+$
    */
   as_name: string;
+  /** A URL the DM will use to PUT job progress messages as the requested instance runs. Used, at the moment, for Job execution
+ */
+  callback_url?: string;
   /**
    * Used in conjunction with the `callback_url` any value provided here will be passed back in the message payload that's delivered to the callback URL. It can be used by the recipient to provide a context that's meaningful
 
@@ -751,6 +760,13 @@ Application IDs currently supported include `datamanagerjobs.squonk.it` and `jup
    * @maxLength 256
    */
   callback_context?: string;
+  /** If set a callback token will be provided in the response. The token allows files to be downloaded from the instance project and expires after a pre-configured amount of time after the instance is complete or if the user revokes the token.
+
+Caution should be taken using this feature. A 3rd party can access the Project's files without authentication, they just need the token and the project identity.
+
+Tokens should therefore be revoked when they're no longer required
+ */
+  generate_callback_token?: boolean;
   /**
    * An optional 22-character **sortuuid** callback token that is supplied by the remote service. If not provided the user can use `generate_callback_token` to have one generated and returned in the response.
 
@@ -761,9 +777,6 @@ See the Python module's `shortuuid.get_alphabet()` for the full list of permitte
    * @pattern ^[2-9A-HJ-NP-Za-km-z]{22}$
    */
   callback_token?: string;
-  /** A URL the DM will use to PUT job progress messages as the requested instance runs. Used, at the moment, for Job execution
- */
-  callback_url?: string;
   /** A debug value that may be used by the instance.
 
 For Data Manager **Job** applications setting this to anything other zero ('0') prevents the Job's Pod from being deleted automatically, allowing a developer to inspect the Pod's log for example.
@@ -771,19 +784,6 @@ For Data Manager **Job** applications setting this to anything other zero ('0')
 The behaviour of **Application** instances using this property is undefined. It will depend on whether the application **CRD** handles the Data Manager debug field.
  */
   debug?: string;
-  /** If set a callback token will be provided in the response. The token allows files to be downloaded from the instance project and expires after a pre-configured amount of time after the instance is complete or if the user revokes the token.
-
-Caution should be taken using this feature. A 3rd party can access the Project's files without authentication, they just need the token and the project identity.
-
-Tokens should therefore be revoked when they're no longer required
- */
-  generate_callback_token?: boolean;
-  /**
-   * The project to attach
-
-   * @pattern ^project-[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$
-   */
-  project_id: string;
   /** The instance specification. A JSON string that's application-specific and controls the application's behaviour.
 
 When launching a Data Manager **Job** Application you must identify the Job using the properties `collection`, `job` and `version`, e.g. `{"collection":"im-test","job":"coin-test","version":"1.0.0"}`
@@ -798,12 +798,6 @@ Applications also support `variables`. The Jupyter notebook application supports
 };
 
 export type FilePostBodyBody = {
-  /** The desired Dataset file type (a MIME type). Whether or not the chosen fileType is supported will depend on the Dataset
- */
-  as_type: string;
-  /** Whether to compress the Dataset File as it's attached. Compression is achieved using gzip, resulting in a File ending `.gz`. By default the file will be compressed
- */
-  compress?: boolean;
   /**
    * The Dataset UUID for the File that you intend to attach
 
@@ -816,9 +810,15 @@ export type FilePostBodyBody = {
    * @minimum 1
    */
   dataset_version: number;
-  /** Whether the Dataset File can be modified while in the Project. By default the File cannot be modified
+  /**
+   * The Project UUID you're attaching to
+
+   * @pattern ^project-[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$
+   */
+  project_id: string;
+  /** The desired Dataset file type (a MIME type). Whether or not the chosen fileType is supported will depend on the Dataset
  */
-  immutable?: boolean;
+  as_type: string;
   /**
    * A path within the Project to add the File, default is the project root ('/'), the mount-point within the application container. Paths must begin '/'
 
@@ -826,34 +826,30 @@ export type FilePostBodyBody = {
    * @pattern ^/.+$|^/$
    */
   path?: string;
-  /**
-   * The Project UUID you're attaching to
-
-   * @pattern ^project-[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$
-   */
-  project_id: string;
+  /** Whether to compress the Dataset File as it's attached. Compression is achieved using gzip, resulting in a File ending `.gz`. By default the file will be compressed
+ */
+  compress?: boolean;
+  /** Whether the Dataset File can be modified while in the Project. By default the File cannot be modified
+ */
+  immutable?: boolean;
 };
 
 export type DatasetPutBodyBody = {
-  /**
-   * If provided the File becomes a new version of the Dataset named. If not provided this File becomes the first version of a new Dataset, whose ID is returned to you on success.
-
-   * @pattern ^(dataset-[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}|)$
-   */
-  dataset_id?: string;
   /** The MIME type of the Dataset
  */
   dataset_type: string;
-  /**
-   * The file name of the file in the Project path to load as a new Dataset.
-
-   * @minLength 1
-   * @maxLength 128
-   */
-  file_name: string;
   /** Extra variables (text) presented to the Dataset format-support container, which occurs during the upload and database processing stage. The content of the text is Dataset type specific.
  */
   format_extra_variables?: string;
+  /** If set the post-format database load action is skipped. This means the dataset is uploaded but its molecules are not entered into the Data Manager database. This can save significant time if you're just experimenting with the dataset and do not need the molecules in the database
+ */
+  skip_molecule_load?: boolean;
+  /**
+   * The Project the file belongs to
+
+   * @pattern ^project-[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$
+   */
+  project_id: string;
   /**
    * The Project path of the file.
 
@@ -863,14 +859,18 @@ export type DatasetPutBodyBody = {
    */
   path: string;
   /**
-   * The Project the file belongs to
+   * The file name of the file in the Project path to load as a new Dataset.
 
-   * @pattern ^project-[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$
+   * @minLength 1
+   * @maxLength 128
    */
-  project_id: string;
-  /** If set the post-format database load action is skipped. This means the dataset is uploaded but its molecules are not entered into the Data Manager database. This can save significant time if you're just experimenting with the dataset and do not need the molecules in the database
- */
-  skip_molecule_load?: boolean;
+  file_name: string;
+  /**
+   * If provided the File becomes a new version of the Dataset named. If not provided this File becomes the first version of a new Dataset, whose ID is returned to you on success.
+
+   * @pattern ^(dataset-[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}|)$
+   */
+  dataset_id?: string;
   /**
    * The Organisational Unit you want the Dataset to belong to. If not supplied the Project Unit is used
 
@@ -880,24 +880,34 @@ export type DatasetPutBodyBody = {
 };
 
 export type DatasetVersionMetaPostBodyBody = {
-  /** JSON string containing a list of annotations. The format of the labels should match either the Fields Descriptor or Service Execution annotation formats described in the data-manager-metadata library.
- */
-  annotations?: string;
   /** JSON string containing a list of parameter changes to the metadata. Only the description is currently allowed.
  */
   meta_properties?: string;
+  /** JSON string containing a list of annotations. The format of the labels should match either the Fields Descriptor or Service Execution annotation formats described in the data-manager-metadata library.
+ */
+  annotations?: string;
 };
 
 export type DatasetMetaPostBodyBody = {
-  /** JSON string containing a list of labels. The format of the labels should match the label annotation format described in the data-manager-metadata library.
- */
-  labels?: string;
   /** JSON string containing a list of parameter changes to the metadata. Only the description is currently allowed.
  */
   meta_properties?: string;
+  /** JSON string containing a list of labels. The format of the labels should match the label annotation format described in the data-manager-metadata library.
+ */
+  labels?: string;
 };
 
 export type DatasetPostBodyBody = {
+  dataset_file: Blob;
+  /** The MIME type of the Dataset. Values like `chemical/x-mdl-sdfile`, `chemical/x-mdl-molfile`, and `chemical/x-pdb` are permitted. See the **\/type** endpoint for a full list of types.
+ */
+  dataset_type: string;
+  /** Extra variables (text) presented to the Dataset format-support container, which occurs during the upload and database processing stage. The content of the text is Dataset type specific.
+ */
+  format_extra_variables?: string;
+  /** If set the post-format database load action is skipped. This means the dataset is uploaded but its molecules are not entered into the Data Manager database. This can save significant time if you're just experimenting with the dataset and do not need the molecules in the database
+ */
+  skip_molecule_load?: boolean;
   /**
    * An optional new filename to use for the uploaded Dataset. The Dataset will be stored using this name.
 
@@ -905,22 +915,12 @@ export type DatasetPostBodyBody = {
    * @maxLength 128
    */
   as_filename?: string;
-  dataset_file: Blob;
   /**
    * If provided the Dataset becomes a new version of the Dataset named. If not provided this Dataset becomes the first version of a new Dataset, whose ID is returned to you on success.
 
    * @pattern ^(dataset-[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}|)$
    */
   dataset_id?: string;
-  /** The MIME type of the Dataset. Values like `chemical/x-mdl-sdfile`, `chemical/x-mdl-molfile`, and `chemical/x-pdb` are permitted. See the **\/type** endpoint for a full list of types.
- */
-  dataset_type: string;
-  /** Extra variables (text) presented to the Dataset format-support container, which occurs during the upload and database processing stage. The content of the text is Dataset type specific.
- */
-  format_extra_variables?: string;
-  /** If set the post-format database load action is skipped. This means the dataset is uploaded but its molecules are not entered into the Data Manager database. This can save significant time if you're just experimenting with the dataset and do not need the molecules in the database
- */
-  skip_molecule_load?: boolean;
   /**
    * The Organisational Unit you want the Dataset to belong to
 
@@ -930,20 +930,20 @@ export type DatasetPostBodyBody = {
 };
 
 export interface AsAdditionalDataProcessingCharge {
-  collateral_cpu_hours?: string;
-  collateral_pod_count?: number;
   cost: string;
-  cost_scale_factor: string;
   cost_to_coins_er: string;
-  error_message?: string;
+  cost_scale_factor: string;
   instance_id: string;
   instance_name: string;
+  started: string;
+  stopped?: string;
+  run_time?: string;
+  error_message?: string;
   job_collection?: string;
   job_job?: string;
   job_version?: string;
-  run_time?: string;
-  started: string;
-  stopped?: string;
+  collateral_pod_count?: number;
+  collateral_cpu_hours?: string;
 }
 
 export interface UserSummary {
@@ -953,18 +953,15 @@ export interface UserSummary {
 }
 
 export interface UserDetail {
-  /** For admin accounts, whether the user is acting in an administrative capacity, i.e. acting as everyone
+  /** The user's preferred username
  */
-  become_admin?: boolean;
+  username: string;
   /** The user's filesystem user uid
  */
   f_uid?: number;
   /** The date and time the user was first seen (an ISO-8601 formatted string in UTC)
  */
   first_seen?: string;
-  /** For admin accounts, whether the user is impersonating another user
- */
-  impersonate?: string;
   /** The date the user was last seen
  */
   last_seen_date?: string;
@@ -977,17 +974,20 @@ export interface UserDetail {
   /** If the account is suspended this typically displays a reason for suspension
  */
   suspension_message?: string;
-  /** The user's preferred username
+  /** For admin accounts, whether the user is acting in an administrative capacity, i.e. acting as everyone
  */
-  username: string;
+  become_admin?: boolean;
+  /** For admin accounts, whether the user is impersonating another user
+ */
+  impersonate?: string;
 }
 
 export interface UserAccountDetail {
+  user: UserDetail;
   /** Whether the caller has admin privilege */
   caller_has_admin_privilege: boolean;
   /** The Data Manager roles the user has */
   data_manager_roles: string[];
-  user: UserDetail;
 }
 
 /**
@@ -1007,34 +1007,34 @@ export const TypeSummaryFormatterOptionsType = {
 
  */
 export type TypeSummaryFormatterOptions = {
-  /** Required properties
- */
-  required: string[];
   /** The title of the Formatter object
  */
   title: string;
   /** The Schema type (an object)
  */
   type: TypeSummaryFormatterOptionsType;
+  /** Required properties
+ */
+  required: string[];
   [key: string]: unknown;
  };
 
 export interface TypeSummary {
+  /** The File Type MIME
+ */
+  mime: string;
   /** The file's supported file extensions. Each type is limited to a limited number of extensions. For example, SDF files must have the extension `.sdf` (or `.sdf.gz`).
  */
   file_extensions: string[];
   /** The file's type's format-support container image (if set). Types without a format support image cannot be uploaded, but they might be available for use as destination type when a Dataset is added to a Project.
  */
   formatter_image?: string;
-  /** If present, contains the formatter_options that can be entered in the format_extra_variables field in the POST /dataset api.
- */
-  formatter_options?: TypeSummaryFormatterOptions;
   /** True if Datasets uploaded using this type's support loading of data into the Data Manager data-base.
  */
   formatter_supports_db_load?: boolean;
-  /** The File Type MIME
+  /** If present, contains the formatter_options that can be entered in the format_extra_variables field in the POST /dataset api.
  */
-  mime: string;
+  formatter_options?: TypeSummaryFormatterOptions;
 }
 
 /**
@@ -1055,24 +1055,24 @@ export const TaskSummaryProcessingStage = {
 } as const;
 
 export interface TaskSummary {
+  /** The Task UUID
+ */
+  id: string;
+  /** If a container image is launched by the task the image name is available here
+ */
+  image?: string;
   /** The date and time the task was created
  */
   created: string;
   /** True if the task has run to completion. If the task finished successfully the `exit_code` will be zero.
  */
   done: boolean;
+  /** True if the Task relates to an object removal, i.e. a DELETE
+ */
+  removal?: boolean;
   /** Present when `done` and zero if the task finished successfully.
  */
   exit_code?: number;
-  /** The Task UUID
- */
-  id: string;
-  /** If a container image is launched by the task the image name is available here
- */
-  image?: string;
-  /** The processing stage. When loading a Dataset it typically passes through `COPYING`, `FORMATTING` and `LOADING` stages before reaching `DONE` (or `FAILED`). A Dataset can be used (and deleted) as long as it's passed the `FORMATTING` stage
- */
-  processing_stage?: TaskSummaryProcessingStage;
   /** The purpose for the Task. Tasks are responsible for _uploading_ a Dataset, _attaching_ a Dataset as a File to a project or launching an Applications _instance_.
  */
   purpose: string;
@@ -1082,9 +1082,9 @@ export interface TaskSummary {
   /** The related object version for the Task purpose. This field will only be set if the **purpose** is `DATASET`.
  */
   purpose_version?: number;
-  /** True if the Task relates to an object removal, i.e. a DELETE
+  /** The processing stage. When loading a Dataset it typically passes through `COPYING`, `FORMATTING` and `LOADING` stages before reaching `DONE` (or `FAILED`). A Dataset can be used (and deleted) as long as it's passed the `FORMATTING` stage
  */
-  removal?: boolean;
+  processing_stage?: TaskSummaryProcessingStage;
 }
 
 /**
@@ -1104,12 +1104,12 @@ export const TaskStateState = {
 } as const;
 
 export interface TaskState {
-  /** A short message accompanying the state, generally only found when the state is `FAILURE`
- */
-  message?: string;
   /** The task state. The typical state sequence is `PENDING`, then `STARTED` and finally `SUCCESS`
  */
   state: TaskStateState;
+  /** A short message accompanying the state, generally only found when the state is `FAILURE`
+ */
+  message?: string;
   /** The date and time of the state change
  */
   time: string;
@@ -1136,15 +1136,15 @@ export const TaskEventLevel = {
 } as const;
 
 export interface TaskEvent {
-  /** The level of the message, a typical logging framework value
+  /** The event sequence number. The first event is always '1'.
  */
-  level: TaskEventLevel;
+  ordinal: number;
   /** A short message.
  */
   message: string;
-  /** The event sequence number. The first event is always '1'.
+  /** The level of the message, a typical logging framework value
  */
-  ordinal: number;
+  level: TaskEventLevel;
   /** The date and time the event was generated
  */
   time: string;
@@ -1161,16 +1161,16 @@ export const ServiceErrorSummarySeverity = {
 } as const;
 
 export interface ServiceErrorSummary {
-  acknowledged: boolean;
-  acknowledged_at?: string;
-  acknowledging_user?: string;
-  created: string;
-  error_code?: number;
-  hostname: string;
   id: number;
+  created: string;
+  summary: string;
   severity: ServiceErrorSummarySeverity;
+  hostname: string;
+  error_code?: number;
   stack_trace: string;
-  summary: string;
+  acknowledged: boolean;
+  acknowledged_at?: string;
+  acknowledging_user?: string;
 }
 
 export interface ProjectFileDetail {
@@ -1195,51 +1195,51 @@ export interface ProjectFileDetail {
   /** True if the ProjectFile cannot be modified while in the Project
  */
   immutable: boolean;
-  /** The ProjectFile MIME type
- */
-  mime_type: string;
   /** The owner of the ProjectFile. This is the user that added the Dataset (as this file) to the Project
  */
   owner: string;
   /** The Project the ProjectFile belongs to
  */
   project_id?: string;
+  /** The ProjectFile MIME type
+ */
+  mime_type: string;
 }
 
 export interface ProjectDetail {
-  /** An administrator (user_id) of the project */
-  administrators: string[];
-  created: string;
-  /** The user who created the project
- */
-  creator: string;
-  /** An editor (user_id) of the project */
-  editors: string[];
-  /** A list of managed files in the Project
- */
-  files?: ProjectFileDetail[];
   /** The project name
  */
   name: string;
-  /** An observer (user_id) of the project */
-  observers: string[];
-  /** The Account Server Organisation the Project Product Unit belongs to
+  /** The project unique reference
  */
-  organisation_id?: string;
-  /** True if the project is private. Private projects are only visible to editors.
+  project_id: string;
+  /** The user who created the project
  */
-  private: boolean;
+  creator: string;
+  created: string;
   /** The Account Server Product the Project belongs to
  */
   product_id?: string;
-  /** The project unique reference
+  /** The Account Server Organisation the Project Product Unit belongs to
  */
-  project_id: string;
-  /** The approximate size of all the files in the Project volume. This is updated regularly throughout the day and its current size may differ from what is reported here. The smallest billable unit is 1GiB (1,073,741,824 bytes). Therefore a project that contains 32KiB of files is recorded as 1GiB in size */
-  size: number;
+  organisation_id?: string;
   /** The Account Server Unit the Project Product belongs to
  */
   unit_id?: string;
+  /** True if the project is private. Private projects are only visible to editors.
+ */
+  private: boolean;
+  /** An administrator (user_id) of the project */
+  administrators: string[];
+  /** An editor (user_id) of the project */
+  editors: string[];
+  /** An observer (user_id) of the project */
+  observers: string[];
+  /** The approximate size of all the files in the Project volume. This is updated regularly throughout the day and its current size may differ from what is reported here. The smallest billable unit is 1GiB (1,073,741,824 bytes). Therefore a project that contains 32KiB of files is recorded as 1GiB in size */
+  size: number;
+  /** A list of managed files in the Project
+ */
+  files?: ProjectFileDetail[];
 }
 
 export interface JobReplacement {
@@ -1258,16 +1258,16 @@ export interface JobOrderDetail {
 }
 
 /**
- * The Job command's outputs. The JSONSchema for the command's inputs, essentially the **variables/outputs** block of the Job's JobDefinition.
+ * The Job command's options. The JSONSchema for the command's options, essentially the **variables/options** block of the Job's JobDefinition.
 
  */
-export type JobVariablesOutputs = { [key: string]: unknown };
+export type JobVariablesOptions = { [key: string]: unknown };
 
 /**
- * The Job command's options. The JSONSchema for the command's options, essentially the **variables/options** block of the Job's JobDefinition.
+ * The Job command's outputs. The JSONSchema for the command's inputs, essentially the **variables/outputs** block of the Job's JobDefinition.
 
  */
-export type JobVariablesOptions = { [key: string]: unknown };
+export type JobVariablesOutputs = { [key: string]: unknown };
 
 /**
  * The Job command's inputs. The JSONSchema for the command's inputs, essentially the **variables/inputs** block of the Job's JobDefinition.
@@ -1276,16 +1276,16 @@ export type JobVariablesOptions = { [key: string]: unknown };
 export type JobVariablesInputs = { [key: string]: unknown };
 
 export interface JobVariables {
+  order?: JobOrderDetail;
   /** The Job command's inputs. The JSONSchema for the command's inputs, essentially the **variables/inputs** block of the Job's JobDefinition.
  */
   inputs?: JobVariablesInputs;
-  /** The Job command's options. The JSONSchema for the command's options, essentially the **variables/options** block of the Job's JobDefinition.
- */
-  options?: JobVariablesOptions;
-  order?: JobOrderDetail;
   /** The Job command's outputs. The JSONSchema for the command's inputs, essentially the **variables/outputs** block of the Job's JobDefinition.
  */
   outputs?: JobVariablesOutputs;
+  /** The Job command's options. The JSONSchema for the command's options, essentially the **variables/options** block of the Job's JobDefinition.
+ */
+  options?: JobVariablesOptions;
 }
 
 /**
@@ -1302,84 +1302,84 @@ export const JobSummaryImageType = {
 } as const;
 
 export interface JobSummary {
-  /** The Job's category
+  /** The Job's unique ID
  */
-  category?: string;
+  id: number;
   /** The Job namespace
  */
   collection: string;
-  /** The description of the job in English
- */
-  description?: string;
-  /** True if disabled. Disabled Jobs cannot be executed. If disabled a reason will be found in `disabled_reason`
- */
-  disabled: boolean;
-  /** A reason why the Job has been disabled.
- */
-  disabled_reason?: string;
-  /** A suggested remedy that accompanies the "disabled_reason". This provides the client with advice on how to avoid the reason that the Job's been disabled, for reasons that can be avoided (not all are).
-
-Where there is no remedy for a given reason the remedy will be "There is no remedy".
- */
-  disabled_remedy?: string;
-  /** A URL linking to the Job documentation
+  /** The Job name, unique within a given namespace
  */
-  doc_url?: string;
-  /** The Job's unique ID
+  job: string;
+  /** The Job version
  */
-  id: number;
+  version: string;
   /** The optional container image type. Typically a single-container 'SIMPLE' (where only one container runs) or a workflow where multiple container images can be spawned (like NEXTFLOW)
  */
   image_type: JobSummaryImageType;
-  /** The Job name, unique within a given namespace
+  /** The Job's category
  */
-  job: string;
+  category?: string;
   /** The list of keywords assigned to the Job
  */
   keywords?: string[];
-  /** A list of Account Server "required_assets" that cannot be found. If assets cannot be found the user will receive a "disabled_reason" that should explain the problem.
- */
-  missing_assets?: string[];
   /** The name of the job in English
  */
   name: string;
-  replaced_by?: JobReplacements;
-  replaces?: JobReplacements;
+  /** The description of the job in English
+ */
+  description?: string;
+  /** A URL linking to the Job documentation
+ */
+  doc_url?: string;
   /** A list of Account Server assets names required to run the Job. You need access to these assets in order to run the Job
  */
   required_assets: string[];
-  /** The Job version
+  /** A list of Account Server "required_assets" that cannot be found. If assets cannot be found the user will receive a "disabled_reason" that should explain the problem.
  */
-  version: string;
+  missing_assets?: string[];
+  /** True if disabled. Disabled Jobs cannot be executed. If disabled a reason will be found in `disabled_reason`
+ */
+  disabled: boolean;
+  /** A reason why the Job has been disabled.
+ */
+  disabled_reason?: string;
+  /** A suggested remedy that accompanies the "disabled_reason". This provides the client with advice on how to avoid the reason that the Job's been disabled, for reasons that can be avoided (not all are).
+
+Where there is no remedy for a given reason the remedy will be "There is no remedy".
+ */
+  disabled_remedy?: string;
+  replaces?: JobReplacements;
+  replaced_by?: JobReplacements;
 }
 
 export interface JobManifestDetail {
+  /** The Job Manifest record ID */
+  id: number;
+  url: string;
+  header?: string;
+  params?: string;
   /** The Date (and time) the manifest was created
  */
   created: string;
   /** The (admin) user who created the manifest
  */
   creator?: string;
-  header?: string;
-  /** The Job Manifest record ID */
-  id: number;
   /** The number of job definition files loaded during the most recent successful load
  */
   job_definition_files_loaded?: number;
   /** The number of job definitions loaded during the most recent successful load
  */
   job_definitions_loaded?: number;
-  /** The status of the time the manifest was last loaded. If the load was successful this will be `SUCCESS` and `last_successful_load` will be the same as `last_load`
+  /** The Date (and time) the manifest was last loaded successfully
  */
-  last_load_status: string;
+  last_successful_load_time?: string;
   /** The Date (and time) the manifest was last loaded, successfully or otherwise. If the manifest (or any of the Job definition files it refers to) fails to load the `load_status` should provide some diagnostic feedback
  */
   last_load_time?: string;
-  /** The Date (and time) the manifest was last loaded successfully
+  /** The status of the time the manifest was last loaded. If the load was successful this will be `SUCCESS` and `last_successful_load` will be the same as `last_load`
  */
-  last_successful_load_time?: string;
-  params?: string;
-  url: string;
+  last_load_status: string;
 }
 
 export interface JobApplication {
@@ -1389,6 +1389,19 @@ export interface JobApplication {
   version: string;
 }
 
+/**
+ * The Job container image type. Typically a single-container 'SIMPLE' (where only one container runs) or a workflow where multiple container images can be spawned (like NEXTFLOW)
+
+ */
+export type InstanceSummaryJobImageType = typeof InstanceSummaryJobImageType[keyof typeof InstanceSummaryJobImageType];
+
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export const InstanceSummaryJobImageType = {
+  SIMPLE: 'SIMPLE',
+  NEXTFLOW: 'NEXTFLOW',
+} as const;
+
 /**
  * The phase of the application. This is a string, one of a limited number of values that are defined internally within the Data Manager.
 The initial phase, indicating that the Instance is preparing to run, is `PENDING`. The instance is running when the phase is `RUNNING`. `COMPLETED` indicates the Instance has finished successfully and `FAILED` when it's finished but unsuccessfully.
@@ -1409,19 +1422,6 @@ export const InstanceSummaryPhase = {
   UNKNOWN: 'UNKNOWN',
 } as const;
 
-/**
- * The Job container image type. Typically a single-container 'SIMPLE' (where only one container runs) or a workflow where multiple container images can be spawned (like NEXTFLOW)
-
- */
-export type InstanceSummaryJobImageType = typeof InstanceSummaryJobImageType[keyof typeof InstanceSummaryJobImageType];
-
-
-// eslint-disable-next-line @typescript-eslint/no-redeclare
-export const InstanceSummaryJobImageType = {
-  SIMPLE: 'SIMPLE',
-  NEXTFLOW: 'NEXTFLOW',
-} as const;
-
 /**
  * The type of Application, which can be a `job` or an `application`
 
@@ -1436,112 +1436,109 @@ export const InstanceSummaryApplicationType = {
 } as const;
 
 export interface InstanceSummary {
+  /** The application instance ID
+ */
+  id: string;
+  /** True if the instance is archived (protected from automatic deletion)
+ */
+  archived: boolean;
   /** The application ID
  */
   application_id: string;
+  /** The application version
+ */
+  application_version: string;
   /** The User's specification, provided when the application was launched
  */
   application_specification?: string;
   /** The type of Application, which can be a `job` or an `application`
  */
   application_type: InstanceSummaryApplicationType;
-  /** The application version
- */
-  application_version: string;
-  /** True if the instance is archived (protected from automatic deletion)
- */
-  archived: boolean;
   /** The code obtained from the Account Server
  */
   authorisation_code?: number;
-  /** The current running coin cost of the instance.
+  /** The phase of the application. This is a string, one of a limited number of values that are defined internally within the Data Manager.
+The initial phase, indicating that the Instance is preparing to run, is `PENDING`. The instance is running when the phase is `RUNNING`. `COMPLETED` indicates the Instance has finished successfully and `FAILED` when it's finished but unsuccessfully.
  */
-  coins?: string;
-  /** If the instance has failed, this will be the error message
+  phase: InstanceSummaryPhase;
+  /** The data and time (UTC) the instance was launched
  */
-  error_message?: string;
-  /** Set if the instance output file permissions are expected to be fixed by the Data Manager when the Instance completes.
+  launched: string;
+  /** The data and time (UTC) the instance started running
  */
-  fix_permissions?: boolean;
-  /** The application instance ID
+  started?: string;
+  /** The data and time (UTC) the instance stopped running
  */
-  id: string;
-  /** If the instance relates to a job, this will be the job collection, as defined in the original collection's job definition.
+  stopped?: string;
+  /** The time the instance has spent running in the cluster. It's a string representation of a Python `timedelta`` object, e.g. `0:12:32` for a run-time of 12 minutes and 32 seconds. The run-time must be considered as an _estimate_ until the instance has stopped and the instance is only considered to be running once `started` has been set.
  */
-  job_collection?: string;
-  /** The Job definition's unique ID
+  run_time: string;
+  /** The application instance owner, the person who launched the application and is the only user than can stop it.
  */
-  job_id?: number;
-  /** The Job container image type. Typically a single-container 'SIMPLE' (where only one container runs) or a workflow where multiple container images can be spawned (like NEXTFLOW)
+  owner: string;
+  /** The Project the instances is running in.
  */
-  job_image_type?: InstanceSummaryJobImageType;
+  project_id: string;
+  /** The Instance name
+ */
+  name: string;
+  /** For applications (not Jobs) this is the URL the application has exposed. It will only be available when the application has started.
+ */
+  url?: string;
+  /** If the instance relates to a job, this will be the job collection, as defined in the original collection's job definition.
+ */
+  job_collection?: string;
   /** If the instance relates to a job, this will be the job, as defined in the original collection's job definition.
  */
   job_job?: string;
   /** If the instance relates to a job, this will be the job's name, as defined in the original collection's job definition.
  */
   job_name?: string;
+  /** The Job definition's unique ID
+ */
+  job_id?: number;
   /** If the instance relates to a job, this will be the job's name, as defined in the original collection's job definition.
  */
   job_version?: string;
-  /** The data and time (UTC) the instance was launched
- */
-  launched: string;
-  /** The Instance name
+  /** The Job container image type. Typically a single-container 'SIMPLE' (where only one container runs) or a workflow where multiple container images can be spawned (like NEXTFLOW)
  */
-  name: string;
+  job_image_type?: InstanceSummaryJobImageType;
   /** The instance's known outputs, a JSON string defining a map of all the outputs. Typically applied only to JOB application types
  */
   outputs?: string;
-  /** The application instance owner, the person who launched the application and is the only user than can stop it.
- */
-  owner: string;
-  /** The phase of the application. This is a string, one of a limited number of values that are defined internally within the Data Manager.
-The initial phase, indicating that the Instance is preparing to run, is `PENDING`. The instance is running when the phase is `RUNNING`. `COMPLETED` indicates the Instance has finished successfully and `FAILED` when it's finished but unsuccessfully.
- */
-  phase: InstanceSummaryPhase;
-  /** The Project the instances is running in.
- */
-  project_id: string;
-  /** The time the instance has spent running in the cluster. It's a string representation of a Python `timedelta`` object, e.g. `0:12:32` for a run-time of 12 minutes and 32 seconds. The run-time must be considered as an _estimate_ until the instance has stopped and the instance is only considered to be running once `started` has been set.
- */
-  run_time: string;
-  /** The data and time (UTC) the instance started running
+  /** Set if the instance output file permissions are expected to be fixed by the Data Manager when the Instance completes.
  */
-  started?: string;
-  /** The data and time (UTC) the instance stopped running
+  fix_permissions?: boolean;
+  /** The current running coin cost of the instance.
  */
-  stopped?: string;
-  /** For applications (not Jobs) this is the URL the application has exposed. It will only be available when the application has started.
+  coins?: string;
+  /** If the instance has failed, this will be the error message
  */
-  url?: string;
+  error_message?: string;
 }
 
 export interface FileStat {
-  /** The date and time (UTC) of the last modification
- */
-  modified: string;
   /** The size of the file in bytes
  */
   size: number;
+  /** The date and time (UTC) of the last modification
+ */
+  modified: string;
 }
 
 export interface FilePathFile {
-  /** The code obtained from the Account Server
- */
-  authorisation_code?: number;
   /** The file's Dataset ID (if the file belongs to a Dataset)
  */
   dataset_id?: string;
   /** The file's Dataset version (if the file belongs to a Dataset)
  */
   dataset_version?: number;
-  /** The ID of the file (if the file belongs to a Dataset)
- */
-  file_id?: string;
   /** The file name
  */
   file_name: string;
+  /** The ID of the file (if the file belongs to a Dataset)
+ */
+  file_id?: string;
   /** Whether the file is immutable (read-only)
  */
   immutable?: boolean;
@@ -1551,14 +1548,17 @@ export interface FilePathFile {
   /** The file's owner
  */
   owner: string;
+  /** The code obtained from the Account Server
+ */
+  authorisation_code?: number;
   stat: FileStat;
 }
 
 export interface JobExchangeRateSummary {
-  collection: string;
   id: number;
-  job: string;
   rate?: string;
+  collection: string;
+  job: string;
   version: string;
 }
 
@@ -1568,13 +1568,19 @@ export interface ApplicationExchangeRateSummary {
 }
 
 export interface ExchangeRateDetail {
-  comment?: string;
-  created: string;
   id: number;
   rate: string;
+  created: string;
   user_id: string;
+  comment?: string;
 }
 
+/**
+ * The dictionary of label/value pairs
+
+ */
+export type DatasetVersionSummaryLabels = { [key: string]: unknown };
+
 /**
  * The processing stage. When loading a Dataset it typically passes through `COPYING`, `FORMATTING` and `LOADING` stages before reaching `DONE` (or `FAILED`). A Dataset can be used (and deleted) as long as it's passed the `FORMATTING` stage
 
@@ -1592,66 +1598,66 @@ export const DatasetVersionSummaryProcessingStage = {
   DONE: 'DONE',
 } as const;
 
-/**
- * The dictionary of label/value pairs
-
- */
-export type DatasetVersionSummaryLabels = { [key: string]: unknown };
-
 export interface DatasetVersionSummary {
-  /** The code obtained from the Account Server
+  /** The owner of the Dataset version
  */
-  authorisation_code?: number;
-  /** The name of the Pod handling the creation of the Dataset
+  owner?: string;
+  /** The source of the Dataset - typically the name of the Dataset that was uploaded or a URL reference
  */
-  creator_pod_name?: string;
-  /** If this is a Deleted dataset this is the date and time the dataset was deleted (an ISO-8601 formatted string in UTC)
+  source_ref: string;
+  /** The date and time the Dataset was uploaded (an ISO-8601 formatted string in UTC)
  */
-  deleted?: string;
-  /** If this is a Deleted dataset this is the username of the user that deleted the Dataset
+  published: string;
+  /** The Dataset MIME type
  */
-  deleting_user?: string;
+  type: string;
   /** The filename of the Dataset
  */
   file_name: string;
+  /** The list of Project's the Dataset is attached to
+ */
+  projects: string[];
   /** Any extra variables passed in during the upload and handed to the format-support container.
  */
   format_extra_variables?: string;
-  /** The dictionary of label/value pairs
+  /** The version of the dataset
  */
-  labels?: DatasetVersionSummaryLabels;
-  /** The owner of the Dataset version
+  version: number;
+  /** The name of the Pod handling the creation of the Dataset
  */
-  owner?: string;
+  creator_pod_name?: string;
   /** The processing stage. When loading a Dataset it typically passes through `COPYING`, `FORMATTING` and `LOADING` stages before reaching `DONE` (or `FAILED`). A Dataset can be used (and deleted) as long as it's passed the `FORMATTING` stage
  */
   processing_stage: DatasetVersionSummaryProcessingStage;
-  /** The list of Project's the Dataset is attached to
+  /** If this is a Deleted dataset this is the date and time the dataset was deleted (an ISO-8601 formatted string in UTC)
  */
-  projects: string[];
-  /** The date and time the Dataset was uploaded (an ISO-8601 formatted string in UTC)
+  deleted?: string;
+  /** If this is a Deleted dataset this is the username of the user that deleted the Dataset
  */
-  published: string;
+  deleting_user?: string;
+  /** The dictionary of label/value pairs
+ */
+  labels?: DatasetVersionSummaryLabels;
   /** The size, in bytes, of the formatted Dataset
  */
   size?: number;
-  /** The source of the Dataset - typically the name of the Dataset that was uploaded or a URL reference
- */
-  source_ref: string;
-  /** The Dataset MIME type
- */
-  type: string;
-  /** The version of the dataset
+  /** The code obtained from the Account Server
  */
-  version: number;
+  authorisation_code?: number;
 }
 
 export interface DatasetVersionProjectFile {
-  files: string[];
-  project: string;
   project_name: string;
+  project: string;
+  files: string[];
 }
 
+/**
+ * The dictionary of label/value pairs
+
+ */
+export type DatasetVersionDetailLabels = { [key: string]: unknown };
+
 /**
  * The processing stage. When loading a Dataset it typically passes through `COPYING`, `FORMATTING` and `LOADING` stages before reaching `DONE` (or `FAILED`). A Dataset can be used (and deleted) as long as it's passed the `FORMATTING` stage
 
@@ -1669,61 +1675,55 @@ export const DatasetVersionDetailProcessingStage = {
   DONE: 'DONE',
 } as const;
 
-/**
- * The dictionary of label/value pairs
-
- */
-export type DatasetVersionDetailLabels = { [key: string]: unknown };
-
 export interface DatasetVersionDetail {
-  /** The code obtained from the Account Server
+  /** The owner of the Dataset version
  */
-  authorisation_code?: number;
-  /** The name of the Pod handling the creation of the Dataset
+  owner: string;
+  /** The source of the Dataset - typically the name of the Dataset that was uploaded or a URL reference
  */
-  creator_pod_name?: string;
-  /** If this is a Deleted dataset this is the date and time the dataset was deleted (an ISO-8601 formatted string in UTC)
+  source_ref: string;
+  /** The date and time the Dataset was uploaded (an ISO-8601 formatted string in UTC)
  */
-  deleted?: string;
-  /** If this is a Deleted dataset this is the username of the user that deleted the Dataset
+  published: string;
+  /** The Dataset MIME type
  */
-  deleting_user?: string;
+  type: string;
   /** The filename of the Dataset
  */
   file_name: string;
+  /** The list of
+ */
+  project_files: DatasetVersionProjectFile[];
+  /** The list of Project's the Dataset is attached to
+ */
+  projects: string[];
   /** Any extra variables passed in during the upload and handed to the format-support container.
  */
   format_extra_variables?: string;
-  /** The dictionary of label/value pairs
+  /** The version of the dataset
  */
-  labels?: DatasetVersionDetailLabels;
-  /** The owner of the Dataset version
+  version: number;
+  /** The name of the Pod handling the creation of the Dataset
  */
-  owner: string;
+  creator_pod_name?: string;
   /** The processing stage. When loading a Dataset it typically passes through `COPYING`, `FORMATTING` and `LOADING` stages before reaching `DONE` (or `FAILED`). A Dataset can be used (and deleted) as long as it's passed the `FORMATTING` stage
  */
   processing_stage: DatasetVersionDetailProcessingStage;
-  /** The list of
+  /** If this is a Deleted dataset this is the date and time the dataset was deleted (an ISO-8601 formatted string in UTC)
  */
-  project_files: DatasetVersionProjectFile[];
-  /** The list of Project's the Dataset is attached to
+  deleted?: string;
+  /** If this is a Deleted dataset this is the username of the user that deleted the Dataset
  */
-  projects: string[];
-  /** The date and time the Dataset was uploaded (an ISO-8601 formatted string in UTC)
+  deleting_user?: string;
+  /** The dictionary of label/value pairs
  */
-  published: string;
+  labels?: DatasetVersionDetailLabels;
   /** The size, in bytes, of the formatted Dataset
  */
   size?: number;
-  /** The source of the Dataset - typically the name of the Dataset that was uploaded or a URL reference
- */
-  source_ref: string;
-  /** The Dataset MIME type
- */
-  type: string;
-  /** The version of the dataset
+  /** The code obtained from the Account Server
  */
-  version: number;
+  authorisation_code?: number;
 }
 
 export interface DatasetSummary {
@@ -1757,23 +1757,23 @@ export interface DatasetDetail {
 }
 
 export interface ApplicationSummary {
-  /** The application unique reference, the value of the Kubernetes **Custom Resource Definition** `metadata.name` property
+  /** The application name, the value of the Kubernetes **Custom Resource Definition** `spec.names.kind` property
  */
-  application_id: string;
+  kind: string;
   /** The application group
  */
   group?: string;
-  /** The application name, the value of the Kubernetes **Custom Resource Definition** `spec.names.kind` property
+  /** The application unique reference, the value of the Kubernetes **Custom Resource Definition** `metadata.name` property
  */
-  kind: string;
+  application_id: string;
   /** The application's latest version as declared in The **Custom Resource Definition**
  */
   latest_version: string;
 }
 
 export interface ApplicationImageVariant {
-  image: string;
   name: string;
+  image: string;
 }
 
 export interface ApplicationImageVariants {
@@ -1796,30 +1796,30 @@ export const ApiLogDetailMethod = {
 } as const;
 
 export interface ApiLogDetail {
+  /** The REST method used. GET methods are not logged
+ */
+  method: ApiLogDetailMethod;
+  /** The API path used, e.g. `/dataset`
+ */
+  path: string;
   /** The date/time the API call began
  */
   began: string;
-  /** A JSON string representing the in-body properties used in the call
- */
-  body?: string;
   /** The REST method approximate execution time (nS) in a humanised form, where 7969400 is presented as 7,969,400
  */
   duration_ns?: string;
-  /** Not all API calls using your user ID may have been executed by you, In cases where an administrator has executed a REST API call on your behalf, their user ID will be revealed using this property
- */
-  impersonator?: string;
-  /** The REST method used. GET methods are not logged
+  /** The HTTP response status code
  */
-  method: ApiLogDetailMethod;
+  status_code?: number;
   /** A JSON string representing the in-query properties used in the call
  */
   params?: string;
-  /** The API path used, e.g. `/dataset`
+  /** A JSON string representing the in-body properties used in the call
  */
-  path: string;
-  /** The HTTP response status code
+  body?: string;
+  /** Not all API calls using your user ID may have been executed by you, In cases where an administrator has executed a REST API call on your behalf, their user ID will be revealed using this property
  */
-  status_code?: number;
+  impersonator?: string;
 }
 
 export interface ModeGetResponse {
@@ -1842,45 +1842,45 @@ export interface UsersGetResponse {
 }
 
 export interface UserApiLogGetResponse {
+  count: number;
   /** A list of API loc call records, with the oldest record first in the list
  */
   api_log: ApiLogDetail[];
-  count: number;
 }
 
 export interface UserActivityDetailPeriod {
-  /** A list of dates where the API has been used during the monitoring period. Dates are returned if when the activity is not 100% and active dates are present. Dates are listed in reverse chronological order (i.e. the most recent first)
+  /** The period over which the activity is monitored
  */
-  active_dates?: string[];
+  monitoring_period: string;
   /** The number of days the API has been used
  */
   active_days: number;
-  /** Active days, as a percentage, over the monitoring period.
- */
-  activity: string;
   /** The number of days the API has not been used
  */
   inactive_days: number;
-  /** The period over which the activity is monitored
+  /** Active days, as a percentage, over the monitoring period.
  */
-  monitoring_period: string;
+  activity: string;
+  /** A list of dates where the API has been used during the monitoring period. Dates are returned if when the activity is not 100% and active dates are present. Dates are listed in reverse chronological order (i.e. the most recent first)
+ */
+  active_dates?: string[];
 }
 
 export interface UserActivityDetail {
-  period_a: UserActivityDetailPeriod;
-  period_b?: UserActivityDetailPeriod;
-  /** The total percentage activity since first seen
+  /** The total number of days since the user was first seen, including the day the user was first seen
  */
-  total_activity: string;
+  total_days_since_first_seen: number;
   /** The total number of days active since first seen
  */
   total_days_active: number;
   /** The total number of days inactive since first seen
  */
   total_days_inactive: number;
-  /** The total number of days since the user was first seen, including the day the user was first seen
+  /** The total percentage activity since first seen
  */
-  total_days_since_first_seen: number;
+  total_activity: string;
+  period_a: UserActivityDetailPeriod;
+  period_b?: UserActivityDetailPeriod;
 }
 
 export type UserAccountGetResponse = UserAccountDetail;
@@ -1915,24 +1915,6 @@ export const TaskGetResponsePurpose = {
 } as const;
 
 export interface TaskGetResponse {
-  /** The date and time the task was created
- */
-  created: string;
-  /** True if the task has run to completion. If the task finished successfully the `exit_code` will be zero.
- */
-  done: boolean;
-  /** A (possibly empty) list of application events. The oldest event occupies the first position in the list.
- */
-  events?: TaskEvent[];
-  /** Present when `done` and zero if the task finished successfully.
- */
-  exit_code?: number;
-  /** If a container image is launched by the task the image name is available here
- */
-  image?: string;
-  /** Is the Task Purpose is `INSTANCE`, and the instance was given a `specification` the specification can be found here. For **Applications** the specification is returned verbatim.
- */
-  instance_specification?: string;
   /** The purpose of the task. Tasks are typically executed for the purpose of Dataset processing, attaching as Project Files or Application Instance execution. Other fields in this object are only valid if the purpose is known (i.e. is not `UNKNOWN`)
  */
   purpose: TaskGetResponsePurpose;
@@ -1942,12 +1924,30 @@ export interface TaskGetResponse {
   /** The version number, relating to the object under control. For Datasets this will be the Dataset version.
  */
   purpose_version?: number;
+  /** Is the Task Purpose is `INSTANCE`, and the instance was given a `specification` the specification can be found here. For **Applications** the specification is returned verbatim.
+ */
+  instance_specification?: string;
+  /** If a container image is launched by the task the image name is available here
+ */
+  image?: string;
+  /** The date and time the task was created
+ */
+  created: string;
+  /** True if the task has run to completion. If the task finished successfully the `exit_code` will be zero.
+ */
+  done: boolean;
   /** True if the Task relates to an object removal, i.e. a DELETE
  */
   removal?: boolean;
+  /** Present when `done` and zero if the task finished successfully.
+ */
+  exit_code?: number;
   /** A (possibly empty) list of application states, the oldest state occupies the first position in the list.
  */
   states?: TaskState[];
+  /** A (possibly empty) list of application events. The oldest event occupies the first position in the list.
+ */
+  events?: TaskEvent[];
 }
 
 export interface ServiceErrorsGetResponse {
@@ -1993,76 +1993,76 @@ export const JobGetResponseImageType = {
 } as const;
 
 export interface JobGetResponse {
-  application: ApplicationSummary;
-  /** The Job's category
+  /** The Job's unique ID
  */
-  category?: string;
+  id: number;
+  application: ApplicationSummary;
   /** The Job collection
  */
   collection: string;
+  /** The Job name, unique within a given collection
+ */
+  job: string;
+  /** The Job version
+ */
+  version: string;
   /** The Job command (usually encoded)
  */
   command: string;
   /** The Job command encoding
  */
   command_encoding: string;
-  /** English description of the job
- */
-  description?: string;
-  /** True if disabled. Disabled Jobs cannot be executed. If disabled a reason will be found in `disabled_reason`
- */
-  disabled: boolean;
-  /** A reason why the Job has been disabled.
- */
-  disabled_reason?: string;
-  /** A suggested remedy that accompanies the "disabled_reason". This provides the client with advice on how to avoid the reason that the Job's been disabled, for reasons that can be avoided (not all are).
-
-Where there is no remedy for a given reason the remedy will be "There is no remedy".
- */
-  disabled_remedy?: string;
-  /** A URL linking to the Job documentation
- */
-  doc_url?: string;
-  exchange_rate: string;
-  /** The Job's unique ID
- */
-  id: number;
   /** The name of the container image that houses the job
  */
   image_name: string;
+  /** The container image tag
+ */
+  image_tag: string;
   /** The directory where the project volume will be mounted. The root path to the project files
  */
   image_project_directory: string;
-  /** The container image tag
+  /** The directory used as the container image working directory (if defined)
  */
-  image_tag: string;
+  image_working_directory?: unknown;
   /** The optional container image type. Typically a single-container `SIMPLE` (where only one container runs) or a workflow where multiple container images can be spawned (like `NEXTFLOW`)
  */
   image_type?: JobGetResponseImageType;
-  /** The directory used as the container image working directory (if defined)
+  /** The Job's descriptive name
  */
-  image_working_directory?: unknown;
-  /** The Job name, unique within a given collection
+  name: string;
+  /** English description of the job
  */
-  job: string;
+  description?: string;
+  /** A URL linking to the Job documentation
+ */
+  doc_url?: string;
+  /** The Job's category
+ */
+  category?: string;
   /** The list of keywords assigned to the Job
  */
   keywords?: string[];
+  variables?: JobVariables;
+  exchange_rate: string;
+  /** A list of Account Server assets names required to run the Job. You need access to these assets in order to run the Job
+ */
+  required_assets: string[];
   /** A list of Account Server "required_assets" that cannot be found. If assets cannot be found the user will receive a "disabled_reason" that should explain the problem.
  */
   missing_assets?: string[];
-  /** The Job's descriptive name
+  /** True if disabled. Disabled Jobs cannot be executed. If disabled a reason will be found in `disabled_reason`
  */
-  name: string;
-  replaced_by?: JobReplacements;
-  replaces?: JobReplacements;
-  /** A list of Account Server assets names required to run the Job. You need access to these assets in order to run the Job
+  disabled: boolean;
+  /** A reason why the Job has been disabled.
  */
-  required_assets: string[];
-  variables?: JobVariables;
-  /** The Job version
+  disabled_reason?: string;
+  /** A suggested remedy that accompanies the "disabled_reason". This provides the client with advice on how to avoid the reason that the Job's been disabled, for reasons that can be avoided (not all are).
+
+Where there is no remedy for a given reason the remedy will be "There is no remedy".
  */
-  version: string;
+  disabled_remedy?: string;
+  replaces?: JobReplacements;
+  replaced_by?: JobReplacements;
 }
 
 export interface InventoryProjectDetail {
@@ -2072,31 +2072,31 @@ export interface InventoryProjectDetail {
 }
 
 export interface InventoryDatasetDetail {
+  id: string;
+  version: number;
   filename: string;
-  id: string;
   unit_id: string;
-  version: number;
 }
 
+export type InventoryUserDetailDatasets = {
+  owner?: InventoryDatasetDetail[];
+  editor?: InventoryDatasetDetail[];
+};
+
 export type InventoryUserDetailProjects = {
   administrator: InventoryProjectDetail[];
   editor: InventoryProjectDetail[];
   observer: InventoryProjectDetail[];
 };
 
-export type InventoryUserDetailDatasets = {
-  editor?: InventoryDatasetDetail[];
-  owner?: InventoryDatasetDetail[];
-};
-
 export interface InventoryUserDetail {
-  activity: UserActivityDetail;
-  datasets: InventoryUserDetailDatasets;
   f_uid: number;
   first_seen: string;
   last_seen_date: string;
-  projects: InventoryUserDetailProjects;
   username: string;
+  projects: InventoryUserDetailProjects;
+  datasets: InventoryUserDetailDatasets;
+  activity: UserActivityDetail;
 }
 
 export type InstanceTaskPurpose = typeof InstanceTaskPurpose[keyof typeof InstanceTaskPurpose];
@@ -2118,6 +2118,19 @@ export interface InstancesGetResponse {
   instances: InstanceSummary[];
 }
 
+/**
+ * The Job container image type. Typically a single-container 'SIMPLE' (where only one container runs) or a workflow where multiple container images can be spawned (like NEXTFLOW)
+
+ */
+export type InstanceGetResponseJobImageType = typeof InstanceGetResponseJobImageType[keyof typeof InstanceGetResponseJobImageType];
+
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export const InstanceGetResponseJobImageType = {
+  SIMPLE: 'SIMPLE',
+  NEXTFLOW: 'NEXTFLOW',
+} as const;
+
 /**
  * The phase of the application. This is a string, one of a limited number of values that are defined internally within the Data Manager.
 The initial phase, indicating that the Instance is preparing to run, is `PENDING`. The instance is running when the phase is `RUNNING`. `COMPLETED` indicates the Instance has finished successfully and `FAILED` when it's finished but unsuccessfully.
@@ -2138,19 +2151,6 @@ export const InstanceGetResponsePhase = {
   UNKNOWN: 'UNKNOWN',
 } as const;
 
-/**
- * The Job container image type. Typically a single-container 'SIMPLE' (where only one container runs) or a workflow where multiple container images can be spawned (like NEXTFLOW)
-
- */
-export type InstanceGetResponseJobImageType = typeof InstanceGetResponseJobImageType[keyof typeof InstanceGetResponseJobImageType];
-
-
-// eslint-disable-next-line @typescript-eslint/no-redeclare
-export const InstanceGetResponseJobImageType = {
-  SIMPLE: 'SIMPLE',
-  NEXTFLOW: 'NEXTFLOW',
-} as const;
-
 /**
  * The type of Application, which can be a `job` or an `application`
 
@@ -2165,100 +2165,100 @@ export const InstanceGetResponseApplicationType = {
 } as const;
 
 export interface InstanceGetResponse {
-  /** The application ID
+  /** The Project the Instance is running in
  */
-  application_id: string;
-  /** The optional application specification. For **Applications** this is returned verbatim. For **Jobs** additional material will be found.
+  project_id: string;
+  /** The application name
  */
-  application_specification?: string;
+  name: string;
+  /** True if the instance is archived (protected from automatic deletion)
+ */
+  archived: boolean;
   /** The type of Application, which can be a `job` or an `application`
  */
   application_type: InstanceGetResponseApplicationType;
+  /** The application ID
+ */
+  application_id: string;
   /** The application version
  */
   application_version: string;
-  /** True if the instance is archived (protected from automatic deletion)
+  /** The optional application specification. For **Applications** this is returned verbatim. For **Jobs** additional material will be found.
  */
-  archived: boolean;
+  application_specification?: string;
   /** The code obtained from the Account Server
  */
   authorisation_code?: number;
-  /** The accumulated coins accrued by the running Job. Coins are calculated based on the `cost` multiplied by the `launch_exchange_rate`. This is a string representation of a Decimal value, e.g. `'16.4'`
+  /** The application owner, the person who launched the application and is the only user than can stop it.
  */
-  coins?: string;
-  /** Where available, this is the number of hours that the JOb would take if the collateral Pods had access to only one CPU core. Collateral Pods are all the pods created by the Job that are in addition to the main (controlling) Pod. A value of `'0.5'` implies the job would have run in 30 minutes on 1 core. The minimum time resolution is 0.001 (3.6 seconds).
+  owner: string;
+  /** The date and time the instance was started, an ISO-8601 format string.
  */
-  collateral_cpu_hours?: string;
-  /** Where available, the number of collateral Pods spawned by the instance, typically used by Job instances. Collateral Pods are all the pods created by the Job that are in addition to the main (controlling) Pod. For `NEXTFLOW` jobs this is a count of the number of Task pods spawned.
+  launched: string;
+  /** The date and time the instance started running in the cluster. This is typically close to the launch time but contention may mean the instance starts only when resources are available.
  */
-  collateral_pod_count?: number;
-  /** The accumulated cost accrued by the running Job. Depending on the the Job, this is either known when the Job completes or may change as the Job runs. This is a string representation of a Decimal value, e.g. `'32.8'`
+  started?: string;
+  /** The date and time the instance stopped, an ISO-8601 format string.
  */
-  cost?: string;
-  /** An optional error message, used to report underlying problems.
+  stopped?: string;
+  /** The time the instance has spent running in the cluster. It's a string representation of a Python timedelta object, e.g. `0:12:32` for a run-time of 12 minutes and 32 seconds. The run-time must be considered as an _estimate_ until the instance has stopped and the instance is only considered to be running once `started` has been set.
  */
-  error_message?: string;
-  /** Set if the instance output file permissions are expected to be fixed by the Data Manager when the Instance completes.
+  run_time: string;
+  /** The phase of the application. This is a string, one of a limited number of values that are defined internally within the Data Manager.
+The initial phase, indicating that the Instance is preparing to run, is `PENDING`. The instance is running when the phase is `RUNNING`. `COMPLETED` indicates the Instance has finished successfully and `FAILED` when it's finished but unsuccessfully.
  */
-  fix_permissions?: boolean;
-  /** Set if the instance has a valid callback token. Instances with a valid token allow users to read files form the project without authentication
+  phase: InstanceGetResponsePhase;
+  /** The application endpoint
  */
-  has_valid_callback_token: boolean;
+  url?: string;
   /** If the instance relates to a job, this will be the job collection, as defined in the original collection's job definition.
  */
   job_collection?: string;
-  /** The Job definition's unique ID
- */
-  job_id?: number;
-  /** The Job container image type. Typically a single-container 'SIMPLE' (where only one container runs) or a workflow where multiple container images can be spawned (like NEXTFLOW)
- */
-  job_image_type?: InstanceGetResponseJobImageType;
   /** If the instance relates to a job, this will be the job, as defined in the original collection's job definition.
  */
   job_job?: string;
   /** If the instance relates to a job, this will be the job's name, as defined in the original collection's job definition.
  */
   job_name?: string;
+  /** The Job definition's unique ID
+ */
+  job_id?: number;
   /** If the instance relates to a job, this will be the job's name, as defined in the original collection's job definition.
  */
   job_version?: string;
-  /** The cost exchange rate that applies to the Job at the time of launch. This is a string representation of a Decimal, e.g. `'0.5'`
- */
-  launch_exchange_rate?: string;
-  /** The date and time the instance was started, an ISO-8601 format string.
- */
-  launched: string;
-  /** The application name
+  /** The Job container image type. Typically a single-container 'SIMPLE' (where only one container runs) or a workflow where multiple container images can be spawned (like NEXTFLOW)
  */
-  name: string;
+  job_image_type?: InstanceGetResponseJobImageType;
   /** The JSON string representation of the JobDefinition's outputs
  */
   outputs?: string;
-  /** The application owner, the person who launched the application and is the only user than can stop it.
+  /** Set if the instance output file permissions are expected to be fixed by the Data Manager when the Instance completes.
  */
-  owner: string;
-  /** The phase of the application. This is a string, one of a limited number of values that are defined internally within the Data Manager.
-The initial phase, indicating that the Instance is preparing to run, is `PENDING`. The instance is running when the phase is `RUNNING`. `COMPLETED` indicates the Instance has finished successfully and `FAILED` when it's finished but unsuccessfully.
+  fix_permissions?: boolean;
+  /** A list of Tasks related to the application. Tasks are responsible for creating and deleting the instance. You should fins at least one, assuming the corresponding task has not been deleted.
  */
-  phase: InstanceGetResponsePhase;
-  /** The Project the Instance is running in
+  tasks: InstanceTask[];
+  /** Set if the instance has a valid callback token. Instances with a valid token allow users to read files form the project without authentication
  */
-  project_id: string;
-  /** The time the instance has spent running in the cluster. It's a string representation of a Python timedelta object, e.g. `0:12:32` for a run-time of 12 minutes and 32 seconds. The run-time must be considered as an _estimate_ until the instance has stopped and the instance is only considered to be running once `started` has been set.
+  has_valid_callback_token: boolean;
+  /** The cost exchange rate that applies to the Job at the time of launch. This is a string representation of a Decimal, e.g. `'0.5'`
  */
-  run_time: string;
-  /** The date and time the instance started running in the cluster. This is typically close to the launch time but contention may mean the instance starts only when resources are available.
+  launch_exchange_rate?: string;
+  /** The accumulated cost accrued by the running Job. Depending on the the Job, this is either known when the Job completes or may change as the Job runs. This is a string representation of a Decimal value, e.g. `'32.8'`
  */
-  started?: string;
-  /** The date and time the instance stopped, an ISO-8601 format string.
+  cost?: string;
+  /** The accumulated coins accrued by the running Job. Coins are calculated based on the `cost` multiplied by the `launch_exchange_rate`. This is a string representation of a Decimal value, e.g. `'16.4'`
  */
-  stopped?: string;
-  /** A list of Tasks related to the application. Tasks are responsible for creating and deleting the instance. You should fins at least one, assuming the corresponding task has not been deleted.
+  coins?: string;
+  /** Where available, this is the number of hours that the JOb would take if the collateral Pods had access to only one CPU core. Collateral Pods are all the pods created by the Job that are in addition to the main (controlling) Pod. A value of `'0.5'` implies the job would have run in 30 minutes on 1 core. The minimum time resolution is 0.001 (3.6 seconds).
  */
-  tasks: InstanceTask[];
-  /** The application endpoint
+  collateral_cpu_hours?: string;
+  /** Where available, the number of collateral Pods spawned by the instance, typically used by Job instances. Collateral Pods are all the pods created by the Job that are in addition to the main (controlling) Pod. For `NEXTFLOW` jobs this is a count of the number of Task pods spawned.
  */
-  url?: string;
+  collateral_pod_count?: number;
+  /** An optional error message, used to report underlying problems.
+ */
+  error_message?: string;
   /** A list of Project-relative annotation files.
  */
   written_job_annotation_files?: string[];
@@ -2267,35 +2267,35 @@ The initial phase, indicating that the Instance is preparing to run, is `PENDING
 export type GetExchangeRatesResponseId = number | string;
 
 export interface GetExchangeRatesResponse {
+  id: GetExchangeRatesResponseId;
   count: number;
   exchange_rates: ExchangeRateDetail[];
-  id: GetExchangeRatesResponseId;
 }
 
 export type GetAllExchangeRatesResponseExchangeRatesItem = ApplicationExchangeRateSummary | JobExchangeRateSummary;
 
 export interface GetAllExchangeRatesResponse {
   count: number;
-  exchange_rates: GetAllExchangeRatesResponseExchangeRatesItem[];
   only_undefined: boolean;
+  exchange_rates: GetAllExchangeRatesResponseExchangeRatesItem[];
 }
 
 export interface FilesGetResponse {
   /** The number of files in the Project path
  */
   count: number;
-  /** The dataset identity (not its name). A unique reference assigned automatically when uploaded
+  /** The project
  */
-  files: FilePathFile[];
+  project_id: string;
   /** The project path
  */
   path: string;
+  /** The dataset identity (not its name). A unique reference assigned automatically when uploaded
+ */
+  files: FilePathFile[];
   /** Sub-directories in the current path
  */
   paths: string[];
-  /** The project
- */
-  project_id: string;
 }
 
 export interface FilePostResponse {
@@ -2314,18 +2314,18 @@ export interface FilePostResponse {
 }
 
 export interface InstancePostResponse {
-  /** A token that can be used to access data in the project without further authentication. The token expires automatically or if the user revokes it. The token is only provided if asked for when the instance is launched.
- */
-  callback_token?: string;
-  /** The instance expanded command. Applies only to Job instances.
- */
-  command?: string;
   /** The application instance identity (not its name). Assigned automatically when created
  */
   instance_id: string;
+  /** A token that can be used to access data in the project without further authentication. The token expires automatically or if the user revokes it. The token is only provided if asked for when the instance is launched.
+ */
+  callback_token?: string;
   /** The instance task identity. The task assigned to process the instance
  */
   task_id: string;
+  /** The instance expanded command. Applies only to Job instances.
+ */
+  command?: string;
 }
 
 export interface InstanceDryRunPostResponse {
@@ -2361,49 +2361,49 @@ export const DatasetSchemaGetResponseType = {
 } as const;
 
 export interface DatasetSchemaGetResponse {
-  /** The Metadata description
- */
-  description: string;
-  /** Required properties
- */
-  required: string[];
   /** The Metadata title
  */
   title: string;
+  /** The Metadata description
+ */
+  description: string;
   /** The Metadata type (an object)
  */
   type: DatasetSchemaGetResponseType;
+  /** Required properties
+ */
+  required: string[];
   [key: string]: unknown;
  }
 
 export interface DatasetMetaGetResponse {
-  /** The Metadata's annotations
- */
-  annotations: unknown[];
-  /** The date and time of creation
- */
-  created: string;
-  /** The user who created the Metadata
+  /** The Metadata title
  */
-  created_by: string;
+  dataset_name: string;
   /** The Metadata description
  */
   dataset_id: string;
-  /** The Metadata title
- */
-  dataset_name: string;
   /** The Metadata type (an object)
  */
   description: string;
-  /** The Metadata's labels
+  /** The date and time of creation
  */
-  labels: unknown[];
+  created: string;
   /** The date and time it was last updated
  */
   last_updated: string;
+  /** The user who created the Metadata
+ */
+  created_by: string;
   /** The Metadata version
  */
   metadata_version: string;
+  /** The Metadata's annotations
+ */
+  annotations: unknown[];
+  /** The Metadata's labels
+ */
+  labels: unknown[];
   [key: string]: unknown;
  }
 
@@ -2432,37 +2432,37 @@ export interface DatasetPutPostResponse {
 }
 
 export interface ApplicationsGetResponse {
-  /** A list of installed applications, which are application-compliant Kubernetes "operators"
- */
-  applications: ApplicationSummary[];
   /** The number of known Applications
  */
   count: number;
+  /** A list of installed applications, which are application-compliant Kubernetes "operators"
+ */
+  applications: ApplicationSummary[];
 }
 
 export interface ApplicationGetResponse {
+  /** The Application's unique ID
+ */
+  id: string;
   /** The Application COST exchange rate
  */
   exchange_rate: string;
-  /** The application group
- */
-  group: string;
-  /** The Application's unique ID
+  /** The application specification template. Used when creating application instances
  */
-  id: string;
-  image_variants?: ApplicationImageVariants;
+  template: string;
   /** A list of instances of the application
  */
   instances: string[];
+  /** The application group
+ */
+  group: string;
   /** The name (kind) of the application
  */
   kind: string;
-  /** The application specification template. Used when creating application instances
- */
-  template: string;
   /** The list of available versions
  */
   versions: string[];
+  image_variants?: ApplicationImageVariants;
 }
 
 export interface AdminUsersGetResponse {
@@ -2477,15 +2477,12 @@ export interface AdminUsersGetResponse {
 export type AdminUserPutResponse = UserAccountDetail;
 
 export interface AdminJobManifestLoadPutResponse {
-  /** Errors raised during the processing of individual Job Definitions
- */
-  job_definition_failures?: string[];
-  /** Errors raised during Job Definition file processing
+  /** True if there are no errors, false otherwise
  */
-  job_definition_file_failures?: string[];
-  /** Errors raised during Manifests file processing
+  status: boolean;
+  /** The number of Job Manifests inspected
  */
-  manifest_file_failures?: string[];
+  num_manifest_files_inspected: number;
   /** The number of Job Definitions inspected
  */
   num_job_definition_files_inspected: number;
@@ -2498,12 +2495,15 @@ export interface AdminJobManifestLoadPutResponse {
   /** The number of Jobs removed
  */
   num_jobs_purged?: number;
-  /** The number of Job Manifests inspected
+  /** Errors raised during Manifests file processing
  */
-  num_manifest_files_inspected: number;
-  /** True if there are no errors, false otherwise
+  manifest_file_failures?: string[];
+  /** Errors raised during Job Definition file processing
  */
-  status: boolean;
+  job_definition_file_failures?: string[];
+  /** Errors raised during the processing of individual Job Definitions
+ */
+  job_definition_failures?: string[];
 }
 
 export interface InventoryUserGetResponse {