fix schema test; temporarily set mex-model dependency to dev branch

mex/common/models/distribution.py

@@ -35,7 +35,7 @@ class BaseDistribution(BaseModel):
     dataCurator: list[PersonID] = []
     dataManager: list[PersonID] = []
     downloadURL: Link | None = None
-    issued: YearMonth | YearMonthDay | YearMonthDayTime
+    issued: YearMonthDayTime | YearMonthDay | YearMonth
     license: (
         Annotated[License, Field(examples=["https://mex.rki.de/item/license-1"])] | None
     ) = None
@@ -48,7 +48,7 @@ class BaseDistribution(BaseModel):
         ]
         | None
     ) = None
-    modified: YearMonth | YearMonthDay | YearMonthDayTime | None = None
+    modified: YearMonthDayTime | YearMonthDay | YearMonth | None = None
     otherContributor: list[PersonID] = []
     projectLeader: list[PersonID] = []
     projectManager: list[PersonID] = []

mex/common/models/resource.py

@@ -59,7 +59,7 @@ class BaseResource(BaseModel):
     ]
     contributingUnit: list[OrganizationalUnitID] = []
     contributor: list[PersonID] = []
-    created: Union[YearMonth, YearMonthDay, YearMonthDayTime, None] = None
+    created: Union[YearMonthDayTime, YearMonthDay, YearMonth, None] = None
     creator: list[PersonID] = []
     description: list[Text] = []
     distribution: list[DistributionID] = []
@@ -88,7 +88,7 @@ class BaseResource(BaseModel):
     ] = []
     method: list[Text] = []
     methodDescription: list[Text] = []
-    modified: Union[YearMonth, YearMonthDay, YearMonthDayTime, None] = None
+    modified: Union[YearMonthDayTime, YearMonthDay, YearMonth, None] = None
     publication: list[Link] = []
     publisher: list[OrganizationID] = []
     qualityInformation: list[Text] = []
@@ -113,9 +113,9 @@ class BaseResource(BaseModel):
         ]
     ] = []
     temporal: Union[
-        YearMonth,
-        YearMonthDay,
         YearMonthDayTime,
+        YearMonthDay,
+        YearMonth,
         Annotated[
             str,
             Field(

pyproject.toml

@@ -23,7 +23,7 @@ requests = "^2.31.0"
 [tool.poetry.group.dev.dependencies]
 black = "^24.1.1"
 ipdb = "^0.13.13"
-mex-model = { git = "https://github.com/robert-koch-institut/mex-model.git", rev = "2.2.0" }
+mex-model = { git = "https://github.com/robert-koch-institut/mex-model.git", branch = "feature/mx-1569-date-validation" }  # TODO update to new version
 mypy = "^1.8.0"
 pandas-stubs = "^2.1.4"
 pytest = "^8.0.0"

tests/models/test_model_schemas.py

@@ -10,7 +10,6 @@
 from mex.common.models import EXTRACTED_MODEL_CLASSES_BY_NAME
 from mex.common.transform import dromedary_to_kebab
 from mex.common.types.identifier import MEX_ID_PATTERN
-from mex.common.types.temporal_entity import TIMESTAMP_REGEX
 
 SPECIFIED_SCHEMA_PATH = files("mex.model").joinpath("entities")
 
@@ -119,17 +118,6 @@ def prepare_field(field: str, obj: list[Any] | dict[str, Any]) -> None:
     use_scheme = obj.pop("useScheme", "")  # only in spec (needed to select vocabulary)
     vocabulary = use_scheme.removeprefix("https://mex.rki.de/item/")  # vocabulary name
 
-    # ignore differences between dates and datetimes
-    # (we only have `Timestamp` as a date-time implementation, but no type for `date`,
-    # but we might/should add that in the future)
-    if (
-        obj.get("format") in ("date", "date-time")
-        or obj.get("pattern") == TIMESTAMP_REGEX
-    ):
-        obj.pop("examples", None)
-        obj.pop("pattern", None)
-        obj["format"] = "date-time"
-
     # align reference paths
     # (the paths to referenced vocabularies and types differ between the models
     # and the specification, so we need to make sure they match before comparing)