From ccc8279808e96042c79a416be8c876a686c56e6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 03:49:37 +0000 Subject: [PATCH 01/10] Bump codecov/codecov-action from 4.2.0 to 4.3.0 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.2.0 to 4.3.0. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v4.2.0...v4.3.0) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 6f45ff88..4b19097f 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -65,7 +65,7 @@ jobs: - name: Upload coverage to Codecov if: ${{ matrix.step == 'unit' }} - uses: codecov/codecov-action@v4.2.0 + uses: codecov/codecov-action@v4.3.0 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: From 74020d190685aa21d93cc7c58c56c3d879cdf493 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Wed, 10 Apr 2024 15:20:51 +0300 Subject: [PATCH 02/10] CWL v1.2.1 was released, update location --- Makefile | 2 +- cwl_utils/parser/cwl_v1_0.py | 663 ++++++++++----------------- cwl_utils/parser/cwl_v1_1.py | 757 +++++++++++-------------------- cwl_utils/parser/cwl_v1_2.py | 853 +++++++++++++---------------------- 4 files changed, 820 insertions(+), 1455 deletions(-) diff --git a/Makefile b/Makefile index 8a825ac1..c4e28c28 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,7 @@ cwl_utils/parser/cwl_v1_1.py: FORCE cwl_utils/parser/cwl_v1_2.py: FORCE schema-salad-tool --codegen python \ --codegen-parser-info "org.w3id.cwl.v1_2" \ - https://github.com/common-workflow-language/cwl-v1.2/raw/1.2.1_proposed/CommonWorkflowLanguage.yml \ + https://github.com/common-workflow-language/cwl-v1.2/raw/codegen/CommonWorkflowLanguage.yml \ > $@ regen_parsers: cwl_utils/parser/cwl_v1_*.py diff --git a/cwl_utils/parser/cwl_v1_0.py b/cwl_utils/parser/cwl_v1_0.py index 2d1c6e0d..2d49ea0c 100644 --- a/cwl_utils/parser/cwl_v1_0.py +++ b/cwl_utils/parser/cwl_v1_0.py @@ -2,6 +2,7 @@ # This file was autogenerated using schema-salad-tool --codegen=python # The code itself is released under the Apache 2.0 license and the help text is # subject to the license of the original schema. + import copy import logging import os @@ -1220,6 +1221,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -1260,8 +1262,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -1270,7 +1270,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -1311,8 +1312,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -1386,7 +1385,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -1464,6 +1463,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + fields = None if "fields" in _doc: try: fields = load_field( @@ -1504,8 +1504,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -1663,6 +1661,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -1703,8 +1702,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -1713,7 +1710,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -1829,7 +1826,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -2660,6 +2657,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -2700,8 +2698,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -2710,7 +2706,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -2751,8 +2748,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -2826,7 +2821,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -2904,6 +2899,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + fields = None if "fields" in _doc: try: fields = load_field( @@ -2944,8 +2940,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -3215,6 +3209,7 @@ def fromDoc( if _doc.get("class") != "File": raise ValidationException("tried `File` but") + location = None if "location" in _doc: try: location = load_field( @@ -3255,8 +3250,7 @@ def fromDoc( [e], ) ) - else: - location = None + path = None if "path" in _doc: try: path = load_field( @@ -3297,8 +3291,7 @@ def fromDoc( [e], ) ) - else: - path = None + basename = None if "basename" in _doc: try: basename = load_field( @@ -3339,8 +3332,7 @@ def fromDoc( [e], ) ) - else: - basename = None + dirname = None if "dirname" in _doc: try: dirname = load_field( @@ -3381,8 +3373,7 @@ def fromDoc( [e], ) ) - else: - dirname = None + nameroot = None if "nameroot" in _doc: try: nameroot = load_field( @@ -3423,8 +3414,7 @@ def fromDoc( [e], ) ) - else: - nameroot = None + nameext = None if "nameext" in _doc: try: nameext = load_field( @@ -3465,8 +3455,7 @@ def fromDoc( [e], ) ) - else: - nameext = None + checksum = None if "checksum" in _doc: try: checksum = load_field( @@ -3507,8 +3496,7 @@ def fromDoc( [e], ) ) - else: - checksum = None + size = None if "size" in _doc: try: size = load_field( @@ -3549,8 +3537,7 @@ def fromDoc( [e], ) ) - else: - size = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -3591,8 +3578,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + format = None if "format" in _doc: try: format = load_field( @@ -3633,8 +3619,7 @@ def fromDoc( [e], ) ) - else: - format = None + contents = None if "contents" in _doc: try: contents = load_field( @@ -3675,8 +3660,6 @@ def fromDoc( [e], ) ) - else: - contents = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -3909,6 +3892,7 @@ def fromDoc( if _doc.get("class") != "Directory": raise ValidationException("tried `Directory` but") + location = None if "location" in _doc: try: location = load_field( @@ -3949,8 +3933,7 @@ def fromDoc( [e], ) ) - else: - location = None + path = None if "path" in _doc: try: path = load_field( @@ -3991,8 +3974,7 @@ def fromDoc( [e], ) ) - else: - path = None + basename = None if "basename" in _doc: try: basename = load_field( @@ -4033,8 +4015,7 @@ def fromDoc( [e], ) ) - else: - basename = None + listing = None if "listing" in _doc: try: listing = load_field( @@ -4075,8 +4056,6 @@ def fromDoc( [e], ) ) - else: - listing = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -4232,6 +4211,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -4272,8 +4252,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -4282,7 +4260,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -4323,8 +4302,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -4367,6 +4344,7 @@ def fromDoc( [e], ) ) + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -4407,8 +4385,7 @@ def fromDoc( [e], ) ) - else: - inputBinding = None + label = None if "label" in _doc: try: label = load_field( @@ -4449,8 +4426,6 @@ def fromDoc( [e], ) ) - else: - label = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -4484,7 +4459,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -4582,6 +4557,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -4622,8 +4598,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -4632,7 +4606,8 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + fields = None if "fields" in _doc: try: fields = load_field( @@ -4673,8 +4648,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -4717,6 +4690,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -4757,8 +4731,6 @@ def fromDoc( [e], ) ) - else: - label = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -4791,7 +4763,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -4887,6 +4859,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -4927,8 +4900,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -4937,7 +4908,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -5022,6 +4993,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -5062,8 +5034,7 @@ def fromDoc( [e], ) ) - else: - label = None + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -5104,8 +5075,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -5139,7 +5108,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -5320,6 +5289,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -5360,8 +5330,7 @@ def fromDoc( [e], ) ) - else: - label = None + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -5402,8 +5371,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -5529,6 +5496,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -5569,8 +5537,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -5579,7 +5545,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -5620,8 +5587,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -5664,6 +5629,7 @@ def fromDoc( [e], ) ) + outputBinding = None if "outputBinding" in _doc: try: outputBinding = load_field( @@ -5704,8 +5670,6 @@ def fromDoc( [e], ) ) - else: - outputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -5738,7 +5702,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -5829,6 +5793,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + fields = None if "fields" in _doc: try: fields = load_field( @@ -5869,8 +5834,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -5913,6 +5876,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -5953,8 +5917,6 @@ def fromDoc( [e], ) ) - else: - label = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -6078,6 +6040,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -6118,8 +6081,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -6128,7 +6089,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -6213,6 +6174,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -6253,8 +6215,7 @@ def fromDoc( [e], ) ) - else: - label = None + outputBinding = None if "outputBinding" in _doc: try: outputBinding = load_field( @@ -6295,8 +6256,6 @@ def fromDoc( [e], ) ) - else: - outputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -6330,7 +6289,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -6511,6 +6470,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -6551,8 +6511,7 @@ def fromDoc( [e], ) ) - else: - label = None + outputBinding = None if "outputBinding" in _doc: try: outputBinding = load_field( @@ -6593,8 +6552,6 @@ def fromDoc( [e], ) ) - else: - outputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -6747,6 +6704,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -6787,8 +6745,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -6797,7 +6753,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing id")) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -6838,8 +6795,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -6880,8 +6836,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -6922,8 +6877,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -6964,8 +6918,7 @@ def fromDoc( [e], ) ) - else: - doc = None + format = None if "format" in _doc: try: format = load_field( @@ -7006,8 +6959,7 @@ def fromDoc( [e], ) ) - else: - format = None + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -7048,8 +7000,7 @@ def fromDoc( [e], ) ) - else: - inputBinding = None + default = None if "default" in _doc: try: default = load_field( @@ -7090,8 +7041,7 @@ def fromDoc( [e], ) ) - else: - default = None + type_ = None if "type" in _doc: try: type_ = load_field( @@ -7132,8 +7082,6 @@ def fromDoc( [e], ) ) - else: - type_ = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -7171,7 +7119,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -7321,6 +7269,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -7361,8 +7310,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -7371,7 +7318,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing id")) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -7412,8 +7360,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -7454,8 +7401,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -7496,8 +7442,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -7538,8 +7483,7 @@ def fromDoc( [e], ) ) - else: - doc = None + outputBinding = None if "outputBinding" in _doc: try: outputBinding = load_field( @@ -7580,8 +7524,7 @@ def fromDoc( [e], ) ) - else: - outputBinding = None + format = None if "format" in _doc: try: format = load_field( @@ -7622,8 +7565,6 @@ def fromDoc( [e], ) ) - else: - format = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -7659,7 +7600,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -7812,6 +7753,7 @@ def fromDoc( if _doc.get("class") != "InlineJavascriptRequirement": raise ValidationException("tried `InlineJavascriptRequirement` but") + expressionLib = None if "expressionLib" in _doc: try: expressionLib = load_field( @@ -7852,8 +7794,6 @@ def fromDoc( [e], ) ) - else: - expressionLib = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -8381,6 +8321,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -8421,8 +8362,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + position = None if "position" in _doc: try: position = load_field( @@ -8463,8 +8403,7 @@ def fromDoc( [e], ) ) - else: - position = None + prefix = None if "prefix" in _doc: try: prefix = load_field( @@ -8505,8 +8444,7 @@ def fromDoc( [e], ) ) - else: - prefix = None + separate = None if "separate" in _doc: try: separate = load_field( @@ -8547,8 +8485,7 @@ def fromDoc( [e], ) ) - else: - separate = None + itemSeparator = None if "itemSeparator" in _doc: try: itemSeparator = load_field( @@ -8589,8 +8526,7 @@ def fromDoc( [e], ) ) - else: - itemSeparator = None + valueFrom = None if "valueFrom" in _doc: try: valueFrom = load_field( @@ -8631,8 +8567,7 @@ def fromDoc( [e], ) ) - else: - valueFrom = None + shellQuote = None if "shellQuote" in _doc: try: shellQuote = load_field( @@ -8673,8 +8608,6 @@ def fromDoc( [e], ) ) - else: - shellQuote = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -8846,6 +8779,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + glob = None if "glob" in _doc: try: glob = load_field( @@ -8886,8 +8820,7 @@ def fromDoc( [e], ) ) - else: - glob = None + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -8928,8 +8861,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + outputEval = None if "outputEval" in _doc: try: outputEval = load_field( @@ -8970,8 +8902,6 @@ def fromDoc( [e], ) ) - else: - outputEval = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -9099,6 +9029,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -9139,8 +9070,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -9149,7 +9078,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -9190,8 +9120,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -9234,6 +9162,7 @@ def fromDoc( [e], ) ) + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -9274,8 +9203,7 @@ def fromDoc( [e], ) ) - else: - inputBinding = None + label = None if "label" in _doc: try: label = load_field( @@ -9316,8 +9244,6 @@ def fromDoc( [e], ) ) - else: - label = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -9351,7 +9277,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -9449,6 +9375,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -9489,8 +9416,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -9499,7 +9424,8 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + fields = None if "fields" in _doc: try: fields = load_field( @@ -9540,8 +9466,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -9584,6 +9508,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -9624,8 +9549,6 @@ def fromDoc( [e], ) ) - else: - label = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -9658,7 +9581,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -9754,6 +9677,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -9794,8 +9718,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -9804,7 +9726,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -9889,6 +9811,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -9929,8 +9852,7 @@ def fromDoc( [e], ) ) - else: - label = None + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -9971,8 +9893,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -10006,7 +9926,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -10187,6 +10107,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -10227,8 +10148,7 @@ def fromDoc( [e], ) ) - else: - label = None + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -10269,8 +10189,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -10396,6 +10314,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -10436,8 +10355,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -10446,7 +10363,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -10487,8 +10405,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -10531,6 +10447,7 @@ def fromDoc( [e], ) ) + outputBinding = None if "outputBinding" in _doc: try: outputBinding = load_field( @@ -10571,8 +10488,6 @@ def fromDoc( [e], ) ) - else: - outputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -10605,7 +10520,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -10699,6 +10614,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -10739,8 +10655,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -10749,7 +10663,8 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + fields = None if "fields" in _doc: try: fields = load_field( @@ -10790,8 +10705,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -10834,6 +10747,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -10874,8 +10788,6 @@ def fromDoc( [e], ) ) - else: - label = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -10908,7 +10820,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -11004,6 +10916,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -11044,8 +10957,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -11054,7 +10965,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -11139,6 +11050,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -11179,8 +11091,7 @@ def fromDoc( [e], ) ) - else: - label = None + outputBinding = None if "outputBinding" in _doc: try: outputBinding = load_field( @@ -11221,8 +11132,6 @@ def fromDoc( [e], ) ) - else: - outputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -11256,7 +11165,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -11437,6 +11346,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -11477,8 +11387,7 @@ def fromDoc( [e], ) ) - else: - label = None + outputBinding = None if "outputBinding" in _doc: try: outputBinding = load_field( @@ -11519,8 +11428,6 @@ def fromDoc( [e], ) ) - else: - outputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -11677,6 +11584,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -11717,8 +11625,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -11727,7 +11633,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing id")) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -11768,8 +11675,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -11810,8 +11716,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -11852,8 +11757,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -11894,8 +11798,7 @@ def fromDoc( [e], ) ) - else: - doc = None + format = None if "format" in _doc: try: format = load_field( @@ -11936,8 +11839,7 @@ def fromDoc( [e], ) ) - else: - format = None + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -11978,8 +11880,7 @@ def fromDoc( [e], ) ) - else: - inputBinding = None + default = None if "default" in _doc: try: default = load_field( @@ -12020,8 +11921,7 @@ def fromDoc( [e], ) ) - else: - default = None + type_ = None if "type" in _doc: try: type_ = load_field( @@ -12062,8 +11962,6 @@ def fromDoc( [e], ) ) - else: - type_ = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -12101,7 +11999,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -12259,6 +12157,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -12299,8 +12198,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -12309,7 +12206,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing id")) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -12350,8 +12248,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -12392,8 +12289,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -12434,8 +12330,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -12476,8 +12371,7 @@ def fromDoc( [e], ) ) - else: - doc = None + outputBinding = None if "outputBinding" in _doc: try: outputBinding = load_field( @@ -12518,8 +12412,7 @@ def fromDoc( [e], ) ) - else: - outputBinding = None + format = None if "format" in _doc: try: format = load_field( @@ -12560,8 +12453,7 @@ def fromDoc( [e], ) ) - else: - format = None + type_ = None if "type" in _doc: try: type_ = load_field( @@ -12602,8 +12494,6 @@ def fromDoc( [e], ) ) - else: - type_ = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -12640,7 +12530,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -12835,6 +12725,7 @@ def fromDoc( if _doc.get("class") != "CommandLineTool": raise ValidationException("tried `CommandLineTool` but") + id = None if "id" in _doc: try: id = load_field( @@ -12875,8 +12766,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -12885,7 +12774,7 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) try: if _doc.get("inputs") is None: raise ValidationException("missing required field `inputs`", None, []) @@ -12970,6 +12859,7 @@ def fromDoc( [e], ) ) + requirements = None if "requirements" in _doc: try: requirements = load_field( @@ -13010,8 +12900,7 @@ def fromDoc( [e], ) ) - else: - requirements = None + hints = None if "hints" in _doc: try: hints = load_field( @@ -13052,8 +12941,7 @@ def fromDoc( [e], ) ) - else: - hints = None + label = None if "label" in _doc: try: label = load_field( @@ -13094,8 +12982,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -13136,8 +13023,7 @@ def fromDoc( [e], ) ) - else: - doc = None + cwlVersion = None if "cwlVersion" in _doc: try: cwlVersion = load_field( @@ -13178,8 +13064,7 @@ def fromDoc( [e], ) ) - else: - cwlVersion = None + baseCommand = None if "baseCommand" in _doc: try: baseCommand = load_field( @@ -13220,8 +13105,7 @@ def fromDoc( [e], ) ) - else: - baseCommand = None + arguments = None if "arguments" in _doc: try: arguments = load_field( @@ -13262,8 +13146,7 @@ def fromDoc( [e], ) ) - else: - arguments = None + stdin = None if "stdin" in _doc: try: stdin = load_field( @@ -13304,8 +13187,7 @@ def fromDoc( [e], ) ) - else: - stdin = None + stderr = None if "stderr" in _doc: try: stderr = load_field( @@ -13346,8 +13228,7 @@ def fromDoc( [e], ) ) - else: - stderr = None + stdout = None if "stdout" in _doc: try: stdout = load_field( @@ -13388,8 +13269,7 @@ def fromDoc( [e], ) ) - else: - stdout = None + successCodes = None if "successCodes" in _doc: try: successCodes = load_field( @@ -13430,8 +13310,7 @@ def fromDoc( [e], ) ) - else: - successCodes = None + temporaryFailCodes = None if "temporaryFailCodes" in _doc: try: temporaryFailCodes = load_field( @@ -13472,8 +13351,7 @@ def fromDoc( [e], ) ) - else: - temporaryFailCodes = None + permanentFailCodes = None if "permanentFailCodes" in _doc: try: permanentFailCodes = load_field( @@ -13514,8 +13392,6 @@ def fromDoc( [e], ) ) - else: - permanentFailCodes = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -13560,7 +13436,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -13796,6 +13672,7 @@ def fromDoc( if _doc.get("class") != "DockerRequirement": raise ValidationException("tried `DockerRequirement` but") + dockerPull = None if "dockerPull" in _doc: try: dockerPull = load_field( @@ -13836,8 +13713,7 @@ def fromDoc( [e], ) ) - else: - dockerPull = None + dockerLoad = None if "dockerLoad" in _doc: try: dockerLoad = load_field( @@ -13878,8 +13754,7 @@ def fromDoc( [e], ) ) - else: - dockerLoad = None + dockerFile = None if "dockerFile" in _doc: try: dockerFile = load_field( @@ -13920,8 +13795,7 @@ def fromDoc( [e], ) ) - else: - dockerFile = None + dockerImport = None if "dockerImport" in _doc: try: dockerImport = load_field( @@ -13962,8 +13836,7 @@ def fromDoc( [e], ) ) - else: - dockerImport = None + dockerImageId = None if "dockerImageId" in _doc: try: dockerImageId = load_field( @@ -14004,8 +13877,7 @@ def fromDoc( [e], ) ) - else: - dockerImageId = None + dockerOutputDirectory = None if "dockerOutputDirectory" in _doc: try: dockerOutputDirectory = load_field( @@ -14046,8 +13918,6 @@ def fromDoc( [e], ) ) - else: - dockerOutputDirectory = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -14404,6 +14274,7 @@ def fromDoc( [e], ) ) + version = None if "version" in _doc: try: version = load_field( @@ -14444,8 +14315,7 @@ def fromDoc( [e], ) ) - else: - version = None + specs = None if "specs" in _doc: try: specs = load_field( @@ -14486,8 +14356,6 @@ def fromDoc( [e], ) ) - else: - specs = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -14610,6 +14478,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + entryname = None if "entryname" in _doc: try: entryname = load_field( @@ -14650,8 +14519,6 @@ def fromDoc( [e], ) ) - else: - entryname = None try: if _doc.get("entry") is None: raise ValidationException("missing required field `entry`", None, []) @@ -14694,6 +14561,7 @@ def fromDoc( [e], ) ) + writable = None if "writable" in _doc: try: writable = load_field( @@ -14734,8 +14602,6 @@ def fromDoc( [e], ) ) - else: - writable = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -15327,6 +15193,7 @@ def fromDoc( if _doc.get("class") != "ResourceRequirement": raise ValidationException("tried `ResourceRequirement` but") + coresMin = None if "coresMin" in _doc: try: coresMin = load_field( @@ -15367,8 +15234,7 @@ def fromDoc( [e], ) ) - else: - coresMin = None + coresMax = None if "coresMax" in _doc: try: coresMax = load_field( @@ -15409,8 +15275,7 @@ def fromDoc( [e], ) ) - else: - coresMax = None + ramMin = None if "ramMin" in _doc: try: ramMin = load_field( @@ -15451,8 +15316,7 @@ def fromDoc( [e], ) ) - else: - ramMin = None + ramMax = None if "ramMax" in _doc: try: ramMax = load_field( @@ -15493,8 +15357,7 @@ def fromDoc( [e], ) ) - else: - ramMax = None + tmpdirMin = None if "tmpdirMin" in _doc: try: tmpdirMin = load_field( @@ -15535,8 +15398,7 @@ def fromDoc( [e], ) ) - else: - tmpdirMin = None + tmpdirMax = None if "tmpdirMax" in _doc: try: tmpdirMax = load_field( @@ -15577,8 +15439,7 @@ def fromDoc( [e], ) ) - else: - tmpdirMax = None + outdirMin = None if "outdirMin" in _doc: try: outdirMin = load_field( @@ -15619,8 +15480,7 @@ def fromDoc( [e], ) ) - else: - outdirMin = None + outdirMax = None if "outdirMax" in _doc: try: outdirMax = load_field( @@ -15661,8 +15521,6 @@ def fromDoc( [e], ) ) - else: - outdirMax = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -15855,6 +15713,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -15895,8 +15754,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -15905,7 +15762,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing id")) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -15946,8 +15804,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -15988,8 +15845,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -16030,8 +15886,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -16072,8 +15927,7 @@ def fromDoc( [e], ) ) - else: - doc = None + outputBinding = None if "outputBinding" in _doc: try: outputBinding = load_field( @@ -16114,8 +15968,7 @@ def fromDoc( [e], ) ) - else: - outputBinding = None + format = None if "format" in _doc: try: format = load_field( @@ -16156,8 +16009,7 @@ def fromDoc( [e], ) ) - else: - format = None + type_ = None if "type" in _doc: try: type_ = load_field( @@ -16198,8 +16050,6 @@ def fromDoc( [e], ) ) - else: - type_ = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -16236,7 +16086,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -16403,6 +16253,7 @@ def fromDoc( if _doc.get("class") != "ExpressionTool": raise ValidationException("tried `ExpressionTool` but") + id = None if "id" in _doc: try: id = load_field( @@ -16443,8 +16294,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -16453,7 +16302,7 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) try: if _doc.get("inputs") is None: raise ValidationException("missing required field `inputs`", None, []) @@ -16538,6 +16387,7 @@ def fromDoc( [e], ) ) + requirements = None if "requirements" in _doc: try: requirements = load_field( @@ -16578,8 +16428,7 @@ def fromDoc( [e], ) ) - else: - requirements = None + hints = None if "hints" in _doc: try: hints = load_field( @@ -16620,8 +16469,7 @@ def fromDoc( [e], ) ) - else: - hints = None + label = None if "label" in _doc: try: label = load_field( @@ -16662,8 +16510,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -16704,8 +16551,7 @@ def fromDoc( [e], ) ) - else: - doc = None + cwlVersion = None if "cwlVersion" in _doc: try: cwlVersion = load_field( @@ -16746,8 +16592,6 @@ def fromDoc( [e], ) ) - else: - cwlVersion = None try: if _doc.get("expression") is None: raise ValidationException("missing required field `expression`", None, []) @@ -16827,7 +16671,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -16996,6 +16840,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -17036,8 +16881,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -17046,7 +16889,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing id")) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -17087,8 +16931,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -17129,8 +16972,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -17171,8 +17013,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -17213,8 +17054,7 @@ def fromDoc( [e], ) ) - else: - doc = None + outputBinding = None if "outputBinding" in _doc: try: outputBinding = load_field( @@ -17255,8 +17095,7 @@ def fromDoc( [e], ) ) - else: - outputBinding = None + format = None if "format" in _doc: try: format = load_field( @@ -17297,8 +17136,7 @@ def fromDoc( [e], ) ) - else: - format = None + outputSource = None if "outputSource" in _doc: try: outputSource = load_field( @@ -17339,8 +17177,7 @@ def fromDoc( [e], ) ) - else: - outputSource = None + linkMerge = None if "linkMerge" in _doc: try: linkMerge = load_field( @@ -17381,8 +17218,7 @@ def fromDoc( [e], ) ) - else: - linkMerge = None + type_ = None if "type" in _doc: try: type_ = load_field( @@ -17423,8 +17259,6 @@ def fromDoc( [e], ) ) - else: - type_ = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -17463,7 +17297,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -17650,6 +17484,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -17690,8 +17525,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -17700,7 +17533,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing id")) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + source = None if "source" in _doc: try: source = load_field( @@ -17741,8 +17575,7 @@ def fromDoc( [e], ) ) - else: - source = None + linkMerge = None if "linkMerge" in _doc: try: linkMerge = load_field( @@ -17783,8 +17616,7 @@ def fromDoc( [e], ) ) - else: - linkMerge = None + default = None if "default" in _doc: try: default = load_field( @@ -17825,8 +17657,7 @@ def fromDoc( [e], ) ) - else: - default = None + valueFrom = None if "valueFrom" in _doc: try: valueFrom = load_field( @@ -17867,8 +17698,6 @@ def fromDoc( [e], ) ) - else: - valueFrom = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -17902,7 +17731,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -17993,6 +17822,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -18033,8 +17863,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -18043,7 +17871,7 @@ def fromDoc( else: _errors__.append(ValidationException("missing id")) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -18071,7 +17899,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -18240,6 +18068,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -18280,8 +18109,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -18290,7 +18117,7 @@ def fromDoc( else: _errors__.append(ValidationException("missing id")) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) try: if _doc.get("in") is None: raise ValidationException("missing required field `in`", None, []) @@ -18375,6 +18202,7 @@ def fromDoc( [e], ) ) + requirements = None if "requirements" in _doc: try: requirements = load_field( @@ -18415,8 +18243,7 @@ def fromDoc( [e], ) ) - else: - requirements = None + hints = None if "hints" in _doc: try: hints = load_field( @@ -18457,8 +18284,7 @@ def fromDoc( [e], ) ) - else: - hints = None + label = None if "label" in _doc: try: label = load_field( @@ -18499,8 +18325,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -18541,8 +18366,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("run") is None: raise ValidationException("missing required field `run`", None, []) @@ -18585,6 +18408,7 @@ def fromDoc( [e], ) ) + scatter = None if "scatter" in _doc: try: scatter = load_field( @@ -18625,8 +18449,7 @@ def fromDoc( [e], ) ) - else: - scatter = None + scatterMethod = None if "scatterMethod" in _doc: try: scatterMethod = load_field( @@ -18667,8 +18490,6 @@ def fromDoc( [e], ) ) - else: - scatterMethod = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -18707,7 +18528,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -18921,6 +18742,7 @@ def fromDoc( if _doc.get("class") != "Workflow": raise ValidationException("tried `Workflow` but") + id = None if "id" in _doc: try: id = load_field( @@ -18961,8 +18783,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -18971,7 +18791,7 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) try: if _doc.get("inputs") is None: raise ValidationException("missing required field `inputs`", None, []) @@ -19056,6 +18876,7 @@ def fromDoc( [e], ) ) + requirements = None if "requirements" in _doc: try: requirements = load_field( @@ -19096,8 +18917,7 @@ def fromDoc( [e], ) ) - else: - requirements = None + hints = None if "hints" in _doc: try: hints = load_field( @@ -19138,8 +18958,7 @@ def fromDoc( [e], ) ) - else: - hints = None + label = None if "label" in _doc: try: label = load_field( @@ -19180,8 +18999,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -19222,8 +19040,7 @@ def fromDoc( [e], ) ) - else: - doc = None + cwlVersion = None if "cwlVersion" in _doc: try: cwlVersion = load_field( @@ -19264,8 +19081,6 @@ def fromDoc( [e], ) ) - else: - cwlVersion = None try: if _doc.get("steps") is None: raise ValidationException("missing required field `steps`", None, []) @@ -19345,7 +19160,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( diff --git a/cwl_utils/parser/cwl_v1_1.py b/cwl_utils/parser/cwl_v1_1.py index 62ccc222..0911c277 100644 --- a/cwl_utils/parser/cwl_v1_1.py +++ b/cwl_utils/parser/cwl_v1_1.py @@ -2,6 +2,7 @@ # This file was autogenerated using schema-salad-tool --codegen=python # The code itself is released under the Apache 2.0 license and the help text is # subject to the license of the original schema. + import copy import logging import os @@ -1220,6 +1221,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -1260,8 +1262,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -1270,7 +1270,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -1311,8 +1312,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -1386,7 +1385,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -1464,6 +1463,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + fields = None if "fields" in _doc: try: fields = load_field( @@ -1504,8 +1504,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -1663,6 +1661,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -1703,8 +1702,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -1713,7 +1710,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -1829,7 +1826,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -2660,6 +2657,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -2700,8 +2698,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -2710,7 +2706,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -2751,8 +2748,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -2826,7 +2821,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -2904,6 +2899,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + fields = None if "fields" in _doc: try: fields = load_field( @@ -2944,8 +2940,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -3215,6 +3209,7 @@ def fromDoc( if _doc.get("class") != "File": raise ValidationException("tried `File` but") + location = None if "location" in _doc: try: location = load_field( @@ -3255,8 +3250,7 @@ def fromDoc( [e], ) ) - else: - location = None + path = None if "path" in _doc: try: path = load_field( @@ -3297,8 +3291,7 @@ def fromDoc( [e], ) ) - else: - path = None + basename = None if "basename" in _doc: try: basename = load_field( @@ -3339,8 +3332,7 @@ def fromDoc( [e], ) ) - else: - basename = None + dirname = None if "dirname" in _doc: try: dirname = load_field( @@ -3381,8 +3373,7 @@ def fromDoc( [e], ) ) - else: - dirname = None + nameroot = None if "nameroot" in _doc: try: nameroot = load_field( @@ -3423,8 +3414,7 @@ def fromDoc( [e], ) ) - else: - nameroot = None + nameext = None if "nameext" in _doc: try: nameext = load_field( @@ -3465,8 +3455,7 @@ def fromDoc( [e], ) ) - else: - nameext = None + checksum = None if "checksum" in _doc: try: checksum = load_field( @@ -3507,8 +3496,7 @@ def fromDoc( [e], ) ) - else: - checksum = None + size = None if "size" in _doc: try: size = load_field( @@ -3549,8 +3537,7 @@ def fromDoc( [e], ) ) - else: - size = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -3591,8 +3578,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + format = None if "format" in _doc: try: format = load_field( @@ -3633,8 +3619,7 @@ def fromDoc( [e], ) ) - else: - format = None + contents = None if "contents" in _doc: try: contents = load_field( @@ -3675,8 +3660,6 @@ def fromDoc( [e], ) ) - else: - contents = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -3909,6 +3892,7 @@ def fromDoc( if _doc.get("class") != "Directory": raise ValidationException("tried `Directory` but") + location = None if "location" in _doc: try: location = load_field( @@ -3949,8 +3933,7 @@ def fromDoc( [e], ) ) - else: - location = None + path = None if "path" in _doc: try: path = load_field( @@ -3991,8 +3974,7 @@ def fromDoc( [e], ) ) - else: - path = None + basename = None if "basename" in _doc: try: basename = load_field( @@ -4033,8 +4015,7 @@ def fromDoc( [e], ) ) - else: - basename = None + listing = None if "listing" in _doc: try: listing = load_field( @@ -4075,8 +4056,6 @@ def fromDoc( [e], ) ) - else: - listing = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -4222,6 +4201,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -4262,8 +4242,6 @@ def fromDoc( [e], ) ) - else: - loadContents = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -4414,6 +4392,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -4454,8 +4433,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -4464,7 +4441,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -4505,8 +4483,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -4549,6 +4525,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -4589,8 +4566,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -4631,8 +4607,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -4673,8 +4648,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + format = None if "format" in _doc: try: format = load_field( @@ -4715,8 +4689,7 @@ def fromDoc( [e], ) ) - else: - format = None + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -4757,8 +4730,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -4799,8 +4771,6 @@ def fromDoc( [e], ) ) - else: - loadListing = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -4838,7 +4808,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -4975,6 +4945,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -5015,8 +4986,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -5025,7 +4994,8 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + fields = None if "fields" in _doc: try: fields = load_field( @@ -5066,8 +5036,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -5110,6 +5078,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -5150,8 +5119,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -5192,8 +5160,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -5227,7 +5193,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -5325,6 +5291,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -5365,8 +5332,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -5375,7 +5340,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -5460,6 +5425,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -5500,8 +5466,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -5542,8 +5507,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -5577,7 +5540,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -5674,6 +5637,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -5714,8 +5678,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -5724,7 +5686,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("items") is None: raise ValidationException("missing required field `items`", None, []) @@ -5809,6 +5771,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -5849,8 +5812,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -5891,8 +5853,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -5926,7 +5886,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -6039,6 +5999,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -6079,8 +6040,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -6089,7 +6048,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -6130,8 +6090,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -6174,6 +6132,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -6214,8 +6173,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -6256,8 +6214,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -6298,8 +6255,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + format = None if "format" in _doc: try: format = load_field( @@ -6340,8 +6296,6 @@ def fromDoc( [e], ) ) - else: - format = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -6377,7 +6331,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -6490,6 +6444,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -6530,8 +6485,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -6540,7 +6493,8 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + fields = None if "fields" in _doc: try: fields = load_field( @@ -6581,8 +6535,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -6625,6 +6577,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -6665,8 +6618,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -6707,8 +6659,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -6742,7 +6692,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -6840,6 +6790,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -6880,8 +6831,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -6890,7 +6839,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -6975,6 +6924,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -7015,8 +6965,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -7057,8 +7006,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -7092,7 +7039,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -7189,6 +7136,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -7229,8 +7177,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -7239,7 +7185,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("items") is None: raise ValidationException("missing required field `items`", None, []) @@ -7324,6 +7270,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -7364,8 +7311,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -7406,8 +7352,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -7441,7 +7385,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -7575,6 +7519,7 @@ def fromDoc( if _doc.get("class") != "InlineJavascriptRequirement": raise ValidationException("tried `InlineJavascriptRequirement` but") + expressionLib = None if "expressionLib" in _doc: try: expressionLib = load_field( @@ -7615,8 +7560,6 @@ def fromDoc( [e], ) ) - else: - expressionLib = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -7928,6 +7871,7 @@ def fromDoc( [e], ) ) + required = None if "required" in _doc: try: required = load_field( @@ -7968,8 +7912,6 @@ def fromDoc( [e], ) ) - else: - required = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -8087,6 +8029,7 @@ def fromDoc( if _doc.get("class") != "LoadListingRequirement": raise ValidationException("tried `LoadListingRequirement` but") + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -8127,8 +8070,6 @@ def fromDoc( [e], ) ) - else: - loadListing = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -8497,6 +8438,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -8537,8 +8479,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + position = None if "position" in _doc: try: position = load_field( @@ -8579,8 +8520,7 @@ def fromDoc( [e], ) ) - else: - position = None + prefix = None if "prefix" in _doc: try: prefix = load_field( @@ -8621,8 +8561,7 @@ def fromDoc( [e], ) ) - else: - prefix = None + separate = None if "separate" in _doc: try: separate = load_field( @@ -8663,8 +8602,7 @@ def fromDoc( [e], ) ) - else: - separate = None + itemSeparator = None if "itemSeparator" in _doc: try: itemSeparator = load_field( @@ -8705,8 +8643,7 @@ def fromDoc( [e], ) ) - else: - itemSeparator = None + valueFrom = None if "valueFrom" in _doc: try: valueFrom = load_field( @@ -8747,8 +8684,7 @@ def fromDoc( [e], ) ) - else: - valueFrom = None + shellQuote = None if "shellQuote" in _doc: try: shellQuote = load_field( @@ -8789,8 +8725,6 @@ def fromDoc( [e], ) ) - else: - shellQuote = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -8965,6 +8899,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -9005,8 +8940,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -9047,8 +8981,7 @@ def fromDoc( [e], ) ) - else: - loadListing = None + glob = None if "glob" in _doc: try: glob = load_field( @@ -9089,8 +9022,7 @@ def fromDoc( [e], ) ) - else: - glob = None + outputEval = None if "outputEval" in _doc: try: outputEval = load_field( @@ -9131,8 +9063,6 @@ def fromDoc( [e], ) ) - else: - outputEval = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -9254,6 +9184,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -9294,8 +9225,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -9438,6 +9367,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -9478,8 +9408,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -9488,7 +9416,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -9529,8 +9458,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -9573,6 +9500,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -9613,8 +9541,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -9655,8 +9582,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -9697,8 +9623,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + format = None if "format" in _doc: try: format = load_field( @@ -9739,8 +9664,7 @@ def fromDoc( [e], ) ) - else: - format = None + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -9781,8 +9705,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -9823,8 +9746,7 @@ def fromDoc( [e], ) ) - else: - loadListing = None + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -9865,8 +9787,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -9905,7 +9825,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -10064,6 +9984,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -10104,8 +10025,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -10114,7 +10033,8 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + fields = None if "fields" in _doc: try: fields = load_field( @@ -10155,8 +10075,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -10199,6 +10117,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -10239,8 +10158,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -10281,8 +10199,7 @@ def fromDoc( [e], ) ) - else: - doc = None + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -10323,8 +10240,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -10359,7 +10274,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -10476,6 +10391,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -10516,8 +10432,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -10526,7 +10440,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -10611,6 +10525,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -10651,8 +10566,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -10693,8 +10607,7 @@ def fromDoc( [e], ) ) - else: - doc = None + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -10735,8 +10648,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -10771,7 +10682,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -10882,6 +10793,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -10922,8 +10834,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -10932,7 +10842,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("items") is None: raise ValidationException("missing required field `items`", None, []) @@ -11017,6 +10927,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -11057,8 +10968,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -11099,8 +11009,7 @@ def fromDoc( [e], ) ) - else: - doc = None + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -11141,8 +11050,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -11177,7 +11084,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -11301,6 +11208,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -11341,8 +11249,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -11351,7 +11257,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -11392,8 +11299,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -11436,6 +11341,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -11476,8 +11382,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -11518,8 +11423,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -11560,8 +11464,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + format = None if "format" in _doc: try: format = load_field( @@ -11602,8 +11505,7 @@ def fromDoc( [e], ) ) - else: - format = None + outputBinding = None if "outputBinding" in _doc: try: outputBinding = load_field( @@ -11644,8 +11546,6 @@ def fromDoc( [e], ) ) - else: - outputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -11682,7 +11582,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -11811,6 +11711,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -11851,8 +11752,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -11861,7 +11760,8 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + fields = None if "fields" in _doc: try: fields = load_field( @@ -11902,8 +11802,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -11946,6 +11844,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -11986,8 +11885,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -12028,8 +11926,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -12063,7 +11959,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -12161,6 +12057,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -12201,8 +12098,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -12211,7 +12106,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -12296,6 +12191,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -12336,8 +12232,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -12378,8 +12273,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -12413,7 +12306,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -12510,6 +12403,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -12550,8 +12444,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -12560,7 +12452,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("items") is None: raise ValidationException("missing required field `items`", None, []) @@ -12645,6 +12537,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -12685,8 +12578,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -12727,8 +12619,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -12762,7 +12652,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -12895,6 +12785,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -12935,8 +12826,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -12945,7 +12834,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -12986,8 +12876,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -13028,8 +12917,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -13070,8 +12958,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -13112,8 +12999,7 @@ def fromDoc( [e], ) ) - else: - doc = None + format = None if "format" in _doc: try: format = load_field( @@ -13154,8 +13040,7 @@ def fromDoc( [e], ) ) - else: - format = None + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -13196,8 +13081,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -13238,8 +13122,7 @@ def fromDoc( [e], ) ) - else: - loadListing = None + default = None if "default" in _doc: try: default = load_field( @@ -13280,8 +13163,6 @@ def fromDoc( [e], ) ) - else: - default = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -13324,6 +13205,7 @@ def fromDoc( [e], ) ) + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -13364,8 +13246,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -13405,7 +13285,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -13579,6 +13459,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -13619,8 +13500,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -13629,7 +13508,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -13670,8 +13550,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -13712,8 +13591,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -13754,8 +13632,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -13796,8 +13673,7 @@ def fromDoc( [e], ) ) - else: - doc = None + format = None if "format" in _doc: try: format = load_field( @@ -13838,8 +13714,6 @@ def fromDoc( [e], ) ) - else: - format = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -13882,6 +13756,7 @@ def fromDoc( [e], ) ) + outputBinding = None if "outputBinding" in _doc: try: outputBinding = load_field( @@ -13922,8 +13797,6 @@ def fromDoc( [e], ) ) - else: - outputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -13960,7 +13833,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -14155,6 +14028,7 @@ def fromDoc( if _doc.get("class") != "CommandLineTool": raise ValidationException("tried `CommandLineTool` but") + id = None if "id" in _doc: try: id = load_field( @@ -14195,8 +14069,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -14205,7 +14077,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -14246,8 +14119,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -14288,8 +14160,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("inputs") is None: raise ValidationException("missing required field `inputs`", None, []) @@ -14374,6 +14244,7 @@ def fromDoc( [e], ) ) + requirements = None if "requirements" in _doc: try: requirements = load_field( @@ -14414,8 +14285,7 @@ def fromDoc( [e], ) ) - else: - requirements = None + hints = None if "hints" in _doc: try: hints = load_field( @@ -14456,8 +14326,7 @@ def fromDoc( [e], ) ) - else: - hints = None + cwlVersion = None if "cwlVersion" in _doc: try: cwlVersion = load_field( @@ -14498,8 +14367,7 @@ def fromDoc( [e], ) ) - else: - cwlVersion = None + baseCommand = None if "baseCommand" in _doc: try: baseCommand = load_field( @@ -14540,8 +14408,7 @@ def fromDoc( [e], ) ) - else: - baseCommand = None + arguments = None if "arguments" in _doc: try: arguments = load_field( @@ -14582,8 +14449,7 @@ def fromDoc( [e], ) ) - else: - arguments = None + stdin = None if "stdin" in _doc: try: stdin = load_field( @@ -14624,8 +14490,7 @@ def fromDoc( [e], ) ) - else: - stdin = None + stderr = None if "stderr" in _doc: try: stderr = load_field( @@ -14666,8 +14531,7 @@ def fromDoc( [e], ) ) - else: - stderr = None + stdout = None if "stdout" in _doc: try: stdout = load_field( @@ -14708,8 +14572,7 @@ def fromDoc( [e], ) ) - else: - stdout = None + successCodes = None if "successCodes" in _doc: try: successCodes = load_field( @@ -14750,8 +14613,7 @@ def fromDoc( [e], ) ) - else: - successCodes = None + temporaryFailCodes = None if "temporaryFailCodes" in _doc: try: temporaryFailCodes = load_field( @@ -14792,8 +14654,7 @@ def fromDoc( [e], ) ) - else: - temporaryFailCodes = None + permanentFailCodes = None if "permanentFailCodes" in _doc: try: permanentFailCodes = load_field( @@ -14834,8 +14695,6 @@ def fromDoc( [e], ) ) - else: - permanentFailCodes = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -14880,7 +14739,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -15134,6 +14993,7 @@ def fromDoc( if _doc.get("class") != "DockerRequirement": raise ValidationException("tried `DockerRequirement` but") + dockerPull = None if "dockerPull" in _doc: try: dockerPull = load_field( @@ -15174,8 +15034,7 @@ def fromDoc( [e], ) ) - else: - dockerPull = None + dockerLoad = None if "dockerLoad" in _doc: try: dockerLoad = load_field( @@ -15216,8 +15075,7 @@ def fromDoc( [e], ) ) - else: - dockerLoad = None + dockerFile = None if "dockerFile" in _doc: try: dockerFile = load_field( @@ -15258,8 +15116,7 @@ def fromDoc( [e], ) ) - else: - dockerFile = None + dockerImport = None if "dockerImport" in _doc: try: dockerImport = load_field( @@ -15300,8 +15157,7 @@ def fromDoc( [e], ) ) - else: - dockerImport = None + dockerImageId = None if "dockerImageId" in _doc: try: dockerImageId = load_field( @@ -15342,8 +15198,7 @@ def fromDoc( [e], ) ) - else: - dockerImageId = None + dockerOutputDirectory = None if "dockerOutputDirectory" in _doc: try: dockerOutputDirectory = load_field( @@ -15384,8 +15239,6 @@ def fromDoc( [e], ) ) - else: - dockerOutputDirectory = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -15742,6 +15595,7 @@ def fromDoc( [e], ) ) + version = None if "version" in _doc: try: version = load_field( @@ -15782,8 +15636,7 @@ def fromDoc( [e], ) ) - else: - version = None + specs = None if "specs" in _doc: try: specs = load_field( @@ -15824,8 +15677,6 @@ def fromDoc( [e], ) ) - else: - specs = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -15948,6 +15799,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + entryname = None if "entryname" in _doc: try: entryname = load_field( @@ -15988,8 +15840,6 @@ def fromDoc( [e], ) ) - else: - entryname = None try: if _doc.get("entry") is None: raise ValidationException("missing required field `entry`", None, []) @@ -16032,6 +15882,7 @@ def fromDoc( [e], ) ) + writable = None if "writable" in _doc: try: writable = load_field( @@ -16072,8 +15923,6 @@ def fromDoc( [e], ) ) - else: - writable = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -16665,6 +16514,7 @@ def fromDoc( if _doc.get("class") != "ResourceRequirement": raise ValidationException("tried `ResourceRequirement` but") + coresMin = None if "coresMin" in _doc: try: coresMin = load_field( @@ -16705,8 +16555,7 @@ def fromDoc( [e], ) ) - else: - coresMin = None + coresMax = None if "coresMax" in _doc: try: coresMax = load_field( @@ -16747,8 +16596,7 @@ def fromDoc( [e], ) ) - else: - coresMax = None + ramMin = None if "ramMin" in _doc: try: ramMin = load_field( @@ -16789,8 +16637,7 @@ def fromDoc( [e], ) ) - else: - ramMin = None + ramMax = None if "ramMax" in _doc: try: ramMax = load_field( @@ -16831,8 +16678,7 @@ def fromDoc( [e], ) ) - else: - ramMax = None + tmpdirMin = None if "tmpdirMin" in _doc: try: tmpdirMin = load_field( @@ -16873,8 +16719,7 @@ def fromDoc( [e], ) ) - else: - tmpdirMin = None + tmpdirMax = None if "tmpdirMax" in _doc: try: tmpdirMax = load_field( @@ -16915,8 +16760,7 @@ def fromDoc( [e], ) ) - else: - tmpdirMax = None + outdirMin = None if "outdirMin" in _doc: try: outdirMin = load_field( @@ -16957,8 +16801,7 @@ def fromDoc( [e], ) ) - else: - outdirMin = None + outdirMax = None if "outdirMax" in _doc: try: outdirMax = load_field( @@ -16999,8 +16842,6 @@ def fromDoc( [e], ) ) - else: - outdirMax = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -17880,6 +17721,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -17920,8 +17762,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -17930,7 +17770,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -17971,8 +17812,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -18013,8 +17853,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -18055,8 +17894,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -18097,8 +17935,7 @@ def fromDoc( [e], ) ) - else: - doc = None + format = None if "format" in _doc: try: format = load_field( @@ -18139,8 +17976,6 @@ def fromDoc( [e], ) ) - else: - format = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -18218,7 +18053,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -18363,6 +18198,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -18403,8 +18239,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -18413,7 +18247,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -18454,8 +18289,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -18496,8 +18330,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -18538,8 +18371,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -18580,8 +18412,7 @@ def fromDoc( [e], ) ) - else: - doc = None + format = None if "format" in _doc: try: format = load_field( @@ -18622,8 +18453,7 @@ def fromDoc( [e], ) ) - else: - format = None + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -18664,8 +18494,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -18706,8 +18535,7 @@ def fromDoc( [e], ) ) - else: - loadListing = None + default = None if "default" in _doc: try: default = load_field( @@ -18748,8 +18576,6 @@ def fromDoc( [e], ) ) - else: - default = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -18792,6 +18618,7 @@ def fromDoc( [e], ) ) + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -18832,8 +18659,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -18873,7 +18698,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -19067,6 +18892,7 @@ def fromDoc( if _doc.get("class") != "ExpressionTool": raise ValidationException("tried `ExpressionTool` but") + id = None if "id" in _doc: try: id = load_field( @@ -19107,8 +18933,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -19117,7 +18941,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -19158,8 +18983,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -19200,8 +19024,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("inputs") is None: raise ValidationException("missing required field `inputs`", None, []) @@ -19286,6 +19108,7 @@ def fromDoc( [e], ) ) + requirements = None if "requirements" in _doc: try: requirements = load_field( @@ -19326,8 +19149,7 @@ def fromDoc( [e], ) ) - else: - requirements = None + hints = None if "hints" in _doc: try: hints = load_field( @@ -19368,8 +19190,7 @@ def fromDoc( [e], ) ) - else: - hints = None + cwlVersion = None if "cwlVersion" in _doc: try: cwlVersion = load_field( @@ -19410,8 +19231,6 @@ def fromDoc( [e], ) ) - else: - cwlVersion = None try: if _doc.get("expression") is None: raise ValidationException("missing required field `expression`", None, []) @@ -19491,7 +19310,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -19657,6 +19476,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -19697,8 +19517,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -19707,7 +19525,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -19748,8 +19567,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -19790,8 +19608,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -19832,8 +19649,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -19874,8 +19690,7 @@ def fromDoc( [e], ) ) - else: - doc = None + format = None if "format" in _doc: try: format = load_field( @@ -19916,8 +19731,7 @@ def fromDoc( [e], ) ) - else: - format = None + outputSource = None if "outputSource" in _doc: try: outputSource = load_field( @@ -19958,8 +19772,7 @@ def fromDoc( [e], ) ) - else: - outputSource = None + linkMerge = None if "linkMerge" in _doc: try: linkMerge = load_field( @@ -20000,8 +19813,6 @@ def fromDoc( [e], ) ) - else: - linkMerge = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -20081,7 +19892,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -20282,6 +20093,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -20322,8 +20134,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -20332,7 +20142,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + source = None if "source" in _doc: try: source = load_field( @@ -20373,8 +20184,7 @@ def fromDoc( [e], ) ) - else: - source = None + linkMerge = None if "linkMerge" in _doc: try: linkMerge = load_field( @@ -20415,8 +20225,7 @@ def fromDoc( [e], ) ) - else: - linkMerge = None + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -20457,8 +20266,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -20499,8 +20307,7 @@ def fromDoc( [e], ) ) - else: - loadListing = None + label = None if "label" in _doc: try: label = load_field( @@ -20541,8 +20348,7 @@ def fromDoc( [e], ) ) - else: - label = None + default = None if "default" in _doc: try: default = load_field( @@ -20583,8 +20389,7 @@ def fromDoc( [e], ) ) - else: - default = None + valueFrom = None if "valueFrom" in _doc: try: valueFrom = load_field( @@ -20625,8 +20430,6 @@ def fromDoc( [e], ) ) - else: - valueFrom = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -20663,7 +20466,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -20787,6 +20590,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -20827,8 +20631,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -20837,7 +20639,7 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -20865,7 +20667,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -21034,6 +20836,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -21074,8 +20877,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -21084,7 +20885,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -21125,8 +20927,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -21167,8 +20968,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("in") is None: raise ValidationException("missing required field `in`", None, []) @@ -21253,6 +21052,7 @@ def fromDoc( [e], ) ) + requirements = None if "requirements" in _doc: try: requirements = load_field( @@ -21293,8 +21093,7 @@ def fromDoc( [e], ) ) - else: - requirements = None + hints = None if "hints" in _doc: try: hints = load_field( @@ -21335,8 +21134,6 @@ def fromDoc( [e], ) ) - else: - hints = None subscope_baseuri = expand_url('run', baseuri, loadingOptions, True) try: @@ -21381,6 +21178,7 @@ def fromDoc( [e], ) ) + scatter = None if "scatter" in _doc: try: scatter = load_field( @@ -21421,8 +21219,7 @@ def fromDoc( [e], ) ) - else: - scatter = None + scatterMethod = None if "scatterMethod" in _doc: try: scatterMethod = load_field( @@ -21463,8 +21260,6 @@ def fromDoc( [e], ) ) - else: - scatterMethod = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -21503,7 +21298,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -21717,6 +21512,7 @@ def fromDoc( if _doc.get("class") != "Workflow": raise ValidationException("tried `Workflow` but") + id = None if "id" in _doc: try: id = load_field( @@ -21757,8 +21553,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -21767,7 +21561,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -21808,8 +21603,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -21850,8 +21644,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("inputs") is None: raise ValidationException("missing required field `inputs`", None, []) @@ -21936,6 +21728,7 @@ def fromDoc( [e], ) ) + requirements = None if "requirements" in _doc: try: requirements = load_field( @@ -21976,8 +21769,7 @@ def fromDoc( [e], ) ) - else: - requirements = None + hints = None if "hints" in _doc: try: hints = load_field( @@ -22018,8 +21810,7 @@ def fromDoc( [e], ) ) - else: - hints = None + cwlVersion = None if "cwlVersion" in _doc: try: cwlVersion = load_field( @@ -22060,8 +21851,6 @@ def fromDoc( [e], ) ) - else: - cwlVersion = None try: if _doc.get("steps") is None: raise ValidationException("missing required field `steps`", None, []) @@ -22141,7 +21930,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( diff --git a/cwl_utils/parser/cwl_v1_2.py b/cwl_utils/parser/cwl_v1_2.py index fea42807..9f3e71d9 100644 --- a/cwl_utils/parser/cwl_v1_2.py +++ b/cwl_utils/parser/cwl_v1_2.py @@ -2,6 +2,7 @@ # This file was autogenerated using schema-salad-tool --codegen=python # The code itself is released under the Apache 2.0 license and the help text is # subject to the license of the original schema. + import copy import logging import os @@ -1220,6 +1221,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -1260,8 +1262,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -1270,7 +1270,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -1311,8 +1312,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -1386,7 +1385,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -1464,6 +1463,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + fields = None if "fields" in _doc: try: fields = load_field( @@ -1504,8 +1504,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -1663,6 +1661,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -1703,8 +1702,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -1713,7 +1710,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -1829,7 +1826,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -2660,6 +2657,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -2700,8 +2698,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -2710,7 +2706,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -2751,8 +2748,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -2826,7 +2821,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -2904,6 +2899,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + fields = None if "fields" in _doc: try: fields = load_field( @@ -2944,8 +2940,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -3215,6 +3209,7 @@ def fromDoc( if _doc.get("class") != "File": raise ValidationException("tried `File` but") + location = None if "location" in _doc: try: location = load_field( @@ -3255,8 +3250,7 @@ def fromDoc( [e], ) ) - else: - location = None + path = None if "path" in _doc: try: path = load_field( @@ -3297,8 +3291,7 @@ def fromDoc( [e], ) ) - else: - path = None + basename = None if "basename" in _doc: try: basename = load_field( @@ -3339,8 +3332,7 @@ def fromDoc( [e], ) ) - else: - basename = None + dirname = None if "dirname" in _doc: try: dirname = load_field( @@ -3381,8 +3373,7 @@ def fromDoc( [e], ) ) - else: - dirname = None + nameroot = None if "nameroot" in _doc: try: nameroot = load_field( @@ -3423,8 +3414,7 @@ def fromDoc( [e], ) ) - else: - nameroot = None + nameext = None if "nameext" in _doc: try: nameext = load_field( @@ -3465,8 +3455,7 @@ def fromDoc( [e], ) ) - else: - nameext = None + checksum = None if "checksum" in _doc: try: checksum = load_field( @@ -3507,8 +3496,7 @@ def fromDoc( [e], ) ) - else: - checksum = None + size = None if "size" in _doc: try: size = load_field( @@ -3549,8 +3537,7 @@ def fromDoc( [e], ) ) - else: - size = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -3591,8 +3578,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + format = None if "format" in _doc: try: format = load_field( @@ -3633,8 +3619,7 @@ def fromDoc( [e], ) ) - else: - format = None + contents = None if "contents" in _doc: try: contents = load_field( @@ -3675,8 +3660,6 @@ def fromDoc( [e], ) ) - else: - contents = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -3909,6 +3892,7 @@ def fromDoc( if _doc.get("class") != "Directory": raise ValidationException("tried `Directory` but") + location = None if "location" in _doc: try: location = load_field( @@ -3949,8 +3933,7 @@ def fromDoc( [e], ) ) - else: - location = None + path = None if "path" in _doc: try: path = load_field( @@ -3991,8 +3974,7 @@ def fromDoc( [e], ) ) - else: - path = None + basename = None if "basename" in _doc: try: basename = load_field( @@ -4033,8 +4015,7 @@ def fromDoc( [e], ) ) - else: - basename = None + listing = None if "listing" in _doc: try: listing = load_field( @@ -4075,8 +4056,6 @@ def fromDoc( [e], ) ) - else: - listing = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -4222,6 +4201,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -4262,8 +4242,6 @@ def fromDoc( [e], ) ) - else: - loadContents = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -4414,6 +4392,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -4454,8 +4433,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -4464,7 +4441,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -4505,8 +4483,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -4549,6 +4525,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -4589,8 +4566,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -4631,8 +4607,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -4673,8 +4648,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + format = None if "format" in _doc: try: format = load_field( @@ -4715,8 +4689,7 @@ def fromDoc( [e], ) ) - else: - format = None + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -4757,8 +4730,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -4799,8 +4771,6 @@ def fromDoc( [e], ) ) - else: - loadListing = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -4838,7 +4808,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -4975,6 +4945,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -5015,8 +4986,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -5025,7 +4994,8 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + fields = None if "fields" in _doc: try: fields = load_field( @@ -5066,8 +5036,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -5110,6 +5078,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -5150,8 +5119,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -5192,8 +5160,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -5227,7 +5193,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -5325,6 +5291,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -5365,8 +5332,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -5375,7 +5340,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -5460,6 +5425,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -5500,8 +5466,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -5542,8 +5507,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -5577,7 +5540,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -5674,6 +5637,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -5714,8 +5678,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -5724,7 +5686,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("items") is None: raise ValidationException("missing required field `items`", None, []) @@ -5809,6 +5771,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -5849,8 +5812,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -5891,8 +5853,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -5926,7 +5886,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -6039,6 +5999,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -6079,8 +6040,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -6089,7 +6048,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -6130,8 +6090,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -6174,6 +6132,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -6214,8 +6173,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -6256,8 +6214,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -6298,8 +6255,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + format = None if "format" in _doc: try: format = load_field( @@ -6340,8 +6296,6 @@ def fromDoc( [e], ) ) - else: - format = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -6377,7 +6331,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -6490,6 +6444,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -6530,8 +6485,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -6540,7 +6493,8 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + fields = None if "fields" in _doc: try: fields = load_field( @@ -6581,8 +6535,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -6625,6 +6577,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -6665,8 +6618,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -6707,8 +6659,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -6742,7 +6692,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -6840,6 +6790,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -6880,8 +6831,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -6890,7 +6839,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -6975,6 +6924,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -7015,8 +6965,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -7057,8 +7006,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -7092,7 +7039,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -7189,6 +7136,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -7229,8 +7177,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -7239,7 +7185,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("items") is None: raise ValidationException("missing required field `items`", None, []) @@ -7324,6 +7270,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -7364,8 +7311,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -7406,8 +7352,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -7441,7 +7385,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -7575,6 +7519,7 @@ def fromDoc( if _doc.get("class") != "InlineJavascriptRequirement": raise ValidationException("tried `InlineJavascriptRequirement` but") + expressionLib = None if "expressionLib" in _doc: try: expressionLib = load_field( @@ -7615,8 +7560,6 @@ def fromDoc( [e], ) ) - else: - expressionLib = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -7950,6 +7893,7 @@ def fromDoc( [e], ) ) + required = None if "required" in _doc: try: required = load_field( @@ -7990,8 +7934,6 @@ def fromDoc( [e], ) ) - else: - required = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -8109,6 +8051,7 @@ def fromDoc( if _doc.get("class") != "LoadListingRequirement": raise ValidationException("tried `LoadListingRequirement` but") + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -8149,8 +8092,6 @@ def fromDoc( [e], ) ) - else: - loadListing = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -8519,6 +8460,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -8559,8 +8501,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + position = None if "position" in _doc: try: position = load_field( @@ -8601,8 +8542,7 @@ def fromDoc( [e], ) ) - else: - position = None + prefix = None if "prefix" in _doc: try: prefix = load_field( @@ -8643,8 +8583,7 @@ def fromDoc( [e], ) ) - else: - prefix = None + separate = None if "separate" in _doc: try: separate = load_field( @@ -8685,8 +8624,7 @@ def fromDoc( [e], ) ) - else: - separate = None + itemSeparator = None if "itemSeparator" in _doc: try: itemSeparator = load_field( @@ -8727,8 +8665,7 @@ def fromDoc( [e], ) ) - else: - itemSeparator = None + valueFrom = None if "valueFrom" in _doc: try: valueFrom = load_field( @@ -8769,8 +8706,7 @@ def fromDoc( [e], ) ) - else: - valueFrom = None + shellQuote = None if "shellQuote" in _doc: try: shellQuote = load_field( @@ -8811,8 +8747,6 @@ def fromDoc( [e], ) ) - else: - shellQuote = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -8987,6 +8921,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -9027,8 +8962,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -9069,8 +9003,7 @@ def fromDoc( [e], ) ) - else: - loadListing = None + glob = None if "glob" in _doc: try: glob = load_field( @@ -9111,8 +9044,7 @@ def fromDoc( [e], ) ) - else: - glob = None + outputEval = None if "outputEval" in _doc: try: outputEval = load_field( @@ -9153,8 +9085,6 @@ def fromDoc( [e], ) ) - else: - outputEval = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -9276,6 +9206,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -9316,8 +9247,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -9460,6 +9389,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -9500,8 +9430,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -9510,7 +9438,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -9551,8 +9480,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -9595,6 +9522,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -9635,8 +9563,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -9677,8 +9604,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -9719,8 +9645,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + format = None if "format" in _doc: try: format = load_field( @@ -9761,8 +9686,7 @@ def fromDoc( [e], ) ) - else: - format = None + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -9803,8 +9727,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -9845,8 +9768,7 @@ def fromDoc( [e], ) ) - else: - loadListing = None + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -9887,8 +9809,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -9927,7 +9847,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -10086,6 +10006,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -10126,8 +10047,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -10136,7 +10055,8 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + fields = None if "fields" in _doc: try: fields = load_field( @@ -10177,8 +10097,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -10221,6 +10139,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -10261,8 +10180,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -10303,8 +10221,7 @@ def fromDoc( [e], ) ) - else: - doc = None + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -10345,8 +10262,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -10381,7 +10296,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -10498,6 +10413,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -10538,8 +10454,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -10548,7 +10462,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -10633,6 +10547,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -10673,8 +10588,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -10715,8 +10629,7 @@ def fromDoc( [e], ) ) - else: - doc = None + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -10757,8 +10670,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -10793,7 +10704,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -10904,6 +10815,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -10944,8 +10856,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -10954,7 +10864,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("items") is None: raise ValidationException("missing required field `items`", None, []) @@ -11039,6 +10949,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -11079,8 +10990,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -11121,8 +11031,7 @@ def fromDoc( [e], ) ) - else: - doc = None + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -11163,8 +11072,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -11199,7 +11106,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -11323,6 +11230,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -11363,8 +11271,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -11373,7 +11279,8 @@ def fromDoc( else: _errors__.append(ValidationException("missing name")) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + doc = None if "doc" in _doc: try: doc = load_field( @@ -11414,8 +11321,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -11458,6 +11363,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -11498,8 +11404,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -11540,8 +11445,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -11582,8 +11486,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + format = None if "format" in _doc: try: format = load_field( @@ -11624,8 +11527,7 @@ def fromDoc( [e], ) ) - else: - format = None + outputBinding = None if "outputBinding" in _doc: try: outputBinding = load_field( @@ -11666,8 +11568,6 @@ def fromDoc( [e], ) ) - else: - outputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -11704,7 +11604,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -11833,6 +11733,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -11873,8 +11774,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -11883,7 +11782,8 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) + fields = None if "fields" in _doc: try: fields = load_field( @@ -11924,8 +11824,6 @@ def fromDoc( [e], ) ) - else: - fields = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -11968,6 +11866,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -12008,8 +11907,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -12050,8 +11948,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -12085,7 +11981,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -12183,6 +12079,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -12223,8 +12120,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -12233,7 +12128,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("symbols") is None: raise ValidationException("missing required field `symbols`", None, []) @@ -12318,6 +12213,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -12358,8 +12254,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -12400,8 +12295,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -12435,7 +12328,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -12532,6 +12425,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + name = None if "name" in _doc: try: name = load_field( @@ -12572,8 +12466,6 @@ def fromDoc( [e], ) ) - else: - name = None __original_name_is_none = name is None if name is None: @@ -12582,7 +12474,7 @@ def fromDoc( else: name = "_:" + str(_uuid__.uuid4()) if not __original_name_is_none: - baseuri = name + baseuri = cast(str, name) try: if _doc.get("items") is None: raise ValidationException("missing required field `items`", None, []) @@ -12667,6 +12559,7 @@ def fromDoc( [e], ) ) + label = None if "label" in _doc: try: label = load_field( @@ -12707,8 +12600,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -12749,8 +12641,6 @@ def fromDoc( [e], ) ) - else: - doc = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -12784,7 +12674,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[name] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, name)] = (_constructed, loadingOptions) return _constructed def save( @@ -12917,6 +12807,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -12957,8 +12848,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -12967,7 +12856,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -13008,8 +12898,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -13050,8 +12939,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -13092,8 +12980,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -13134,8 +13021,7 @@ def fromDoc( [e], ) ) - else: - doc = None + format = None if "format" in _doc: try: format = load_field( @@ -13176,8 +13062,7 @@ def fromDoc( [e], ) ) - else: - format = None + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -13218,8 +13103,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -13260,8 +13144,7 @@ def fromDoc( [e], ) ) - else: - loadListing = None + default = None if "default" in _doc: try: default = load_field( @@ -13302,8 +13185,6 @@ def fromDoc( [e], ) ) - else: - default = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -13346,6 +13227,7 @@ def fromDoc( [e], ) ) + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -13386,8 +13268,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -13427,7 +13307,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -13601,6 +13481,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -13641,8 +13522,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -13651,7 +13530,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -13692,8 +13572,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -13734,8 +13613,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -13776,8 +13654,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -13818,8 +13695,7 @@ def fromDoc( [e], ) ) - else: - doc = None + format = None if "format" in _doc: try: format = load_field( @@ -13860,8 +13736,6 @@ def fromDoc( [e], ) ) - else: - format = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -13904,6 +13778,7 @@ def fromDoc( [e], ) ) + outputBinding = None if "outputBinding" in _doc: try: outputBinding = load_field( @@ -13944,8 +13819,6 @@ def fromDoc( [e], ) ) - else: - outputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -13982,7 +13855,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -14181,6 +14054,7 @@ def fromDoc( if _doc.get("class") != "CommandLineTool": raise ValidationException("tried `CommandLineTool` but") + id = None if "id" in _doc: try: id = load_field( @@ -14221,8 +14095,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -14231,7 +14103,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -14272,8 +14145,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -14314,8 +14186,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("inputs") is None: raise ValidationException("missing required field `inputs`", None, []) @@ -14400,6 +14270,7 @@ def fromDoc( [e], ) ) + requirements = None if "requirements" in _doc: try: requirements = load_field( @@ -14440,8 +14311,7 @@ def fromDoc( [e], ) ) - else: - requirements = None + hints = None if "hints" in _doc: try: hints = load_field( @@ -14482,8 +14352,7 @@ def fromDoc( [e], ) ) - else: - hints = None + cwlVersion = None if "cwlVersion" in _doc: try: cwlVersion = load_field( @@ -14524,8 +14393,7 @@ def fromDoc( [e], ) ) - else: - cwlVersion = None + intent = None if "intent" in _doc: try: intent = load_field( @@ -14566,8 +14434,7 @@ def fromDoc( [e], ) ) - else: - intent = None + baseCommand = None if "baseCommand" in _doc: try: baseCommand = load_field( @@ -14608,8 +14475,7 @@ def fromDoc( [e], ) ) - else: - baseCommand = None + arguments = None if "arguments" in _doc: try: arguments = load_field( @@ -14650,8 +14516,7 @@ def fromDoc( [e], ) ) - else: - arguments = None + stdin = None if "stdin" in _doc: try: stdin = load_field( @@ -14692,8 +14557,7 @@ def fromDoc( [e], ) ) - else: - stdin = None + stderr = None if "stderr" in _doc: try: stderr = load_field( @@ -14734,8 +14598,7 @@ def fromDoc( [e], ) ) - else: - stderr = None + stdout = None if "stdout" in _doc: try: stdout = load_field( @@ -14776,8 +14639,7 @@ def fromDoc( [e], ) ) - else: - stdout = None + successCodes = None if "successCodes" in _doc: try: successCodes = load_field( @@ -14818,8 +14680,7 @@ def fromDoc( [e], ) ) - else: - successCodes = None + temporaryFailCodes = None if "temporaryFailCodes" in _doc: try: temporaryFailCodes = load_field( @@ -14860,8 +14721,7 @@ def fromDoc( [e], ) ) - else: - temporaryFailCodes = None + permanentFailCodes = None if "permanentFailCodes" in _doc: try: permanentFailCodes = load_field( @@ -14902,8 +14762,6 @@ def fromDoc( [e], ) ) - else: - permanentFailCodes = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -14949,7 +14807,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -15207,6 +15065,7 @@ def fromDoc( if _doc.get("class") != "DockerRequirement": raise ValidationException("tried `DockerRequirement` but") + dockerPull = None if "dockerPull" in _doc: try: dockerPull = load_field( @@ -15247,8 +15106,7 @@ def fromDoc( [e], ) ) - else: - dockerPull = None + dockerLoad = None if "dockerLoad" in _doc: try: dockerLoad = load_field( @@ -15289,8 +15147,7 @@ def fromDoc( [e], ) ) - else: - dockerLoad = None + dockerFile = None if "dockerFile" in _doc: try: dockerFile = load_field( @@ -15331,8 +15188,7 @@ def fromDoc( [e], ) ) - else: - dockerFile = None + dockerImport = None if "dockerImport" in _doc: try: dockerImport = load_field( @@ -15373,8 +15229,7 @@ def fromDoc( [e], ) ) - else: - dockerImport = None + dockerImageId = None if "dockerImageId" in _doc: try: dockerImageId = load_field( @@ -15415,8 +15270,7 @@ def fromDoc( [e], ) ) - else: - dockerImageId = None + dockerOutputDirectory = None if "dockerOutputDirectory" in _doc: try: dockerOutputDirectory = load_field( @@ -15457,8 +15311,6 @@ def fromDoc( [e], ) ) - else: - dockerOutputDirectory = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -15815,6 +15667,7 @@ def fromDoc( [e], ) ) + version = None if "version" in _doc: try: version = load_field( @@ -15855,8 +15708,7 @@ def fromDoc( [e], ) ) - else: - version = None + specs = None if "specs" in _doc: try: specs = load_field( @@ -15897,8 +15749,6 @@ def fromDoc( [e], ) ) - else: - specs = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -16025,6 +15875,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + entryname = None if "entryname" in _doc: try: entryname = load_field( @@ -16065,8 +15916,6 @@ def fromDoc( [e], ) ) - else: - entryname = None try: if _doc.get("entry") is None: raise ValidationException("missing required field `entry`", None, []) @@ -16109,6 +15958,7 @@ def fromDoc( [e], ) ) + writable = None if "writable" in _doc: try: writable = load_field( @@ -16149,8 +15999,6 @@ def fromDoc( [e], ) ) - else: - writable = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -16748,6 +16596,7 @@ def fromDoc( if _doc.get("class") != "ResourceRequirement": raise ValidationException("tried `ResourceRequirement` but") + coresMin = None if "coresMin" in _doc: try: coresMin = load_field( @@ -16788,8 +16637,7 @@ def fromDoc( [e], ) ) - else: - coresMin = None + coresMax = None if "coresMax" in _doc: try: coresMax = load_field( @@ -16830,8 +16678,7 @@ def fromDoc( [e], ) ) - else: - coresMax = None + ramMin = None if "ramMin" in _doc: try: ramMin = load_field( @@ -16872,8 +16719,7 @@ def fromDoc( [e], ) ) - else: - ramMin = None + ramMax = None if "ramMax" in _doc: try: ramMax = load_field( @@ -16914,8 +16760,7 @@ def fromDoc( [e], ) ) - else: - ramMax = None + tmpdirMin = None if "tmpdirMin" in _doc: try: tmpdirMin = load_field( @@ -16956,8 +16801,7 @@ def fromDoc( [e], ) ) - else: - tmpdirMin = None + tmpdirMax = None if "tmpdirMax" in _doc: try: tmpdirMax = load_field( @@ -16998,8 +16842,7 @@ def fromDoc( [e], ) ) - else: - tmpdirMax = None + outdirMin = None if "outdirMin" in _doc: try: outdirMin = load_field( @@ -17040,8 +16883,7 @@ def fromDoc( [e], ) ) - else: - outdirMin = None + outdirMax = None if "outdirMax" in _doc: try: outdirMax = load_field( @@ -17082,8 +16924,6 @@ def fromDoc( [e], ) ) - else: - outdirMax = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -17963,6 +17803,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -18003,8 +17844,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -18013,7 +17852,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -18054,8 +17894,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -18096,8 +17935,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -18138,8 +17976,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -18180,8 +18017,7 @@ def fromDoc( [e], ) ) - else: - doc = None + format = None if "format" in _doc: try: format = load_field( @@ -18222,8 +18058,6 @@ def fromDoc( [e], ) ) - else: - format = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -18301,7 +18135,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -18446,6 +18280,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -18486,8 +18321,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -18496,7 +18329,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -18537,8 +18371,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -18579,8 +18412,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -18621,8 +18453,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -18663,8 +18494,7 @@ def fromDoc( [e], ) ) - else: - doc = None + format = None if "format" in _doc: try: format = load_field( @@ -18705,8 +18535,7 @@ def fromDoc( [e], ) ) - else: - format = None + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -18747,8 +18576,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -18789,8 +18617,7 @@ def fromDoc( [e], ) ) - else: - loadListing = None + default = None if "default" in _doc: try: default = load_field( @@ -18831,8 +18658,6 @@ def fromDoc( [e], ) ) - else: - default = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -18875,6 +18700,7 @@ def fromDoc( [e], ) ) + inputBinding = None if "inputBinding" in _doc: try: inputBinding = load_field( @@ -18915,8 +18741,6 @@ def fromDoc( [e], ) ) - else: - inputBinding = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -18956,7 +18780,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -19154,6 +18978,7 @@ def fromDoc( if _doc.get("class") != "ExpressionTool": raise ValidationException("tried `ExpressionTool` but") + id = None if "id" in _doc: try: id = load_field( @@ -19194,8 +19019,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -19204,7 +19027,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -19245,8 +19069,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -19287,8 +19110,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("inputs") is None: raise ValidationException("missing required field `inputs`", None, []) @@ -19373,6 +19194,7 @@ def fromDoc( [e], ) ) + requirements = None if "requirements" in _doc: try: requirements = load_field( @@ -19413,8 +19235,7 @@ def fromDoc( [e], ) ) - else: - requirements = None + hints = None if "hints" in _doc: try: hints = load_field( @@ -19455,8 +19276,7 @@ def fromDoc( [e], ) ) - else: - hints = None + cwlVersion = None if "cwlVersion" in _doc: try: cwlVersion = load_field( @@ -19497,8 +19317,7 @@ def fromDoc( [e], ) ) - else: - cwlVersion = None + intent = None if "intent" in _doc: try: intent = load_field( @@ -19539,8 +19358,6 @@ def fromDoc( [e], ) ) - else: - intent = None try: if _doc.get("expression") is None: raise ValidationException("missing required field `expression`", None, []) @@ -19621,7 +19438,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -19798,6 +19615,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -19838,8 +19656,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -19848,7 +19664,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -19889,8 +19706,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -19931,8 +19747,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -19973,8 +19788,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -20015,8 +19829,7 @@ def fromDoc( [e], ) ) - else: - doc = None + format = None if "format" in _doc: try: format = load_field( @@ -20057,8 +19870,7 @@ def fromDoc( [e], ) ) - else: - format = None + outputSource = None if "outputSource" in _doc: try: outputSource = load_field( @@ -20099,8 +19911,7 @@ def fromDoc( [e], ) ) - else: - outputSource = None + linkMerge = None if "linkMerge" in _doc: try: linkMerge = load_field( @@ -20141,8 +19952,7 @@ def fromDoc( [e], ) ) - else: - linkMerge = None + pickValue = None if "pickValue" in _doc: try: pickValue = load_field( @@ -20183,8 +19993,6 @@ def fromDoc( [e], ) ) - else: - pickValue = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -20265,7 +20073,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -20540,6 +20348,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -20580,8 +20389,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -20590,7 +20397,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + source = None if "source" in _doc: try: source = load_field( @@ -20631,8 +20439,7 @@ def fromDoc( [e], ) ) - else: - source = None + linkMerge = None if "linkMerge" in _doc: try: linkMerge = load_field( @@ -20673,8 +20480,7 @@ def fromDoc( [e], ) ) - else: - linkMerge = None + pickValue = None if "pickValue" in _doc: try: pickValue = load_field( @@ -20715,8 +20521,7 @@ def fromDoc( [e], ) ) - else: - pickValue = None + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -20757,8 +20562,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -20799,8 +20603,7 @@ def fromDoc( [e], ) ) - else: - loadListing = None + label = None if "label" in _doc: try: label = load_field( @@ -20841,8 +20644,7 @@ def fromDoc( [e], ) ) - else: - label = None + default = None if "default" in _doc: try: default = load_field( @@ -20883,8 +20685,7 @@ def fromDoc( [e], ) ) - else: - default = None + valueFrom = None if "valueFrom" in _doc: try: valueFrom = load_field( @@ -20925,8 +20726,6 @@ def fromDoc( [e], ) ) - else: - valueFrom = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -20964,7 +20763,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -21093,6 +20892,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -21133,8 +20933,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -21143,7 +20941,7 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -21171,7 +20969,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -21368,6 +21166,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -21408,8 +21207,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -21418,7 +21215,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -21459,8 +21257,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -21501,8 +21298,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("in") is None: raise ValidationException("missing required field `in`", None, []) @@ -21587,6 +21382,7 @@ def fromDoc( [e], ) ) + requirements = None if "requirements" in _doc: try: requirements = load_field( @@ -21627,8 +21423,7 @@ def fromDoc( [e], ) ) - else: - requirements = None + hints = None if "hints" in _doc: try: hints = load_field( @@ -21669,8 +21464,6 @@ def fromDoc( [e], ) ) - else: - hints = None subscope_baseuri = expand_url('run', baseuri, loadingOptions, True) try: @@ -21715,6 +21508,7 @@ def fromDoc( [e], ) ) + when = None if "when" in _doc: try: when = load_field( @@ -21755,8 +21549,7 @@ def fromDoc( [e], ) ) - else: - when = None + scatter = None if "scatter" in _doc: try: scatter = load_field( @@ -21797,8 +21590,7 @@ def fromDoc( [e], ) ) - else: - scatter = None + scatterMethod = None if "scatterMethod" in _doc: try: scatterMethod = load_field( @@ -21839,8 +21631,6 @@ def fromDoc( [e], ) ) - else: - scatterMethod = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -21880,7 +21670,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -22109,6 +21899,7 @@ def fromDoc( if _doc.get("class") != "Workflow": raise ValidationException("tried `Workflow` but") + id = None if "id" in _doc: try: id = load_field( @@ -22149,8 +21940,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -22159,7 +21948,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -22200,8 +21990,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -22242,8 +22031,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("inputs") is None: raise ValidationException("missing required field `inputs`", None, []) @@ -22328,6 +22115,7 @@ def fromDoc( [e], ) ) + requirements = None if "requirements" in _doc: try: requirements = load_field( @@ -22368,8 +22156,7 @@ def fromDoc( [e], ) ) - else: - requirements = None + hints = None if "hints" in _doc: try: hints = load_field( @@ -22410,8 +22197,7 @@ def fromDoc( [e], ) ) - else: - hints = None + cwlVersion = None if "cwlVersion" in _doc: try: cwlVersion = load_field( @@ -22452,8 +22238,7 @@ def fromDoc( [e], ) ) - else: - cwlVersion = None + intent = None if "intent" in _doc: try: intent = load_field( @@ -22494,8 +22279,6 @@ def fromDoc( [e], ) ) - else: - intent = None try: if _doc.get("steps") is None: raise ValidationException("missing required field `steps`", None, []) @@ -22576,7 +22359,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -23156,6 +22939,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -23196,8 +22980,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -23206,7 +22988,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -23247,8 +23030,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -23289,8 +23071,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -23331,8 +23112,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -23373,8 +23153,7 @@ def fromDoc( [e], ) ) - else: - doc = None + format = None if "format" in _doc: try: format = load_field( @@ -23415,8 +23194,7 @@ def fromDoc( [e], ) ) - else: - format = None + loadContents = None if "loadContents" in _doc: try: loadContents = load_field( @@ -23457,8 +23235,7 @@ def fromDoc( [e], ) ) - else: - loadContents = None + loadListing = None if "loadListing" in _doc: try: loadListing = load_field( @@ -23499,8 +23276,7 @@ def fromDoc( [e], ) ) - else: - loadListing = None + default = None if "default" in _doc: try: default = load_field( @@ -23541,8 +23317,6 @@ def fromDoc( [e], ) ) - else: - default = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -23623,7 +23397,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -23786,6 +23560,7 @@ def fromDoc( _doc.lc.data = doc.lc.data _doc.lc.filename = doc.lc.filename _errors__ = [] + id = None if "id" in _doc: try: id = load_field( @@ -23826,8 +23601,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -23836,7 +23609,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -23877,8 +23651,7 @@ def fromDoc( [e], ) ) - else: - label = None + secondaryFiles = None if "secondaryFiles" in _doc: try: secondaryFiles = load_field( @@ -23919,8 +23692,7 @@ def fromDoc( [e], ) ) - else: - secondaryFiles = None + streamable = None if "streamable" in _doc: try: streamable = load_field( @@ -23961,8 +23733,7 @@ def fromDoc( [e], ) ) - else: - streamable = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -24003,8 +23774,7 @@ def fromDoc( [e], ) ) - else: - doc = None + format = None if "format" in _doc: try: format = load_field( @@ -24045,8 +23815,6 @@ def fromDoc( [e], ) ) - else: - format = None try: if _doc.get("type") is None: raise ValidationException("missing required field `type`", None, []) @@ -24124,7 +23892,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( @@ -24281,6 +24049,7 @@ def fromDoc( if _doc.get("class") != "Operation": raise ValidationException("tried `Operation` but") + id = None if "id" in _doc: try: id = load_field( @@ -24321,8 +24090,6 @@ def fromDoc( [e], ) ) - else: - id = None __original_id_is_none = id is None if id is None: @@ -24331,7 +24098,8 @@ def fromDoc( else: id = "_:" + str(_uuid__.uuid4()) if not __original_id_is_none: - baseuri = id + baseuri = cast(str, id) + label = None if "label" in _doc: try: label = load_field( @@ -24372,8 +24140,7 @@ def fromDoc( [e], ) ) - else: - label = None + doc = None if "doc" in _doc: try: doc = load_field( @@ -24414,8 +24181,6 @@ def fromDoc( [e], ) ) - else: - doc = None try: if _doc.get("inputs") is None: raise ValidationException("missing required field `inputs`", None, []) @@ -24500,6 +24265,7 @@ def fromDoc( [e], ) ) + requirements = None if "requirements" in _doc: try: requirements = load_field( @@ -24540,8 +24306,7 @@ def fromDoc( [e], ) ) - else: - requirements = None + hints = None if "hints" in _doc: try: hints = load_field( @@ -24582,8 +24347,7 @@ def fromDoc( [e], ) ) - else: - hints = None + cwlVersion = None if "cwlVersion" in _doc: try: cwlVersion = load_field( @@ -24624,8 +24388,7 @@ def fromDoc( [e], ) ) - else: - cwlVersion = None + intent = None if "intent" in _doc: try: intent = load_field( @@ -24666,8 +24429,6 @@ def fromDoc( [e], ) ) - else: - intent = None extension_fields: Dict[str, Any] = {} for k in _doc.keys(): if k not in cls.attrs: @@ -24705,7 +24466,7 @@ def fromDoc( extension_fields=extension_fields, loadingOptions=loadingOptions, ) - loadingOptions.idx[id] = (_constructed, loadingOptions) + loadingOptions.idx[cast(str, id)] = (_constructed, loadingOptions) return _constructed def save( From 0ad6983898f0d9001fe0f416f97c4d8b940e384a Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Wed, 10 Apr 2024 15:48:09 +0300 Subject: [PATCH 03/10] release 0.33 --- cwl_utils/__meta__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cwl_utils/__meta__.py b/cwl_utils/__meta__.py index b9b6fbac..088ff715 100644 --- a/cwl_utils/__meta__.py +++ b/cwl_utils/__meta__.py @@ -1,3 +1,3 @@ # SPDX-License-Identifier: Apache-2.0 """Global version number for the cwl_utils package.""" -__version__ = "0.32" +__version__ = "0.33" From f7a39b2f8aa30da39c1c2d48f02881e3046b9f86 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Fri, 3 May 2024 10:00:49 +0200 Subject: [PATCH 04/10] build now uses the module name --- release-test.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release-test.sh b/release-test.sh index 3865c21e..ae519a08 100755 --- a/release-test.sh +++ b/release-test.sh @@ -66,7 +66,7 @@ pushd src/${package} pip install -rtest-requirements.txt build make dist make test -cp dist/${package}*tar.gz ../../../testenv3/ +cp dist/${module}*tar.gz ../../../testenv3/ cp dist/${module}*whl ../../../testenv4/ pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install popd # ../.. no subdir named ${proj} here, safe for py.testing the installed module @@ -83,12 +83,12 @@ source bin/activate rm -f lib/python-wheels/setuptools* \ && pip install --force-reinstall -U pip==${pipver} \ && pip install setuptools==${setuptoolsver} wheel -package_tar=$(find . -name "${package}*tar.gz") +package_tar=$(find . -name "${module}*tar.gz") pip install "-r${DIR}/test-requirements.txt" build pip install "${package_tar}${extras}" mkdir out -tar --extract --directory=out -z -f ${package}*.tar.gz -pushd out/${package}* +tar --extract --directory=out -z -f ${module}*.tar.gz +pushd out/${module}* make dist make test pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install From 475b3075040eabbebad34b10af2febb6ece305eb Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Fri, 3 May 2024 10:08:11 +0200 Subject: [PATCH 05/10] udocker nodejs container name fix Also handle udocker failure better --- cwl_utils/sandboxjs.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cwl_utils/sandboxjs.py b/cwl_utils/sandboxjs.py index 883950cd..9d6f25b5 100644 --- a/cwl_utils/sandboxjs.py +++ b/cwl_utils/sandboxjs.py @@ -320,7 +320,7 @@ def new_js_proc( nodeimg = "docker.io/node:alpine" if container_engine == "singularity": nodeimg = f"docker://{nodeimg}" - elif container_engine == "podman": + elif container_engine in ("podman", "udocker"): nodeimg = "docker.io/library/node:alpine" if not self.have_node_slim: @@ -352,6 +352,8 @@ def new_js_proc( ) if matches: dockerimgs = matches[0] + else: + dockerimgs = "" else: raise Exception( f"Unknown container_engine: {container_engine}." From 57ac7d714c1ce3615b7a0e7cb27d3b244514b636 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 03:32:36 +0000 Subject: [PATCH 06/10] Update flake8-bugbear requirement from <24.3 to <24.5 Updates the requirements on [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) to permit the latest version. - [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) - [Commits](https://github.com/PyCQA/flake8-bugbear/compare/16.4.1...24.4.21) --- updated-dependencies: - dependency-name: flake8-bugbear dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- lint-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lint-requirements.txt b/lint-requirements.txt index b831e713..4c4cedf3 100644 --- a/lint-requirements.txt +++ b/lint-requirements.txt @@ -1,4 +1,4 @@ -flake8-bugbear < 24.3 +flake8-bugbear < 24.5 black ~= 24.3 codespell isort >= 5 From 5258253aa35ba4773d1b350800c31e8ad7857ff0 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Fri, 3 May 2024 10:51:15 +0200 Subject: [PATCH 07/10] gh-actions: shellcheck clean --- .github/workflows/ci-tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 4b19097f..97f6e180 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -121,12 +121,12 @@ jobs: - name: pull some containers run: | - export CWL_SINGULARITY_CACHE=$(echo $GITHUB_WORKSPACE)/singularity_cache - mkdir -p ${CWL_SINGULARITY_CACHE} - singularity pull --name ${CWL_SINGULARITY_CACHE}/node_alpine.sif docker://docker.io/node:alpine - ls -lh ${CWL_SINGULARITY_CACHE} - echo ${CWL_SINGULARITY_CACHE} - echo "CWL_SINGULARITY_CACHE=${CWL_SINGULARITY_CACHE}" >> $GITHUB_ENV + export CWL_SINGULARITY_CACHE=$GITHUB_WORKSPACE/singularity_cache + mkdir -p "${CWL_SINGULARITY_CACHE}" + singularity pull --name "${CWL_SINGULARITY_CACHE}/node_alpine.sif" docker://docker.io/node:alpine + ls -lh "${CWL_SINGULARITY_CACHE}" + echo "${CWL_SINGULARITY_CACHE}" + echo "CWL_SINGULARITY_CACHE=${CWL_SINGULARITY_CACHE}" >> "$GITHUB_ENV" - name: Set up Python uses: actions/setup-python@v5 From 8b2c207098814b39efc17f6e86ee817b879cef8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 04:00:45 +0000 Subject: [PATCH 08/10] Bump codecov/codecov-action from 4.3.0 to 4.3.1 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v4.3.0...v4.3.1) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/ci-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 97f6e180..801389b0 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -65,7 +65,7 @@ jobs: - name: Upload coverage to Codecov if: ${{ matrix.step == 'unit' }} - uses: codecov/codecov-action@v4.3.0 + uses: codecov/codecov-action@v4.3.1 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: From b16a0db881b56c38c480cd5432c3b8a55c7872bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 11:14:21 +0200 Subject: [PATCH 09/10] Update black requirement from ~=24.3 to ~=24.4 (#299) Updates the requirements on [black](https://github.com/psf/black) to permit the latest version. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/24.3.0...24.4.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Michael R. Crusoe <1330696+mr-c@users.noreply.github.com> --- lint-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lint-requirements.txt b/lint-requirements.txt index 4c4cedf3..8f969a0f 100644 --- a/lint-requirements.txt +++ b/lint-requirements.txt @@ -1,4 +1,4 @@ flake8-bugbear < 24.5 -black ~= 24.3 +black ~= 24.4 codespell isort >= 5 From 67dbfa590c733b6ad5bf9139866e42cb5cd02aa2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 09:13:38 +0000 Subject: [PATCH 10/10] Bump mypy from 1.9.0 to 1.10.0 Bumps [mypy](https://github.com/python/mypy) from 1.9.0 to 1.10.0. - [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md) - [Commits](https://github.com/python/mypy/compare/1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- mypy-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mypy-requirements.txt b/mypy-requirements.txt index adad0534..31599f91 100644 --- a/mypy-requirements.txt +++ b/mypy-requirements.txt @@ -1,4 +1,4 @@ -mypy==1.9.0 +mypy==1.10.0 typing_extensions types-requests types-setuptools>=57.4.0