Merge pull request #44 from testdrivenio/updates

updates

Author: mjhea0

.github/workflows/main.yml

@@ -83,7 +83,7 @@ jobs:
             -p 5003:8765 \
             ${{ env.IMAGE }}-final:latest
       - name: Install requirements
-        run: docker exec fastapi-tdd pip install black==23.12.1 flake8==7.0.0 isort==5.13.2 pytest==7.4.4
+        run: docker exec fastapi-tdd python3 -m pip install black==25.1.0 flake8==7.2.0 isort==6.0.1 pytest==8.3.5
       - name: Pytest
         run: docker exec fastapi-tdd python -m pytest .
       - name: Flake8
@@ -98,7 +98,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build, test]
     env:
-      HEROKU_APP_NAME: quiet-citadel-80656
+      HEROKU_APP_NAME: shrouded-shelf-89730
       HEROKU_REGISTRY_IMAGE: registry.heroku.com/${HEROKU_APP_NAME}/summarizer
     steps:
       - name: Checkout

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
 
   web:

project/Dockerfile

@@ -1,5 +1,5 @@
 # pull official base image
-FROM python:3.12.1-slim-bookworm
+FROM python:3.13.3-slim-bookworm
 
 # set working directory
 WORKDIR /usr/src/app

project/Dockerfile.prod

@@ -3,7 +3,7 @@
 ###########
 
 # pull official base image
-FROM python:3.12.1-slim-bookworm as builder
+FROM python:3.13.3-slim-bookworm as builder
 
 # install system dependencies
 RUN apt-get update \
@@ -24,7 +24,7 @@ RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -r requir
 
 # lint
 COPY . /usr/src/app/
-RUN pip install black==23.12.1 flake8==7.0.0 isort==5.13.2
+RUN pip install black==25.1.0 flake8==7.2.0 isort==6.0.1
 RUN flake8 .
 RUN black --exclude=migrations . --check
 RUN isort . --check-only
@@ -35,7 +35,7 @@ RUN isort . --check-only
 #########
 
 # pull official base image
-FROM python:3.12.1-slim-bookworm
+FROM python:3.13.3-slim-bookworm
 
 # create directory for the app user
 RUN mkdir -p /home/app
@@ -65,7 +65,7 @@ COPY --from=builder /usr/src/app/wheels /wheels
 COPY --from=builder /usr/src/app/requirements.txt .
 RUN pip install --upgrade pip
 RUN pip install --no-cache /wheels/*
-RUN pip install "uvicorn[standard]==0.26.0"
+RUN pip install "uvicorn[standard]==0.34.1"
 
 # add app
 COPY . .

project/app/api/crud.py

@@ -1,8 +1,12 @@
 from typing import List, Union
 
-from app.models.pydantic import SummaryPayloadSchema
 from app.models.tortoise import TextSummary
 
+from app.models.pydantic import (  # isort:skip
+    SummaryPayloadSchema,
+    SummaryUpdatePayloadSchema,
+)
+
 
 async def get(id: int) -> Union[dict, None]:
     summary = await TextSummary.filter(id=id).first().values()
@@ -22,7 +26,7 @@ async def post(payload: SummaryPayloadSchema) -> int:
     return summary.id
 
 
-async def put(id: int, payload: SummaryPayloadSchema) -> Union[dict, None]:
+async def put(id: int, payload: SummaryUpdatePayloadSchema) -> Union[dict, None]:
     summary = await TextSummary.filter(id=id).update(
         url=payload.url, summary=payload.summary
     )

project/app/main.py

@@ -20,13 +20,4 @@ def create_application() -> FastAPI:
 
 app = create_application()
 
-
-@app.on_event("startup")
-async def startup_event():
-    log.info("Starting up...")
-    init_db(app)
-
-
-@app.on_event("shutdown")
-async def shutdown_event():
-    log.info("Shutting down...")
+init_db(app)

project/app/summarizer.py

@@ -10,9 +10,9 @@ async def generate_summary(summary_id: int, url: str) -> None:
     article.parse()
 
     try:
-        nltk.data.find("tokenizers/punkt")
+        nltk.data.find("tokenizers/punkt_tab")
     except LookupError:
-        nltk.download("punkt")
+        nltk.download("punkt_tab")
     finally:
         article.nlp()
 

project/db/Dockerfile

@@ -1,5 +1,5 @@
 # pull official base image
-FROM postgres:16
+FROM postgres:17
 
 # run create.sql on init
 ADD create.sql /docker-entrypoint-initdb.d

project/migrations/models/0_20240122171233_init.py renamed to project/migrations/models/0_20250421234125_init.py

@@ -7,7 +7,7 @@ async def upgrade(db: BaseDBAsyncClient) -> str:
     "id" SERIAL NOT NULL PRIMARY KEY,
     "url" TEXT NOT NULL,
     "summary" TEXT NOT NULL,
-    "created_at" TIMESTAMPTZ NOT NULL  DEFAULT CURRENT_TIMESTAMP
+    "created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 CREATE TABLE IF NOT EXISTS "aerich" (
     "id" SERIAL NOT NULL PRIMARY KEY,

project/requirements-dev.txt

@@ -1,8 +1,8 @@
-black==23.12.1
-flake8==7.0.0
-isort==5.13.2
-pytest==7.4.4
-pytest-cov==4.1.0
-pytest-xdist==3.5.0
+black==25.1.0
+flake8==7.2.0
+isort==6.0.1
+pytest==8.3.5
+pytest-cov==6.1.1
+pytest-xdist==3.6.1
 
 -r requirements.txt