refresh parsers to pick up new shortname helper function

Add test for shortname

Author: mr-c

cwl_utils/parser/cwl_v1_0.py

@@ -2,13 +2,13 @@
 # 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.
-from abc import ABC, abstractmethod
 import copy
 import os
 import pathlib
 import re
 import tempfile
 import uuid as _uuid__  # pylint: disable=unused-import # noqa: F401
+from abc import ABC, abstractmethod
 from io import StringIO
 from typing import (
     Any,
@@ -22,7 +22,7 @@
     Type,
     Union,
 )
-from urllib.parse import quote, urlsplit, urlunsplit
+from urllib.parse import quote, urlsplit, urlunsplit, urlparse
 from urllib.request import pathname2url
 
 from ruamel.yaml.comments import CommentedMap
@@ -337,6 +337,7 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):
                                 d
                             )
                         )
+                    r.append(new_dict)
 
                 else:
                     raise ValidationException(
@@ -360,6 +361,7 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):
                         doc
                     )
                 )
+            r.append(new_dict)
 
         elif isinstance(doc, str):
             if doc.endswith("?"):
@@ -672,6 +674,22 @@ def save_relative_uri(
         return save(uri, top=False, base_url=base_url)
 
 
+def shortname(inputid: str) -> str:
+    """
+    Compute the shortname of a fully qualified identifer.
+
+    See https://w3id.org/cwl/v1.2/SchemaSalad.html#Short_names.
+    """
+    parsed_id = urlparse(inputid)
+    if parsed_id.fragment:
+        return parsed_id.fragment.split("/")[-1]
+    return parsed_id.path.split("/")[-1]
+
+
+def parser_info() -> str:
+    return "org.w3id.cwl.v1_0"
+
+
 class RecordField(Savable):
     """
     A field of a record.
@@ -11431,7 +11449,7 @@ def save(
     "https://w3id.org/cwl/cwl#v1.0.dev4": "v1.0.dev4",
 }
 
-strtype = _PrimitiveLoader((str, str))
+strtype = _PrimitiveLoader(str)
 inttype = _PrimitiveLoader(int)
 floattype = _PrimitiveLoader(float)
 booltype = _PrimitiveLoader(bool)

cwl_utils/parser/cwl_v1_1.py

@@ -22,7 +22,7 @@
     Type,
     Union,
 )
-from urllib.parse import quote, urlsplit, urlunsplit
+from urllib.parse import quote, urlsplit, urlunsplit, urlparse
 from urllib.request import pathname2url
 
 from ruamel.yaml.comments import CommentedMap
@@ -674,6 +674,22 @@ def save_relative_uri(
         return save(uri, top=False, base_url=base_url)
 
 
+def shortname(inputid: str) -> str:
+    """
+    Compute the shortname of a fully qualified identifer.
+
+    See https://w3id.org/cwl/v1.2/SchemaSalad.html#Short_names.
+    """
+    parsed_id = urlparse(inputid)
+    if parsed_id.fragment:
+        return parsed_id.fragment.split("/")[-1]
+    return parsed_id.path.split("/")[-1]
+
+
+def parser_info() -> str:
+    return "org.w3id.cwl.v1_1"
+
+
 class Documented(Savable):
     pass
 
@@ -13230,7 +13246,7 @@ def save(
     "https://w3id.org/cwl/cwl#v1.1.0-dev1": "v1.1.0-dev1",
 }
 
-strtype = _PrimitiveLoader((str, str))
+strtype = _PrimitiveLoader(str)
 inttype = _PrimitiveLoader(int)
 floattype = _PrimitiveLoader(float)
 booltype = _PrimitiveLoader(bool)

cwl_utils/parser/cwl_v1_2.py

@@ -22,7 +22,7 @@
     Type,
     Union,
 )
-from urllib.parse import quote, urlsplit, urlunsplit
+from urllib.parse import quote, urlsplit, urlunsplit, urlparse
 from urllib.request import pathname2url
 
 from ruamel.yaml.comments import CommentedMap
@@ -674,6 +674,22 @@ def save_relative_uri(
         return save(uri, top=False, base_url=base_url)
 
 
+def shortname(inputid: str) -> str:
+    """
+    Compute the shortname of a fully qualified identifer.
+
+    See https://w3id.org/cwl/v1.2/SchemaSalad.html#Short_names.
+    """
+    parsed_id = urlparse(inputid)
+    if parsed_id.fragment:
+        return parsed_id.fragment.split("/")[-1]
+    return parsed_id.path.split("/")[-1]
+
+
+def parser_info() -> str:
+    return "org.w3id.cwl.v1_2"
+
+
 class Documented(Savable):
     pass
 
@@ -1205,8 +1221,8 @@ class File(Savable):
     a number of properties that provide metadata about the file.
 
     The `location` property of a File is a URI that uniquely identifies the
-    file.  Implementations must support the file:// URI scheme and may support
-    other schemes such as http://.  The value of `location` may also be a
+    file.  Implementations must support the `file://` URI scheme and may support
+    other schemes such as `http://` and `https://`.  The value of `location` may also be a
     relative reference, in which case it must be resolved relative to the URI
     of the document it appears in.  Alternately to `location`, implementations
     must also accept the `path` property on File, which must be a filesystem
@@ -3972,7 +3988,7 @@ class SchemaDefRequirement(ProcessRequirement):
     """
     This field consists of an array of type definitions which must be used when
     interpreting the `inputs` and `outputs` fields.  When a `type` field
-    contain a IRI, the implementation must check if the type is defined in
+    contains a IRI, the implementation must check if the type is defined in
     `schemaDefs` and use that definition.  If the type is not found in
     `schemaDefs`, it is an error.  The entries in `schemaDefs` must be
     processed in the order listed such that later schema definitions may refer
@@ -14507,7 +14523,7 @@ def save(
     "https://w3id.org/cwl/cwl#v1.2.0-dev5": "v1.2.0-dev5",
 }
 
-strtype = _PrimitiveLoader((str, str))
+strtype = _PrimitiveLoader(str)
 inttype = _PrimitiveLoader(int)
 floattype = _PrimitiveLoader(float)
 booltype = _PrimitiveLoader(bool)

tests/test_parser.py

@@ -3,7 +3,13 @@
 
 from ruamel import yaml
 
-from cwl_utils.parser import cwl_version, load_document, load_document_by_uri, save
+from cwl_utils.parser import (
+    cwl_version,
+    load_document,
+    load_document_by_uri,
+    save,
+    cwl_v1_2,
+)
 import cwl_utils.parser.latest as latest
 
 HERE = Path(__file__).resolve().parent
@@ -69,3 +75,12 @@ def test_latest_parser() -> None:
         yaml_obj12 = yaml.main.round_trip_load(cwl_h, preserve_quotes=True)
     latest_cwl_obj = latest.load_document_by_yaml(yaml_obj12, uri)  # type: ignore
     assert latest_cwl_obj.cwlVersion == "v1.2"
+
+
+def test_shortname() -> None:
+    assert cwl_v1_2.shortname("http://example.com/foo") == "foo"
+    assert cwl_v1_2.shortname("http://example.com/#bar") == "bar"
+    assert cwl_v1_2.shortname("http://example.com/foo/bar") == "bar"
+    assert cwl_v1_2.shortname("http://example.com/foo#bar") == "bar"
+    assert cwl_v1_2.shortname("http://example.com/#foo/bar") == "bar"
+    assert cwl_v1_2.shortname("http://example.com/foo#bar/baz") == "baz"