From 26c7b70b35ef045e99d0979c5d2a7f3c67eaa183 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Tue, 16 Apr 2024 12:51:30 +0100 Subject: [PATCH] Rebuild client API schema for pydantic 2.7.0 --- client/src/api/schema/schema.ts | 125 ++++++++++++++++++++++++++++++++ pyproject.toml | 2 +- 2 files changed, 126 insertions(+), 1 deletion(-) diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts index 8202790f40be..33daf886711e 100644 --- a/client/src/api/schema/schema.ts +++ b/client/src/api/schema/schema.ts @@ -2131,6 +2131,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "add_input"; /** Collection Type */ @@ -2166,6 +2167,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "add_step"; /** @@ -2273,6 +2275,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "History"; /** @@ -2389,6 +2392,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "History"; /** @@ -2553,6 +2557,7 @@ export interface components { * Category * @default broadcast * @constant + * @enum {string} */ category?: "broadcast"; /** @@ -2575,6 +2580,7 @@ export interface components { * Category * @default broadcast * @constant + * @enum {string} */ category?: "broadcast"; /** @@ -2617,6 +2623,7 @@ export interface components { * Category * @default broadcast * @constant + * @enum {string} */ category?: "broadcast"; content: components["schemas"]["BroadcastNotificationContent"]; @@ -2665,6 +2672,7 @@ export interface components { /** * Browsable * @constant + * @enum {boolean} */ browsable: true; /** @@ -2722,6 +2730,7 @@ export interface components { /** * Type * @constant + * @enum {string} */ type: "change_datatype"; }; @@ -2732,6 +2741,7 @@ export interface components { /** * Type * @constant + * @enum {string} */ type: "change_dbkey"; }; @@ -2945,6 +2955,7 @@ export interface components { /** * Src * @constant + * @enum {string} */ src: "composite"; /** Tags */ @@ -3045,6 +3056,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "connect"; /** Input */ @@ -3438,6 +3450,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Quota"; /** @@ -3504,6 +3517,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "User"; /** @@ -3777,6 +3791,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "DatasetCollectionElement"; /** @@ -3826,6 +3841,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "DatasetCollection"; /** @@ -3931,6 +3947,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "HistoryDatasetCollectionAssociation"; tags: components["schemas"]["TagCollection"]; @@ -3993,6 +4010,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "DatasetHash"; }; @@ -4332,6 +4350,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "DefaultQuotaAssociation"; /** @@ -4559,6 +4578,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "disconnect"; /** Input */ @@ -4745,6 +4765,7 @@ export interface components { * Source * @description The source of this dataset, which in the case of the model can only be `hdca`. * @constant + * @enum {string} */ src: "hdca"; }; @@ -4831,6 +4852,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Job"; /** @@ -5029,6 +5051,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "extract_input"; /** Input */ @@ -5042,6 +5065,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "extract_untyped_parameter"; /** Label */ @@ -5061,6 +5085,7 @@ export interface components { /** * FavoriteObjectType * @constant + * @enum {string} */ FavoriteObjectType: "tools"; /** FavoriteObjectsSummary */ @@ -5133,6 +5158,7 @@ export interface components { /** * Src * @constant + * @enum {string} */ src: "files"; /** Tags */ @@ -5148,6 +5174,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "fill_defaults"; }; @@ -5201,6 +5228,7 @@ export interface components { /** * Type * @constant + * @enum {string} */ type: "file"; /** @@ -5266,6 +5294,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "fill_step_defaults"; /** Step */ @@ -5301,6 +5330,7 @@ export interface components { /** * Type * @constant + * @enum {string} */ type: "folder"; /** @@ -5357,6 +5387,7 @@ export interface components { /** * Src * @constant + * @enum {string} */ src: "ftp_import"; /** Tags */ @@ -5386,6 +5417,7 @@ export interface components { /** * Src * @constant + * @enum {string} */ src: "ftp_import"; /** Tags */ @@ -5429,6 +5461,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Group"; /** @@ -5448,6 +5481,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "GroupQuotaAssociation"; }; @@ -5465,6 +5499,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Group"; /** name of the group */ @@ -5788,6 +5823,7 @@ export interface components { * @description TODO * @default file * @constant + * @enum {string} */ api_type?: "file"; /** Copied From Ldda Id */ @@ -5889,6 +5925,7 @@ export interface components { * History Content Type * @description This is always `dataset` for datasets. * @constant + * @enum {string} */ history_content_type: "dataset"; /** @@ -5925,6 +5962,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "HistoryDatasetAssociation"; /** @@ -5973,6 +6011,7 @@ export interface components { * @description This is always `file` for datasets. * @default file * @constant + * @enum {string} */ type?: "file"; /** @@ -6040,6 +6079,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "HistoryDatasetAssociation"; /** @@ -6094,6 +6134,7 @@ export interface components { * History Content Type * @description This is always `dataset` for datasets. * @constant + * @enum {string} */ history_content_type: "dataset"; /** @@ -6204,6 +6245,7 @@ export interface components { * History Content Type * @description This is always `dataset_collection` for dataset collections. * @constant + * @enum {string} */ history_content_type: "dataset_collection"; /** @@ -6240,6 +6282,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "HistoryDatasetCollectionAssociation"; /** @@ -6268,6 +6311,7 @@ export interface components { * @description This is always `collection` for dataset collections. * @default collection * @constant + * @enum {string} */ type?: "collection"; /** @@ -6336,6 +6380,7 @@ export interface components { * History Content Type * @description This is always `dataset_collection` for dataset collections. * @constant + * @enum {string} */ history_content_type: "dataset_collection"; /** @@ -6367,6 +6412,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "HistoryDatasetCollectionAssociation"; /** @@ -6390,6 +6436,7 @@ export interface components { * @description This is always `collection` for dataset collections. * @default collection * @constant + * @enum {string} */ type?: "collection"; /** @@ -6526,6 +6573,7 @@ export interface components { /** * Type * @constant + * @enum {string} */ type: "hdas"; }; @@ -6589,6 +6637,7 @@ export interface components { /** * Type * @constant + * @enum {string} */ type: "hdca"; }; @@ -7021,6 +7070,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "History"; /** @@ -7135,6 +7185,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "History"; /** @@ -7203,6 +7254,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model: "ImplicitCollectionJobs"; /** @@ -7246,6 +7298,7 @@ export interface components { * src * @description Indicates that the tool data should be resolved by a URI. * @constant + * @enum {string} */ src: "uri"; /** @@ -7318,6 +7371,7 @@ export interface components { /** * Type * @constant + * @enum {string} */ type: "data_collection_input"; /** When */ @@ -7360,6 +7414,7 @@ export interface components { /** * Type * @constant + * @enum {string} */ type: "data_input"; /** When */ @@ -7402,6 +7457,7 @@ export interface components { /** * Type * @constant + * @enum {string} */ type: "parameter_input"; /** When */ @@ -7499,6 +7555,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "ToolShedRepository"; /** @@ -7534,6 +7591,7 @@ export interface components { /** * Reason * @constant + * @enum {string} */ reason: "history_deleted"; }; @@ -7542,6 +7600,7 @@ export interface components { /** * Reason * @constant + * @enum {string} */ reason: "cancelled_on_review"; /** @@ -7555,6 +7614,7 @@ export interface components { /** * Reason * @constant + * @enum {string} */ reason: "user_request"; }; @@ -7568,6 +7628,7 @@ export interface components { /** * Reason * @constant + * @enum {string} */ reason: "workflow_output_not_found"; /** Workflow step id of step that caused a warning. */ @@ -7589,6 +7650,7 @@ export interface components { /** * Reason * @constant + * @enum {string} */ reason: "collection_failed"; /** @@ -7613,6 +7675,7 @@ export interface components { /** * Reason * @constant + * @enum {string} */ reason: "dataset_failed"; /** @@ -7631,6 +7694,7 @@ export interface components { /** * Reason * @constant + * @enum {string} */ reason: "expression_evaluation_failed"; /** @@ -7655,6 +7719,7 @@ export interface components { /** * Reason * @constant + * @enum {string} */ reason: "job_failed"; /** @@ -7675,6 +7740,7 @@ export interface components { /** * Reason * @constant + * @enum {string} */ reason: "output_not_found"; /** @@ -7693,6 +7759,7 @@ export interface components { /** * Reason * @constant + * @enum {string} */ reason: "when_not_boolean"; /** @@ -7755,6 +7822,7 @@ export interface components { /** * Model * @constant + * @enum {string} */ model: "WorkflowInvocation"; /** @@ -7781,6 +7849,7 @@ export interface components { * Source * @description Source model of the output dataset. * @constant + * @enum {string} */ src: "hda"; /** @@ -7801,6 +7870,7 @@ export interface components { * Source * @description Source model of the output dataset collection. * @constant + * @enum {string} */ src: "hdca"; /** @@ -7875,6 +7945,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Report"; /** @@ -7882,6 +7953,7 @@ export interface components { * @description Format of the invocation report. * @default markdown * @constant + * @enum {string} */ render_format?: "markdown"; /** @@ -7942,6 +8014,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "WorkflowInvocationStep"; /** @@ -8007,6 +8080,7 @@ export interface components { * @description The source model of the output. * @default hdca * @constant + * @enum {string} */ src?: "hdca"; }; @@ -8021,6 +8095,7 @@ export interface components { /** * Model * @constant + * @enum {string} */ model: "ImplicitCollectionJobs"; /** @@ -8047,6 +8122,7 @@ export interface components { /** * Model * @constant + * @enum {string} */ model: "Job"; /** @@ -8073,6 +8149,7 @@ export interface components { /** * Model * @constant + * @enum {string} */ model: "WorkflowInvocationStep"; /** @@ -8101,6 +8178,7 @@ export interface components { * @description The source model of the output. * @default hda * @constant + * @enum {string} */ src?: "hda"; /** @@ -8124,6 +8202,7 @@ export interface components { /** * Reason * @constant + * @enum {string} */ reason: "unexpected_failure"; /** @@ -8358,6 +8437,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Job"; /** @@ -8521,6 +8601,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Job"; /** @@ -8719,6 +8800,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model: "Job"; /** @@ -8790,6 +8872,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Job"; /** @@ -8923,6 +9006,7 @@ export interface components { /** * Type * @constant + * @enum {string} */ type: "library"; }; @@ -8963,6 +9047,7 @@ export interface components { /** * Type * @constant + * @enum {string} */ type: "library_folder"; }; @@ -9006,6 +9091,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "LibraryFolder"; /** @@ -9054,6 +9140,7 @@ export interface components { /** * LibraryFolderPermissionAction * @constant + * @enum {string} */ LibraryFolderPermissionAction: "set_permissions"; /** LibraryFolderPermissionsPayload */ @@ -9111,6 +9198,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Library"; /** @@ -9221,6 +9309,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Library"; /** @@ -9348,6 +9437,7 @@ export interface components { * * The user will always receive notifications from these categories. * @constant + * @enum {string} */ MandatoryNotificationCategory: "broadcast"; /** MaterializeDatasetInstanceAPIRequest */ @@ -9373,6 +9463,7 @@ export interface components { * Category * @default message * @constant + * @enum {string} */ category?: "message"; /** @@ -9500,6 +9591,7 @@ export interface components { * Category * @default new_shared_item * @constant + * @enum {string} */ category?: "new_shared_item"; /** @@ -9918,6 +10010,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Page"; /** @@ -9993,6 +10086,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Page"; /** @@ -10083,6 +10177,7 @@ export interface components { /** * Src * @constant + * @enum {string} */ src: "pasted"; /** Tags */ @@ -10142,6 +10237,7 @@ export interface components { /** * Src * @constant + * @enum {string} */ src: "path"; /** Tags */ @@ -10189,6 +10285,7 @@ export interface components { /** * Type * @constant + * @enum {string} */ type: "pause"; /** When */ @@ -10359,6 +10456,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Quota"; /** @@ -10411,6 +10509,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Quota"; /** @@ -10589,6 +10688,7 @@ export interface components { /** * Class * @constant + * @enum {string} */ class: "Directory"; /** @@ -10612,6 +10712,7 @@ export interface components { /** * Class * @constant + * @enum {string} */ class: "File"; /** @@ -10663,6 +10764,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "remove_unlabeled_workflow_outputs"; }; @@ -10749,6 +10851,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Role"; /** @@ -10840,6 +10943,7 @@ export interface components { /** * Src * @constant + * @enum {string} */ src: "server_dir"; /** Tags */ @@ -11271,6 +11375,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "Job"; /** @@ -11501,6 +11606,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "StoredWorkflow"; /** @@ -11611,6 +11717,7 @@ export interface components { /** * Type * @constant + * @enum {string} */ type: "subworkflow"; /** When */ @@ -11802,6 +11909,7 @@ export interface components { /** * Type * @constant + * @enum {string} */ type: "tool"; /** When */ @@ -11924,6 +12032,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "update_annotation"; /** Annotation */ @@ -11962,6 +12071,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "update_creator"; /** Creator */ @@ -12060,6 +12170,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "update_license"; /** License */ @@ -12070,6 +12181,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "update_name"; /** Name */ @@ -12088,6 +12200,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "update_output_label"; /** Output */ @@ -12141,6 +12254,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "update_report"; report: components["schemas"]["Report"]; @@ -12150,6 +12264,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "update_step_label"; /** @@ -12168,6 +12283,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "update_step_position"; position_shift: components["schemas"]["Position"]; @@ -12195,6 +12311,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "upgrade_all_steps"; }; @@ -12203,6 +12320,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "upgrade_subworkflow"; /** Content Id */ @@ -12218,6 +12336,7 @@ export interface components { /** * Action Type * @constant + * @enum {string} */ action_type: "upgrade_tool"; /** @@ -12273,6 +12392,7 @@ export interface components { /** * Src * @constant + * @enum {string} */ src: "url"; /** Tags */ @@ -12368,6 +12488,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "User"; /** @@ -12507,6 +12628,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "UserQuotaAssociation"; /** @@ -12651,6 +12773,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "WorkflowInvocation"; /** @@ -12731,6 +12854,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model_class: "WorkflowInvocation"; /** @@ -12795,6 +12919,7 @@ export interface components { * Model class * @description The name of the database model class. * @constant + * @enum {string} */ model: "WorkflowInvocation"; /** diff --git a/pyproject.toml b/pyproject.toml index 2b24828dbe6a..2fdd4b314297 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -89,7 +89,7 @@ pillow = "*" psutil = "*" pulsar-galaxy-lib = ">=0.15.0.dev0" pycryptodome = "*" -pydantic = {version = ">=2, !=2.6.0, !=2.6.1, !=2.6.2, !=2.6.3, !=2.6.4", extras = ["email"]} # https://github.com/pydantic/pydantic/issues/8760 +pydantic = {version = ">=2.7.0", extras = ["email"]} # https://github.com/pydantic/pydantic/issues/8760 PyJWT = "*" pykwalify = "*" pylibmagic = "*"