[test] add local server as tiles xyz provider

samgis/io/wrappers_helpers.py

@@ -174,8 +174,8 @@ def get_url_tile(source_type: str):
             case XYZTerrainProvidersNames.NEXTZEN_TERRAIN_TILES_NAME:
                 app_logger.info("nextzen_terrain_rgb:", nextzen_terrain_rgb)
                 return nextzen_terrain_rgb
-
-        return providers.query_name(source_type)
+            case _:
+                return providers.query_name(source_type)
     except ValueError as ve:
         from pydantic_core import ValidationError
 

samgis/utilities/utilities.py

@@ -17,7 +17,8 @@ def _is_base64(sb: str or bytes):
 
     try:
         sb_bytes = _prepare_base64_input(sb)
-        return base64.b64encode(base64.b64decode(sb_bytes, validate=True)) == sb_bytes
+        decoded = base64.b64decode(sb_bytes, validate=True)
+        return base64.b64encode(decoded).decode("utf-8") == sb_bytes.decode("utf-8")
     except ValueError:
         return False
 

scripts/extract-openapi-fastapi.py

@@ -3,14 +3,15 @@ import argparse
 import json
 import logging
 import sys
+
 import yaml
 from uvicorn.importer import import_from_string
 
+from samgis import PROJECT_ROOT_FOLDER
 
 parser = argparse.ArgumentParser(prog="extract-openapi-fastapi.py")
 parser.add_argument("app",       help='App import string. Eg. "main:app"', default="main:app")
 parser.add_argument("--app-dir", help="Directory containing the app", default=None)
-parser.add_argument("--out",     help="Output file ending in .json or .yaml", default="openapi.yaml")
 
 
 if __name__ == "__main__":
@@ -26,11 +27,11 @@ if __name__ == "__main__":
     openapi = app.openapi()
     version = openapi.get("openapi", "unknown version")
 
-    logging.info(f"writing openapi spec v{version}")
-    with open(args.out, "w") as f:
-        if args.out.endswith(".json"):
-            json.dump(openapi, f, indent=2)
-        else:
-            yaml.dump(openapi, f, sort_keys=False)
+    logging.info(f"writing openapi spec v{version}...")
+    output_dir_path = PROJECT_ROOT_FOLDER / "docs" / "specs"
+    with open(output_dir_path / "output.json", "w") as f:
+        json.dump(openapi, f)
+    with open(output_dir_path / "output.yaml", "w") as f:
+        yaml.dump(openapi, f, sort_keys=False)
 
     logging.info(f"spec written to {args.out} #")

tests/test_fastapi_app.py

@@ -6,7 +6,9 @@ from unittest.mock import patch
 from fastapi.testclient import TestClient
 
 from samgis import PROJECT_ROOT_FOLDER
+from samgis.io import wrappers_helpers
 from tests import TEST_EVENTS_FOLDER
+from tests.local_tiles_http_server import LocalTilesHttpServer
 from wrappers import fastapi_wrapper
 from wrappers.fastapi_wrapper import app
 
@@ -125,14 +127,22 @@ class TestFastapiApp(unittest.TestCase):
         print("response.body:", body)
         assert body == {'msg': 'Error - Internal Server Error'}
 
+    @patch.object(wrappers_helpers, "get_url_tile")
     @patch.object(time, "time")
-    def test_infer_samgis_real_200(self, time_mocked):
+    def test_infer_samgis_real_200(self, time_mocked, get_url_tile_mocked):
         import shapely
+        import xyzservices
+        from tests import LOCAL_URL_TILE, TEST_EVENTS_FOLDER
 
         time_mocked.return_value = 0
+        listen_port = 8000
 
-        response = client.post("/infer_samgis", json=event)
-        print("response.status_code:", response.status_code)
+        local_tile_provider = xyzservices.TileProvider(name="local_tile_provider", url=LOCAL_URL_TILE, attribution="")
+        get_url_tile_mocked.return_value = local_tile_provider
+
+        with LocalTilesHttpServer.http_server("localhost", listen_port, directory=TEST_EVENTS_FOLDER):
+            response = client.post("/infer_samgis", json=event)
+            print("response.status_code:", response.status_code)
         assert response.status_code == 200
         body_string = response.json()["body"]
         body_loaded = json.loads(body_string)