Do mega restructuring of Python source code

Author: PythonCoderAS

Dockerfile

@@ -34,7 +34,7 @@ WORKDIR /app
 
 COPY --from=build-server-deps /venv /venv
 
-COPY src/main.py src/main.py
+COPY src src
 COPY dump_openapi.py .
 ENV FASTAPI_OPENAPI_OUTPUT="/tmp/openapi.json"
 RUN ["mkdir", "-p", "frontend/dist"]
@@ -68,8 +68,8 @@ ENV S6_KEEP_ENV=1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 ENV S6_VERBOSITY=1
 
+COPY src ./src
 COPY --from=build-server-deps /venv /venv
-COPY src/main.py ./src/main.py
 COPY --from=build-frontend /tmp/frontend/dist ./frontend/dist
 ENV PATH="/venv/bin:$PATH"
 

alembic/env.py

@@ -2,9 +2,8 @@
 from logging.config import fileConfig
 from os import environ
 
-from sqlalchemy import pool
 from sqlalchemy.engine import Connection
-from sqlalchemy.ext.asyncio import async_engine_from_config, create_async_engine
+from sqlalchemy.ext.asyncio import create_async_engine
 
 from alembic import context
 
@@ -19,7 +18,8 @@
 
 # add your model's MetaData object here
 # for 'autogenerate' support
-from src.main import Base
+from src.models import Base  # noqa: E402
+
 target_metadata = Base.metadata
 # target_metadata = None
 
@@ -67,8 +67,8 @@ async def run_async_migrations() -> None:
     """
 
     connectable = create_async_engine(
-            environ.get("DATABASE_URL", "sqlite:///db.sqlite")
-        )
+        environ.get("DATABASE_URL", "sqlite:///db.sqlite")
+    )
 
     async with connectable.connect() as connection:
         await connection.run_sync(do_run_migrations)

alembic/versions/930b75030da8_initial_revision.py

@@ -17,6 +17,7 @@
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
 
+
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(

alembic/versions/f79ac07ca876_fix_pkey_issue.py

@@ -19,9 +19,7 @@
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_constraint("batch_jobs_pkey", "batch_jobs", type_="primary")
-    op.create_primary_key(
-        "batch_jobs_pkey", "batch_jobs", ["id"], schema="public"
-    )
+    op.create_primary_key("batch_jobs_pkey", "batch_jobs", ["id"], schema="public")
     pass
     # ### end Alembic commands ###
 

dump_openapi.py

@@ -1,18 +1,24 @@
 import json
 from os import environ
+import warnings
 
 from fastapi.openapi.utils import get_openapi
 
 from src.main import app
+from src.routes import load_routes
+
+load_routes()
 
 with open(environ.get("FASTAPI_OPENAPI_OUTPUT", "openapi.json"), "w") as f:
-    json.dump(
-        get_openapi(
-            title=app.title,
-            version=app.version,
-            openapi_version=app.openapi_version,
-            description=app.description,
-            routes=app.routes,
-        ),
-        f,
-    )
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", category=UserWarning)
+        json.dump(
+            get_openapi(
+                title=app.title,
+                version=app.version,
+                openapi_version=app.openapi_version,
+                description=app.description,
+                routes=app.routes,
+            ),
+            f,
+        )

frontend/src/routes/Home.tsx

@@ -202,7 +202,7 @@ export default function Home() {
 
   useEffect(() => {
     Promise.all([
-      GET("/current_job")
+      GET("/job/current")
         .catch((error) => {
           console.error("Error getting current job", error);
           return { data: { job: null } };

pyproject.toml

@@ -4,3 +4,6 @@ order-by-type = true
 
 [tool.ruff.format]
 docstring-code-format = true
+
+[tool.ruff.lint]
+ignore = ["E711"]