Merge pull request #2191 from GSA/sync-production-to-main-v2

Sync production to main v2

app/clients/cloudwatch/aws_cloudwatch.py

@@ -197,15 +197,19 @@ class AwsCloudwatchClient(Client):
 
     def _get_receipts(self, log_group_name, start, end):
         event_set = set()
-        all_events = self._get_log(log_group_name, start, end)
-        for event in all_events:
-            try:
-                actual_event = self.event_to_db_format(event["message"])
-                event_set.add(json.dumps(actual_event))
-            except Exception:
-                current_app.logger.exception(
-                    f"Could not format delivery receipt {event} for db insert"
-                )
+        try:
+            all_events = self._get_log(log_group_name, start, end)
+            for event in all_events:
+                try:
+                    actual_event = self.event_to_db_format(event["message"])
+                    event_set.add(json.dumps(actual_event))
+                except Exception:
+                    current_app.logger.exception(
+                        f"Could not format delivery receipt {event} for db insert"
+                    )
+        except Exception as e:
+            current_app.logger.error(f"Could not find log group {log_group_name}")
+            raise e
         return event_set
 
     def _aws_value_or_default(self, event, top_level, second_level):

app/cloudfoundry_config.py

@@ -9,8 +9,8 @@ class CloudfoundryConfig:
         self.s3_buckets = {bucket["name"]: bucket["credentials"] for bucket in buckets}
         self._empty_bucket_credentials = {
             "bucket": "",
-            "access_key_id": "",
-            "secret_access_key": "",
+            "access_key_id": "",  # nosec B105
+            "secret_access_key": "",  # nosec B105
             "region": "",
         }
 

app/commands.py

@@ -8,7 +8,8 @@ from os import getenv
 
 import click
 import flask
-from click_datetime import Datetime as click_dt
+
+# from click_datetime import Datetime as click_dt
 from faker import Faker
 from flask import current_app, json
 from sqlalchemy import and_, select, text, update
@@ -59,7 +60,8 @@ from app.models import (
     TemplateHistory,
     User,
 )
-from app.utils import utc_now
+
+# from app.utils import utc_now
 from notifications_python_client.authentication import create_jwt_token
 from notifications_utils.recipients import RecipientCSV
 from notifications_utils.template import SMSMessageTemplate
@@ -260,50 +262,55 @@ def bulk_invite_user_to_service(file_name, service_id, user_id, auth_type, permi
     file.close()
 
 
-@notify_command(name="archive-jobs-created-between-dates")
-@click.option(
-    "-s",
-    "--start_date",
-    required=True,
-    help="start date inclusive",
-    type=click_dt(format="%Y-%m-%d"),
-)
-@click.option(
-    "-e",
-    "--end_date",
-    required=True,
-    help="end date inclusive",
-    type=click_dt(format="%Y-%m-%d"),
-)
-def update_jobs_archived_flag(start_date, end_date):
-    current_app.logger.info(
-        f"Archiving jobs created between {start_date} to {end_date}"
-    )
+# TODO this is commented out because there is a conflict between
+# the version of wheel we need to be on (0.46.2 or greater) and
+# the click-datetime dependency, which insists wheel be 0.45.0 or lower.
+# So need to rewrite this command to not use click-datetime, or see
+# if the owners of click-datetime updated it (not as of 1/22/2026).
+# @notify_command(name="archive-jobs-created-between-dates")
+# @click.option(
+#     "-s",
+#     "--start_date",
+#     required=True,
+#     help="start date inclusive",
+#     type=click_dt(format="%Y-%m-%d"),
+# )
+# @click.option(
+#     "-e",
+#     "--end_date",
+#     required=True,
+#     help="end date inclusive",
+#     type=click_dt(format="%Y-%m-%d"),
+# )
+# def update_jobs_archived_flag(start_date, end_date):
+#     current_app.logger.info(
+#         f"Archiving jobs created between {start_date} to {end_date}"
+#     )
 
-    process_date = start_date
-    total_updated = 0
+#     process_date = start_date
+#     total_updated = 0
 
-    while process_date < end_date:
-        start_time = utc_now()
-        sql = """update
-                    jobs set archived = true
-                where
-                    created_at >= (date :start + time '00:00:00')
-                    and created_at < (date :end + time '00:00:00')
-        """
-        result = db.session.execute(
-            text(sql), {"start": process_date, "end": process_date + timedelta(days=1)}
-        )
-        db.session.commit()
-        current_app.logger.info(
-            f"jobs: --- Completed took {datetime.now() - start_time}ms. Archived "
-            f"{result.rowcount} jobs for {process_date}"
-        )
+#     while process_date < end_date:
+#         start_time = utc_now()
+#         sql = """update
+#                     jobs set archived = true
+#                 where
+#                     created_at >= (date :start + time '00:00:00')
+#                     and created_at < (date :end + time '00:00:00')
+#         """
+#         result = db.session.execute(
+#             text(sql), {"start": process_date, "end": process_date + timedelta(days=1)}
+#         )
+#         db.session.commit()
+#         current_app.logger.info(
+#             f"jobs: --- Completed took {datetime.now() - start_time}ms. Archived "
+#             f"{result.rowcount} jobs for {process_date}"
+#         )
 
-        process_date += timedelta(days=1)
+#         process_date += timedelta(days=1)
 
-        total_updated += result.rowcount
-    current_app.logger.info(f"Total archived jobs = {total_updated}")
+#         total_updated += result.rowcount
+#     current_app.logger.info(f"Total archived jobs = {total_updated}")
 
 
 @notify_command(name="populate-organizations-from-file")

app/dao/notifications_dao.py

@@ -308,8 +308,8 @@ def dao_get_notification_count_for_service(*, service_id):
 
 
 def dao_get_notification_count_for_service_message_ratio(service_id, current_year):
-    start_date = datetime(current_year, 6, 16)
-    end_date = datetime(current_year + 1, 6, 16)
+    start_date = datetime(current_year - 1, 6, 16)
+    end_date = datetime(current_year, 6, 16)
     stmt1 = (
         select(func.count())
         .select_from(Notification)

app/notifications/validators.py

@@ -35,11 +35,12 @@ def check_service_over_total_message_limit(key_type, service):
     # For now we are using calendar year
     # Switch to using service agreement dates when the Agreement model is ready
     # If the service stat has never been set before, compute the remaining seconds for 2025
-    # and set it (all services) to expire on 12/31/2025.
+    # and set it (all services) to expire on 12/31/2026.
     if service_stats is None:
         now_et = datetime.now(ZoneInfo("America/New_York"))
+
         target_time = datetime(
-            2025, 12, 31, 23, 59, 59, tzinfo=ZoneInfo("America/New_York")
+            2026, 12, 31, 23, 59, 59, tzinfo=ZoneInfo("America/New_York")
         )
         time_difference = target_time - now_et
         seconds_difference = int(time_difference.total_seconds())

app/organization/rest.py

@@ -180,7 +180,9 @@ def get_organization_dashboard(organization_id):
         organization_id, year, include_all_services=True
     )
 
-    service_ids = [service_data["service_id"] for service_data in services_with_usage.values()]
+    service_ids = [
+        service_data["service_id"] for service_data in services_with_usage.values()
+    ]
 
     if not service_ids:
         return jsonify(services=[]), 200
@@ -197,11 +199,13 @@ def get_organization_dashboard(organization_id):
     sorted_services = sorted(
         services_list,
         key=lambda s: (
-            0 if (s["active"] and not s["restricted"]) else
-            1 if (s["active"] and s["restricted"]) else
-            2,
-            s["service_name"].lower()
-        )
+            (
+                0
+                if (s["active"] and not s["restricted"])
+                else 1 if (s["active"] and s["restricted"]) else 2
+            ),
+            s["service_name"].lower(),
+        ),
     )
 
     return jsonify(services=sorted_services)

pyproject.toml

@@ -9,18 +9,17 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.13.2"
-alembic = "==1.17.2"
+alembic = "==1.18.1"
 amqp = "==5.3.1"
 beautifulsoup4 = "==4.14.3"
 boto3 = "^1.38.27"
 botocore = "^1.38.27"
-cachetools = "==6.2.2"
-celery = {version = "==5.6.0", extras = ["redis"]}
+cachetools = "==6.2.4"
+celery = {version = "==5.6.2", extras = ["redis"]}
 certifi = ">=2022.12.7"
 cffi = "==2.0.0"
 charset-normalizer = "^3.4.4"
 click = "==8.3.1"
-click-datetime = "==0.4.0"
 click-didyoumean = "==0.3.1"
 click-plugins = "==1.1.1.2"
 click-repl = "==0.3.0"
@@ -32,74 +31,77 @@ flask-bcrypt = "==1.0.1"
 flask-migrate = "==4.1.0"
 flask-redis = "==0.4.0"
 flask-sqlalchemy = "^3.1.1"
-gunicorn = {version = "==23.0.0", extras = ["gevent"]}
+gunicorn = {version = "==24.1.1", extras = ["gevent"]}
 iso8601 = "==2.1.0"
-jsonschema = {version = "==4.25.1", extras = ["format"]}
+jsonschema = {version = "==4.26.0", extras = ["format"]}
 lxml = "==6.0.2"
-marshmallow = "^4.1.0"
+marshmallow = "^4.2.1"
 marshmallow-sqlalchemy = "^1.4.2"
-newrelic = "^11.1.0"
-packaging = "==25.0"
+newrelic = "^11.3.0"
+packaging = "==26.0"
 poetry-dotenv-plugin = "==0.2.0"
 psycopg2-binary = "==2.9.11"
 pyjwt = "==2.10.1"
 python-dotenv = "==1.2.1"
-sqlalchemy = "==2.0.44"
-werkzeug = "^3.1.4"
-faker = "^38.2.0"
+sqlalchemy = "==2.0.46"
+werkzeug = "^3.1.5"
+faker = "^40.1.0"
 async-timeout = "^5.0.1"
 bleach = "^6.3.0"
 geojson = "^3.2.0"
-numpy = "^2.3.5"
+numpy = "^2.4.1"
 ordered-set = "^4.1.0"
-phonenumbers = "^9.0.20"
+phonenumbers = "^9.0.22"
 python-json-logger = "^4.0.0"
-regex = "^2025.11.3"
+regex = "^2026.1.15"
 shapely = "^2.1.2"
 smartypants = "^2.0.1"
-mistune = "^3.1.4"
+mistune = "^3.2.0"
 blinker = "^1.9.0"
 cryptography = "^46.0.3"
 idna = "^3.11"
-jmespath = "^1.0.1"
+jmespath = "^1.1.0"
 markupsafe = "^3.0.3"
-pycparser = "^2.23"
+pycparser = "^3.0"
 python-dateutil = "^2.9.0.post0"
 pyyaml = "^6.0.3"
 s3transfer = "^0.13.1"
 six = "^1.16.0"
-urllib3 = "^2.6.0"
+urllib3 = "^2.6.3"
 webencodings = "^0.5.1"
 itsdangerous = "^2.2.0"
 jinja2 = "^3.1.6"
 redis = "^6.4.0"
 requests = "^2.32.5"
-virtualenv = "^20.35.4"
+virtualenv = "^20.36.1"
 marshmallow-enum = "^1.5.1"
 awscli = "^1.40.36"
 typing-extensions = "^4.15.0"
-aiohttp = "^3.13.2"
-pytest = "^9.0.1"
+aiohttp = "^3.13.3"
+pytest = "^9.0.2"
+filelock = ">=3.20.3"
+pyasn1 = ">=0.6.2"
+jaraco-context = ">=6.1.0"
+wheel = ">=0.46.2"
 
 
 [tool.poetry.group.dev.dependencies]
-awscli = "^1.33.32"
 bandit = "*"
-black = "^25.11.0"
+black = "^26.1.0"
 cyclonedx-python-lib = "^11.6.0"
 cloudfoundry-client = "*"
 exceptiongroup = "==1.3.1"
 flake8 = "^7.3.0"
 flake8-bugbear = "^25.11.29"
 freezegun = "^1.5.5"
-hypothesis = "^6.148.7"
+hypothesis = "^6.151.2"
 honcho = "*"
 isort = "^7.0.0"
-jinja2-cli = {version = "==0.8.2", extras = ["yaml"]}
-moto = "==5.1.18"
+jinja2-cli = {version = "==1.0.0", extras = ["yaml"]}
+moto = "==5.1.20"
 pip-audit = "*"
-pre-commit = "^4.5.0"
-pytest = "^9.0.1"
+pre-commit = "^4.5.1"
+pytest = "^9.0.2"
 pytest-env = "^1.2.0"
 pytest-mock = "^3.15.1"
 pytest-cov = "^7.0.0"

terraform/demo/main.tf

@@ -50,7 +50,7 @@ module "egress-space" {
   cf_restricted_space_name = local.cf_space_name
   deployers = [
     var.cf_user,
-    "carlo.costino@gsa.gov"
+    "alex.janousek@gsa.gov"
   ]
 }
 

terraform/demo/providers.tf

@@ -2,8 +2,8 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
-      source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.53.1"
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.9.0"
     }
     cfcommunity = {
       source  = "cloudfoundry-community/cloudfoundry"

terraform/production/providers.tf

@@ -2,8 +2,8 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
-      source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.53.1"
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.9.0"
     }
     cfcommunity = {
       source  = "cloudfoundry-community/cloudfoundry"

terraform/sandbox/main.tf

@@ -50,7 +50,7 @@ module "egress-space" {
   cf_restricted_space_name = local.cf_space_name
   deployers = [
     var.cf_user,
-    "carlo.costino@gsa.gov"
+    "alex.janousek@gsa.gov"
   ]
 }
 

terraform/staging/main.tf

@@ -60,7 +60,7 @@ module "egress-space" {
   cf_restricted_space_name = local.cf_space_name
   deployers = [
     var.cf_user,
-    "carlo.costino@gsa.gov"
+    "alex.janousek@gsa.gov"
   ]
 }
 

tests/app/organization/test_rest.py

@@ -1009,10 +1009,14 @@ def test_get_organization_dashboard(admin_request, mocker):
         }
     }
 
-    mock_templates = mocker.patch("app.organization.rest.dao_get_recent_sms_template_per_service")
+    mock_templates = mocker.patch(
+        "app.organization.rest.dao_get_recent_sms_template_per_service"
+    )
     mock_templates.return_value = {service_id: "Welcome SMS"}
 
-    mock_contacts = mocker.patch("app.organization.rest.dao_get_service_primary_contacts")
+    mock_contacts = mocker.patch(
+        "app.organization.rest.dao_get_service_primary_contacts"
+    )
     mock_contacts.return_value = {service_id: "billing@example.com"}
 
     response = admin_request.get(

tests/app/test_commands.py

@@ -7,7 +7,7 @@ import pytest
 from sqlalchemy import func, select
 
 from app import db
-from app.commands import (
+from app.commands import (  # update_jobs_archived_flag,
     _clear_templates_from_cache,
     _update_template,
     associate_services_to_organizations,
@@ -32,7 +32,6 @@ from app.commands import (
     promote_user_to_platform_admin,
     purge_csv_bucket,
     purge_functional_test_data,
-    update_jobs_archived_flag,
     update_templates,
 )
 from app.dao.inbound_numbers_dao import dao_get_available_inbound_numbers
@@ -46,23 +45,19 @@ from app.enums import (
     TemplateType,
     UserState,
 )
-from app.models import (
+from app.models import (  # Job,
     AnnualBilling,
-    Job,
     Notification,
     Organization,
     Service,
     Template,
     User,
 )
-from app.utils import utc_now
-from tests.app.db import (
+from tests.app.db import (  # create_job,; create_template,
     create_annual_billing,
-    create_job,
     create_notification,
     create_organization,
     create_service,
-    create_template,
 )
 
 
@@ -120,35 +115,35 @@ def test_purge_functional_test_data_bad_mobile(notify_db_session, notify_api):
     assert user_count == 0
 
 
-def test_update_jobs_archived_flag(notify_db_session, notify_api):
-    service = create_service()
+# def test_update_jobs_archived_flag(notify_db_session, notify_api):
+#     service = create_service()
 
-    sms_template = create_template(service=service, template_type=TemplateType.SMS)
-    create_job(sms_template)
+#     sms_template = create_template(service=service, template_type=TemplateType.SMS)
+#     create_job(sms_template)
 
-    right_now = utc_now()
-    tomorrow = right_now + timedelta(days=1)
+#     right_now = utc_now()
+#     tomorrow = right_now + timedelta(days=1)
 
-    right_now = right_now.strftime("%Y-%m-%d")
-    tomorrow = tomorrow.strftime("%Y-%m-%d")
+#     right_now = right_now.strftime("%Y-%m-%d")
+#     tomorrow = tomorrow.strftime("%Y-%m-%d")
 
-    stmt = select(Job).where(Job.archived is True)
-    archived_jobs = db.session.execute(stmt).scalar() or 0
-    assert archived_jobs == 0
+#     stmt = select(Job).where(Job.archived is True)
+#     archived_jobs = db.session.execute(stmt).scalar() or 0
+#     assert archived_jobs == 0
 
-    notify_api.test_cli_runner().invoke(
-        update_jobs_archived_flag,
-        [
-            "-e",
-            tomorrow,
-            "-s",
-            right_now,
-        ],
-    )
-    jobs = db.session.execute(select(Job)).scalars().all()
-    assert len(jobs) == 1
-    for job in jobs:
-        assert job.archived is True
+#     notify_api.test_cli_runner().invoke(
+#         update_jobs_archived_flag,
+#         [
+#             "-e",
+#             tomorrow,
+#             "-s",
+#             right_now,
+#         ],
+#     )
+#     jobs = db.session.execute(select(Job)).scalars().all()
+#     assert len(jobs) == 1
+#     for job in jobs:
+#         assert job.archived is True
 
 
 def _get_organization_query_count():