Update optional (#39)

* removed optional * test passing
DARPA-CRITICALMAAS · Jun 26, 2024 · 9e3c538 · 9e3c538
1 parent 5e8c806
commit 9e3c538
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/cdr_schemas/cdr_responses/area_extractions.py b/cdr_schemas/cdr_responses/area_extractions.py
@@ -13,7 +13,7 @@ class AreaExtractionResponse(BaseModel):
     reference_id: Union[str, None] = Field(
         default=None, description="Legend id of older version of this legend item."
     )
-    px_bbox: Optional[List[Union[float, int]]] = Field(
+    px_bbox: List[Union[float, int]] = Field(
         default_factory=list,
         description="""The rough 2 point bounding box of the item.
                     Format is expected to be [x1,y1,x2,y2].""",

diff --git a/cdr_schemas/cdr_responses/features.py b/cdr_schemas/cdr_responses/features.py
@@ -23,7 +23,7 @@ class ProjectedFeature(BaseModel):
 class PolygonExtractionResponse(BaseModel):
     polygon_id: str = Field(default="", description="CDR polygon id")
     cog_id: str = Field(default="", description="Cog id")
-    px_bbox: Optional[List[Union[float, int]]] = Field(
+    px_bbox: List[Union[float, int]] = Field(
         default_factory=list,
         description="""The rough 2 point bounding box of the item.
                     Format is expected to be [x1,y1,x2,y2].""",
@@ -57,7 +57,7 @@ class PolygonExtractionResponse(BaseModel):
 class PointExtractionResponse(BaseModel):
     point_id: str = Field(default="", description="CDR point id")
     cog_id: str = Field(default="", description="Cog id")
-    px_bbox: Optional[List[Union[float, int]]] = Field(
+    px_bbox: List[Union[float, int]] = Field(
         default_factory=list,
         description="""The rough 2 point bounding box of the item.
                     Format is expected to be [x1,y1,x2,y2].""",
@@ -100,7 +100,7 @@ class PointExtractionResponse(BaseModel):
 class LineExtractionResponse(BaseModel):
     line_id: str = Field(default="", description="CDR line id")
     cog_id: str = Field(default="", description="Cog id")
-    px_bbox: Optional[List[Union[float, int]]] = Field(
+    px_bbox: List[Union[float, int]] = Field(
         default_factory=list,
         description="""The rough 2 point bounding box of the item.
                     Format is expected to be [x1,y1,x2,y2].""",

diff --git a/cdr_schemas/cdr_responses/legend_items.py b/cdr_schemas/cdr_responses/legend_items.py
@@ -23,7 +23,7 @@ class LegendItemResponse(BaseModel):
         default="",
         description="If category of type polygon this can be filled in with pattern type",
     )
-    px_bbox: Optional[List[Union[float, int]]] = Field(
+    px_bbox: List[Union[float, int]] = Field(
         default_factory=list,
         description="""The rough 2 point bounding box of the item.
                     Format is expected to be [x1,y1,x2,y2].""",

diff --git a/cdr_schemas/features/point_features.py b/cdr_schemas/features/point_features.py
@@ -38,7 +38,7 @@ class PointProperties(BaseModel):
     )
 
     # Point Properties
-    bbox: Optional[List[Union[float, int]]] = Field(
+    bbox: List[Union[float, int]] = Field(
         default=None,
         description="""The extacted 2 point bounding box of the point item.
                     Format is expected to be [x1,y1,x2,y2] where the top left

diff --git a/tests/test_point_extraction.py b/tests/test_point_extraction.py
@@ -27,7 +27,10 @@ def test_point_extraction_1():
             {
                 "id": "11",
                 "geometry": {"coordinates": [23.33, 122]},
-                "properties": {"model": "test", "model_version": "1"},
+                "properties": {
+                    "model": "test",
+                     "model_version": "1",
+                     "bbox":[]},
             }
         ]
     },