Fix comments that I think we are agreed on.

lukas-phaf · lukas-phaf · commit 555fdaa0e223 · 2025-02-19T14:45:45.000+01:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,7 +21,7 @@ classifiers = [
     "Typing :: Typed",
 ]
 version = "0.5.0"
-dependencies = ["pydantic>=2.3,<3"]
+dependencies = ["pydantic>=2.3,<3", "typing-extensions>=4.12.2"]
 
 [project.optional-dependencies]
 test = ["pytest", "pytest-cov"]
diff --git a/src/edr_pydantic/extent.py b/src/edr_pydantic/extent.py
@@ -14,11 +14,8 @@ class Spatial(EdrBaseModel):
     crs: str
 
 
-IntervalLen = Len(min_length=2, max_length=2)
-
-
 class Temporal(EdrBaseModel):
-    interval: List[Annotated[List[AwareDatetime], IntervalLen]]
+    interval: List[Annotated[List[AwareDatetime], Len(min_length=2, max_length=2)]]
     # TODO: Validate this is a list of ISO 8601 single time, ISO 8601 time duration or ISO 8601 interval
     values: List[str]
     trs: str
diff --git a/tests/test_data/temporal-interval-length1.json b/tests/test_data/temporal-interval-length1.json
diff --git a/tests/test_data/temporal-interval-length3.json b/tests/test_data/temporal-interval-length3.json
@@ -0,0 +1,13 @@
+{
+    "interval": [
+        [
+            "2020-04-19T11:00:00Z",
+            "2020-04-19T12:00:00Z",
+            "2020-04-19T13:00:00Z"
+        ]
+    ],
+    "values": [
+        "2020-04-19T11:00:00Z/2020-06-30T09:00:00Z"
+    ],
+    "trs": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]]"
+}
diff --git a/tests/test_edr.py b/tests/test_edr.py
@@ -38,7 +38,8 @@ def test_happy_cases(file_name, object_type):
 
 error_cases = [
     ("label-or-symbol-unit.json", Unit, r"Either 'label' or 'symbol' should be set"),
-    ("temporal-interval.json", Temporal, r"List should have at least 2 items after validation"),
+    ("temporal-interval-length1.json", Temporal, r"List should have at least 2 items after validation"),
+    ("temporal-interval-length3.json", Temporal, r"List should have at most 2 items after validation, not 3"),
 ]
 
 
diff --git a/tests/test_extent.py b/tests/test_extent.py

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ classifiers = [`
`21`	`21`	`"Typing :: Typed",`
`22`	`22`	`]`
`23`	`23`	`version = "0.5.0"`
`24`		`-dependencies = ["pydantic>=2.3,<3"]`
	`24`	`+dependencies = ["pydantic>=2.3,<3", "typing-extensions>=4.12.2"]`
`25`	`25`
`26`	`26`	`[project.optional-dependencies]`
`27`	`27`	`test = ["pytest", "pytest-cov"]`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ def test_happy_cases(file_name, object_type):`
`38`	`38`
`39`	`39`	`error_cases = [`
`40`	`40`	`("label-or-symbol-unit.json", Unit, r"Either 'label' or 'symbol' should be set"),`
`41`		`- ("temporal-interval.json", Temporal, r"List should have at least 2 items after validation"),`
	`41`	`+ ("temporal-interval-length1.json", Temporal, r"List should have at least 2 items after validation"),`
	`42`	`+ ("temporal-interval-length3.json", Temporal, r"List should have at most 2 items after validation, not 3"),`
`42`	`43`	`]`
`43`	`44`
`44`	`45`