More dissection and consolidation of dependencies as appropriate. Try to get CI Actions to pass for 'uv run ruff check' on 2 particular projects (sftp-outbound-transfer-lambda and locust_tests).

Author: jonathan-cantu-icf

.github/workflows/ci-python.yml

@@ -6,6 +6,7 @@ on:
       - "**/*.py"
       - "**/*requirement*.txt"
       - "**/uv.lock"
+      - "**/pyproject.toml"
       - ".github/workflows/ci-python.yml"
 
   merge_group:
@@ -17,7 +18,7 @@ env:
   PYTHON_MAX: 3.14
 
 jobs:
-  matrix-pytest:
+  setup-workspace:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
@@ -62,6 +63,9 @@ jobs:
           java-version: "25"
           distribution: "corretto"
       - uses: astral-sh/setup-uv@v7
+        with:
+          version: "latest"
+          enable-cache: true
       - name: Run Python Tests per project
         id: run-pytest-set
         run: |

apps/bfd-model-idr/pyproject.toml

@@ -8,7 +8,7 @@ dependencies = [
     "pandas>=2.2.3",
     "xlsxwriter>=3.2.5",
     "pyyaml>=6.0.2",
-    "pydantic>=2.12.3",
+    "pydantic",
     "tqdm>=4.67.1",
     "click>=8.3.1",
     "requests>=2.32.5",

apps/bfd-server-ng/codegen/.python-version

@@ -7,18 +7,17 @@
 from collections.abc import Callable, Mapping
 from typing import Any
 
-from locust import FastHttpUser, events
-from locust.argument_parser import LocustArgumentParser
-from locust.contrib.fasthttp import ResponseContextManager
-from locust.env import Environment
-
 from common import custom_args, data, validation
 from common.locust_utils import is_distributed, is_locust_worker
 from common.stats import stats_compare, stats_writers
 from common.stats.aggregated_stats import FinalCompareResult, StatsCollector
 from common.stats.stats_config import StatsConfiguration
 from common.url_path import create_url_path
 from common.validation import ValidationResult
+from locust import FastHttpUser, events
+from locust.argument_parser import LocustArgumentParser
+from locust.contrib.fasthttp import ResponseContextManager
+from locust.env import Environment
 
 _COMPARISONS_METADATA_PATH = None
 """The path to a given stats comparison metadata JSON file for a particular test suite. Should be
@@ -27,12 +26,12 @@
 
 
 @events.init_command_line_parser.add_listener
-def _(parser: LocustArgumentParser, **kwargs: dict[str, Any]) -> None:  # noqa: ARG001
+def _(parser: LocustArgumentParser, **kwargs: dict[str, Any]) -> None:
     custom_args.register_custom_args(parser)
 
 
 @events.init.add_listener
-def _(environment: Environment, **kwargs: dict[str, Any]) -> None:  # noqa: ARG001
+def _(environment: Environment, **kwargs: dict[str, Any]) -> None:
     if is_distributed(environment) and is_locust_worker(environment):
         return
 
@@ -44,7 +43,7 @@ def _(environment: Environment, **kwargs: dict[str, Any]) -> None:  # noqa: ARG0
 
 
 @events.quitting.add_listener
-def _(environment: Environment, **kwargs: dict[str, Any]) -> None:  # noqa: ARG001
+def _(environment: Environment, **kwargs: dict[str, Any]) -> None:
     """Run one-time teardown tasks after the tests have completed.
 
     Args:

apps/utils/locust_tests/common/bfd_user_base.py

@@ -54,7 +54,7 @@ def _get_regression_query(select_query: str) -> str:
     )
 
 
-def get_regression_bene_ids(uri: str, table_sample_pct: float | None = None) -> list[str]:  # noqa: ARG001
+def get_regression_bene_ids(uri: str, table_sample_pct: float | None = None) -> list[str]:
     """Retrieve a list of beneficiary IDs within the range of 20,000 contiguous synthetic
     beneficiaries that exist in each environment. Returned list is sorted in ascending order.
 
@@ -68,7 +68,7 @@ def get_regression_bene_ids(uri: str, table_sample_pct: float | None = None) ->
     return [str(r[0]) for r in _execute(uri, bene_query)]
 
 
-def get_regression_hashed_mbis(uri: str, table_sample_pct: float | None = None) -> list[str]:  # noqa: ARG001
+def get_regression_hashed_mbis(uri: str, table_sample_pct: float | None = None) -> list[str]:
     """Retrieve a list of hashed MBIs within the range of 20,000 contiguous synthetic
     beneficiaries that exist in each environment. Returned list is sorted in ascending order.
 
@@ -82,7 +82,7 @@ def get_regression_hashed_mbis(uri: str, table_sample_pct: float | None = None)
     return [str(r[0]) for r in _execute(uri, mbi_query)]
 
 
-def get_regression_mbis(uri: str, table_sample_pct: float | None = None) -> list[str]:  # noqa: ARG001
+def get_regression_mbis(uri: str, table_sample_pct: float | None = None) -> list[str]:
     """Retrieve a list of MBIs within the range of 20,000 contiguous synthetic
     beneficiaries that exist in each environment. Returned list is sorted in ascending order.
 
@@ -98,7 +98,7 @@ def get_regression_mbis(uri: str, table_sample_pct: float | None = None) -> list
 
 def get_regression_contract_ids(
     uri: str,
-    table_sample_pct: float | None = None,  # noqa: ARG001
+    table_sample_pct: float | None = None,
 ) -> list[dict[str, str]]:
     """Retrieve a list of contract IDs within the range of 20,000 contiguous synthetic
     beneficiaries that exist in each environment. Returned list is sorted in ascending order, and
@@ -126,7 +126,7 @@ def get_regression_contract_ids(
     ]
 
 
-def get_regression_pac_hashed_mbis(uri: str, table_sample_pct: float | None = None) -> list[str]:  # noqa: ARG001
+def get_regression_pac_hashed_mbis(uri: str, table_sample_pct: float | None = None) -> list[str]:
     """Return a list of MBI hashes within the set of static, synthetic PAC data.
 
     Args:
@@ -141,7 +141,7 @@ def get_regression_pac_hashed_mbis(uri: str, table_sample_pct: float | None = No
     return [str(r[0]) for r in _execute(uri, claims_mbis_query)]
 
 
-def get_regression_pac_mbis(uri: str, table_sample_pct: float | None = None) -> list[str]:  # noqa: ARG001
+def get_regression_pac_mbis(uri: str, table_sample_pct: float | None = None) -> list[str]:
     """Return a list of MBI within the set of static, synthetic PAC data.
 
     Args:

apps/utils/locust_tests/common/db.py

@@ -28,7 +28,7 @@ def _execute(uri: str, query: LiteralString) -> list:
 
 
 # table_sample_pct is required for the interface even though it's unused here
-def get_regression_bene_sks(uri: str, table_sample_pct: float | None = None) -> list[str]:  # noqa: ARG001
+def get_regression_bene_sks(uri: str, table_sample_pct: float | None = None) -> list[str]:
     """Retrieve a random list of beneficiary IDs.
 
     Args:
@@ -43,7 +43,7 @@ def get_regression_bene_sks(uri: str, table_sample_pct: float | None = None) ->
 
 def get_regression_current_part_a_bene_sks(
     uri: str,
-    table_sample_pct: float | None = None,  # noqa: ARG001
+    table_sample_pct: float | None = None,
 ) -> list[str]:
     """Retrieve a random list of beneficiary IDs.
 
@@ -65,7 +65,7 @@ def get_regression_current_part_a_bene_sks(
 
 def get_regression_current_part_b_bene_sks(
     uri: str,
-    table_sample_pct: float | None = None,  # noqa: ARG001
+    table_sample_pct: float | None = None,
 ) -> list[str]:
     """Retrieve a random list of beneficiary IDs.
 
@@ -84,7 +84,7 @@ def get_regression_current_part_b_bene_sks(
     return [str(r[0]) for r in _execute(uri, bene_query)]
 
 
-def get_regression_bene_mbis(uri: str, table_sample_pct: float | None = None) -> list[str]:  # noqa: ARG001
+def get_regression_bene_mbis(uri: str, table_sample_pct: float | None = None) -> list[str]:
     """Retrieve a random list list of MBIs.
 
     Args:
@@ -97,7 +97,7 @@ def get_regression_bene_mbis(uri: str, table_sample_pct: float | None = None) ->
     return [str(r[0]) for r in _execute(uri, bene_query)]
 
 
-def get_regression_claim_ids(uri: str, table_sample_pct: float | None = None) -> list[str]:  # noqa: ARG001
+def get_regression_claim_ids(uri: str, table_sample_pct: float | None = None) -> list[str]:
     """Retrieve a random list list of clam Ids.
 
     Args:

apps/utils/locust_tests/common/db_idr.py

@@ -9,11 +9,10 @@
 from enum import StrEnum
 from typing import Any
 
+from common.validation import ValidationResult
 from locust.env import Environment
 from locust.stats import PERCENTILES_TO_REPORT, StatsEntry
 
-from common.validation import ValidationResult
-
 ResponseTimePercentiles = dict[str, int | float]
 """A type representing a dictionary of stringified percentile keys to their integer or
 floating-point values"""

apps/utils/locust_tests/common/stats/aggregated_stats.py

@@ -11,8 +11,6 @@
 from statistics import mean
 from typing import Any
 
-from gevent import monkey
-
 from common.stats.aggregated_stats import (
     AggregatedStats,
     FinalCompareResult,
@@ -25,6 +23,7 @@
     StatsStorageType,
 )
 from common.validation import ValidationResult
+from gevent import monkey
 
 # botocore/boto3 is incompatible with gevent out-of-box causing issues with SSL.
 # We need to monkey patch gevent _before_ importing boto3 to ensure this doesn't happen.
@@ -180,7 +179,7 @@ def __init__(self, stats_config: StatsConfiguration, metadata: StatsMetadata) ->
     def load_previous(self) -> AggregatedStats | None:
         query = (
             f"SELECT cast(totals as JSON), cast(tasks as JSON) "
-            f'FROM "{self.stats_config.stats_store_s3_database}"."{self.stats_config.stats_store_s3_table}" '  # noqa: E501
+            f'FROM "{self.stats_config.stats_store_s3_database}"."{self.stats_config.stats_store_s3_table}" '
             f"WHERE {self.__get_where_clause()} ORDER BY metadata.timestamp DESC "
             "LIMIT 1"
         )
@@ -191,7 +190,7 @@ def load_previous(self) -> AggregatedStats | None:
     def load_average(self) -> AggregatedStats | None:
         query = (
             f"SELECT cast(totals as JSON), cast(tasks as JSON) "
-            f'FROM "{self.stats_config.stats_store_s3_database}"."{self.stats_config.stats_store_s3_table}" '  # noqa: E501
+            f'FROM "{self.stats_config.stats_store_s3_database}"."{self.stats_config.stats_store_s3_table}" '
             f"WHERE {self.__get_where_clause()} "
             "ORDER BY metadata.timestamp DESC "
             f"LIMIT {self.stats_config.stats_compare_load_limit}"

apps/utils/locust_tests/common/stats/stats_loaders.py

@@ -7,10 +7,9 @@
 from dataclasses import asdict
 from pathlib import Path
 
-from gevent import monkey
-
 from common.stats.aggregated_stats import AggregatedStats
 from common.stats.stats_config import StatsConfiguration, StatsStorageType
+from gevent import monkey
 
 # botocore/boto3 is incompatible with gevent out-of-box causing issues with SSL.
 # We need to monkey patch gevent _before_ importing boto3 to ensure this doesn't happen.

apps/utils/locust_tests/common/stats/stats_writers.py

@@ -10,14 +10,13 @@
     TypeVar,
 )
 
-from locust import TaskSet, User, events, tag, task
-from locust.env import Environment
-
 from common import data, db
 from common.bfd_user_base import BFDUserBase
 from common.locust_utils import is_distributed, is_locust_master
 from common.url_path import create_url_path
 from common.user_init_aware_load_shape import UserInitAwareLoadShape
+from locust import TaskSet, User, events, tag, task
+from locust.env import Environment
 
 TaskT = TypeVar("TaskT", Callable[..., None], type["TaskSet"])
 MASTER_BENE_IDS: Collection[str] = []
@@ -28,7 +27,7 @@
 
 
 @events.test_start.add_listener
-def _(environment: Environment, **kwargs: dict[str, Any]) -> None:  # noqa: ARG001
+def _(environment: Environment, **kwargs: dict[str, Any]) -> None:
     if (
         is_distributed(environment) and is_locust_master(environment)
     ) or not environment.parsed_options:
@@ -296,7 +295,7 @@ class PatientTaskSet(HighVolumeTaskSet):
     def patient_test_coverage_contract_v1(self) -> None:
         """Patient search by coverage contract (all pages)."""
 
-        def make_url():  # noqa: ANN202
+        def make_url():
             contract = self.user.contract_data.pop()
             return create_url_path(
                 "/v1/fhir/Patient",