From 20bcf7c262683e915d2a6128b25eb91f35843ea3 Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Thu, 29 Oct 2026 14:09:41 +0000 Subject: [PATCH] Separate target-manager HTTP controls from Flask setup --- .../vws_mock_test_backends/flask_backend.py | 30 +++++-------- .../target_manager_controls.py | 45 +++++++++++++++++++ 2 files changed, 56 insertions(+), 19 deletions(-) create mode 100644 test-backends/src/vws_mock_test_backends/target_manager_controls.py diff --git a/test-backends/src/vws_mock_test_backends/flask_backend.py b/test-backends/src/vws_mock_test_backends/flask_backend.py index a35795480..1c8634e62 100644 --- a/test-backends/src/vws_mock_test_backends/flask_backend.py +++ b/test-backends/src/vws_mock_test_backends/flask_backend.py @@ -21,6 +21,7 @@ from vws_mock_server.target_manager import TARGET_MANAGER_FLASK_APP from vws_mock_server.vwq import CLOUDRECO_FLASK_APP from vws_mock_server.vws import VWS_FLASK_APP +from vws_mock_test_backends import target_manager_controls from vws_mock_test_backends.mock_databases import create_vumark_database @@ -227,29 +228,20 @@ def seed_flask_recognition_counts( total_recos: int, ) -> None: """Set recognition counts through the target manager service.""" - target_manager_base_url = os.environ["TARGET_MANAGER_BASE_URL"] - response = requests.post( - url=( - f"{target_manager_base_url}/cloud_databases/" - f"{database_name}/targets/{target_id}/recognition_counts" - ), - json={ - "current_month_recos": current_month_recos, - "previous_month_recos": previous_month_recos, - "total_recos": total_recos, - }, - timeout=30, + target_manager_controls.seed_recognition_counts( + target_manager_base_url=os.environ["TARGET_MANAGER_BASE_URL"], + database_name=database_name, + target_id=target_id, + current_month_recos=current_month_recos, + previous_month_recos=previous_month_recos, + total_recos=total_recos, ) - response.raise_for_status() @beartype def add_cloud_database(*, cloud_database: CloudDatabase) -> None: """Add a cloud database through the target manager service.""" - target_manager_base_url = os.environ["TARGET_MANAGER_BASE_URL"] - response = requests.post( - url=f"{target_manager_base_url}/cloud_databases", - json=cloud_database.to_dict(), - timeout=30, + target_manager_controls.add_cloud_database( + target_manager_base_url=os.environ["TARGET_MANAGER_BASE_URL"], + cloud_database=cloud_database, ) - response.raise_for_status() diff --git a/test-backends/src/vws_mock_test_backends/target_manager_controls.py b/test-backends/src/vws_mock_test_backends/target_manager_controls.py new file mode 100644 index 000000000..c2b5c7832 --- /dev/null +++ b/test-backends/src/vws_mock_test_backends/target_manager_controls.py @@ -0,0 +1,45 @@ +"""HTTP controls for a mock target-manager service.""" + +import requests +from beartype import beartype + +from mock_vws.database import CloudDatabase + + +@beartype +def seed_recognition_counts( + *, + target_manager_base_url: str, + database_name: str, + target_id: str, + current_month_recos: int, + previous_month_recos: int, + total_recos: int, +) -> None: + """Set recognition counts through the target manager service.""" + response = requests.post( + url=( + f"{target_manager_base_url}/cloud_databases/" + f"{database_name}/targets/{target_id}/recognition_counts" + ), + json={ + "current_month_recos": current_month_recos, + "previous_month_recos": previous_month_recos, + "total_recos": total_recos, + }, + timeout=30, + ) + response.raise_for_status() + + +@beartype +def add_cloud_database( + *, target_manager_base_url: str, cloud_database: CloudDatabase +) -> None: + """Add a cloud database through the target manager service.""" + response = requests.post( + url=f"{target_manager_base_url}/cloud_databases", + json=cloud_database.to_dict(), + timeout=30, + ) + response.raise_for_status()