updates

Author: mjhea0

.github/workflows/main.yml

@@ -17,27 +17,19 @@ jobs:
         run: echo ${GITHUB_TOKEN} | docker login -u ${GITHUB_ACTOR} --password-stdin docker.pkg.github.com
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Pull images
+      - name: Pull image
         run: |
-          docker pull ${{ env.IMAGE }}-builder:latest || true
-          docker pull ${{ env.IMAGE }}-final:latest || true
-      - name: Build images
+          docker pull ${{ env.IMAGE }}:latest || true
+      - name: Build image
         run: |
           docker build \
-            --target builder \
-            --cache-from ${{ env.IMAGE }}-builder:latest \
-            --tag ${{ env.IMAGE }}-builder:latest \
-            --file ./project/Dockerfile.prod \
-            "./project"
-          docker build \
-            --cache-from ${{ env.IMAGE }}-final:latest \
-            --tag ${{ env.IMAGE }}-final:latest \
+            --cache-from ${{ env.IMAGE }}:latest \
+            --tag ${{ env.IMAGE }}:latest \
             --file ./project/Dockerfile.prod \
             "./project"
-      - name: Push images
+      - name: Push image
         run: |
-          docker push ${{ env.IMAGE }}-builder:latest
-          docker push ${{ env.IMAGE }}-final:latest
+          docker push ${{ env.IMAGE }}:latest
 
   test:
     name: Test Docker Image
@@ -50,21 +42,14 @@ jobs:
         run: echo ${GITHUB_TOKEN} | docker login -u ${GITHUB_ACTOR} --password-stdin docker.pkg.github.com
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Pull images
+      - name: Pull image
         run: |
-          docker pull ${{ env.IMAGE }}-builder:latest || true
-          docker pull ${{ env.IMAGE }}-final:latest || true
-      - name: Build images
+          docker pull ${{ env.IMAGE }}:latest || true
+      - name: Build image
         run: |
           docker build \
-            --target builder \
-            --cache-from ${{ env.IMAGE }}-builder:latest \
-            --tag ${{ env.IMAGE }}-builder:latest \
-            --file ./project/Dockerfile.prod \
-            "./project"
-          docker build \
-            --cache-from ${{ env.IMAGE }}-final:latest \
-            --tag ${{ env.IMAGE }}-final:latest \
+            --cache-from ${{ env.IMAGE }}:latest \
+            --tag ${{ env.IMAGE }}:latest \
             --file ./project/Dockerfile.prod \
             "./project"
       - name: Run container
@@ -76,9 +61,7 @@ jobs:
             -e ENVIRONMENT=dev \
             -e DATABASE_TEST_URL=sqlite://sqlite.db \
             -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
+            ${{ env.IMAGE }}:latest
       - name: Pytest
         run: docker exec fastapi-tdd python -m pytest .
       - name: Flake8
@@ -87,50 +70,3 @@ jobs:
         run: docker exec fastapi-tdd python -m black . --check
       - name: isort
         run: docker exec fastapi-tdd python -m isort . --check-only
-
-  deploy:
-    name: Deploy to Heroku
-    runs-on: ubuntu-latest
-    needs: [build, test]
-    env:
-      HEROKU_APP_NAME: secret-crag-02876
-      HEROKU_REGISTRY_IMAGE: registry.heroku.com/${HEROKU_APP_NAME}/summarizer
-    steps:
-      - name: Checkout master
-        uses: actions/checkout@v2.3.4
-      - name: Log in to GitHub Packages
-        run: echo ${GITHUB_TOKEN} | docker login -u ${GITHUB_ACTOR} --password-stdin docker.pkg.github.com
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Pull images
-        run: |
-          docker pull ${{ env.IMAGE }}-builder:latest || true
-          docker pull ${{ env.IMAGE }}-final:latest || true
-      - name: Build images
-        run: |
-          docker build \
-            --target builder \
-            --cache-from ${{ env.IMAGE }}-builder:latest \
-            --tag ${{ env.IMAGE }}-builder:latest \
-            --file ./project/Dockerfile.prod \
-            "./project"
-          docker build \
-            --cache-from ${{ env.IMAGE }}-final:latest \
-            --tag ${{ env.IMAGE }}:latest \
-            --tag ${{ env.HEROKU_REGISTRY_IMAGE }}:latest \
-            --file ./project/Dockerfile.prod \
-            "./project"
-      - name: Log in to the Heroku Container Registry
-        run: docker login -u _ -p ${HEROKU_AUTH_TOKEN} registry.heroku.com
-        env:
-          HEROKU_AUTH_TOKEN: ${{ secrets.HEROKU_AUTH_TOKEN }}
-      - name: Push to the registry
-        run: docker push ${{ env.HEROKU_REGISTRY_IMAGE }}:latest
-      - name: Set environment variables
-        run: |
-          echo "HEROKU_REGISTRY_IMAGE=${{ env.HEROKU_REGISTRY_IMAGE }}" >> $GITHUB_ENV
-          echo "HEROKU_AUTH_TOKEN=${{ secrets.HEROKU_AUTH_TOKEN }}" >> $GITHUB_ENV
-      - name: Release
-        run: |
-          chmod +x ./release.sh
-          ./release.sh

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
@@ -16,8 +16,7 @@ RUN apt-get update \
 # install python dependencies
 RUN pip install --upgrade pip
 COPY ./requirements.txt .
-COPY ./requirements-dev.txt .
-RUN pip install -r requirements-dev.txt
+RUN pip install -r requirements.txt
 
 # add app
 COPY . .

project/Dockerfile.prod

@@ -1,41 +1,5 @@
-###########
-# BUILDER #
-###########
-
 # pull official base image
-FROM python:3.8.8-slim-buster as builder
-
-# install system dependencies
-RUN apt-get update \
-  && apt-get -y install gcc postgresql \
-  && apt-get clean
-
-# set work directory
-WORKDIR /usr/src/app
-
-# set environment variables
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
-
-# install dependencies
-RUN pip install --upgrade pip
-COPY ./requirements.txt .
-RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -r requirements.txt
-
-# lint
-COPY . /usr/src/app/
-RUN pip install black==20.8b1 flake8===3.8.4 isort==5.7.0
-RUN flake8 .
-RUN black --exclude=migrations .
-RUN isort .
-
-
-#########
-# FINAL #
-#########
-
-# 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
@@ -61,17 +25,16 @@ RUN apt-get update \
   && apt-get clean
 
 # install python dependencies
-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"
+COPY ./requirements.txt .
+RUN pip install -r requirements.txt
+RUN pip install "uvicorn[standard]==0.14.0"
 
 # add app
 COPY . .
 
 # chown all the files to the app user
-RUN chown -R app:app $HOME
+RUN chown -R app:app $APP_HOME
 
 # change to the app user
 USER app

project/aerich.ini

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

project/app/api/crud.py

@@ -8,7 +8,10 @@
 
 
 async def post(payload: SummaryPayloadSchema) -> int:
-    summary = TextSummary(url=payload.url, summary="")
+    summary = TextSummary(
+        url=payload.url,
+        summary="dummy summary",
+    )
     await summary.save()
     return summary.id
 
@@ -23,18 +26,3 @@ async def get(id: int) -> Union[dict, None]:
 async def get_all() -> List:
     summaries = await TextSummary.all().values()
     return summaries
-
-
-async def delete(id: int) -> int:
-    summary = await TextSummary.filter(id=id).first().delete()
-    return summary
-
-
-async def put(id: int, payload: SummaryPayloadSchema) -> Union[dict, None]:
-    summary = await TextSummary.filter(id=id).update(
-        url=payload.url, summary=payload.summary
-    )
-    if summary:
-        updated_summary = await TextSummary.filter(id=id).first().values()
-        return updated_summary[0]
-    return None

project/app/api/summaries.py

@@ -1,35 +1,27 @@
+# project/app/api/summaries.py
+
+
 from typing import List
 
-from fastapi import APIRouter, BackgroundTasks, HTTPException, Path
+from fastapi import APIRouter, HTTPException
 
 from app.api import crud
+from app.models.pydantic import SummaryPayloadSchema, SummaryResponseSchema
 from app.models.tortoise import SummarySchema
-from app.summarizer import generate_summary
-
-from app.models.pydantic import (  # isort:skip
-    SummaryPayloadSchema,
-    SummaryResponseSchema,
-    SummaryUpdatePayloadSchema,
-)
-
 
 router = APIRouter()
 
 
 @router.post("/", response_model=SummaryResponseSchema, status_code=201)
-async def create_summary(
-    payload: SummaryPayloadSchema, background_tasks: BackgroundTasks
-) -> SummaryResponseSchema:
+async def create_summary(payload: SummaryPayloadSchema) -> SummaryResponseSchema:
     summary_id = await crud.post(payload)
 
-    background_tasks.add_task(generate_summary, summary_id, payload.url)
-
     response_object = {"id": summary_id, "url": payload.url}
     return response_object
 
 
 @router.get("/{id}/", response_model=SummarySchema)
-async def read_summary(id: int = Path(..., gt=0)) -> SummarySchema:
+async def read_summary(id: int) -> SummarySchema:
     summary = await crud.get(id)
     if not summary:
         raise HTTPException(status_code=404, detail="Summary not found")
@@ -40,25 +32,3 @@ async def read_summary(id: int = Path(..., gt=0)) -> SummarySchema:
 @router.get("/", response_model=List[SummarySchema])
 async def read_all_summaries() -> List[SummarySchema]:
     return await crud.get_all()
-
-
-@router.delete("/{id}/", response_model=SummaryResponseSchema)
-async def delete_summary(id: int = Path(..., gt=0)) -> SummaryResponseSchema:
-    summary = await crud.get(id)
-    if not summary:
-        raise HTTPException(status_code=404, detail="Summary not found")
-
-    await crud.delete(id)
-
-    return summary
-
-
-@router.put("/{id}/", response_model=SummarySchema)
-async def update_summary(
-    payload: SummaryUpdatePayloadSchema, id: int = Path(..., gt=0)
-) -> SummarySchema:
-    summary = await crud.put(id, payload)
-    if not summary:
-        raise HTTPException(status_code=404, detail="Summary not found")
-
-    return summary

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/models/pydantic.py

@@ -1,16 +1,12 @@
 # project/app/models/pydantic.py
 
 
-from pydantic import AnyHttpUrl, BaseModel
+from pydantic import BaseModel
 
 
 class SummaryPayloadSchema(BaseModel):
-    url: AnyHttpUrl
+    url: str
 
 
 class SummaryResponseSchema(SummaryPayloadSchema):
     id: int
-
-
-class SummaryUpdatePayloadSchema(SummaryPayloadSchema):
-    summary: str

project/app/summarizer.py

@@ -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
+);