auto-rest-api 0.1.3__tar.gz → 0.1.4__tar.gz

{auto_rest_api-0.1.3 → auto_rest_api-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: auto-rest-api
-Version: 0.1.3
+Version: 0.1.4
 Summary: Automatically map database schemas and deploy per-table REST API endpoints.
 License: GPL-3.0-only
 Keywords: Better,HPC,automatic,rest,api
@@ -34,7 +34,7 @@ Description-Content-Type: text/markdown
 
 # Auto-REST
 
-A command line tool for deploying dynamically generated REST APIs against relational databases.
+A light-weight CLI tool for deploying dynamically generated REST APIs against relational databases.
 See the [project documentation](https://better-hpc.github.io/auto-rest/) for detailed usage instructions.
 
 ## Supported Databases
@@ -70,10 +70,6 @@ Launch an API by providing connection arguments to a database of your choice.
 
 ```shell
 auto-rest \
-  # Enable optional endpoints / functionality
-  --enable-docs \
-  --enable-write \
-  # Define the database type and connection arguments
   --psql 
   --db-host localhost
   --db-port 5432

{auto_rest_api-0.1.3 → auto_rest_api-0.1.4}/README.md

@@ -1,6 +1,6 @@
 # Auto-REST
 
-A command line tool for deploying dynamically generated REST APIs against relational databases.
+A light-weight CLI tool for deploying dynamically generated REST APIs against relational databases.
 See the [project documentation](https://better-hpc.github.io/auto-rest/) for detailed usage instructions.
 
 ## Supported Databases
@@ -36,10 +36,6 @@ Launch an API by providing connection arguments to a database of your choice.
 
 ```shell
 auto-rest \
-  # Enable optional endpoints / functionality
-  --enable-docs \
-  --enable-write \
-  # Define the database type and connection arguments
   --psql 
   --db-host localhost
   --db-port 5432

auto_rest_api-0.1.4/auto_rest/__main__.py

@@ -0,0 +1,70 @@
+"""Application entrypoint triggered by calling the packaged CLI command."""
+
+import logging
+
+from .app import *
+from .cli import *
+from .models import *
+from .routers import *
+
+__all__ = ["main", "run_application"]
+
+logger = logging.getLogger("auto-rest")
+
+
+def main() -> None:  # pragma: no cover
+    """Application entry point called when executing the command line interface.
+
+    This is a wrapper around the `run_application` function used to provide
+    graceful error handling.
+    """
+
+    try:
+        run_application()
+
+    except KeyboardInterrupt:
+        pass
+
+    except Exception as e:
+        logger.critical(str(e), exc_info=True)
+
+
+def run_application(cli_args: list[str] = None, /) -> None:  # pragma: no cover
+    """Run an Auto-REST API server.
+
+    This function is equivalent to launching an API server from the command line
+    and accepts the same arguments as those provided in the CLI. Arguments are
+    parsed from STDIN by default, unless specified in the function call.
+
+    Args:
+        A list of commandline arguments used to run the application.
+    """
+
+    # Parse application arguments
+    args = create_cli_parser().parse_args(cli_args)
+    configure_cli_logging(args.log_level)
+
+    logger.info(f"Resolving database connection settings.")
+    db_kwargs = parse_db_settings(args.db_config)
+    db_url = create_db_url(
+        driver=args.db_driver,
+        host=args.db_host,
+        port=args.db_port,
+        database=args.db_name,
+        username=args.db_user,
+        password=args.db_pass
+    )
+
+    logger.info("Mapping database schema.")
+    db_conn = create_db_engine(db_url, **db_kwargs)
+    db_meta = create_db_metadata(db_conn)
+
+    logger.info("Creating application.")
+    app = create_app(args.app_title, args.app_version)
+    app.include_router(create_welcome_router(), prefix="")
+    app.include_router(create_meta_router(db_conn, db_meta, args.app_title, args.app_version), prefix="/meta")
+    for table_name, table in db_meta.tables.items():
+        app.include_router(create_table_router(db_conn, table), prefix=f"/db/{table_name}")
+
+    logger.info(f"Launching server on http://{args.server_host}:{args.server_port}.")
+    run_server(app, args.server_host, args.server_port)

{auto_rest_api-0.1.3 → auto_rest_api-0.1.4}/auto_rest/app.py

@@ -8,20 +8,42 @@ deploying Fast-API applications.
     ```python
     from auto_rest.app import create_app, run_server
 
-    app = create_app(app_title="My Application", app_version="1.2.3", enable_docs=True)
+    app = create_app(app_title="My Application", app_version="1.2.3")
     ... # Add endpoints to the application here
     run_server(app, host="127.0.0.1", port=8081)
     ```
 """
 
+import logging
+
 import uvicorn
-from fastapi import FastAPI
+from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
+from starlette.responses import Response
 
 __all__ = ["create_app", "run_server"]
 
+logger = logging.getLogger("auto-rest")
+
+
+async def logging_middleware(request: Request, call_next: callable) -> Response:
+    """FastAPI middleware for the logging response status codes.
+
+    Args:
+        request: The incoming HTTP request.
+        call_next: The next middleware in the middleware chain.
+
+    Returns:
+        The outgoing HTTP response.
+    """
+
+    response = await call_next(request)
+    level = logging.INFO if response.status_code < 400 else logging.ERROR
+    logger.log(level, f"{request.method} ({response.status_code}) {request.client.host} - {request.url.path}")
+    return response
 
-def create_app(app_title: str, app_version: str, enable_docs: bool) -> FastAPI:
+
+def create_app(app_title: str, app_version: str) -> FastAPI:
     """Create and configure a FastAPI application instance.
 
     This function initializes a FastAPI app with a customizable title, version,
@@ -31,7 +53,6 @@ def create_app(app_title: str, app_version: str, enable_docs: bool) -> FastAPI:
     Args:
         app_title: The title of the FastAPI application.
         app_version: The version of the FastAPI application.
-        enable_docs: Whether to enable the `/docs/` endpoint.
 
     Returns:
         FastAPI: A configured FastAPI application instance.
@@ -40,14 +61,15 @@ def create_app(app_title: str, app_version: str, enable_docs: bool) -> FastAPI:
     app = FastAPI(
         title=app_title,
         version=app_version,
-        docs_url="/docs/" if enable_docs else None,
+        docs_url="/docs/",
         redoc_url=None,
     )
 
+    app.middleware("http")(logging_middleware)
     app.add_middleware(
         CORSMiddleware,
-        allow_origins=["*"],
         allow_credentials=True,
+        allow_origins=["*"],
         allow_methods=["*"],
         allow_headers=["*"],
     )
@@ -55,7 +77,7 @@ def create_app(app_title: str, app_version: str, enable_docs: bool) -> FastAPI:
     return app
 
 
-def run_server(app: FastAPI, host: str, port: int) -> None: # pragma: no cover
+def run_server(app: FastAPI, host: str, port: int) -> None:  # pragma: no cover
     """Deploy a FastAPI application server.
 
     Args:
@@ -64,4 +86,5 @@ def run_server(app: FastAPI, host: str, port: int) -> None: # pragma: no cover
         port: The port number for the server to listen on.
     """
 
-    uvicorn.run(app, host=host, port=port, log_level="error")
+    # Uvicorn overwrites its logging level when run and needs to be manually disabled here.
+    uvicorn.run(app, host=host, port=port, log_level=1000)

{auto_rest_api-0.1.3 → auto_rest_api-0.1.4}/auto_rest/cli.py

@@ -62,11 +62,13 @@ def configure_cli_logging(level: str) -> None:
     handler.setFormatter(DefaultFormatter(fmt="%(levelprefix)s %(message)s"))
     logging.basicConfig(
         force=True,
-        level=level,
         format="%(levelprefix)s %(message)s",
         handlers=[handler],
     )
 
+    logging.getLogger("auto-rest").setLevel(level)
+    logging.getLogger("sqlalchemy").setLevel(1000)
+
 
 def create_cli_parser(exit_on_error: bool = True) -> ArgumentParser:
     """Create a command-line argument parser with preconfigured arguments.
@@ -95,10 +97,6 @@ def create_cli_parser(exit_on_error: bool = True) -> ArgumentParser:
         help="Set the logging level."
     )
 
-    features = parser.add_argument_group(title="API features")
-    features.add_argument("--enable-docs", action="store_true", help="enable the 'docs' endpoint.")
-    features.add_argument("--enable-write", action="store_true", help="enable support for write operations.")
-
     driver = parser.add_argument_group("database type")
     db_type = driver.add_mutually_exclusive_group(required=True)
     db_type.add_argument("--sqlite", action="store_const", dest="db_driver", const="sqlite+aiosqlite", help="use a SQLite database driver.")

{auto_rest_api-0.1.3 → auto_rest_api-0.1.4}/auto_rest/handlers.py

@@ -75,7 +75,7 @@ __all__ = [
     "create_welcome_handler",
 ]
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("auto-rest")
 
 
 def create_welcome_handler() -> Callable[[], Awaitable[PydanticModel]]:

{auto_rest_api-0.1.3 → auto_rest_api-0.1.4}/auto_rest/models.py

@@ -34,6 +34,7 @@ import logging
 from pathlib import Path
 from typing import Callable
 
+import yaml
 from sqlalchemy import create_engine, Engine, MetaData, URL
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, create_async_engine
 from sqlalchemy.orm import Session
@@ -45,15 +46,34 @@ __all__ = [
     "create_db_metadata",
     "create_db_url",
     "create_session_iterator",
+    "parse_db_settings"
 ]
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("auto-rest")
 
 # Base classes and typing objects.
 DBEngine = Engine | AsyncEngine
 DBSession = Session | AsyncSession
 
 
+def parse_db_settings(path: Path | None) -> dict[str, any]:
+    """Parse engine configuration settings from a given file path.
+
+    Args:
+        path: Path to the configuration file.
+
+    Returns:
+        Engine configuration settings.
+    """
+
+    if path is not None:
+        logger.debug(f"Parsing engine configuration from {path}.")
+        return yaml.safe_load(path.read_text()) or dict()
+
+    logger.debug("No connection file specified.")
+    return {}
+
+
 def create_db_url(
     driver: str,
     database: str,
@@ -76,21 +96,23 @@ def create_db_url(
         A fully qualified database URL.
     """
 
-    logger.debug("Resolving database URL.")
-
     # Handle special case where SQLite uses file paths.
     if "sqlite" in driver:
         path = Path(database).resolve()
-        return URL.create(drivername=driver, database=str(path))
-
-    return URL.create(
-        drivername=driver,
-        username=username,
-        password=password,
-        host=host,
-        port=port,
-        database=database,
-    )
+        url = URL.create(drivername=driver, database=str(path))
+
+    else:
+        url = URL.create(
+            drivername=driver,
+            username=username,
+            password=password,
+            host=host,
+            port=port,
+            database=database,
+        )
+
+    logger.debug(f"Resolved URL: {url}")
+    return url
 
 
 def create_db_engine(url: URL, **kwargs: dict[str: any]) -> DBEngine:

{auto_rest_api-0.1.3 → auto_rest_api-0.1.4}/auto_rest/queries.py

@@ -19,6 +19,7 @@ handling and provides a streamlined interface for database interactions.
         result = await execute_session_query(async_session, query)
     ```
 """
+
 from typing import Literal
 
 from fastapi import HTTPException

{auto_rest_api-0.1.3 → auto_rest_api-0.1.4}/auto_rest/routers.py

@@ -23,6 +23,8 @@ routers to be added directly to an API application instance.
     ```
 """
 
+import logging
+
 from fastapi import APIRouter
 from sqlalchemy import MetaData, Table
 from starlette import status
@@ -36,6 +38,8 @@ __all__ = [
     "create_welcome_router",
 ]
 
+logger = logging.getLogger("auto-rest")
+
 
 def create_welcome_router() -> APIRouter:
     """Create an API router for returning a welcome message.
@@ -44,6 +48,8 @@ def create_welcome_router() -> APIRouter:
         An `APIRouter` with a single route for retrieving a welcome message.
     """
 
+    logger.debug("Creating welcome endpoint.")
+
     router = APIRouter()
     router.add_api_route(
         path="/",
@@ -71,6 +77,8 @@ def create_meta_router(engine: DBEngine, metadata: MetaData, name: str, version:
         An `APIRouter` with a routes for retrieving application metadata.
     """
 
+    logger.debug("Creating metadata endpoints.")
+
     router = APIRouter()
     tags = ["Application Metadata"]
 
@@ -101,25 +109,25 @@ def create_meta_router(engine: DBEngine, metadata: MetaData, name: str, version:
     return router
 
 
-def create_table_router(engine: DBEngine, table: Table, writeable: bool = False) -> APIRouter:
+def create_table_router(engine: DBEngine, table: Table) -> APIRouter:
     """Create an API router with endpoint handlers for a given database table.
 
     Args:
         engine: The SQLAlchemy engine connected to the database.
         table: The database table to create API endpoints for.
-        writeable: Whether the router should include support for write operations.
 
     Returns:
         An APIRouter instance with routes for database operations on the table.
     """
 
+    logger.debug(f"Creating endpoints for table `{table.name}`.")
     router = APIRouter()
 
     # Construct path parameters from primary key columns
     pk_columns = sorted(column.name for column in table.primary_key.columns)
     path_params_url = "/".join(f"{{{col_name}}}" for col_name in pk_columns)
 
-    # Add route for read operations against the table
+    # Add routes for operations against the table
     router.add_api_route(
         path="/",
         methods=["GET"],
@@ -129,16 +137,14 @@ def create_table_router(engine: DBEngine, table: Table, writeable: bool = False)
         tags=[table.name],
     )
 
-    # Add route for write operations against the table
-    if writeable:
-        router.add_api_route(
-            path="/",
-            methods=["POST"],
-            endpoint=create_post_record_handler(engine, table),
-            status_code=status.HTTP_201_CREATED,
-            summary="Create a new record.",
-            tags=[table.name],
-        )
+    router.add_api_route(
+        path="/",
+        methods=["POST"],
+        endpoint=create_post_record_handler(engine, table),
+        status_code=status.HTTP_201_CREATED,
+        summary="Create a new record.",
+        tags=[table.name],
+    )
 
     # Add route for read operations against individual records
     if pk_columns:
@@ -151,8 +157,6 @@ def create_table_router(engine: DBEngine, table: Table, writeable: bool = False)
             tags=[table.name],
         )
 
-    # Add routes for write operations against individual records
-    if pk_columns and writeable:
         router.add_api_route(
             path=f"/{path_params_url}/",
             methods=["PUT"],

{auto_rest_api-0.1.3 → auto_rest_api-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "auto-rest-api"
-version = "0.1.3"
+version = "0.1.4"
 readme = "README.md"
 description = "Automatically map database schemas and deploy per-table REST API endpoints."
 authors = [{ name = "Better HPC LLC" }]

auto_rest_api-0.1.3/auto_rest/__main__.py

@@ -1,94 +0,0 @@
-"""Application entrypoint triggered by calling the packaged CLI command."""
-
-import logging
-from pathlib import Path
-
-import yaml
-
-from .app import *
-from .cli import *
-from .models import *
-from .routers import *
-
-__all__ = ["main", "run_application"]
-
-logger = logging.getLogger(__name__)
-
-
-def main() -> None:  # pragma: no cover
-    """Parse command-line arguments and launch an API server."""
-
-    try:
-        parser = create_cli_parser()
-        args = vars(parser.parse_args())
-        log_level = args.pop("log_level")
-
-        configure_cli_logging(log_level)
-        run_application(**args)
-
-    except KeyboardInterrupt:
-        pass
-
-    except Exception as e:
-        logger.critical(str(e), exc_info=True)
-
-
-def run_application(
-    enable_docs: bool,
-    enable_write: bool,
-    db_driver: str,
-    db_host: str,
-    db_port: int,
-    db_name: str,
-    db_user: str,
-    db_pass: str,
-    db_config: Path | None,
-    server_host: str,
-    server_port: int,
-    app_title: str,
-    app_version: str,
-) -> None:  # pragma: no cover
-    """Run an Auto-REST API server.
-
-    This function is equivalent to launching an API server from the command line
-    and accepts the same arguments as those provided in the CLI.
-
-    Args:
-        enable_docs: Whether to enable the 'docs' API endpoint.
-        enable_write: Whether to enable support for write operations.
-        db_driver: SQLAlchemy-compatible database driver.
-        db_host: Database host address.
-        db_port: Database port number.
-        db_name: Database name.
-        db_user: Database authentication username.
-        db_pass: Database authentication password.
-        db_config: Path to a database configuration file.
-        server_host: API server host address.
-        server_port: API server port number.
-        app_title: title for the generated OpenAPI schema.
-        app_version: version number for the generated OpenAPI schema.
-    """
-
-    logger.info(f"Mapping database schema for {db_name}.")
-
-    # Resolve database connection settings
-    db_url = create_db_url(driver=db_driver, host=db_host, port=db_port, database=db_name, username=db_user, password=db_pass)
-    db_kwargs = yaml.safe_load(db_config.read_text()) if db_config else {}
-
-    # Connect to and map the database.
-    db_conn = create_db_engine(db_url, **db_kwargs)
-    db_meta = create_db_metadata(db_conn)
-
-    # Build an empty application and dynamically add the requested functionality.
-    logger.info("Creating API application.")
-    app = create_app(app_title, app_version, enable_docs)
-    app.include_router(create_welcome_router(), prefix="")
-    app.include_router(create_meta_router(db_conn, db_meta, app_title, app_version), prefix="/meta")
-
-    for table_name, table in db_meta.tables.items():
-        logger.info(f"Adding `/db/{table_name}` endpoint.")
-        app.include_router(create_table_router(db_conn, table, enable_write), prefix=f"/db/{table_name}")
-
-    # Launch the API server.
-    logger.info(f"Launching API server on http://{server_host}:{server_port}.")
-    run_server(app, server_host, server_port)