Fixed save method for namespaced class fields

This commit ensures that namespaced class names (e.g., those coming from
`cwltool` extensions) are correctly saved by the `save` method of the
`Saveable` class. Before this commit, the prefix was lost during this
process.

Author: GlassOfWhiskey

Diff for: schema_salad/metaschema.py

@@ -1163,8 +1163,6 @@ class RecordField(Documented):
     """
 
     name: str
-    class_uri = "https://w3id.org/cwl/salad#RecordField"
-
     def __init__(
         self,
         name: Any,
@@ -1431,8 +1429,6 @@ def save(
 
 
 class RecordSchema(Saveable):
-    class_uri = "https://w3id.org/cwl/salad#RecordSchema"
-
     def __init__(
         self,
         type_: Any,
@@ -1638,8 +1634,6 @@ class EnumSchema(Saveable):
     """
 
     name: str
-    class_uri = "https://w3id.org/cwl/salad#EnumSchema"
-
     def __init__(
         self,
         symbols: Any,
@@ -1906,8 +1900,6 @@ def save(
 
 
 class ArraySchema(Saveable):
-    class_uri = "https://w3id.org/cwl/salad#ArraySchema"
-
     def __init__(
         self,
         items: Any,
@@ -2107,8 +2099,6 @@ def save(
 
 
 class MapSchema(Saveable):
-    class_uri = "https://w3id.org/cwl/salad#MapSchema"
-
     def __init__(
         self,
         type_: Any,
@@ -2308,8 +2298,6 @@ def save(
 
 
 class UnionSchema(Saveable):
-    class_uri = "https://w3id.org/cwl/salad#UnionSchema"
-
     def __init__(
         self,
         names: Any,
@@ -2515,8 +2503,6 @@ class JsonldPredicate(Saveable):
 
     """
 
-    class_uri = "https://w3id.org/cwl/salad#JsonldPredicate"
-
     def __init__(
         self,
         _id: Optional[Any] = None,
@@ -3255,8 +3241,6 @@ def save(
 
 
 class SpecializeDef(Saveable):
-    class_uri = "https://w3id.org/cwl/salad#SpecializeDef"
-
     def __init__(
         self,
         specializeFrom: Any,
@@ -3482,8 +3466,6 @@ class SaladRecordField(RecordField):
     """
 
     name: str
-    class_uri = "https://w3id.org/cwl/salad#SaladRecordField"
-
     def __init__(
         self,
         name: Any,
@@ -3866,8 +3848,6 @@ def save(
 
 class SaladRecordSchema(NamedType, RecordSchema, SchemaDefinedType):
     name: str
-    class_uri = "https://w3id.org/cwl/salad#SaladRecordSchema"
-
     def __init__(
         self,
         name: Any,
@@ -4730,8 +4710,6 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
     """
 
     name: str
-    class_uri = "https://w3id.org/cwl/salad#SaladEnumSchema"
-
     def __init__(
         self,
         symbols: Any,
@@ -5474,8 +5452,6 @@ class SaladMapSchema(NamedType, MapSchema, SchemaDefinedType):
     """
 
     name: str
-    class_uri = "https://w3id.org/cwl/salad#SaladMapSchema"
-
     def __init__(
         self,
         name: Any,
@@ -6162,8 +6138,6 @@ class SaladUnionSchema(NamedType, UnionSchema, DocType):
     """
 
     name: str
-    class_uri = "https://w3id.org/cwl/salad#SaladUnionSchema"
-
     def __init__(
         self,
         name: Any,
@@ -6791,8 +6765,6 @@ class Documentation(NamedType, DocType):
     """
 
     name: str
-    class_uri = "https://w3id.org/cwl/salad#Documentation"
-
     def __init__(
         self,
         name: Any,

Diff for: schema_salad/python_codegen.py

@@ -167,7 +167,9 @@ 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" 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]
@@ -666,7 +668,9 @@ def declare_field(
     u = save_relative_uri(self.{safename}, {baseurl}, {scoped_id}, {ref_scope}, relative_uris)
     r["{fieldname}"] = u
 """.format(
-                        safename=self.safe_name(name),
+                        safename=(
+                            "class_uri" if shortname(name) == "class" else self.safe_name(name)
+                        ),
                         fieldname=shortname(name).strip(),
                         baseurl=baseurl,
                         scoped_id=fieldtype.scoped_id,