stac-fastapi.api 6.2.0__tar.gz → 6.3.0__tar.gz

{stac_fastapi_api-6.2.0 → stac_fastapi_api-6.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stac-fastapi-api
-Version: 6.2.0
+Version: 6.3.0
 Summary: An implementation of STAC API based on the FastAPI framework.
 Project-URL: Homepage, https://github.com/stac-utils/stac-fastapi
 Author-email: ArturoAI <engineering@arturo.ai>

{stac_fastapi_api-6.2.0 → stac_fastapi_api-6.3.0}/stac_fastapi/api/app.py

@@ -1,6 +1,5 @@
 """Fastapi app creation."""
 
-
 import inspect
 from typing import Awaitable, Callable, Dict, List, Optional, Tuple, Type, Union
 
@@ -13,10 +12,11 @@ from stac_pydantic import api
 from stac_pydantic.shared import MimeTypes
 from stac_pydantic.version import STAC_VERSION
 from starlette.middleware import Middleware
+from starlette.middleware.cors import CORSMiddleware
 from starlette.responses import Response
 
 from stac_fastapi.api.errors import DEFAULT_STATUS_CODES, add_exception_handlers
-from stac_fastapi.api.middleware import CORSMiddleware, ProxyHeaderMiddleware
+from stac_fastapi.api.middleware import ProxyHeaderMiddleware
 from stac_fastapi.api.models import (
     APIRequest,
     CollectionUri,
@@ -126,7 +126,14 @@ class StacApi:
         default=attr.Factory(
             lambda: [
                 Middleware(BrotliMiddleware),
-                Middleware(CORSMiddleware),
+                Middleware(
+                    CORSMiddleware,
+                    # Set CORS defaults to those recommended by the STAC API spec
+                    allow_origins=["*"],
+                    allow_methods=["OPTIONS", "POST", "GET"],
+                    allow_headers=["Content-Type"],
+                    max_age=600,
+                ),
                 Middleware(ProxyHeaderMiddleware),
             ]
         )

{stac_fastapi_api-6.2.0 → stac_fastapi_api-6.3.0}/stac_fastapi/api/middleware.py

@@ -3,6 +3,7 @@
 import contextlib
 import re
 import typing
+import warnings
 from http.client import HTTP_PORT, HTTPS_PORT
 from typing import List, Optional, Tuple
 
@@ -31,17 +32,25 @@ class CORSMiddleware(_CORSMiddleware):
         allow_origin_regex: typing.Optional[str] = None,
         expose_headers: typing.Sequence[str] = (),
         max_age: int = 600,
+        **kwargs: typing.Any,
     ) -> None:
         """Create CORS middleware."""
+        warnings.warn(
+            """stac_fastapi.api.middleware.CORSMiddleware is deprecated and
+            will be removed in a future release.
+            Please use starlette.middleware.cors.CORSMiddleware instead.""",
+            DeprecationWarning,
+        )
         super().__init__(
             app,
-            allow_origins,
-            allow_methods,
-            allow_headers,
-            allow_credentials,
-            allow_origin_regex,
-            expose_headers,
-            max_age,
+            allow_origins=allow_origins,
+            allow_methods=allow_methods,
+            allow_headers=allow_headers,
+            allow_credentials=allow_credentials,
+            allow_origin_regex=allow_origin_regex,
+            expose_headers=expose_headers,
+            max_age=max_age,
+            **kwargs,
         )
 
 

{stac_fastapi_api-6.2.0 → stac_fastapi_api-6.3.0}/stac_fastapi/api/routes.py

@@ -83,6 +83,45 @@ class Scope(TypedDict, total=False):
     type: Optional[str]
 
 
+def _is_endpoint_route(route: BaseRoute) -> bool:
+    """Check if route is a standard endpoint (not a mount or sub-router)."""
+    return (
+        hasattr(route, "path") and hasattr(route, "methods") and route.methods is not None
+    )
+
+
+def _apply_dependencies_to_route(
+    route: BaseRoute, scopes: List[Scope], dependencies: List[params.Depends]
+) -> None:
+    """Apply dependencies to a single route matching the given scopes."""
+    for scope in scopes:
+        _scope = copy.deepcopy(scope)
+
+        if scope["path"] == "*":
+            _scope["path"] = route.path  # type: ignore
+
+        if scope["method"] == "*":
+            _scope["method"] = list(route.methods)[0]  # type: ignore
+
+        match, _ = route.matches({"type": "http", **_scope})
+        if match != Match.FULL:
+            continue
+
+        if not hasattr(route, "dependant"):
+            continue
+
+        for depends in dependencies[::-1]:
+            route.dependant.dependencies.insert(
+                0,
+                get_parameterless_sub_dependant(
+                    depends=depends,
+                    path=route.path_format,  # type: ignore
+                ),
+            )
+
+        route.dependencies.extend(dependencies)  # type: ignore
+
+
 def add_route_dependencies(
     routes: List[BaseRoute], scopes: List[Scope], dependencies: List[params.Depends]
 ) -> None:
@@ -96,48 +135,19 @@ def add_route_dependencies(
     Returns:
         None
     """
-    for scope in scopes:
-        _scope = copy.deepcopy(scope)
-        for route in routes:
-            if scope["path"] == "*":
-                # NOTE: ignore type, because BaseRoute has no "path" attribute
-                # but APIRoute does.
-                _scope["path"] = route.path  # type: ignore
-
-            # NOTE: ignore type, because BaseRoute has no "method" attribute
-            # but APIRoute does.
-            if scope["method"] == "*":
-                _scope["method"] = list(route.methods)[0]  # type: ignore
-
-            match, _ = route.matches({"type": "http", **_scope})
-            if match != Match.FULL:
-                continue
-
-            # Ignore paths without dependants, e.g. /api, /api.html, /docs/oauth2-redirect
-            if not hasattr(route, "dependant"):
-                continue
-
-            # Mimicking how APIRoute handles dependencies:
-            # https://github.com/tiangolo/fastapi/blob/1760da0efa55585c19835d81afa8ca386036c325/fastapi/routing.py#L408-L412
-            for depends in dependencies[::-1]:
-                route.dependant.dependencies.insert(
-                    0,
-                    get_parameterless_sub_dependant(
-                        # NOTE: ignore type, because BaseRoute has no "path_format"
-                        # attribute but APIRoute does.
-                        depends=depends,
-                        path=route.path_format,  # type: ignore
-                    ),
-                )
-
-            # Register dependencies directly on route so that they aren't ignored if
-            # the routes are later associated with an app (e.g.
-            # app.include_router(router))
-            # https://github.com/tiangolo/fastapi/blob/58ab733f19846b4875c5b79bfb1f4d1cb7f4823f/fastapi/applications.py#L337-L360
-            # https://github.com/tiangolo/fastapi/blob/58ab733f19846b4875c5b79bfb1f4d1cb7f4823f/fastapi/routing.py#L677-L678
-            # NOTE: ignore type, because BaseRoute has no "dependencies" attribute
-            # but APIRoute does.
-            route.dependencies.extend(dependencies)  # type: ignore
+    for route in routes:
+        if hasattr(route, "original_router"):
+            add_route_dependencies(route.original_router.routes, scopes, dependencies)
+            continue
+
+        if hasattr(route, "routes") and route.routes:
+            add_route_dependencies(route.routes, scopes, dependencies)
+            continue
+
+        if not _is_endpoint_route(route):
+            continue
+
+        _apply_dependencies_to_route(route, scopes, dependencies)
 
 
 def add_direct_response(app: FastAPI) -> None:

{stac_fastapi_api-6.2.0 → stac_fastapi_api-6.3.0}/stac_fastapi/api/version.py

@@ -1,3 +1,3 @@
 """Library version."""
 
-__version__ = "6.2.0"
+__version__ = "6.3.0"