Merge pull request #12 from testdrivenio/updates

updates

Author: mjhea0

.github/workflows/main.yml

@@ -78,7 +78,7 @@ jobs:
             -p 5003:8765 \
             ${{ env.IMAGE }}-final:latest
       - name: Install requirements
-        run: docker exec fastapi-tdd pip install black==20.8b1 flake8===3.8.4 isort==5.6.4 pytest==6.2.0
+        run: docker exec fastapi-tdd pip install black==21.6b0 flake8==3.9.2 isort==5.9.1 pytest==6.2.4
       - name: Pytest
         run: docker exec fastapi-tdd python -m pytest .
       - name: Flake8
@@ -93,7 +93,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build, test]
     env:
-      HEROKU_APP_NAME: secret-crag-02876
+      HEROKU_APP_NAME: thawing-beach-87010
       HEROKU_REGISTRY_IMAGE: registry.heroku.com/${HEROKU_APP_NAME}/summarizer
     steps:
       - name: Checkout master

project/Dockerfile

@@ -1,5 +1,5 @@
 # pull official base image
-FROM python:3.9.2-slim-buster
+FROM python:3.9.6-slim-buster
 
 # set working directory
 WORKDIR /usr/src/app

project/Dockerfile.prod

@@ -3,7 +3,7 @@
 ###########
 
 # pull official base image
-FROM python:3.8.8-slim-buster as builder
+FROM python:3.8.11-slim-buster 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==20.8b1 flake8===3.8.4 isort==5.7.0
+RUN pip install black==21.6b0 flake8==3.9.2 isort==5.9.1
 RUN flake8 .
 RUN black --exclude=migrations .
 RUN isort .
@@ -35,7 +35,7 @@ RUN isort .
 #########
 
 # pull official base image
-FROM python:3.8.8-slim-buster
+FROM python:3.8.11-slim-buster
 
 # 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.13.4"
+RUN pip install "uvicorn[standard]==0.14.0"
 
 # add app
 COPY . .

project/aerich.ini

@@ -0,0 +1,3 @@
+[aerich]
+tortoise_orm = app.db.TORTOISE_ORM
+location = ./migrations

project/app/api/summaries.py

@@ -1,3 +1,6 @@
+# project/app/api/summaries.py
+
+
 from typing import List
 
 from fastapi import APIRouter, BackgroundTasks, HTTPException, Path
@@ -12,7 +15,6 @@
     SummaryUpdatePayloadSchema,
 )
 
-
 router = APIRouter()
 
 

project/app/db.py

@@ -11,6 +11,17 @@
 log = logging.getLogger("uvicorn")
 
 
+TORTOISE_ORM = {
+    "connections": {"default": os.environ.get("DATABASE_URL")},
+    "apps": {
+        "models": {
+            "models": ["app.models.tortoise", "aerich.models"],
+            "default_connection": "default",
+        },
+    },
+}
+
+
 def init_db(app: FastAPI) -> None:
     register_tortoise(
         app,

project/app/summarizer.py

@@ -1,3 +1,6 @@
+# project/app/summarizer.py
+
+
 import nltk
 from newspaper import Article
 

project/migrations/models/1_20210704142846_None.sql

@@ -0,0 +1,13 @@
+-- upgrade --
+CREATE TABLE IF NOT EXISTS "textsummary" (
+    "id" SERIAL NOT NULL PRIMARY KEY,
+    "url" TEXT NOT NULL,
+    "summary" TEXT NOT NULL,
+    "created_at" TIMESTAMPTZ NOT NULL  DEFAULT CURRENT_TIMESTAMP
+);
+CREATE TABLE IF NOT EXISTS "aerich" (
+    "id" SERIAL NOT NULL PRIMARY KEY,
+    "version" VARCHAR(255) NOT NULL,
+    "app" VARCHAR(20) NOT NULL,
+    "content" JSONB NOT NULL
+);

project/requirements-dev.txt

@@ -1,8 +1,8 @@
-black==20.8b1
-flake8===3.8.4
-isort==5.7.0
-pytest==6.2.2
-pytest-cov==2.11.1
-pytest-xdist==2.2.1
+black==21.6b0
+flake8==3.9.2
+isort==5.9.1
+pytest==6.2.4
+pytest-cov==2.12.1
+pytest-xdist==2.3.0
 
 -r requirements.txt

project/requirements.txt

@@ -1,7 +1,8 @@
-asyncpg==0.22.0
-fastapi==0.63.0
-gunicorn==20.0.4
+aerich==0.5.3
+asyncpg==0.23.0
+fastapi==0.65.3
+gunicorn==20.1.0
 newspaper3k==0.2.8
 requests==2.25.1
-tortoise-orm==0.16.21
-uvicorn==0.13.4
+tortoise-orm==0.17.4
+uvicorn==0.14.0