Update Api (major)

api/pyproject.toml

@@ -15,33 +15,32 @@ python-dotenv = "^1.0.0"
 pydantic = "^2.4.2"
 botocore = "^1.31.62"
 boto3 = "^1.28.62"
-smart-open = "^6.1.0"
+smart-open = "^7.0.0"
 pytz = "^2023.3.post1"
 APIFlask = "^2.1.0"
 marshmallow-dataclass = { extras = ["enum", "union"], version = "^8.5.8" }
 marshmallow = "^3.20.1"
-gunicorn = "^22.0.0"
+gunicorn = "^23.0.0"
 psycopg = { extras = ["binary"], version = "^3.1.19" }
 pydantic-settings = "^2.0.3"
 flask-cors = "^5.0.0"
 opensearch-py = "^2.5.0"
 
 [tool.poetry.group.dev.dependencies]
-black = "^23.9.1"
+black = "^24.0.0"
 isort = "^5.12.0"
 mypy = "^1.8.0"
-moto = { extras = ["s3"], version = "^4.0.2" }
+moto = { extras = ["s3"], version = "^5.0.0" }
 types-pytz = "^2023.3.1.1"
 coverage = "^7.3.2"
-Faker = "^19.8.0"
+Faker = "^28.0.0"
 factory-boy = "^3.3.0"
 bandit = "^1.7.5"
-pytest = "^7.4.2"
+pytest = "^8.0.0"
 pytest-watch = "^4.2.0"
-pytest-lazy-fixture = "^0.6.3"
 types-pyyaml = "^6.0.12.11"
-setuptools = "^68.2.2"
-pydot = "1.4.2"
+setuptools = "^75.0.0"
+pydot = "3.0.1"
 sadisplay = "0.4.9"
 ruff = "^0.4.0"
 debugpy = "^1.8.1"

api/src/adapters/db/client.py

@@ -3,6 +3,7 @@
 
 For usage information look at the package docstring in __init__.py
 """
+
 import abc
 import logging
 

api/src/adapters/db/flask_db.py

@@ -38,6 +38,7 @@ def health():
         db_client = flask_db.get_db(current_app)
         # db_client.get_connection() or db_client.get_session()
 """
+
 from functools import wraps
 from typing import Callable, Concatenate, ParamSpec, TypeVar
 

api/src/api/schemas/extension/field_validators.py

@@ -16,12 +16,10 @@ class Regexp(validators.Regexp):
     )
 
     @typing.overload
-    def __call__(self, value: str) -> str:
-        ...
+    def __call__(self, value: str) -> str: ...
 
     @typing.overload
-    def __call__(self, value: bytes) -> bytes:
-        ...
+    def __call__(self, value: bytes) -> bytes: ...
 
     def __call__(self, value: str | bytes) -> str | bytes:
         if self.regex.match(value) is None:  # type: ignore

api/src/db/migrations/versions/2023_08_10_default_table_privileges.py

@@ -5,6 +5,7 @@
 Create Date: 2023-08-10 15:52:10.626153
 
 """
+
 from alembic import op
 
 # revision identifiers, used by Alembic.

api/src/db/migrations/versions/2023_10_18_basic_opportunity_table.py

@@ -5,6 +5,7 @@
 Create Date: 2023-10-18 16:37:18.252136
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

api/src/db/migrations/versions/2023_11_27_rename_opportunity_table_prior_to_real_.py

@@ -5,6 +5,7 @@
 Create Date: 2023-11-27 14:43:04.227044
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import postgresql

api/src/db/migrations/versions/2023_12_11_add_rest_of_opportunity_table.py

@@ -5,6 +5,7 @@
 Create Date: 2023-12-11 13:13:33.446941
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

api/src/db/migrations/versions/2024_01_29_add_topportunity_table_for_transfer.py

@@ -5,6 +5,7 @@
 Create Date: 2024-01-29 14:07:42.665723
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

api/src/db/migrations/versions/2024_02_02_add_opportunity_category_table.py

@@ -5,6 +5,7 @@
 Create Date: 2024-02-02 11:36:33.241412
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

api/src/db/migrations/versions/2024_02_07_add_expanded_opportunity_models.py

@@ -5,6 +5,7 @@
 Create Date: 2024-02-07 12:16:16.564629
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

api/src/db/migrations/versions/2024_02_12_create_dms_exceptions_table.py

@@ -5,6 +5,7 @@
 Create Date: 2024-02-12 15:58:54.880550
 
 """
+
 from alembic import op
 
 # revision identifiers, used by Alembic.

api/src/db/migrations/versions/2024_02_21_remove_dms_exceptions_table.py

@@ -5,6 +5,7 @@
 Create Date: 2024-02-21 13:44:50.932948
 
 """
+
 from alembic import op
 
 # revision identifiers, used by Alembic.

api/src/db/migrations/versions/2024_03_07_drop_tables_to_remake.py

@@ -5,6 +5,7 @@
 Create Date: 2024-03-07 10:20:15.639825
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import postgresql

api/src/db/migrations/versions/2024_03_07_updates_for_summary_tables.py

@@ -5,6 +5,7 @@
 Create Date: 2024-03-07 10:44:08.694002
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

api/src/db/migrations/versions/2024_03_12_add_indexes_for_search.py

@@ -5,6 +5,7 @@
 Create Date: 2024-03-12 13:22:57.718265
 
 """
+
 from alembic import op
 
 # revision identifiers, used by Alembic.

api/src/db/migrations/versions/2024_04_16_make_revision_number_nullable.py

@@ -5,6 +5,7 @@
 Create Date: 2024-04-16 13:36:35.993325
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

api/src/db/migrations/versions/2024_04_19_fix_column_type_and_add_version_number.py

@@ -5,6 +5,7 @@
 Create Date: 2024-04-19 13:41:34.017203
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

api/src/db/migrations/versions/2024_04_24_add_staging_tables.py

@@ -5,6 +5,7 @@
 Create Date: 2024-04-24 15:27:13.602523
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

api/src/db/migrations/versions/2024_05_01_add_created_at_updated_at_and_deleted_.py

@@ -5,6 +5,7 @@
 Create Date: 2024-05-01 11:14:34.332661
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

api/src/db/migrations/versions/2024_05_02_add_unique_constraint_for_summary.py

@@ -5,6 +5,7 @@
 Create Date: 2024-05-02 10:11:35.832837
 
 """
+
 from alembic import op
 
 # revision identifiers, used by Alembic.

api/src/db/migrations/versions/2024_05_07_add_unique_constraint_link_table_legacy_.py

@@ -5,6 +5,7 @@
 Create Date: 2024-05-07 14:41:19.401963
 
 """
+
 from alembic import op
 
 # revision identifiers, used by Alembic.

api/src/db/migrations/versions/2024_05_09_add_transformation_notes_to_staging_.py

@@ -5,6 +5,7 @@
 Create Date: 2024-05-09 15:06:48.010975
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

api/src/db/migrations/versions/2024_07_08_add_agency_related_tables.py

@@ -5,6 +5,7 @@
 Create Date: 2024-07-08 12:43:45.240782
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

api/src/db/models/agency_models.py

@@ -47,12 +47,14 @@ class Agency(ApiSchemaTable, TimestampMixin):
 
     assistance_listing_number: Mapped[str]
 
-    agency_submission_notification_setting: Mapped[
-        AgencySubmissionNotificationSetting
-    ] = mapped_column(
-        "agency_submission_notification_setting_id",
-        LookupColumn(LkAgencySubmissionNotificationSetting),
-        ForeignKey(LkAgencySubmissionNotificationSetting.agency_submission_notification_setting_id),
+    agency_submission_notification_setting: Mapped[AgencySubmissionNotificationSetting] = (
+        mapped_column(
+            "agency_submission_notification_setting_id",
+            LookupColumn(LkAgencySubmissionNotificationSetting),
+            ForeignKey(
+                LkAgencySubmissionNotificationSetting.agency_submission_notification_setting_id
+            ),
+        )
     )
 
     agency_contact_info_id: Mapped[BigInteger | None] = mapped_column(

api/src/db/models/opportunity_models.py

@@ -165,10 +165,10 @@ class OpportunitySummary(ApiSchemaTable, TimestampMixin):
     updated_by: Mapped[str | None]
     created_by: Mapped[str | None]
 
-    link_funding_instruments: Mapped[
-        list["LinkOpportunitySummaryFundingInstrument"]
-    ] = relationship(
-        back_populates="opportunity_summary", uselist=True, cascade="all, delete-orphan"
+    link_funding_instruments: Mapped[list["LinkOpportunitySummaryFundingInstrument"]] = (
+        relationship(
+            back_populates="opportunity_summary", uselist=True, cascade="all, delete-orphan"
+        )
     )
     link_funding_categories: Mapped[list["LinkOpportunitySummaryFundingCategory"]] = relationship(
         back_populates="opportunity_summary", uselist=True, cascade="all, delete-orphan"

api/src/logging/__init__.py

@@ -24,7 +24,6 @@
     logger.info("message")
 """
 
-
 import src.logging.config as config
 
 

api/src/logging/flask_logger.py

@@ -16,6 +16,7 @@
 
     flask_logger.init_app(logger, app)
 """
+
 import logging
 import time
 import uuid

api/src/logging/formatters.py

@@ -6,6 +6,7 @@
 
 See https://docs.python.org/3/library/logging.html#formatter-objects
 """
+
 import json
 import logging
 from datetime import date, datetime

api/src/task/opportunities/set_current_opportunities_task.py

@@ -84,9 +84,11 @@ def _process_opportunity(self, opportunity: Opportunity) -> None:
             "existing_opportunity_status": opportunity.opportunity_status,
         }
         log_extra |= get_log_extra_for_summary(
-            opportunity.current_opportunity_summary.opportunity_summary
-            if opportunity.current_opportunity_summary
-            else None,
+            (
+                opportunity.current_opportunity_summary.opportunity_summary
+                if opportunity.current_opportunity_summary
+                else None
+            ),
             "existing",
         )
         logger.info("Processing opportunity %s", opportunity.opportunity_id, extra=log_extra)
@@ -245,9 +247,9 @@ def is_opportunity_changed(
 def get_log_extra_for_summary(summary: OpportunitySummary | None, prefix: str) -> dict[str, Any]:
     return {
         f"{prefix}_opportunity_summary_id": summary.opportunity_summary_id if summary else None,
-        f"{prefix}_opportunity_summary_revision_number": summary.revision_number
-        if summary
-        else None,
+        f"{prefix}_opportunity_summary_revision_number": (
+            summary.revision_number if summary else None
+        ),
         f"{prefix}_opportunity_summary_is_forecast": summary.is_forecast if summary else None,
         f"{prefix}_opportunity_summary_post_date": summary.post_date if summary else None,
         f"{prefix}_opportunity_summary_close_date": summary.close_date if summary else None,

api/tests/conftest.py

@@ -240,7 +240,8 @@ def reset_aws_env_vars(monkeypatch):
 
 @pytest.fixture
 def mock_s3(reset_aws_env_vars):
-    with moto.mock_s3():
+    # https://docs.getmoto.org/en/stable/docs/configuration/index.html#whitelist-services
+    with moto.mock_aws(config={"core": {"service_whitelist": ["s3"]}}):
         yield boto3.resource("s3")
 
 

api/tests/lib/db_testing.py

@@ -1,4 +1,5 @@
 """Helper functions for testing database code."""
+
 import contextlib
 import logging
 

api/tests/src/db/models/factories.py

@@ -7,6 +7,7 @@
 The factories are based on the `factory_boy` library. See
 https://factoryboy.readthedocs.io/en/latest/ for more information.
 """
+
 import random
 from datetime import datetime
 from typing import Optional