fix: reconcile main changes with strict type checking

Co-authored-by: yyyyyyyan <24644216+yyyyyyyan@users.noreply.github.com>

Author: Copilot

app/sep/bundle_upload/factory.py

@@ -81,7 +81,7 @@ def _rebase_query(
     :param endpoint_query: The query pairs carried by the configured endpoint.
     :return: The merged query map.
     """
-    merged: dict[str, PlanValue] = {
+    merged: dict[str, AnyStepValue] = {
         key: LiteralValue(source="literal", value=value)
         for key, value in endpoint_query.items()
     }

tests/app/sep/apps/mysql_backups/test_form_backfill.py

@@ -497,7 +497,9 @@ def _repair(self, **overrides: object) -> dict[str, object] | None:
     def _repaired_format(self, **overrides: object) -> EncryptionFormat:
         repaired = self._repair(**overrides)
         assert repaired is not None
-        return repaired["encryption_format"]
+        repaired_format = repaired["encryption_format"]
+        assert isinstance(repaired_format, EncryptionFormat)
+        return repaired_format
 
     @pytest.mark.parametrize(
         ("stamped_fields", "expected"),
@@ -573,6 +575,7 @@ def test_the_repaired_stamp_validates_and_replaces_the_stored_one(self):
         outcome = _backfill_single_task(task, FORM_BACKFILL_ENTRIES[0], _ctx(lookup))
 
         assert outcome.label == "repaired"
+        assert outcome.stamped_data is not None
         assert (
             outcome.stamped_data[RESERVED_FORM_KEY]["encryption_format"]
             == EncryptionFormat.GPG

tests/app/sep/apps/mysql_backups/test_xtrabackup_encryption_format.py

@@ -26,6 +26,7 @@
 
 import logging
 import types
+from typing import cast
 
 import pytest
 
@@ -40,7 +41,8 @@
     payload_method,
 )
 
-_FORMATS = load_constant("ENCRYPTION_FORMATS")
+_FORMATS = cast(tuple[str, ...], load_constant("ENCRYPTION_FORMATS"))
+assert isinstance(_FORMATS, tuple)
 _resolve_encryption = load_function("_resolve_encryption")
 
 _KEYFILE = "/keys/aes.key"

tests/app/sep/bundle_upload/test_plan.py

@@ -2371,6 +2371,8 @@ async def test_search_runs_none_of_the_plans_resolution_steps(self, api: RemoteA
             async with api:
                 await executor.search_cases("CS00")
 
-            requested = [str(key[1]) for key in mock.requests]
+            requested = [
+                str(key[1]) for key, calls in mock.requests.items() for _ in calls
+            ]
 
         assert requested == [_CASE_SEARCH_URL]