Revert unnecessary changes to cloud-specific functions

Restore cloud functions to match main exactly - only VuMark additions remain.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: adamtheturtle

src/mock_vws/_flask_server/target_manager.py

@@ -57,28 +57,6 @@ class TargetManagerSettings(BaseSettings):
     target_rater: _TargetRaterChoice = _TargetRaterChoice.BRISQUE
 
 
-@beartype
-def _get_cloud_database(database_name: str) -> CloudDatabase:
-    """Get a cloud database by name."""
-    (database,) = (
-        database
-        for database in TARGET_MANAGER.cloud_databases
-        if database.database_name == database_name
-    )
-    return database
-
-
-@beartype
-def _get_vumark_database(database_name: str) -> VuMarkDatabase:
-    """Get a VuMark database by name."""
-    (database,) = (
-        database
-        for database in TARGET_MANAGER.vumark_databases
-        if database.database_name == database_name
-    )
-    return database
-
-
 @TARGET_MANAGER_FLASK_APP.route(
     rule="/cloud_databases/<string:database_name>",
     methods=[HTTPMethod.DELETE],
@@ -90,11 +68,15 @@ def delete_cloud_database(database_name: str) -> Response:
     :status 200: The cloud database has been deleted.
     """
     try:
-        database = _get_cloud_database(database_name=database_name)
+        (matching_database,) = {
+            database
+            for database in TARGET_MANAGER.cloud_databases
+            if database_name == database.database_name
+        }
     except ValueError:
         return Response(response="", status=HTTPStatus.NOT_FOUND)
 
-    TARGET_MANAGER.remove_cloud_database(cloud_database=database)
+    TARGET_MANAGER.remove_cloud_database(cloud_database=matching_database)
     return Response(response="", status=HTTPStatus.OK)
 
 
@@ -109,11 +91,15 @@ def delete_vumark_database(database_name: str) -> Response:
     :status 200: The VuMark database has been deleted.
     """
     try:
-        database = _get_vumark_database(database_name=database_name)
+        (matching_database,) = {
+            database
+            for database in TARGET_MANAGER.vumark_databases
+            if database_name == database.database_name
+        }
     except ValueError:
         return Response(response="", status=HTTPStatus.NOT_FOUND)
 
-    TARGET_MANAGER.remove_vumark_database(vumark_database=database)
+    TARGET_MANAGER.remove_vumark_database(vumark_database=matching_database)
     return Response(response="", status=HTTPStatus.OK)
 
 
@@ -196,34 +182,43 @@ def create_cloud_database() -> Response:
 
     :status 201: The cloud database has been successfully created.
     """
-    request_json = json.loads(s=request.data)
     random_database = CloudDatabase()
-    database = CloudDatabase(
-        server_access_key=request_json.get(
-            "server_access_key",
-            random_database.server_access_key,
-        ),
-        server_secret_key=request_json.get(
-            "server_secret_key",
-            random_database.server_secret_key,
-        ),
-        client_access_key=request_json.get(
-            "client_access_key",
-            random_database.client_access_key,
-        ),
-        client_secret_key=request_json.get(
-            "client_secret_key",
-            random_database.client_secret_key,
-        ),
-        database_name=request_json.get(
-            "database_name",
-            random_database.database_name,
-        ),
-        state=States[
-            request_json.get("state_name", random_database.state.name)
-        ],
+    request_json = json.loads(s=request.data)
+    server_access_key = request_json.get(
+        "server_access_key",
+        random_database.server_access_key,
+    )
+    server_secret_key = request_json.get(
+        "server_secret_key",
+        random_database.server_secret_key,
+    )
+    client_access_key = request_json.get(
+        "client_access_key",
+        random_database.client_access_key,
+    )
+    client_secret_key = request_json.get(
+        "client_secret_key",
+        random_database.client_secret_key,
+    )
+    database_name = request_json.get(
+        "database_name",
+        random_database.database_name,
+    )
+    state_name = request_json.get(
+        "state_name",
+        random_database.state.name,
     )
 
+    state = States[state_name]
+
+    database = CloudDatabase(
+        server_access_key=server_access_key,
+        server_secret_key=server_secret_key,
+        client_access_key=client_access_key,
+        client_secret_key=client_secret_key,
+        database_name=database_name,
+        state=state,
+    )
     try:
         TARGET_MANAGER.add_cloud_database(cloud_database=database)
     except ValueError as exc:
@@ -286,7 +281,11 @@ def create_vumark_database() -> Response:
 @beartype
 def create_target(database_name: str) -> Response:
     """Create a new target in a given cloud database."""
-    database = _get_cloud_database(database_name=database_name)
+    (database,) = (
+        database
+        for database in TARGET_MANAGER.cloud_databases
+        if database.database_name == database_name
+    )
     request_json = json.loads(s=request.data)
     image_base64 = request_json["image_base64"]
     image_bytes = base64.b64decode(s=image_base64)
@@ -318,7 +317,11 @@ def create_target(database_name: str) -> Response:
 @beartype
 def create_vumark_target(database_name: str) -> Response:
     """Create a new VuMark target in a given database."""
-    database = _get_vumark_database(database_name=database_name)
+    (database,) = (
+        database
+        for database in TARGET_MANAGER.vumark_databases
+        if database.database_name == database_name
+    )
     request_json = json.loads(s=request.data)
     target = VuMarkTarget.from_dict(target_dict=request_json)
     database.vumark_targets.add(target)
@@ -336,7 +339,11 @@ def create_vumark_target(database_name: str) -> Response:
 @beartype
 def delete_target(database_name: str, target_id: str) -> Response:
     """Delete a target."""
-    database = _get_cloud_database(database_name=database_name)
+    (database,) = (
+        database
+        for database in TARGET_MANAGER.cloud_databases
+        if database.database_name == database_name
+    )
     target = database.get_target(target_id=target_id)
     now = datetime.datetime.now(tz=target.upload_date.tzinfo)
     # See https://github.com/facebook/pyrefly/issues/1897
@@ -358,7 +365,11 @@ def delete_target(database_name: str, target_id: str) -> Response:
 )
 def update_target(database_name: str, target_id: str) -> Response:
     """Update a target."""
-    database = _get_cloud_database(database_name=database_name)
+    (database,) = (
+        database
+        for database in TARGET_MANAGER.cloud_databases
+        if database.database_name == database_name
+    )
     target = database.get_target(target_id=target_id)
 
     request_json = json.loads(s=request.data)

src/mock_vws/_flask_server/vws.py

@@ -87,11 +87,12 @@ class VWSSettings(BaseSettings):
 
 @beartype
 def get_all_cloud_databases() -> set[CloudDatabase]:
-    """Get all cloud database objects from the target manager back-end."""
+    """Get all database objects from the task manager back-end."""
     settings = VWSSettings.model_validate(obj={})
+    timeout_seconds = 30
     response = requests.get(
         url=f"{settings.target_manager_base_url}/cloud_databases",
-        timeout=30,
+        timeout=timeout_seconds,
     )
     return {
         CloudDatabase.from_dict(database_dict=database_dict)

src/mock_vws/_requests_mock_server/mock_web_query_api.py

@@ -116,14 +116,13 @@ def __init__(
     @route(path_pattern="/v1/query", http_methods={HTTPMethod.POST})
     def query(self, request: PreparedRequest) -> _ResponseType:
         """Perform an image recognition query."""
-        cloud_databases = self._target_manager.cloud_databases
         try:
             run_query_validators(
                 request_path=request.path_url,
                 request_headers=request.headers,
                 request_body=_body_bytes(request=request),
                 request_method=request.method or "",
-                databases=cloud_databases,
+                databases=self._target_manager.cloud_databases,
             )
         except ValidatorError as exc:
             return exc.status_code, exc.headers, exc.response_text
@@ -133,7 +132,7 @@ def query(self, request: PreparedRequest) -> _ResponseType:
             request_body=_body_bytes(request=request),
             request_method=request.method or "",
             request_path=request.path_url,
-            databases=cloud_databases,
+            databases=self._target_manager.cloud_databases,
             query_match_checker=self._query_match_checker,
         )