chore: fix merge commit

Author: pythoninthegrass

.github/workflows/hooks/pre-commit.py

@@ -1,5 +1,5 @@
-#!/usr/bin/env python3
-"""Helper script to be used as a pre-commit hook."""
+#!/usr/bin/env python
+
 import os
 import sys
 import subprocess

.pre-commit-config.yaml

@@ -17,11 +17,6 @@ repos:
     - id: check-yaml
     - id: check-added-large-files
       args: ['--maxkb=1024']
-    - id: check-docstring-first
-      exclude: |
-          (?x)^(
-              hello.py
-          )$
     - id: check-executables-have-shebangs
     - id: check-merge-conflict
     - id: check-shebang-scripts-are-executable

Dockerfile.web

@@ -30,11 +30,13 @@ WORKDIR /app
 COPY ./app .
 COPY ./requirements.txt .
 
-RUN python -m venv $VENV
+RUN python -m venv $VENV \
+    && python -m pip install -r requirements.txt
 
-RUN --mount=type=cache,target=/root/.cache/pip \
-    --mount=type=bind,source=./requirements.txt,target=/app/requirements.txt \
-    python -m pip install -r requirements.txt
+# ! heroku doesn't use buildkit
+# RUN --mount=type=cache,target=/root/.cache/pip \
+#     --mount=type=bind,source=./requirements.txt,target=/app/requirements.txt \
+#     python -m pip install -r requirements.txt
 
 FROM python:${PYTHON_VERSION}-slim-bullseye AS runner
 

Makefile

@@ -279,6 +279,7 @@ def load_user(username: str):
 Startup
 """
 
+# TODO: https://fastapi.tiangolo.com/advanced/events/
 @app.on_event('startup')
 def startup_event():
     """
@@ -327,6 +328,7 @@ def generate_token(current_user: User = Depends(get_current_active_user)):
         access_token = tokens['access_token']
         refresh_token = tokens['refresh_token']
     except KeyError as e:
+        print(f"{Fore.RED}{error:<10}{Fore.RESET}KeyError: {e}")
         raise HTTPException(status_code=500, detail="Internal Server Error")
 
     return access_token, refresh_token
@@ -421,7 +423,12 @@ def main():
     import uvicorn
 
     try:
-        uvicorn.run("main:app", host="0.0.0.0", port=PORT, limit_max_requests=10000, log_level="warning", reload=True)
+        uvicorn.run("main:app",
+                    host="0.0.0.0",
+                    port=PORT,
+                    limit_max_requests=10000,
+                    log_level="warning",
+                    reload=True)
     except KeyboardInterrupt:
         print("\nExiting...")
         sys.exit(0)

app/gunicorn.conf.py

@@ -9,7 +9,7 @@
 from colorama import Fore
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.backends import default_backend
-from decouple import Config, RepositoryEnv
+from decouple import config
 from icecream import ic
 from pathlib import Path
 from urllib.parse import urlencode
@@ -22,15 +22,6 @@
 error = "ERROR:"
 warning = "WARNING:"
 
-# get .env file
-if not Path(".env").exists():
-    env_file = Path(__file__).parent / '.env'
-else:
-    env_file = Path(".env")
-
-# decouple read .env file
-config = Config(RepositoryEnv(env_file))
-
 # creds
 if Path('jwt_priv.pem').exists():
     priv_key = Path('jwt_priv.pem')

app/main.py

@@ -52,7 +52,7 @@ def test_send_request(datafiles, requests_mock):
     assert re.search(r'200', res)
 
     # * spot check of raw response length is > 25000 chars
-    assert (type(res) is str) and len(res) >= 1000
+    assert isinstance(res, str) and len(res) >= 1000
     assert re.search(r'"name": "Techlahoma"', res)
     assert re.search(r'"memberUrl": "https://www.meetup.com/members/186454903"', res)
 

app/sign_jwt.py

@@ -45,14 +45,15 @@ def test_sign_token():
     """Test sign_token()"""
     token = sign_token()
 
-    assert (type(token) is str) and len(token) >= 1030
+    assert isinstance(token, str) and len(token) >= 1030
 
 
 def test_verify_token():
     """Test verify_token()"""
     token = sign_token()
 
-    assert verify_token(token) == True
+    if verify_token(token):
+        assert True
 
 
 # TODO: mock requests.post() to test get_access_token()
@@ -66,4 +67,3 @@ def test_get_access_token():
     assert res.text.find('refresh_token') != -1
     assert res.text.find('token_type') != -1
     assert res.text.find('expires_in') != -1
-

app/tests/test_meetup_query.py

@@ -10,7 +10,7 @@ setup:
     APP_NAME: meetup-bot-bot
 build:
   docker:
-    web: ./app/Dockerfile.web
+    web: ./Dockerfile.web
 # * Defaults to Dockerfile CMD if `run` isn't declared
 # run:
 #   web: gunicorn -w 2 -k uvicorn.workers.UvicornWorker main:app --bind 0.0.0.0:${PORT:-3000} --log-file -