Handle the gpkg format output

Author: CannonLock

api/app.py

@@ -23,7 +23,7 @@
     patch_sources_sub_table,
     select_sources_sub_table,
 )
-from api.models.source import PolygonModel, PolygonRequestModel, Sources, CopyColumnRequest
+from api.models.source import PolygonModel, PolygonRequestModel, PolygonResponseModel, Sources, CopyColumnRequest
 from api.query_parser import ParserException
 from api.routes.security import TokenData, get_groups
 from api.routes.object import router as object_router
@@ -102,7 +102,7 @@ async def get_source(source_id: int, include_geom: bool = False) -> Sources:
         return db.results_to_model(results, Sources)[0]
 
 
-@app.get("/sources/{table_id}/polygons", response_model=List[PolygonModel])
+@app.get("/sources/{table_id}/polygons", response_model=List[PolygonResponseModel])
 async def get_sub_sources(
         response: Response,
         request: starlette.requests.Request,

api/database.py

@@ -207,7 +207,7 @@ async def select_sources_sub_table(
         )
 
         # Strip out the unwanted columns
-        ignored_columns = ["geom"]  # No reason that this moment to pass this through
+        ignored_columns = ["geom", "geometry"]  # No reason that this moment to pass this through
         selected_columns = table.c[
             *[col.key for col in table.c if col.key not in ignored_columns]
         ]

api/models/source.py

@@ -3,6 +3,7 @@
 
 from geojson_pydantic import Feature, Polygon, MultiPolygon
 from pydantic import BaseModel, ConfigDict, field_validator
+from numpy import isnan
 
 
 class CommonModel(BaseModel):
@@ -22,6 +23,7 @@ class PolygonModel(CommonModel):
     t_interval: Optional[Union[int | str]] = None
     b_interval: Optional[Union[int | str]] = None
     geom: Optional[Polygon] = None
+    confidence: Optional[float] = None
 
 
 class PolygonRequestModel(PolygonModel):
@@ -32,6 +34,14 @@ def transform_str_to_int(cls, v):
         return v
 
 
+class PolygonResponseModel(PolygonModel):
+    @field_validator("confidence")
+    def change_nan_to_none(cls, v):
+        if type(v) == float and isnan(v):
+            return None
+        return v
+
+
 class LineworkModel(CommonModel):
     name: Optional[str] = None
     type: Optional[str] = None

poetry.lock

@@ -23,6 +23,7 @@ aiohttp = "^3.8.6"
 python-jose = {extras = ["cryptography"], version = "^3.3.0"}
 bcrypt = "^4.1.1"
 minio = "^7.2.3"
+numpy = "^1.26.4"
 
 [tool.poetry.group.dev.dependencies]
 bandit = "~1.7"