Merge remote-tracking branch 'origin/dev'

Author: pythoninthegrass

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

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 import os
-import sys
 import subprocess
+import sys
 
 
 def gitleaksEnabled():
@@ -23,5 +23,7 @@ def gitleaksEnabled():
 ''')
         sys.exit(1)
 else:
-    print('gitleaks precommit disabled\
-     (enable with `git config hooks.gitleaks true`)')
+    print(
+        'gitleaks precommit disabled\
+     (enable with `git config hooks.gitleaks true`)'
+    )

app/main.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import arrow
+import os
 import pandas as pd
 import sys
 import time
@@ -18,9 +19,9 @@
 from meetup_query import *
 from passlib.context import CryptContext
 from pathlib import Path
-from pony.orm import Database, Required, Optional, PrimaryKey, Set, db_session
+from pony.orm import Database, Optional, PrimaryKey, Required, Set, db_session
 from pydantic import BaseModel
-from schedule import get_schedule, get_current_schedule_time, snooze_schedule, check_and_revert_snooze
+from schedule import check_and_revert_snooze, get_current_schedule_time, get_schedule, snooze_schedule
 from sign_jwt import main as gen_token
 from slackbot import *
 from typing import List, Union
@@ -74,8 +75,8 @@
 
 
 class IPConfig(BaseModel):
-    whitelist: List[str] = ["localhost", "127.0.0.1"]
-    public_ips: List[str] = []  # TODO: add whitelisted public IPs here
+    whitelist: list[str] = ["localhost", "127.0.0.1"]
+    public_ips: list[str] = []  # TODO: add whitelisted public IPs here
 
 
 ip_config = IPConfig()
@@ -254,7 +255,7 @@ async def ip_whitelist_or_auth(request: Request, current_user: User = Depends(ge
     return current_user
 
 
-def check_auth(auth: Union[dict, User]) -> None:
+def check_auth(auth: dict | User) -> None:
     """
     Shared function to check authentication result.
     Raises an HTTPException if authentication fails.
@@ -276,9 +277,7 @@ async def login_for_oauth_token(form_data: OAuth2PasswordRequestForm = Depends()
             headers={"WWW-Authenticate": "Bearer"},
         )
     oauth_token_expires = timedelta(minutes=TOKEN_EXPIRE)
-    oauth_token = create_access_token(
-        data={"sub": user.username}, expires_delta=oauth_token_expires
-    )
+    oauth_token = create_access_token(data={"sub": user.username}, expires_delta=oauth_token_expires)
 
     return {"access_token": oauth_token, "token_type": "bearer"}
 
@@ -416,6 +415,10 @@ def get_events(auth: dict = Depends(ip_whitelist_or_auth),
     # cleanup output file
     sort_json(json_fn)
 
+    # check if file exists after sorting
+    if not os.path.exists(json_fn) or os.stat(json_fn).st_size == 0:
+        return {"message": "No events found", "events": []}
+
     return pd.read_json(json_fn)
 
 
@@ -524,7 +527,7 @@ def post_slack(
 def snooze_slack_post(
     duration: str,
     auth: dict = Depends(ip_whitelist_or_auth),
-    ):
+):
     """
     Snooze the Slack post for the specified duration
 
@@ -544,7 +547,7 @@ def snooze_slack_post(
 
 # TODO: test IP whitelisting
 @api_router.get("/schedule")
-def get_current_schedule(auth: Union[dict, User] = Depends(ip_whitelist_or_auth)):
+def get_current_schedule(auth: dict | User = Depends(ip_whitelist_or_auth)):
     """
     Get the current schedule including any active snoozes
     """

app/meetup_query.py

@@ -11,8 +11,8 @@
 from colorama import Fore
 from decouple import config
 from icecream import ic
-from sign_jwt import main as gen_token
 from pathlib import Path
+from sign_jwt import main as gen_token
 
 # verbose icecream
 ic.configureOutput(includeContext=True)
@@ -45,8 +45,8 @@
         raise FileNotFoundError(f"groups.csv not found in {script_dir} or {cwd}")
 
 # time span (e.g., 3600 = 1 hour)
-sec = int(60)               # n seconds
-ttl = int(sec * 30)         # n minutes -> hours
+sec = 60  # n seconds
+ttl = int(sec * 30)  # n minutes -> hours
 
 # cache the requests as script basename, expire after n time
 requests_cache.install_cache(Path(cache_fn), expire_after=ttl)
@@ -148,17 +148,10 @@ def send_request(token, query, vars) -> str:
 
     endpoint = 'https://api.meetup.com/gql'
 
-    headers = {
-        'Authorization': f'Bearer {token}',
-        'Content-Type': 'application/json; charset=utf-8'
-    }
+    headers = {'Authorization': f'Bearer {token}', 'Content-Type': 'application/json; charset=utf-8'}
 
     try:
-        r = requests.post(
-            endpoint,
-            json={'query': query, 'variables': vars},
-            headers=headers
-        )
+        r = requests.post(endpoint, json={'query': query, 'variables': vars}, headers=headers)
         print(f"{Fore.GREEN}{info:<10}{Fore.RESET}Response HTTP Response Body: {r.status_code}")
 
         # pretty prints json response content but skips sorting keys as it rearranges graphql response
@@ -167,7 +160,7 @@ def send_request(token, query, vars) -> str:
         # formatted response
         # print('Response HTTP Response Body:\n{content}'.format(content=pretty_response))
     except requests.exceptions.RequestException as e:
-        print('HTTP Request failed:\n{error}'.format(error=e))
+        print(f'HTTP Request failed:\n{e}')
         sys.exit(1)
 
     return pretty_response
@@ -303,7 +296,7 @@ def sort_json(filename) -> None:
         pass
 
     # control for timestamp edge case `1-07-21 18:00:00` || `1-01-25 10:00:00` raising OutOfBoundsError
-    df['date'] = pd.to_datetime(df['date'], errors='coerce')
+    df['date'] = pd.to_datetime(df['date'], format='%Y-%m-%dT%H:%M:%S', errors='coerce')
 
     # convert datetimeindex to datetime
     df['date'] = df['date'].dt.tz_localize(None)
@@ -327,7 +320,7 @@ def sort_json(filename) -> None:
         json.dump(data, f, indent=2)
 
 
-def export_to_file(response, type: str='json', exclusions: str='') -> None:
+def export_to_file(response, type: str = 'json', exclusions: str = '') -> None:
     """
     Export to CSV or JSON
     """
@@ -361,7 +354,7 @@ def export_to_file(response, type: str='json', exclusions: str='') -> None:
             and os.stat(json_fn).st_size > 0
         ):
             # append to json
-            with open(json_fn, 'r') as f:
+            with open(json_fn) as f:
                 data_json = json.load(f)
                 data_json.extend(data)
                 with open(json_fn, 'w', encoding='utf-8') as f:
@@ -393,7 +386,7 @@ def main():
     # first-party query
     response = send_request(access_token, query, vars)
     # format_response(response, exclusions=exclusions)                      # don't need if exporting to file
-    export_to_file(response, format, exclusions=exclusions)                  # csv/json
+    export_to_file(response, format, exclusions=exclusions)  # csv/json
 
     # third-party query
     output = []

app/schedule.py

@@ -4,15 +4,15 @@
 import time
 from datetime import datetime, timedelta
 from decouple import config
-from pony.orm import Database, Required, Optional, PrimaryKey, Set, db_session
+from pony.orm import Database, Optional, PrimaryKey, Required, Set, db_session
 
 # env
 DB_NAME = config("DB_NAME")
 DB_USER = config("DB_USER")
 DB_PASS = config("DB_PASS")
 DB_HOST = config("DB_HOST")
 DB_PORT = config("DB_PORT", default=5432, cast=int)
-TZ = config("TZ", default="America/Chicago")        # Set this to local timezone
+TZ = config("TZ", default="America/Chicago")  # Set this to local timezone
 LOCAL_TIME = config("LOCAL_TIME", default="09:00")  # Local time for schedule
 
 # time

app/scheduler.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from distutils.log import warn
 import arrow
 import atexit
 import os
@@ -10,6 +9,7 @@
 from apscheduler.schedulers.background import BackgroundScheduler
 from colorama import Fore
 from decouple import config
+from distutils.log import warn
 from pathlib import Path
 from urllib.parse import urlencode
 
@@ -48,9 +48,7 @@ def get_token():
 
     payload = f"username={DB_USER}&password={DB_PASS}"
 
-    headers = {
-        'Content-Type': 'application/x-www-form-urlencoded'
-    }
+    headers = {'Content-Type': 'application/x-www-form-urlencoded'}
 
     try:
         res = requests.request("POST", url, headers=headers, data=payload)
@@ -63,7 +61,7 @@ def get_token():
 
 
 # @sched.scheduled_job(trigger='cron', hour='9,17,20,23', id='post_slack')      # 9am, 5pm, 8pm, 11pm
-@sched.scheduled_job(trigger='cron', hour='*', id='post_slack')                 # every hour
+@sched.scheduled_job(trigger='cron', hour='*', id='post_slack')  # every hour
 # @sched.scheduled_job(trigger='cron', minute='*/30', id='post_slack')          # every n minutes
 def post_to_slack():
     """Post to Slack"""
@@ -72,15 +70,9 @@ def post_to_slack():
 
     url = f"http://{HOST}:{PORT}/api/slack"
 
-    payload = urlencode({
-        'location': 'Oklahoma City',
-        'exclusions': 'Tulsa'
-    })
+    payload = urlencode({'location': 'Oklahoma City', 'exclusions': 'Tulsa'})
 
-    headers = {
-        'Authorization': f'Bearer {access_token}',
-        'accept': 'application/json'
-    }
+    headers = {'Authorization': f'Bearer {access_token}', 'accept': 'application/json'}
 
     try:
         res = requests.request("POST", url, headers=headers, data=payload)

app/sign_jwt.py

@@ -7,8 +7,8 @@
 import sys
 import time
 from colorama import Fore
-from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives import serialization
 from decouple import config
 from icecream import ic
 from pathlib import Path
@@ -42,42 +42,23 @@
 # load private key
 if isinstance(priv_key, pathlib.PosixPath) and priv_key.exists():
     with open(priv_key, 'rb') as f:
-        private_key = serialization.load_pem_private_key(
-            data=f.read(),
-            password=None,
-            backend=default_backend()
-        )
+        private_key = serialization.load_pem_private_key(data=f.read(), password=None, backend=default_backend())
 else:
     # decode base64
     private_key = base64.b64decode(priv_key)
     # load private key from env
-    private_key = serialization.load_pem_private_key(
-        data=private_key,
-        password=None,
-        backend=default_backend()
-    )
+    private_key = serialization.load_pem_private_key(data=private_key, password=None, backend=default_backend())
 
 if isinstance(pub_key, pathlib.PosixPath) and pub_key.exists():
     with open(pub_key, 'rb') as f:
-        public_key = serialization.load_pem_public_key(
-            data=f.read(),
-            backend=default_backend()
-        )
+        public_key = serialization.load_pem_public_key(data=f.read(), backend=default_backend())
 else:
     # decode base64
     public_key = base64.b64decode(pub_key)
     # load public key
-    public_key = serialization.load_pem_public_key(
-        data=public_key,
-        backend=default_backend()
-    )
+    public_key = serialization.load_pem_public_key(data=public_key, backend=default_backend())
 
-headers = {
-    "alg": 'RS256',
-    "typ": 'JWT',
-    "Accept": 'application/json',
-    "Content-Type": 'application/x-www-form-urlencoded'
-}
+headers = {"alg": 'RS256', "typ": 'JWT', "Accept": 'application/json', "Content-Type": 'application/x-www-form-urlencoded'}
 
 
 # TODO: Fix `Signature has expired\n[ERROR] Exception in ASGI application`; scheduler.sh only works for ~7 tries / 1 hour
@@ -87,33 +68,19 @@ def gen_payload_data():
 
     Avoids `invalid_grant` by getting a new `exp` value during signing
     """
-    payload_data = {
-        "sub": SELF_ID,
-        "iss": CLIENT_ID,
-        "aud": "api.meetup.com",
-        "exp": int(time.time() + JWT_LIFE_SPAN)
-    }
+    payload_data = {"sub": SELF_ID, "iss": CLIENT_ID, "aud": "api.meetup.com", "exp": int(time.time() + JWT_LIFE_SPAN)}
     return payload_data
 
 
 def sign_token():
     """Generate signed JWT"""
 
     # Define headers exactly as specified in docs
-    jwt_headers = {
-        "kid": SIGNING_KEY_ID,
-        "typ": "JWT",
-        "alg": "RS256"
-    }
+    jwt_headers = {"kid": SIGNING_KEY_ID, "typ": "JWT", "alg": "RS256"}
 
     payload_data = gen_payload_data()
 
-    payload = jwt.encode(
-        headers=jwt_headers,
-        payload=payload_data,
-        key=private_key,
-        algorithm='RS256'
-    )
+    payload = jwt.encode(headers=jwt_headers, payload=payload_data, key=private_key, algorithm='RS256')
 
     return payload
 
@@ -122,14 +89,7 @@ def verify_token(token):
     """Verify signed JWT against public key"""
 
     try:
-        jwt.decode(
-            jwt=token,
-            key=public_key,
-            issuer=CLIENT_ID,
-            audience="api.meetup.com",
-            verify=True,
-            algorithms=['RS256']
-        )
+        jwt.decode(jwt=token, key=public_key, issuer=CLIENT_ID, audience="api.meetup.com", verify=True, algorithms=['RS256'])
         print(f"{Fore.GREEN}{info:<10}{Fore.RESET}Success! Token verified.")
         return True
     except jwt.exceptions.ExpiredSignatureError as e:
@@ -140,7 +100,7 @@ def verify_token(token):
         jwt.exceptions.InvalidSignatureError,
         jwt.exceptions.InvalidIssuerError,
         jwt.exceptions.InvalidAudienceError,
-        ) as e:
+    ) as e:
         print(f"{Fore.RED}{error:<10}{Fore.RESET}{e}")
         sys.exit(1)
 
@@ -149,16 +109,11 @@ def get_access_token(token):
     """Post token to auth server to get access token"""
 
     # Headers for the token request
-    request_headers = {
-        "Content-Type": "application/x-www-form-urlencoded"
-    }
+    request_headers = {"Content-Type": "application/x-www-form-urlencoded"}
 
     # Payload exactly as specified in docs
     # https://www.meetup.com/api/authentication/#p04-jwt-flow-section
-    payload = {
-        "grant_type": "urn:ietf:params:oauth:grant-type:jwt-bearer",
-        "assertion": token
-    }
+    payload = {"grant_type": "urn:ietf:params:oauth:grant-type:jwt-bearer", "assertion": token}
     payload = urlencode(payload)
 
     try: