cognite-neat 0.75.7__py3-none-any.whl → 0.75.9__py3-none-any.whl

cognite/neat/rules/importers/_dms2rules.py

@@ -10,6 +10,14 @@ from cognite.client.utils import ms_to_datetime
 from cognite.neat.rules import issues
 from cognite.neat.rules.importers._base import BaseImporter, Rules
 from cognite.neat.rules.issues import IssueList
+from cognite.neat.rules.models.data_types import DataType
+from cognite.neat.rules.models.entities import (
+    ClassEntity,
+    ContainerEntity,
+    DMSUnknownEntity,
+    ViewEntity,
+    ViewPropertyEntity,
+)
 from cognite.neat.rules.models.rules import DMSRules, DMSSchema, RoleTypes
 from cognite.neat.rules.models.rules._base import ExtensionCategory, SchemaCompleteness
 from cognite.neat.rules.models.rules._dms_architect_rules import (
@@ -19,15 +27,6 @@ from cognite.neat.rules.models.rules._dms_architect_rules import (
     DMSView,
     SheetList,
 )
-from cognite.neat.rules.models.rules._types import (
-    ClassEntity,
-    ContainerEntity,
-    DMSValueType,
-    Undefined,
-    Unknown,
-    ViewEntity,
-    ViewPropEntity,
-)
 
 
 class DMSImporter(BaseImporter):
@@ -82,14 +81,12 @@ class DMSImporter(BaseImporter):
         return cls(DMSSchema.from_zip(zip_file))
 
     @overload
-    def to_rules(self, errors: Literal["raise"], role: RoleTypes | None = None) -> Rules:
-        ...
+    def to_rules(self, errors: Literal["raise"], role: RoleTypes | None = None) -> Rules: ...
 
     @overload
     def to_rules(
         self, errors: Literal["continue"] = "continue", role: RoleTypes | None = None
-    ) -> tuple[Rules | None, IssueList]:
-        ...
+    ) -> tuple[Rules | None, IssueList]: ...
 
     def to_rules(
         self, errors: Literal["raise", "continue"] = "continue", role: RoleTypes | None = None
@@ -136,21 +133,21 @@ class DMSImporter(BaseImporter):
                             raise NotImplementedError(f"Constraint type {type(constraint_obj)} not implemented")
 
                     if isinstance(container_prop.type, dm.DirectRelation):
-                        direct_value_type: str | ViewEntity | DMSValueType
+                        direct_value_type: str | ViewEntity | DataType | DMSUnknownEntity
                         if prop.source is None:
                             issue_list.append(
                                 issues.importing.UnknownValueTypeWarning(class_entity.versioned_id, prop_id)
                             )
-                            direct_value_type = ViewPropEntity(prefix=Undefined, suffix=Unknown)
+                            direct_value_type = DMSUnknownEntity()
                         else:
-                            direct_value_type = ViewPropEntity.from_id(prop.source)
+                            direct_value_type = ViewEntity.from_id(prop.source)
 
                         dms_property = DMSProperty(
                             class_=class_entity,
                             property_=prop_id,
                             description=prop.description,
                             name=prop.name,
-                            value_type=cast(ViewPropEntity | DMSValueType, direct_value_type),
+                            value_type=direct_value_type,
                             relation="direct",
                             nullable=container_prop.nullable,
                             default=container_prop.default_value,
@@ -168,7 +165,7 @@ class DMSImporter(BaseImporter):
                             property_=prop_id,
                             description=prop.description,
                             name=prop.name,
-                            value_type=cast(ViewPropEntity | DMSValueType, container_prop.type._type),
+                            value_type=cast(ViewPropertyEntity | DataType, container_prop.type._type),
                             nullable=container_prop.nullable,
                             is_list=container_prop.type.is_list,
                             default=container_prop.default_value,
@@ -180,7 +177,7 @@ class DMSImporter(BaseImporter):
                             constraint=unique_constraints or None,
                         )
                 elif isinstance(prop, dm.MultiEdgeConnectionApply):
-                    view_entity = ViewPropEntity.from_id(prop.source)
+                    view_entity = ViewEntity.from_id(prop.source)
                     dms_property = DMSProperty(
                         class_=ClassEntity(prefix=view.space, suffix=view.external_id, version=view.version),
                         property_=prop_id,

cognite/neat/rules/importers/_dtdl2rules/dtdl_converter.py

@@ -1,5 +1,6 @@
 from collections import Counter
 from collections.abc import Callable, Sequence
+from typing import cast
 
 import cognite.neat.rules.issues.importing
 from cognite.neat.rules import issues
@@ -20,13 +21,9 @@ from cognite.neat.rules.importers._dtdl2rules.spec import (
     TelemetryV2,
 )
 from cognite.neat.rules.issues import IssueList, ValidationIssue
+from cognite.neat.rules.models.data_types import _DATA_TYPE_BY_NAME, DataType, Json, String
+from cognite.neat.rules.models.entities import ClassEntity, ParentClassEntity
 from cognite.neat.rules.models.rules._information_rules import InformationClass, InformationProperty
-from cognite.neat.rules.models.rules._types import (
-    XSD_VALUE_TYPE_MAPPINGS,
-    ClassEntity,
-    ParentClassEntity,
-    XSDValueType,
-)
 
 
 class _DTDLConverter:
@@ -92,7 +89,12 @@ class _DTDLConverter:
             name=item.display_name,
             description=item.description,
             comment=item.comment,
-            parent=[ParentClassEntity.from_raw(parent.as_class_id()) for parent in item.extends or []] or None,
+            parent=[
+                cast(ParentClassEntity, parent_entity)
+                for parent in item.extends or []
+                if isinstance(parent_entity := ParentClassEntity.load(parent.as_class_id()), ParentClassEntity)
+            ]
+            or None,
         )
         self.classes.append(class_)
         for sub_item_or_id in item.contents or []:
@@ -123,7 +125,7 @@ class _DTDLConverter:
             return None
 
         prop = InformationProperty(
-            class_=ClassEntity.from_raw(parent),
+            class_=ClassEntity.load(parent),
             property_=item.name,
             name=item.display_name,
             description=item.description,
@@ -175,7 +177,7 @@ class _DTDLConverter:
         if value_type is None:
             return
         prop = InformationProperty(
-            class_=ClassEntity.from_raw(parent),
+            class_=ClassEntity.load(parent),
             property_=item.name,
             name=item.display_name,
             description=item.description,
@@ -195,7 +197,7 @@ class _DTDLConverter:
         if value_type is None:
             return
         prop = InformationProperty(
-            class_=ClassEntity.from_raw(parent),
+            class_=ClassEntity.load(parent),
             property_=item.name,
             name=item.display_name,
             description=item.description,
@@ -211,7 +213,7 @@ class _DTDLConverter:
             self._missing_parent_warning(item)
             return None
         if item.target is not None:
-            value_type: XSDValueType | ClassEntity
+            value_type: DataType | ClassEntity
             if item.target in self._item_by_id:
                 value_type = item.target.as_class_id()
             else:
@@ -223,10 +225,10 @@ class _DTDLConverter:
                         instance_id=item.target.model_dump(),
                     )
                 )
-                value_type = XSD_VALUE_TYPE_MAPPINGS["json"]
+                value_type = Json()
 
             prop = InformationProperty(
-                class_=ClassEntity.from_raw(parent),
+                class_=ClassEntity.load(parent),
                 property_=item.name,
                 name=item.display_name,
                 description=item.description,
@@ -275,13 +277,13 @@ class _DTDLConverter:
 
     def schema_to_value_type(
         self, schema: Schema | Interface | DTMI | None, item: DTDLBase
-    ) -> XSDValueType | ClassEntity | None:
+    ) -> DataType | ClassEntity | None:
         input_type = self._item_by_id.get(schema) if isinstance(schema, DTMI) else schema
 
         if isinstance(input_type, Enum):
-            return XSD_VALUE_TYPE_MAPPINGS["string"]
-        elif isinstance(input_type, str) and input_type in XSD_VALUE_TYPE_MAPPINGS:
-            return XSD_VALUE_TYPE_MAPPINGS[input_type]
+            return String()
+        elif isinstance(input_type, str) and input_type.casefold() in _DATA_TYPE_BY_NAME:
+            return _DATA_TYPE_BY_NAME[input_type.casefold()]()
         elif isinstance(input_type, str):
             self.issues.append(
                 cognite.neat.rules.issues.importing.UnsupportedPropertyTypeError(
@@ -301,11 +303,11 @@ class _DTDLConverter:
                         instance_name=input_type.display_name,
                     )
                 )
-                return XSD_VALUE_TYPE_MAPPINGS["json"]
+                return Json()
             else:
                 if isinstance(input_type, Object):
                     self.convert_object(input_type, None)
-                return ClassEntity.from_raw(input_type.id_.as_class_id())
+                return ClassEntity.load(input_type.id_.as_class_id())
         else:
             self.issues.append(
                 issues.importing.UnknownPropertyWarning(

cognite/neat/rules/importers/_dtdl2rules/dtdl_importer.py

@@ -119,14 +119,12 @@ class DTDLImporter(BaseImporter):
         return cls(items, zip_file.stem, read_issues=issues)
 
     @overload
-    def to_rules(self, errors: Literal["raise"], role: RoleTypes | None = None) -> Rules:
-        ...
+    def to_rules(self, errors: Literal["raise"], role: RoleTypes | None = None) -> Rules: ...
 
     @overload
     def to_rules(
         self, errors: Literal["continue"] = "continue", role: RoleTypes | None = None
-    ) -> tuple[Rules | None, IssueList]:
-        ...
+    ) -> tuple[Rules | None, IssueList]: ...
 
     def to_rules(
         self, errors: Literal["raise", "continue"] = "continue", role: RoleTypes | None = None

cognite/neat/rules/importers/_dtdl2rules/spec.py

@@ -14,7 +14,7 @@ from typing import TYPE_CHECKING, Any, ClassVar, Literal, TypeAlias
 
 from pydantic import BaseModel, Field, field_validator, model_serializer, model_validator
 
-from cognite.neat.rules.models.rules._types import ClassEntity
+from cognite.neat.rules.models.entities import ClassEntity
 
 if TYPE_CHECKING:
     from pydantic.type_adapter import IncEx
@@ -72,8 +72,7 @@ class DTMI(BaseModel):
             exclude_none: bool = False,
             round_trip: bool = False,
             warnings: bool = True,
-        ) -> str:
-            ...
+        ) -> str: ...
 
 
 IRI: TypeAlias = str
@@ -124,8 +123,7 @@ class Unit(BaseModel, ABC):
             exclude_none: bool = False,
             round_trip: bool = False,
             warnings: bool = True,
-        ) -> str:
-            ...
+        ) -> str: ...
 
 
 class DTDLBase(BaseModel, ABC):

cognite/neat/rules/importers/_owl2rules/_owl2rules.py

@@ -10,8 +10,8 @@ from rdflib import DC, DCTERMS, OWL, RDF, RDFS, SKOS, Graph
 
 from cognite.neat.rules.importers._base import BaseImporter, Rules
 from cognite.neat.rules.issues import IssueList
+from cognite.neat.rules.models.data_types import _XSD_TYPES
 from cognite.neat.rules.models.rules import InformationRules, RoleTypes
-from cognite.neat.rules.models.rules._types import XSD_VALUE_TYPE_MAPPINGS
 
 from ._owl2classes import parse_owl_classes
 from ._owl2metadata import parse_owl_metadata
@@ -43,14 +43,12 @@ class OWLImporter(BaseImporter):
         self.make_compliant = make_compliant
 
     @overload
-    def to_rules(self, errors: Literal["raise"], role: RoleTypes | None = None) -> Rules:
-        ...
+    def to_rules(self, errors: Literal["raise"], role: RoleTypes | None = None) -> Rules: ...
 
     @overload
     def to_rules(
         self, errors: Literal["continue"] = "continue", role: RoleTypes | None = None
-    ) -> tuple[Rules | None, IssueList]:
-        ...
+    ) -> tuple[Rules | None, IssueList]: ...
 
     def to_rules(
         self, errors: Literal["raise", "continue"] = "continue", role: RoleTypes | None = None
@@ -126,7 +124,7 @@ def _add_missing_value_types(components: dict) -> dict:
         Updated tables with missing properties added to containers
     """
 
-    xsd_types = set(XSD_VALUE_TYPE_MAPPINGS.keys())
+    xsd_types = _XSD_TYPES
     candidate_value_types = {definition["Value Type"] for definition in components["Properties"]} - {
         definition["Class"] for definition in components["Classes"]
     }

cognite/neat/rules/importers/_spreadsheet2rules.py

@@ -15,6 +15,7 @@ from cognite.neat.rules import issues
 from cognite.neat.rules.issues import IssueList
 from cognite.neat.rules.models.rules import RULES_PER_ROLE, DMSRules, DomainRules, InformationRules
 from cognite.neat.rules.models.rules._base import RoleTypes, SchemaCompleteness
+from cognite.neat.rules.models.rules._dms_rules_write import DMSRulesWrite
 from cognite.neat.utils.auxiliary import local_import
 from cognite.neat.utils.spreadsheet import SpreadsheetRead, read_individual_sheet
 
@@ -152,16 +153,14 @@ class ExcelImporter(BaseImporter):
         self.filepath = filepath
 
     @overload
-    def to_rules(self, errors: Literal["raise"], role: RoleTypes | None = None) -> Rules:
-        ...
+    def to_rules(self, errors: Literal["raise"], role: RoleTypes | None = None) -> Rules: ...
 
     @overload
     def to_rules(
         self,
         errors: Literal["continue"] = "continue",
         role: RoleTypes | None = None,
-    ) -> tuple[Rules | None, IssueList]:
-        ...
+    ) -> tuple[Rules | None, IssueList]: ...
 
     def to_rules(
         self, errors: Literal["raise", "continue"] = "continue", role: RoleTypes | None = None
@@ -214,7 +213,11 @@ class ExcelImporter(BaseImporter):
             error_cls=issues.spreadsheet.InvalidSheetError,
             error_args={"read_info_by_sheet": read_info_by_sheet},
         ) as future:
-            rules = rules_cls.model_validate(sheets)  # type: ignore[attr-defined]
+            rules: Rules
+            if rules_cls is DMSRules:
+                rules = DMSRulesWrite.load(sheets).as_read()
+            else:
+                rules = rules_cls.model_validate(sheets)  # type: ignore[attr-defined]
 
         if future.result == "failure" or issue_list.has_errors:
             return self._return_or_raise(issue_list, errors)
@@ -239,14 +242,12 @@ class GoogleSheetImporter(BaseImporter):
         self.skiprows = skiprows
 
     @overload
-    def to_rules(self, errors: Literal["raise"], role: RoleTypes | None = None) -> Rules:
-        ...
+    def to_rules(self, errors: Literal["raise"], role: RoleTypes | None = None) -> Rules: ...
 
     @overload
     def to_rules(
         self, errors: Literal["continue"] = "continue", role: RoleTypes | None = None
-    ) -> tuple[Rules | None, IssueList]:
-        ...
+    ) -> tuple[Rules | None, IssueList]: ...
 
     def to_rules(
         self, errors: Literal["raise", "continue"] = "continue", role: RoleTypes | None = None

cognite/neat/rules/importers/_yaml2rules.py

@@ -5,7 +5,8 @@ import yaml
 
 from cognite.neat.rules import issues
 from cognite.neat.rules.issues import IssueList, NeatValidationError, ValidationIssue
-from cognite.neat.rules.models.rules import RULES_PER_ROLE, RoleTypes
+from cognite.neat.rules.models.rules import RULES_PER_ROLE, DMSRules, RoleTypes
+from cognite.neat.rules.models.rules._dms_rules_write import DMSRulesWrite
 
 from ._base import BaseImporter, Rules, _handle_issues
 
@@ -45,14 +46,12 @@ class YAMLImporter(BaseImporter):
         return cls(yaml.safe_load(filepath.read_text()), filepaths=[filepath])
 
     @overload
-    def to_rules(self, errors: Literal["raise"], role: RoleTypes | None = None) -> Rules:
-        ...
+    def to_rules(self, errors: Literal["raise"], role: RoleTypes | None = None) -> Rules: ...
 
     @overload
     def to_rules(
         self, errors: Literal["continue"] = "continue", role: RoleTypes | None = None
-    ) -> tuple[Rules | None, IssueList]:
-        ...
+    ) -> tuple[Rules | None, IssueList]: ...
 
     def to_rules(
         self, errors: Literal["raise", "continue"] = "continue", role: RoleTypes | None = None
@@ -97,7 +96,12 @@ class YAMLImporter(BaseImporter):
         rules_model = RULES_PER_ROLE[role_enum]
 
         with _handle_issues(issue_list) as future:
-            rules = rules_model.model_validate(self.raw_data)
+            rules: Rules
+            if rules_model is DMSRules:
+                rules = DMSRulesWrite.load(self.raw_data).as_read()
+            else:
+                rules = rules_model.model_validate(self.raw_data)
+
         if future.result == "failure":
             if errors == "continue":
                 return None, issue_list

cognite/neat/rules/issues/dms.py

@@ -32,13 +32,11 @@ __all__ = [
 
 
 @dataclass(frozen=True)
-class DMSSchemaError(NeatValidationError, ABC):
-    ...
+class DMSSchemaError(NeatValidationError, ABC): ...
 
 
 @dataclass(frozen=True)
-class DMSSchemaWarning(ValidationWarning, ABC):
-    ...
+class DMSSchemaWarning(ValidationWarning, ABC): ...
 
 
 @dataclass(frozen=True)
@@ -195,7 +193,7 @@ class DirectRelationMissingSourceWarning(DMSSchemaWarning):
     property: str
 
     def message(self) -> str:
-        return f"The source view referred to by {self.view_id}.{self.property} does not exist"
+        return f"The source view referred to by '{self.view_id.external_id}.{self.property}' does not exist."
 
     def dump(self) -> dict[str, Any]:
         output = super().dump()

cognite/neat/rules/issues/formatters.py

@@ -79,5 +79,7 @@ class BasicHTML(Formatter):
 
 
 FORMATTER_BY_NAME: dict[str, type[Formatter]] = {
-    subclass.__name__: subclass for subclass in Formatter.__subclasses__() if ABC not in subclass.__bases__  # type: ignore[type-abstract]
+    subclass.__name__: subclass  # type: ignore[type-abstract]
+    for subclass in Formatter.__subclasses__()
+    if ABC not in subclass.__bases__  # type: ignore[type-abstract]
 }

cognite/neat/rules/models/data_types.py

@@ -13,6 +13,12 @@ else:
 
 
 class DataType(BaseModel):
+    # These are necessary for Pydantic to work
+    # pydantic gets confused as we have no fields.
+    __pydantic_extra__ = None
+    __pydantic_fields_set__ = set()
+    __pydantic_private__ = {}
+
     name: ClassVar[str]
     python: ClassVar[type]
     dms: ClassVar[type[dms.PropertyType]]
@@ -32,10 +38,12 @@ class DataType(BaseModel):
         if isinstance(value, cls | dict):
             return value
         elif isinstance(value, str):
-            try:
-                return _DATA_TYPE_BY_NAME[value.casefold()]()
-            except KeyError:
-                raise ValueError(f"Unknown literal type: {value}") from None
+            value_standardized = value.casefold()
+            if cls_ := _DATA_TYPE_BY_DMS_TYPE.get(value_standardized):
+                return cls_()
+            elif cls_ := _DATA_TYPE_BY_NAME.get(value_standardized):
+                return cls_()
+            raise ValueError(f"Unknown literal type: {value}") from None
         raise ValueError(f"Cannot load {cls.__name__} from {value}")
 
     @model_serializer(when_used="unless-none", return_type=str)
@@ -48,13 +56,20 @@ class DataType(BaseModel):
     def __eq__(self, other: Any) -> bool:
         return isinstance(other, type(self))
 
+    def __hash__(self) -> int:
+        return hash(str(self))
+
+    @classmethod
+    def is_data_type(cls, value: str) -> bool:
+        return value.casefold() in _DATA_TYPE_BY_NAME or value.casefold() in _DATA_TYPE_BY_DMS_TYPE
+
 
 class Boolean(DataType):
     name = "boolean"
     python = bool
     dms = dms.Boolean
     graphql = "Boolean"
-    xsd = "xsd:boolean"
+    xsd = "boolean"
     sql = "BOOLEAN"
 
 
@@ -63,7 +78,7 @@ class Float(DataType):
     python = float
     dms = dms.Float32
     graphql = "Float"
-    xsd = "xsd:float"
+    xsd = "float"
     sql = "FLOAT"
 
 
@@ -72,7 +87,7 @@ class Double(DataType):
     python = float
     dms = dms.Float64
     graphql = "Float"
-    xsd = "xsd:double"
+    xsd = "double"
     sql = "FLOAT"
 
 
@@ -81,7 +96,7 @@ class Integer(DataType):
     python = int
     dms = dms.Int32
     graphql = "Int"
-    xsd = "xsd:integer"
+    xsd = "integer"
     sql = "INTEGER"
 
 
@@ -90,7 +105,7 @@ class NonPositiveInteger(DataType):
     python = int
     dms = dms.Int32
     graphql = "Int"
-    xsd = "xsd:nonPositiveInteger"
+    xsd = "nonPositiveInteger"
     sql = "INTEGER"
 
 
@@ -99,7 +114,7 @@ class NonNegativeInteger(DataType):
     python = int
     dms = dms.Int32
     graphql = "Int"
-    xsd = "xsd:nonNegativeInteger"
+    xsd = "nonNegativeInteger"
     sql = "INTEGER"
 
 
@@ -108,7 +123,7 @@ class NegativeInteger(DataType):
     python = int
     dms = dms.Int32
     graphql = "Int"
-    xsd = "xsd:negativeInteger"
+    xsd = "negativeInteger"
     sql = "INTEGER"
 
 
@@ -117,7 +132,7 @@ class Long(DataType):
     python = int
     dms = dms.Int64
     graphql = "Int"
-    xsd = "xsd:long"
+    xsd = "long"
     sql = "BIGINT"
 
 
@@ -126,7 +141,7 @@ class String(DataType):
     python = str
     dms = dms.Text
     graphql = "String"
-    xsd = "xsd:string"
+    xsd = "string"
     sql = "STRING"
 
 
@@ -135,7 +150,7 @@ class LangString(DataType):
     python = str
     dms = dms.Text
     graphql = "String"
-    xsd = "xsd:string"
+    xsd = "string"
     sql = "STRING"
 
 
@@ -144,7 +159,7 @@ class AnyURI(DataType):
     python = str
     dms = dms.Text
     graphql = "String"
-    xsd = "xsd:anyURI"
+    xsd = "anyURI"
     sql = "STRING"
 
 
@@ -153,7 +168,7 @@ class NormalizedString(DataType):
     python = str
     dms = dms.Text
     graphql = "String"
-    xsd = "xsd:normalizedString"
+    xsd = "normalizedString"
     sql = "STRING"
 
 
@@ -162,7 +177,7 @@ class Token(DataType):
     python = str
     dms = dms.Text
     graphql = "String"
-    xsd = "xsd:string"
+    xsd = "string"
     sql = "STRING"
 
 
@@ -171,25 +186,25 @@ class DateTime(DataType):
     python = datetime
     dms = dms.Timestamp
     graphql = "Timestamp"
-    xsd = "xsd:dateTimeStamp"
+    xsd = "dateTimeStamp"
     sql = "TIMESTAMP"
 
 
-class DateTimeStamp(DataType):
-    name = "dateTimeStamp"
+class Timestamp(DataType):
+    name = "timestamp"
     python = datetime
     dms = dms.Timestamp
     graphql = "Timestamp"
-    xsd = "xsd:dateTimeStamp"
+    xsd = "dateTimeStamp"
     sql = "TIMESTAMP"
 
 
-class Timestamp(DataType):
-    name = "timestamp"
+class DateTimeStamp(DataType):
+    name = "dateTimeStamp"
     python = datetime
     dms = dms.Timestamp
     graphql = "Timestamp"
-    xsd = "xsd:dateTimeStamp"
+    xsd = "dateTimeStamp"
     sql = "TIMESTAMP"
 
 
@@ -198,7 +213,7 @@ class Date(DataType):
     python = date
     dms = dms.Date
     graphql = "String"
-    xsd = "xsd:date"
+    xsd = "date"
     sql = "DATE"
 
 
@@ -207,7 +222,7 @@ class PlainLiteral(DataType):
     python = str
     dms = dms.Text
     graphql = "String"
-    xsd = "xsd:string"
+    xsd = "plainLiteral"
     sql = "STRING"
 
 
@@ -216,7 +231,7 @@ class Literal(DataType):
     python = str
     dms = dms.Text
     graphql = "String"
-    xsd = "xsd:string"
+    xsd = "string"
     sql = "STRING"
 
 
@@ -225,7 +240,7 @@ class Timeseries(DataType):
     python = dms.TimeSeriesReference
     dms = dms.TimeSeriesReference
     graphql = "TimeSeries"
-    xsd = "xsd:string"
+    xsd = "string"
     sql = "STRING"
 
 
@@ -234,7 +249,7 @@ class File(DataType):
     python = dms.FileReference
     dms = dms.FileReference
     graphql = "File"
-    xsd = "xsd:string"
+    xsd = "string"
     sql = "STRING"
 
 
@@ -243,7 +258,7 @@ class Sequence(DataType):
     python = dms.SequenceReference
     dms = dms.SequenceReference
     graphql = "Sequence"
-    xsd = "xsd:string"
+    xsd = "string"
     sql = "STRING"
 
 
@@ -252,8 +267,16 @@ class Json(DataType):
     python = dms.Json
     dms = dms.Json
     graphql = "Json"
-    xsd = "xsd:string"
+    xsd = "string"
     sql = "STRING"
 
 
 _DATA_TYPE_BY_NAME = {cls.name.casefold(): cls for cls in DataType.__subclasses__()}
+_seen = set()
+_DATA_TYPE_BY_DMS_TYPE = {
+    cls.dms._type.casefold(): cls
+    for cls in DataType.__subclasses__()
+    if cls.dms._type not in _seen and not _seen.add(cls.dms._type)  # type: ignore[func-returns-value]
+}
+del _seen
+_XSD_TYPES = {cls_.xsd for cls_ in _DATA_TYPE_BY_NAME.values()}