fix: python 3.9 dump version due to docker compose issues

Author: preneond

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
     rev: stable
     hooks:
       - id: black
-        language_version: python3.10
+        language_version: python3.9
   - repo: https://github.com/pre-commit/mirrors-isort
     rev: v5.4.2
     hooks:

Dockerfile

@@ -1,4 +1,5 @@
-FROM python:3.10
+FROM tiangolo/uvicorn-gunicorn-fastapi:python3.9
+
 
 COPY ./requirements.txt /app/requirements.txt
 RUN pip install --upgrade pip
@@ -15,4 +16,6 @@ EXPOSE 8000
 RUN pip install --no-cache-dir -r /app/requirements.txt
 
 WORKDIR /app
-CMD [ "python", "src/main.py" ]
+
+# sleep to wait until the database is ready
+CMD sleep 5 && python src/main.py

docker-compose.yaml

@@ -6,15 +6,14 @@ services:
     volumes:
       - ./database/init.sql:/docker-entrypoint-initdb.d/init.sql
     environment:
-      - POSTGRES_USER=${PostgresUser}
-      - POSTGRES_PASSWORD=${PostgresPassword}
-      - POSTGRES_SERVER=${PostgresServer}
-      - POSTGRES_DB=${PostgresDb}
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DB=appw
     ports:
       - "5432:5432"
   app:
     build: .
-    ports:
-      - "8000:8000"
     depends_on:
       - database
+    ports:
+      - "8000:8000"

setup.cfg

@@ -14,7 +14,7 @@ per-file-ignores =
     __init__.py: F401
 
 [mypy]
-python_version = 3.10
+python_version = 3.9
 disallow_untyped_calls = True
 disallow_untyped_defs = True
 disallow_incomplete_defs = True

src/core/database.py

@@ -25,7 +25,7 @@ def query_all(
 
     def query_one(
         self, query: str, params: Union[Sequence[Any], Mapping[str, Any], None] = None
-    ) -> Tuple[Any, ...] | None:
+    ) -> Optional[Tuple[Any, ...]]:
         """Execute a query and return the results"""
         with self.conn.cursor() as cursor:
             cursor.execute(query, params)

src/core/dependencies.py

@@ -1,4 +1,5 @@
 import json
+from typing import Optional
 
 from fastapi import File, UploadFile
 from starlette.requests import Request
@@ -18,7 +19,7 @@ async def load_json_file(file: UploadFile = File(...)) -> JSONType:
     return json_data
 
 
-async def get_accept_request_header(request: Request) -> str | None:
+async def get_accept_request_header(request: Request) -> Optional[str]:
     """
     Returns the value of the Accept header of the request.
     :param request: request

src/core/xml_parser.py

@@ -57,19 +57,16 @@ def parse_element_value(self, value: Optional[str]) -> Any:
                 raise ValueError("Invalid XML file schema")
 
         # element type validation check
-        match self:
-            case XMLElementType.STRING:
-                return value
-            case XMLElementType.INTEGER:
-                return int(value)
-            case XMLElementType.FLOAT:
-                return float(value)
-            case XMLElementType.BOOLEAN:
-                return value == "true"
-            case _:
-                raise NotImplementedError(
-                    f"Etree element type not supported: {self.value}"
-                )
+        if self is XMLElementType.STRING:
+            return value
+        elif self is XMLElementType.INTEGER:
+            return int(value)
+        elif self is XMLElementType.FLOAT:
+            return float(value)
+        elif self is XMLElementType.BOOLEAN:
+            return value == "true"
+        else:
+            raise NotImplementedError(f"Etree element type not supported: {self.value}")
 
 
 class XMLParser:
@@ -145,30 +142,33 @@ def _parse_json_data_to_etree(data: JSONType) -> _Element:
         element_value: Optional[str] = None
 
         # Set element children and value based on the type of the item
-        match element_type:
-            # if the element is an object, then assign children to element keys recursively
-            case XMLElementType.OBJECT:
-                for key, value in data.items():  # type: ignore
-                    child = XMLParser._parse_json_data_to_etree(value)
-                    child.set("key", key)
-                    element.append(child)
-            # if the element is a list, then append children to element
-            case XMLElementType.LIST:
-                for value in data:  # type: ignore
-                    child = XMLParser._parse_json_data_to_etree(value)
-                    element.append(child)
-            # if the element type is a string leaf, then set the value of the element
-            case XMLElementType.STRING:
-                element_value = data  # type: ignore
-            # if the element type is a leaf and not a string, then set the json-dumped value of the element
-            case XMLElementType.INTEGER | XMLElementType.FLOAT | XMLElementType.BOOLEAN:
-                element_value = json.dumps(data)
-            # if the element type is null, then do not set the value of the element
-            case XMLElementType.NULL:
-                pass
-            # if the element type is not one of above type, then raise an error
-            case _:
-                raise NotImplementedError("Unsupported type for parsing")
+        # if the element is an object, then assign children to element keys recursively
+        if element_type is XMLElementType.OBJECT:
+            for key, value in data.items():  # type: ignore
+                child = XMLParser._parse_json_data_to_etree(value)
+                child.set("key", key)
+                element.append(child)
+        # if the element is a list, then append children to element
+        elif element_type is XMLElementType.LIST:
+            for value in data:  # type: ignore
+                child = XMLParser._parse_json_data_to_etree(value)
+                element.append(child)
+        # if the element type is a string leaf, then set the value of the element
+        elif element_type is XMLElementType.STRING:
+            element_value = data  # type: ignore
+        # if the element type is a leaf and not a string, then set the json-dumped value of the element
+        elif element_type in [
+            XMLElementType.INTEGER,
+            XMLElementType.FLOAT,
+            XMLElementType.BOOLEAN,
+        ]:
+            element_value = json.dumps(data)
+        # if the element type is null, then do not set the value of the element
+        elif element_type is XMLElementType.NULL:
+            pass
+        # if the element type is not one of above type, then raise an error
+        else:
+            raise NotImplementedError("Unsupported type for parsing")
 
         if element_value is not None:
             element.set("value", element_value)

src/routers/xml_json.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, Union
 
 from fastapi import APIRouter, Depends, File, UploadFile
 from lxml import etree
@@ -26,7 +26,7 @@ async def convert_xml2json_request(file: UploadFile = File(...)) -> JSONResponse
 async def convert_json2xml_request(
     accept_header: Optional[str] = Depends(get_accept_request_header),
     json_data: JSONType = Depends(load_json_file),
-) -> Response | JSONResponse:
+) -> Union[Response, JSONResponse]:
     """
     Endpoint that converts JSON to XML.