stac-fastapi.api 3.0.0a3__tar.gz → 3.0.0a4__tar.gz

{stac_fastapi_api-3.0.0a3 → stac_fastapi_api-3.0.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stac-fastapi.api
-Version: 3.0.0a3
+Version: 3.0.0a4
 Summary: An implementation of STAC API based on the FastAPI framework.
 Home-page: https://github.com/stac-utils/stac-fastapi
 Author: Arturo Engineering

{stac_fastapi_api-3.0.0a3 → stac_fastapi_api-3.0.0a4}/stac_fastapi/api/app.py

@@ -439,11 +439,6 @@ class StacApi:
         """
         return add_route_dependencies(self.app.router.routes, scopes, dependencies)
 
-    def add_middleware(self, middleware: Middleware):
-        """Add a middleware class to the application."""
-        self.app.user_middleware.insert(0, middleware)
-        self.app.middleware_stack = self.app.build_middleware_stack()
-
     def __attrs_post_init__(self):
         """Post-init hook.
 
@@ -483,8 +478,11 @@ class StacApi:
         self.app.openapi = self.customize_openapi
 
         # add middlewares
+        if self.middlewares and self.app.middleware_stack is not None:
+            raise RuntimeError("Cannot add middleware after an application has started")
+
         for middleware in self.middlewares:
-            self.add_middleware(middleware)
+            self.app.user_middleware.insert(0, middleware)
 
         # customize route dependencies
         for scopes, dependencies in self.route_dependencies:

stac_fastapi_api-3.0.0a4/stac_fastapi/api/version.py

@@ -0,0 +1,2 @@
+"""Library version."""
+__version__ = "3.0.0a4"

{stac_fastapi_api-3.0.0a3 → stac_fastapi_api-3.0.0a4}/stac_fastapi.api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stac-fastapi.api
-Version: 3.0.0a3
+Version: 3.0.0a4
 Summary: An implementation of STAC API based on the FastAPI framework.
 Home-page: https://github.com/stac-utils/stac-fastapi
 Author: Arturo Engineering

{stac_fastapi_api-3.0.0a3 → stac_fastapi_api-3.0.0a4}/tests/test_app.py

@@ -8,10 +8,10 @@ from stac_pydantic import api
 
 from stac_fastapi.api import app
 from stac_fastapi.api.models import create_get_request_model, create_post_request_model
-from stac_fastapi.extensions.core.filter.filter import FilterExtension
+from stac_fastapi.extensions.core import FieldsExtension, FilterExtension
 from stac_fastapi.types import stac
 from stac_fastapi.types.config import ApiSettings
-from stac_fastapi.types.core import NumType
+from stac_fastapi.types.core import BaseCoreClient, NumType
 from stac_fastapi.types.search import BaseSearchPostRequest
 
 
@@ -190,3 +190,107 @@ def test_filter_extension(validate, TestCoreClient, item_dict):
     assert landing.status_code == 200, landing.text
     assert get_search.status_code == 200, get_search.text
     assert post_search.status_code == 200, post_search.text
+
+
+@pytest.mark.parametrize("validate", [True, False])
+def test_fields_extension(validate, TestCoreClient, item_dict):
+    """Test if fields Parameters are passed correctly."""
+
+    class BadCoreClient(BaseCoreClient):
+        def post_search(
+            self, search_request: BaseSearchPostRequest, **kwargs
+        ) -> stac.ItemCollection:
+            return {"not": "a proper stac item"}
+
+        def get_search(
+            self,
+            collections: Optional[List[str]] = None,
+            ids: Optional[List[str]] = None,
+            bbox: Optional[List[NumType]] = None,
+            intersects: Optional[str] = None,
+            datetime: Optional[Union[str, datetime]] = None,
+            limit: Optional[int] = 10,
+            **kwargs,
+        ) -> stac.ItemCollection:
+            return {"not": "a proper stac item"}
+
+        def get_item(self, item_id: str, collection_id: str, **kwargs) -> stac.Item:
+            raise NotImplementedError
+
+        def all_collections(self, **kwargs) -> stac.Collections:
+            raise NotImplementedError
+
+        def get_collection(self, collection_id: str, **kwargs) -> stac.Collection:
+            raise NotImplementedError
+
+        def item_collection(
+            self,
+            collection_id: str,
+            bbox: Optional[List[Union[float, int]]] = None,
+            datetime: Optional[Union[str, datetime]] = None,
+            limit: int = 10,
+            token: str = None,
+            **kwargs,
+        ) -> stac.ItemCollection:
+            raise NotImplementedError
+
+    test_app = app.StacApi(
+        settings=ApiSettings(enable_response_models=validate),
+        client=BadCoreClient(),
+        search_get_request_model=create_get_request_model([FieldsExtension()]),
+        search_post_request_model=create_post_request_model([FieldsExtension()]),
+        extensions=[FieldsExtension()],
+    )
+
+    with TestClient(test_app.app) as client:
+        get_search = client.get(
+            "/search",
+            params={"fields": "properties.datetime"},
+        )
+        post_search = client.post(
+            "/search",
+            json={
+                "collections": ["test"],
+                "fields": {
+                    "include": ["properties.datetime"],
+                    "exclude": [],
+                },
+            },
+        )
+
+    assert get_search.status_code == 200, get_search.text
+    assert post_search.status_code == 200, post_search.text
+
+    test_app = app.StacApi(
+        settings=ApiSettings(enable_response_models=validate),
+        client=BadCoreClient(),
+        search_get_request_model=create_get_request_model([FieldsExtension()]),
+        search_post_request_model=create_post_request_model([FieldsExtension()]),
+        extensions=[],
+    )
+
+    with TestClient(test_app.app) as client:
+        get_search = client.get(
+            "/search",
+            params={"fields": "properties.datetime"},
+        )
+        post_search = client.post(
+            "/search",
+            json={
+                "collections": ["test"],
+                "fields": {
+                    "include": ["properties.datetime"],
+                    "exclude": [],
+                },
+            },
+        )
+    if validate:
+        assert get_search.status_code == 500, (
+            get_search.json()["code"] == "ResponseValidationError"
+        )
+        assert post_search.status_code == 500, (
+            post_search.json()["code"] == "ResponseValidationError"
+        )
+    else:
+        assert get_search.status_code == 200, get_search.text
+        assert post_search.status_code == 200, post_search.text

{stac_fastapi_api-3.0.0a3 → stac_fastapi_api-3.0.0a4}/tests/test_middleware.py

@@ -1,6 +1,8 @@
 from unittest import mock
 
 import pytest
+from fastapi import Request
+from fastapi.responses import JSONResponse
 from starlette.applications import Starlette
 from starlette.testclient import TestClient
 
@@ -166,3 +168,31 @@ def test_cors_middleware(test_client):
     resp = test_client.get("/_mgmt/ping", headers={"Origin": "http://netloc"})
     assert resp.status_code == 200
     assert resp.headers["access-control-allow-origin"] == "*"
+
+
+def test_middleware_stack():
+    stac_api = StacApi(
+        settings=ApiSettings(), client=mock.create_autospec(BaseCoreClient)
+    )
+
+    def exception_handler(request: Request, exc: Exception) -> JSONResponse:
+        return JSONResponse(
+            status_code=400,
+            content={"customerrordetail": "yoo", "body": "yo"},
+        )
+
+    class CustomException(Exception):
+        "Custom Exception"
+
+        pass
+
+    stac_api.app.add_exception_handler(CustomException, exception_handler)
+
+    @stac_api.app.get("/error")
+    def error_endpoint():
+        raise CustomException("got you!")
+
+    with TestClient(stac_api.app) as client:
+        resp = client.get("/error")
+        assert resp.status_code == 400
+        assert resp.json()["customerrordetail"] == "yoo"

stac_fastapi_api-3.0.0a3/stac_fastapi/api/version.py

@@ -1,2 +0,0 @@
-"""Library version."""
-__version__ = "3.0.0a3"