reorganize code into submodules

stac_fastapi/api

@@ -0,0 +1 @@
+../stac_fastapi_api/fastapi_stac/api

fastapi_stac_api/fastapi_stac/api/app.py → stac_fastapi_api/fastapi_stac/api/app.py

@@ -7,21 +7,24 @@
 from stac_pydantic import ItemCollection
 from stac_pydantic.api import ConformanceClasses, LandingPage
 
-from stac_api.api.extensions import FieldsExtension
-from stac_api.api.extensions.extension import ApiExtension
-from stac_api.api.models import (
+from stac_api.clients.base import BaseCoreClient
+from stac_api.config import ApiSettings, inject_settings
+from stac_api.errors import DEFAULT_STATUS_CODES, add_exception_handlers
+from stac_api.models import schemas
+from stac_fastapi.api.extensions import FieldsExtension
+from stac_fastapi.api.extensions.extension import ApiExtension
+from stac_fastapi.api.models import (
     CollectionUri,
     EmptyRequest,
     ItemCollectionUri,
     ItemUri,
     SearchGetRequest,
     _create_request_model,
 )
-from stac_api.api.routes import create_endpoint_from_model, create_endpoint_with_depends
-from stac_api.clients.base import BaseCoreClient
-from stac_api.config import ApiSettings, inject_settings
-from stac_api.errors import DEFAULT_STATUS_CODES, add_exception_handlers
-from stac_api.models import schemas
+from stac_fastapi.api.routes import (
+    create_endpoint_from_model,
+    create_endpoint_with_depends,
+)
 
 
 @attr.s

stac_fastapi_api/fastapi_stac/api/routes.py

@@ -0,0 +1,68 @@
+"""route factories."""
+from typing import Callable, Type
+
+from fastapi import Depends
+from pydantic import BaseModel
+from starlette.requests import Request
+
+from stac_fastapi.api.models import APIRequest
+
+
+# TODO: Only use one endpoint factory
+def create_endpoint_from_model(
+    func: Callable, request_model: Type[BaseModel]
+) -> Callable:
+    """Create a FastAPI endpoint from pydantic model.
+
+    Wrap a callable in a function which uses the desired request model.  It is expected
+    that the signature of the callable matches that of the request model.  This is best for validating
+    request bodies (ex. POST requests).
+
+    Args:
+        func: the wrapped function.
+        request_model: a pydantic model.
+
+    Returns:
+        callable: fastapi route which may be added to a router/application
+    """
+
+    def _endpoint(
+        request: Request,
+        request_data: request_model,  # type:ignore
+    ):
+        """Endpoint."""
+        resp = func(request_data, request=request)
+        return resp
+
+    return _endpoint
+
+
+def create_endpoint_with_depends(
+    func: Callable,
+    request_model: Type[APIRequest],
+) -> Callable:
+    """Create a FastAPI endpoint from an `APIRequest` (dataclass).
+
+    Wrap a callable in a function which uses the desired `APIRequest` to define request parameters.  It is expected
+    that the return of `APIRequest.kwargs` matches that of the callable.  This works best for validating query/path
+    parameters (ex. GET request) and allows for dependency injection.
+
+    Args:
+        func: the wrapped function
+        request_model: subclass of `APIRequest`
+
+    Returns:
+        callable: fastapi route which may be added to a router/application
+    """
+
+    def _endpoint(
+        request: Request,
+        request_data: request_model = Depends(),  # type:ignore
+    ):
+        """Endpoint."""
+        resp = func(
+            request=request, **request_data.kwargs()  # type:ignore
+        )
+        return resp
+
+    return _endpoint

fastapi_stac_api/setup.py → stac_fastapi_api/setup.py

@@ -6,17 +6,15 @@
 
 from setuptools import find_namespace_packages, setup
 
-name = "fastapi_stac"
+name = "stac_fastapi_api"
 description = (
     "API subpackage of fastapi-stac, a STAC compliant API layer build with FastAPI."
 )
 
 __version__ = load_source(
-    "fastapi_stac.api.version",
-    os.path.join(
-        os.path.dirname(__file__), "fastapi_stac/api/version.py"
-    ),  # type:ignore
-).__version__
+    "stac_fastapi.api.version",
+    os.path.join(os.path.dirname(__file__), "stac_fastapi/api/version.py"),
+).__version__  # type:ignore
 
 install_requires = [
     "attrs",