Merge pull request #148 from RemcoMeeuwissen/fix-decimal-error-again

Fix decimal error again
developmentseed · Dec 19, 2023 · 15996fb · 15996fb
2 parents c856a09 + 24b7109
commit 15996fb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/tipg/factory.py b/tipg/factory.py
@@ -35,7 +35,7 @@
 )
 from tipg.errors import MissingGeometryColumn, NoPrimaryKey, NotFound
 from tipg.resources.enums import MediaType
-from tipg.resources.response import GeoJSONResponse, SchemaJSONResponse
+from tipg.resources.response import GeoJSONResponse, SchemaJSONResponse, orjsonDumps
 from tipg.settings import FeaturesSettings, MVTSettings, TMSSettings
 
 from fastapi import APIRouter, Depends, Path, Query
@@ -781,7 +781,7 @@ async def items(  # noqa: C901
                 # NDJSON Response
                 if output_type == MediaType.ndjson:
                     return StreamingResponse(
-                        (orjson.dumps(row) + b"\n" for row in rows),
+                        (orjsonDumps(row) + b"\n" for row in rows),
                         media_type=MediaType.ndjson,
                         headers={
                             "Content-Disposition": "attachment;filename=items.ndjson"
@@ -886,13 +886,13 @@ async def items(  # noqa: C901
             # HTML Response
             if output_type == MediaType.html:
                 return self._create_html_response(
-                    request, orjson.dumps(data).decode(), template_name="items"
+                    request, orjsonDumps(data).decode(), template_name="items"
                 )
 
             # GeoJSONSeq Response
             elif output_type == MediaType.geojsonseq:
                 return StreamingResponse(
-                    (orjson.dumps(f) + b"\n" for f in data["features"]),  # type: ignore
+                    (orjsonDumps(f) + b"\n" for f in data["features"]),  # type: ignore
                     media_type=MediaType.geojsonseq,
                     headers={
                         "Content-Disposition": "attachment;filename=items.geojson"
@@ -1016,7 +1016,7 @@ async def item(
                 # NDJSON Response
                 if output_type == MediaType.ndjson:
                     return StreamingResponse(
-                        (orjson.dumps(row) + b"\n" for row in rows),
+                        (orjsonDumps(row) + b"\n" for row in rows),
                         media_type=MediaType.ndjson,
                         headers={
                             "Content-Disposition": "attachment;filename=items.ndjson"
@@ -1050,7 +1050,7 @@ async def item(
             if output_type == MediaType.html:
                 return self._create_html_response(
                     request,
-                    orjson.dumps(data).decode(),
+                    orjsonDumps(data).decode(),
                     template_name="item",
                 )
 
@@ -1512,7 +1512,6 @@ async def collection_get_tile(
             return Response(bytes(tile), media_type=MediaType.mvt.value)
 
     def _tilejson_routes(self):
-
         ############################################################################
         # ADDITIONAL ENDPOINTS NOT IN OGC Tiles API (tilejson, style.json, viewer) #
         ############################################################################

diff --git a/tipg/resources/response.py b/tipg/resources/response.py
@@ -14,16 +14,21 @@ def default(obj):
         return str(obj)
 
 
+def orjsonDumps(content: Any):
+    """Small wrapper function to run the orjson.dumps with the additional options we want"""
+    return orjson.dumps(
+        content,
+        default=default,
+        option=orjson.OPT_NON_STR_KEYS | orjson.OPT_SERIALIZE_NUMPY,
+    )
+
+
 class ORJSONResponse(JSONResponse):
     """Custom response handler for using orjson"""
 
     def render(self, content: Any) -> bytes:
         """Render the content into a JSON response using orjson"""
-        return orjson.dumps(
-            content,
-            default=default,
-            option=orjson.OPT_NON_STR_KEYS | orjson.OPT_SERIALIZE_NUMPY,
-        )
+        return orjsonDumps(content)
 
 
 class GeoJSONResponse(ORJSONResponse):