refactor(etl-uvicorn): simplify settings resolver integration

Author: CyMule

test/api/test_invocation_envelope.py

@@ -424,9 +424,7 @@ def resolve(payload):
             return resolved
 
         monkeypatch.setattr(
-            invocation_settings_transport._invocation_settings_contract,
-            "resolve_invocation_settings",
-            resolve,
+            invocation_settings_transport, "resolve_invocation_settings", resolve
         )
 
         recorder, response = _post_invoke({"invocation_settings": opaque_payload})
@@ -442,7 +440,7 @@ def resolve(_payload):
             resolver_threads.append(get_ident())
             return {"model": "m"}
 
-        monkeypatch.setattr(invocation_settings_transport, "_resolve_invocation_settings", resolve)
+        monkeypatch.setattr(invocation_settings_transport, "resolve_invocation_settings", resolve)
 
         recorder, response = _post_invoke({"invocation_settings": {"opaque": "payload"}})
 
@@ -461,7 +459,7 @@ def test_resolution_failure_uses_blame_for_http_status(
         def fail(_payload):
             raise _ResolutionFailure(blame)
 
-        monkeypatch.setattr(invocation_settings_transport, "_resolve_invocation_settings", fail)
+        monkeypatch.setattr(invocation_settings_transport, "resolve_invocation_settings", fail)
 
         recorder, response = _post_invoke({"invocation_settings": {"opaque": "payload"}})
 
@@ -475,7 +473,7 @@ def test_resolution_failure_never_exposes_exception_message(self, monkeypatch, c
         def fail(_payload):
             raise _ResolutionFailure(Blame.RECIPIENT, secret)
 
-        monkeypatch.setattr(invocation_settings_transport, "_resolve_invocation_settings", fail)
+        monkeypatch.setattr(invocation_settings_transport, "resolve_invocation_settings", fail)
 
         recorder, response = _post_invoke({"invocation_settings": {"opaque": "payload"}})
 

unstructured_platform_plugins/invocation_settings.py

@@ -36,7 +36,6 @@
 from contextvars import ContextVar
 from typing import Any, Optional, TypeVar
 
-import utic_invocation_settings as _invocation_settings_contract
 from fastapi import Depends, FastAPI, Request
 from starlette.requests import ClientDisconnect
 from starlette.responses import JSONResponse
@@ -48,6 +47,7 @@
     Blame,
     InvocationSettingsError,
     MalformedEnvelopeError,
+    resolve_invocation_settings,
 )
 
 from unstructured_platform_plugins.invocation_context import (
@@ -101,15 +101,6 @@ def current_invocation_context() -> Optional[InvocationContext]:
     return _INVOCATION.get()[1]
 
 
-def _resolve_invocation_settings(payload: Any) -> Optional[dict[str, Any]]:
-    """Resolve a contract-owned payload to the ordinary mapping bound to a plugin.
-
-    This deliberately thin call is the only integration point with the settings wire contract.
-    The transport does not inspect ``dag_node_settings`` or any field envelope within it.
-    """
-    return _invocation_settings_contract.resolve_invocation_settings(payload)
-
-
 @contextmanager
 def invocation_envelope(
     invocation_settings: Optional[dict], invocation_context: Optional[InvocationContext]
@@ -225,7 +216,7 @@ async def bind_invocation_envelope(request: Request) -> AsyncIterator[None]:
     try:
         # Off the event loop: resolution may perform blocking cryptography for independently
         # sealed fields, and this dependency fronts every invoke on the pod.
-        invocation_settings = await asyncio.to_thread(_resolve_invocation_settings, raw_settings)
+        invocation_settings = await asyncio.to_thread(resolve_invocation_settings, raw_settings)
     except Exception as exc:
         # Class name only — never envelope contents, and never the exception's own message,
         # which can embed request-controlled values.