Merge pull request #1983 from GSA/main

09/19/2025 Production Deploy

Author: ccostino

.ds.baseline

@@ -169,7 +169,7 @@
         "filename": "app/enums.py",
         "hashed_secret": "12322e07b94ee3c7cd65a2952ece441538b53eb3",
         "is_verified": false,
-        "line_number": 123,
+        "line_number": 129,
         "is_secret": false
       }
     ],
@@ -295,7 +295,7 @@
         "filename": "tests/app/service/test_rest.py",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 1288,
+        "line_number": 1290,
         "is_secret": false
       }
     ],
@@ -339,7 +339,7 @@
         "filename": "tests/app/user/test_rest.py",
         "hashed_secret": "0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33",
         "is_verified": false,
-        "line_number": 874,
+        "line_number": 875,
         "is_secret": false
       }
     ],
@@ -374,5 +374,5 @@
       }
     ]
   },
-  "generated_at": "2025-08-12T18:08:49Z"
+  "generated_at": "2025-09-11T16:22:46Z"
 }

.github/actions/setup-project/action.yml

@@ -9,10 +9,10 @@ runs:
         sudo apt-get update \
         && sudo apt-get install -y --no-install-recommends \
         libcurl4-openssl-dev
-    - name: Set up Python 3.12.9
+    - name: Set up Python 3.13.2
       uses: actions/setup-python@v4
       with:
-        python-version: "3.12.9"
+        python-version: "3.13.2"
     - name: Install poetry
       shell: bash
       run: pip install poetry==2.1.3

.github/dependabot.yml

@@ -13,3 +13,7 @@ updates:
       - "dependabot" # Custom label to identify Dependabot PRs
     assignees:
       - "alexjanousekGSA"
+    ignore:
+      # gevent 25.8+ breaks Celery/Kombu compatibility (potentially)
+      - dependency-name: "gevent"
+        versions: [">=25.8.0"]

README.md

@@ -39,7 +39,7 @@ You will need the following items:
 This project currently works with these major versions of the following main
 components:
 
-- Python 3.12.x
+- Python 3.13.x
 - PostgreSQL 15.x (version 12.x is used in the hosted environments)
 
 These instructions will walk you through how to set your machine up with all of
@@ -178,12 +178,12 @@ session to make the changes take effect.
 Now we're ready to install the Python version we need with `pyenv`, like so:
 
 ```sh
-pyenv install 3.12
+pyenv install 3.13
 ```
 
-This will install the latest version of Python 3.12.
+This will install the latest version of Python 3.13.
 
-_NOTE: This project currently runs on Python 3.12.x._
+_NOTE: This project currently runs on Python 3.13.x._
 
 #### Python Dependency Installation
 
@@ -264,12 +264,12 @@ git clone [email protected]:GSA/notifications-api.git
 
 Now go into the project directory (`notifications-api` by default), create a
 virtual environment, and set the local Python version to point to the virtual
-environment (assumes version Python `3.12.9` is what is installed on your
+environment (assumes version Python `3.13.2` is what is installed on your
 machine):
 
 ```sh
 cd notifications-api
-pyenv virtualenv 3.12.9 notify-api
+pyenv virtualenv 3.13.2 notify-api
 pyenv local notify-api
 ```
 
@@ -317,10 +317,10 @@ If you're upgrading an existing project to a newer version of Python, you can
 follow these steps to get yourself up-to-date.
 
 First, use `pyenv` to install the newer version of Python you'd like to use;
-we'll use `3.12` in our example here since we recently upgraded to this version:
+we'll use `3.13` in our example here since we recently upgraded to this version:
 
 ```sh
-pyenv install 3.12
+pyenv install 3.13
 ```
 
 Next, delete the virtual environment you previously had set up. If you followed
@@ -335,7 +335,7 @@ environment with the newer version of Python you just installed:
 
 ```sh
 cd notifications-api
-pyenv virtualenv 3.12.9 notify-api
+pyenv virtualenv 3.13.2 notify-api
 pyenv local notify-api
 ```
 

app/aws/s3.py

@@ -476,7 +476,11 @@ def get_job_from_s3(service_id, job_id):
 def extract_phones(job, service_id, job_id):
     job_csv_data = StringIO(job)
     csv_reader = csv.reader(job_csv_data)
-    first_row = next(csv_reader)
+    try:
+        first_row = next(csv_reader)
+    except StopIteration:
+        current_app.logger.warning(f"Empty CSV file for job {job_id} in service {service_id}")
+        return {}
 
     phone_index = 0
     for i, item in enumerate(first_row):
@@ -506,9 +510,18 @@ def extract_phones(job, service_id, job_id):
 
 
 def extract_personalisation(job):
+    if job is None:
+        current_app.logger.warning("No job data provided for personalisation extraction")
+        return {}
     if isinstance(job, dict):
         job = job[0]
+    if not job:
+        current_app.logger.warning("Empty job data for personalisation extraction")
+        return {}
     job = job.split("\r\n")
+    if not job or not job[0]:
+        current_app.logger.warning("Empty job data after split for personalisation extraction")
+        return {}
     first_row = job[0]
     job.pop(0)
     first_row = first_row.split(",")
@@ -647,7 +660,7 @@ def s3upload(
         metadata = put_args["Metadata"] = metadata
 
     try:
-        current_app.logger.info(hilite(f"Going to try to upload this {key}"))
+        current_app.logger.debug(hilite(f"Going to try to upload this {key}"))
         key.put(**put_args)
     except botocore.exceptions.NoCredentialsError as e:
         current_app.logger.exception(

app/celery/research_mode_tasks.py

@@ -51,7 +51,7 @@ def make_request(notification_type, provider, data, headers):
         )
         raise e
     finally:
-        current_app.logger.info("Mocked provider callback request finished")
+        current_app.logger.debug("Mocked provider callback request finished")
     return response.json()
 
 

app/celery/scheduled_tasks.py

@@ -304,14 +304,6 @@ def cleanup_delivery_receipts(self):
 def batch_insert_notifications(self):
     batch = []
 
-    # TODO We probably need some way to clear the list if
-    # things go haywire.  A command?
-
-    # with redis_store.pipeline():
-    #     while redis_store.llen("message_queue") > 0:
-    #         redis_store.lpop("message_queue")
-    #     current_app.logger.info("EMPTY!")
-    #     return
     current_len = redis_store.llen("message_queue")
     with redis_store.pipeline():
         # since this list is being fed by other processes, just grab what is available when

app/celery/test_key_tasks.py

@@ -51,7 +51,7 @@ def make_request(notification_type, provider, data, headers):
         )
         raise e
     finally:
-        current_app.logger.info("Mocked provider callback request finished")
+        current_app.logger.debug("Mocked provider callback request finished")
     return response.json()
 
 

app/commands.py

@@ -183,7 +183,7 @@ def insert_inbound_numbers_from_file(file_name):
         for line in file:
             line = line.strip()
             if line:
-                current_app.logger.info(line)
+                current_app.logger.debug(line)
                 db.session.execute(sql, {"uuid": str(uuid.uuid4()), "line": line})
                 db.session.commit()
 
@@ -228,7 +228,6 @@ def bulk_invite_user_to_service(file_name, service_id, user_id, auth_type, permi
     # "send_texts,send_emails,view_activity"
     from app.service_invite.rest import create_invited_user
 
-    current_app.logger.info("ENTER")
     file = open(file_name)
     for email_address in file:
         data = {
@@ -239,7 +238,6 @@ def bulk_invite_user_to_service(file_name, service_id, user_id, auth_type, permi
             "auth_type": auth_type,
             "invite_link_host": current_app.config["ADMIN_BASE_URL"],
         }
-        current_app.logger.info(f"DATA = {data}")
         with current_app.test_request_context(
             path=f"/service/{service_id}/invite/",
             method="POST",
@@ -248,12 +246,12 @@ def bulk_invite_user_to_service(file_name, service_id, user_id, auth_type, permi
         ):
             try:
                 response = create_invited_user(service_id)
-                current_app.logger.info(f"RESPONSE {response[1]}")
+                current_app.logger.debug(f"RESPONSE {response[1]}")
                 if response[1] != 201:
                     current_app.logger.warning(
                         f"*** ERROR occurred for email address: {email_address.strip()}"
                     )
-                current_app.logger.info(response[0].get_data(as_text=True))
+                current_app.logger.debug(response[0].get_data(as_text=True))
             except Exception:
                 current_app.logger.exception(
                     f"*** ERROR occurred for email address: {email_address.strip()}.",
@@ -337,7 +335,6 @@ def boolean_or_none(field):
 
         for line in itertools.islice(f, 1, None):
             columns = line.split("|")
-            current_app.logger.info(columns)
             email_branding = None
             email_branding_column = columns[5].strip()
             if len(email_branding_column) > 0:
@@ -439,20 +436,19 @@ def populate_go_live(file_name):
     # 6- Contact detail, 7-MOU, 8- LIVE date, 9- SMS, 10 - Email, 11 - Letters, 12 -CRM, 13 - Blue badge
     import csv
 
-    current_app.logger.info("Populate go live user and date")
     with open(file_name, "r") as f:
         rows = csv.reader(
             f,
             quoting=csv.QUOTE_MINIMAL,
             skipinitialspace=True,
         )
-        current_app.logger.info(next(rows))  # ignore header row
+        current_app.logger.debug(next(rows))  # ignore header row
         for index, row in enumerate(rows):
-            current_app.logger.info(index, row)
+            current_app.logger.debug(index, row)
             service_id = row[2]
             go_live_email = row[6]
             go_live_date = datetime.strptime(row[8], "%d/%m/%Y") + timedelta(hours=12)
-            current_app.logger.info(service_id, go_live_email, go_live_date)
+            current_app.logger.debug(service_id, go_live_email, go_live_date)
             try:
                 if go_live_email:
                     go_live_user = get_user_by_email(go_live_email)
@@ -506,13 +502,11 @@ def fix_billable_units():
         )
         db.session.execute(stmt)
     db.session.commit()
-    current_app.logger.info("End fix_billable_units")
 
 
 @notify_command(name="delete-unfinished-jobs")
 def delete_unfinished_jobs():
     cleanup_unfinished_jobs()
-    current_app.logger.info("End cleanup_unfinished_jobs")
 
 
 @notify_command(name="process-row-from-job")
@@ -618,7 +612,7 @@ def dump_user_info(user_email_address):
     with open("user_download.json", "wb") as f:
         f.write(json.dumps(content).encode("utf8"))
     f.close()
-    current_app.logger.info("Successfully downloaded user info to user_download.json")
+    current_app.logger.debug("Successfully downloaded user info to user_download.json")
 
 
 @notify_command(name="populate-annual-billing-with-defaults")

app/dao/organization_dao.py

@@ -3,6 +3,7 @@
 
 from app import db
 from app.dao.dao_utils import VersionOptions, autocommit, version_class
+from app.enums import UserState
 from app.models import Domain, Organization, Service, User
 
 
@@ -125,7 +126,7 @@ def dao_get_users_for_organization(organization_id):
     return (
         db.session.query(User)
         .join(User.organizations)
-        .where(Organization.id == organization_id, User.state == "active")
+        .where(Organization.id == organization_id, User.state == UserState.ACTIVE)
         .order_by(User.created_at)
         .all()
     )