auto-rest-api 0.1.5__tar.gz → 0.1.6__tar.gz

{auto_rest_api-0.1.5 → auto_rest_api-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: auto-rest-api
-Version: 0.1.5
+Version: 0.1.6
 Summary: Automatically map database schemas and deploy per-table REST API endpoints.
 License: GPL-3.0-only
 Keywords: Better,HPC,automatic,rest,api

{auto_rest_api-0.1.5 → auto_rest_api-0.1.6}/auto_rest/app.py

@@ -44,9 +44,12 @@ async def logging_middleware(request: Request, call_next: callable) -> Response:
         "ip": request.client.host,
         "port": request.client.port,
         "method": request.method,
-        "endpoint": f"{request.url.path}?{request.url.query}",
+        "endpoint": request.url.path,
     }
 
+    if request.url.query:
+        request_meta["endpoint"] += "?" + request.url.query
+
     # Execute handling logic
     try:
         response = await call_next(request)

{auto_rest_api-0.1.5 → auto_rest_api-0.1.6}/auto_rest/cli.py

@@ -35,7 +35,7 @@ import logging.config
 from argparse import ArgumentParser, HelpFormatter
 from pathlib import Path
 
-__all__ = ["configure_cli_logging", "create_cli_parser"]
+__all__ = ["configure_cli_logging", "create_cli_parser", "VERSION"]
 
 VERSION = importlib.metadata.version("auto-rest-api")
 

{auto_rest_api-0.1.5 → auto_rest_api-0.1.6}/auto_rest/handlers.py

@@ -188,21 +188,42 @@ def create_list_records_handler(engine: DBEngine, table: Table) -> Callable[...,
     """
 
     interface = create_interface(table)
-    columns = tuple(table.columns.keys())
+    interface_opt = create_interface(table, mode="optional")
+    col_names = tuple(table.columns.keys())
 
     async def list_records_handler(
         response: Response,
         session: DBSession = Depends(create_session_iterator(engine)),
+        filters: interface_opt = Depends(),
         _limit_: int = Query(0, ge=0, description="The maximum number of records to return."),
         _offset_: int = Query(0, ge=0, description="The starting index of the returned records."),
-        _order_by_: Optional[Literal[*columns]] = Query(None, description="The field name to sort by."),
-        _direction_: Literal["asc", "desc"] = Query("asc", description="Sort results in 'asc' or 'desc' order.")
+        _order_by_: Optional[Literal[*col_names]] = Query(None, description="The field name to sort by."),
+        _direction_: Literal["asc", "desc"] = Query("asc", description="Sort results in 'asc' or 'desc' order."),
     ) -> list[interface]:
         """Fetch a list of records from the database.
 
         URL query parameters are used to enable filtering, ordering, and paginating returned values.
         """
 
+        query = select(table)
+
+        # Fetch data per the request parameters
+        for param, value in filters:
+            if value is not None:
+                column = getattr(table.c, param)
+                if value.lower() == "_null_":
+                    query = query.filter(column.is_(None))
+
+                else:
+                    query = query.filter(column.ilike(f"%{value}%"))
+
+        if _limit_ > 0:
+            query = query.offset(_offset_).limit(_limit_)
+
+        if _order_by_ is not None:
+            direction = {'desc': desc, 'asc': asc}[_direction_]
+            query = query.order_by(direction(_order_by_))
+
         # Determine total record count
         total_count_query = select(func.count()).select_from(table)
         total_count = await execute_session_query(session, total_count_query)
@@ -214,17 +235,8 @@ def create_list_records_handler(engine: DBEngine, table: Table) -> Callable[...,
         response.headers["x-order-by"] = str(_order_by_)
         response.headers["x-order-direction"] = str(_direction_)
 
-        # Fetch data per the request parameters
-        query = select(table)
-        if _limit_ > 0:
-            query = query.offset(_offset_).limit(_limit_)
-
-        if _order_by_ is not None:
-            direction = {'desc': desc, 'asc': asc}[_direction_]
-            query = query.order_by(direction(_order_by_))
-
-        result = await execute_session_query(session, query)
-        return [row._mapping for row in result.all()]
+        # noinspection PyTypeChecker
+        return await execute_session_query(session, query)
 
     return list_records_handler
 
@@ -257,7 +269,7 @@ def create_get_record_handler(engine: DBEngine, table: Table) -> Callable[..., A
     return get_record_handler
 
 
-def create_post_record_handler(engine: DBEngine, table: Table) -> Callable[..., Awaitable[PydanticModel]]:
+def create_post_record_handler(engine: DBEngine, table: Table) -> Callable[..., Awaitable[None]]:
     """Create a function for handling POST requests against a record in the database.
 
     Args:
@@ -276,7 +288,7 @@ def create_post_record_handler(engine: DBEngine, table: Table) -> Callable[...,
     ) -> None:
         """Create a new record in the database."""
 
-        query = insert(table).values(**data.dict())
+        query = insert(table).values(**data.model_dump())
         await execute_session_query(session, query)
         await commit_session(session)
 

{auto_rest_api-0.1.5 → auto_rest_api-0.1.6}/auto_rest/models.py

@@ -32,7 +32,7 @@ connection and session handling are configured accordingly.
 import asyncio
 import logging
 from pathlib import Path
-from typing import Callable
+from typing import AsyncGenerator, Callable, Generator
 
 import yaml
 from sqlalchemy import create_engine, Engine, MetaData, URL
@@ -169,7 +169,7 @@ def create_db_metadata(engine: DBEngine) -> MetaData:
     return metadata
 
 
-def create_session_iterator(engine: DBEngine) -> Callable[[], DBSession]:
+def create_session_iterator(engine: DBEngine) -> Callable[[], Generator[Session, None, None] | AsyncGenerator[AsyncSession, None]]:
     """Create a generator for database sessions.
 
     Returns a synchronous or asynchronous function depending on whether
@@ -185,12 +185,12 @@ def create_session_iterator(engine: DBEngine) -> Callable[[], DBSession]:
     """
 
     if isinstance(engine, AsyncEngine):
-        async def session_iterator() -> AsyncSession:
+        async def session_iterator() -> AsyncGenerator[AsyncSession, None]:
             async with AsyncSession(bind=engine, autocommit=False, autoflush=True) as session:
                 yield session
 
     else:
-        def session_iterator() -> Session:
+        def session_iterator() -> Generator[Session, None, None]:
             with Session(bind=engine, autocommit=False, autoflush=True) as session:
                 yield session
 

{auto_rest_api-0.1.5 → auto_rest_api-0.1.6}/pyproject.toml

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