Merge pull request #910 from common-workflow-language/fix-save-prefix

Fixed `save` method for namespaced `class` fields

Author: mergify[bot]

schema_salad/metaschema.py

@@ -1163,7 +1163,6 @@ class RecordField(Documented):
     """
 
     name: str
-    class_uri = "https://w3id.org/cwl/salad#RecordField"
 
     def __init__(
         self,
@@ -1431,8 +1430,6 @@ def save(
 
 
 class RecordSchema(Saveable):
-    class_uri = "https://w3id.org/cwl/salad#RecordSchema"
-
     def __init__(
         self,
         type_: Any,
@@ -1638,7 +1635,6 @@ class EnumSchema(Saveable):
     """
 
     name: str
-    class_uri = "https://w3id.org/cwl/salad#EnumSchema"
 
     def __init__(
         self,
@@ -1906,8 +1902,6 @@ def save(
 
 
 class ArraySchema(Saveable):
-    class_uri = "https://w3id.org/cwl/salad#ArraySchema"
-
     def __init__(
         self,
         items: Any,
@@ -2107,8 +2101,6 @@ def save(
 
 
 class MapSchema(Saveable):
-    class_uri = "https://w3id.org/cwl/salad#MapSchema"
-
     def __init__(
         self,
         type_: Any,
@@ -2308,8 +2300,6 @@ def save(
 
 
 class UnionSchema(Saveable):
-    class_uri = "https://w3id.org/cwl/salad#UnionSchema"
-
     def __init__(
         self,
         names: Any,
@@ -2515,8 +2505,6 @@ class JsonldPredicate(Saveable):
 
     """
 
-    class_uri = "https://w3id.org/cwl/salad#JsonldPredicate"
-
     def __init__(
         self,
         _id: Optional[Any] = None,
@@ -3255,8 +3243,6 @@ def save(
 
 
 class SpecializeDef(Saveable):
-    class_uri = "https://w3id.org/cwl/salad#SpecializeDef"
-
     def __init__(
         self,
         specializeFrom: Any,
@@ -3482,7 +3468,6 @@ class SaladRecordField(RecordField):
     """
 
     name: str
-    class_uri = "https://w3id.org/cwl/salad#SaladRecordField"
 
     def __init__(
         self,
@@ -3866,7 +3851,6 @@ def save(
 
 class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
     name: str
-    class_uri = "https://w3id.org/cwl/salad#SaladRecordSchema"
 
     def __init__(
         self,
@@ -4730,7 +4714,6 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
     """
 
     name: str
-    class_uri = "https://w3id.org/cwl/salad#SaladEnumSchema"
 
     def __init__(
         self,
@@ -5474,7 +5457,6 @@ class SaladMapSchema(NamedType, MapSchema, SchemaDefinedType):
     """
 
     name: str
-    class_uri = "https://w3id.org/cwl/salad#SaladMapSchema"
 
     def __init__(
         self,
@@ -6162,7 +6144,6 @@ class SaladUnionSchema(NamedType, UnionSchema, DocType):
     """
 
     name: str
-    class_uri = "https://w3id.org/cwl/salad#SaladUnionSchema"
 
     def __init__(
         self,
@@ -6791,7 +6772,6 @@ class Documentation(NamedType, DocType):
     """
 
     name: str
-    class_uri = "https://w3id.org/cwl/salad#Documentation"
 
     def __init__(
         self,

schema_salad/python_codegen.py

@@ -167,7 +167,11 @@ def begin_class(
         idfield_safe_name = self.safe_name(idfield) if idfield != "" else None
         if idfield_safe_name is not None:
             self.out.write(f"    {idfield_safe_name}: str\n")
-        self.out.write(f'    class_uri = "{class_uri}"\n\n')
+            if "class" not in field_names:
+                self.out.write("\n")
+
+        if "class" in field_names:
+            self.out.write(f'    class_uri = "{class_uri}"\n\n')
 
         required_field_names = [f for f in field_names if f not in optional_fields]
         optional_field_names = [f for f in field_names if f in optional_fields]
@@ -658,7 +662,28 @@ def declare_field(
         else:
             baseurl = f"self.{self.safe_name(self.idfield)}"
 
-        if fieldtype.is_uri:
+        if shortname(name) == "class":
+            self.serializer.write(
+                fmt(
+                    """
+if self.{safename} is not None:
+    if p := self.loadingOptions.rvocab.get(self.class_uri[:-len(self.{safename})]):
+        uri = f"{{p}}:{{self.{safename}}}"
+    else:
+        uri = self.{safename}
+    u = save_relative_uri(uri, {baseurl}, {scoped_id}, {ref_scope}, relative_uris)
+    r["{fieldname}"] = u
+""".format(
+                        safename=self.safe_name(name),
+                        fieldname=shortname(name).strip(),
+                        baseurl=baseurl,
+                        scoped_id=fieldtype.scoped_id,
+                        ref_scope=fieldtype.ref_scope,
+                    ),
+                    8,
+                )
+            )
+        elif fieldtype.is_uri:
             self.serializer.write(
                 fmt(
                     """