removed alembic migrations script, removed option to return as list of Row objects in get_multi

Author: igorbenav

docker-compose.yml

@@ -45,33 +45,33 @@ services:
     volumes:
       - redis-data:/data
 
-  # #-------- uncomment to create first superuser --------
-  # create_superuser:
-  #   build: 
-  #     context: .
-  #     dockerfile: Dockerfile
-  #   env_file:
-  #     - ./src/.env
-  #   depends_on:
-  #     - db
-  #   command: python -m src.scripts.create_first_superuser
-  #   volumes:
-  #     - ./src:/code/src
+  #-------- uncomment to create first superuser --------
+  create_superuser:
+    build: 
+      context: .
+      dockerfile: Dockerfile
+    env_file:
+      - ./src/.env
+    depends_on:
+      - db
+    command: python -m src.scripts.create_first_superuser
+    volumes:
+      - ./src:/code/src
 
-  # #-------- uncomment to run tests --------
-  # pytest:
-  #   build: 
-  #     context: .
-  #     dockerfile: Dockerfile 
-  #   env_file:
-  #     - ./src/.env 
-  #   depends_on:
-  #     - db
-  #     - create_superuser
-  #     - redis
-  #   command: python -m pytest
-  #   volumes:
-  #     - ./src:/code/src
+  #-------- uncomment to run tests --------
+  pytest:
+    build: 
+      context: .
+      dockerfile: Dockerfile 
+    env_file:
+      - ./src/.env 
+    depends_on:
+      - db
+      - create_superuser
+      - redis
+    command: python -m pytest
+    volumes:
+      - ./src:/code/src
 
 volumes:
   postgres-data:

src/app/core/cache.py

@@ -11,7 +11,7 @@
 from fastapi import FastAPI
 from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
 
-from app.core.exceptions import CacheIdentificationInferenceError, InvalidRequestError, InvalidOutputTypeError
+from app.core.exceptions import CacheIdentificationInferenceError, InvalidRequestError
 
 # --------------- server side caching ---------------
 
@@ -209,9 +209,6 @@ async def sample_endpoint(request: Request, resource_id: int):
     def wrapper(func: Callable) -> Callable:
         @functools.wraps(func)
         async def inner(request: Request, *args, **kwargs) -> Response:
-            if "output_type" in kwargs.keys() and kwargs["output_type"] == list:
-                raise InvalidOutputTypeError
-            
             if resource_id_name:
                 resource_id = kwargs[resource_id_name]
             else:

src/app/core/exceptions.py

@@ -8,9 +8,3 @@ class InvalidRequestError(Exception):
     def __init__(self, message="Type of request not supported."):
         self.message = message
         super().__init__(self.message)
-
-
-class InvalidOutputTypeError(Exception):
-    def __init__(self, message="output_type not allowed. If caching, use dict"):
-        self.message = message
-        super().__init__(self.message)

src/app/crud/crud_base.py

@@ -10,8 +10,6 @@
     _extract_matching_columns_from_schema, 
     _extract_matching_columns_from_kwargs
 )
-from app.core.exceptions import InvalidOutputTypeError
-
 
 ModelType = TypeVar("ModelType")
 CreateSchemaType = TypeVar("CreateSchemaType", bound=BaseModel)
@@ -157,7 +155,6 @@ async def get_multi(
             offset: int = 0, 
             limit: int = 100, 
             schema_to_select: Union[Type[BaseModel], List[Type[BaseModel]], None] = None,
-            output_type: Union[Type[dict], Type[list]] = dict,
             **kwargs: Any
     ) -> Dict[str, Any]:
         """
@@ -173,19 +170,13 @@ async def get_multi(
             Maximum number of rows to fetch. Default is 100.
         schema_to_select : Union[Type[BaseModel], List[Type[BaseModel]], None], optional
             Pydantic schema for selecting specific columns. Default is None to select all columns.
-        output_type : Union[Type[dict], Type[list]], optional
-            Desired output type of the result. Default is dict.
         kwargs : dict
             Filters to apply to the query.
 
         Returns
         -------
         Dict[str, Any]
             Dictionary containing the fetched rows under 'data' key and total count under 'total_count'.
-
-        Note
-        ----
-            -  The cache decorator only works with output_type=dict (default)
         """
         to_select = _extract_matching_columns_from_schema(model=self._model, schema=schema_to_select)
         stmt = select(*to_select) \
@@ -194,14 +185,7 @@ async def get_multi(
             .limit(limit)
 
         result = await db.execute(stmt)
-        row_data = result
-
-        if output_type == dict:
-            data = [dict(row) for row in row_data.mappings()]
-        elif output_type == list:
-            data = row_data.all()
-        else:
-            raise InvalidOutputTypeError
+        data = [dict(row) for row in result.mappings()]
 
         total_count = await self.count(db=db, **kwargs)