0f3d32ec58
Trim the salvaged fix to the shape main wants: * Every gate asks ``agent.transports.registered_api_modes()`` directly. The three helper spellings (``_has_registered_transport``, ``_registry_knows``, ``is_registered_api_mode``) and the ``sys.modules`` peek are gone: no transport module imports ``providers`` or ``hermes_cli`` at module level, so a plain import cannot re-enter provider discovery. * ``hermes_cli/auth.py`` late-registration pass dropped — main already re-syncs plugin profiles into ``PROVIDER_REGISTRY`` on every registry miss (``auth_plugin_providers.registry_lookup`` / ``sync_plugin_provider_registry``, #102123); the probe shows a profile registered after the import-time mirror resolves and reaches the wire on base. * ``ProviderTransport.normalize_stream_delta`` and the streaming-assembler hook dropped — legacy ``delta.function_call`` translation is a separate concern from api_mode propagation and has no in-tree consumer. * Tests: 15 gate-by-gate unit tests replaced by two invariants that install a REAL plugin under a temp HERMES_HOME and walk profile → determine_api_mode → resolve_runtime_provider → agent ladder → delegation resolver (positive: red on origin/main; negative: an unregistered mode still degrades to chat_completions).
54 lines
2.3 KiB
Python
54 lines
2.3 KiB
Python
"""Abstract base for provider transports.
|
|
A transport owns one api_mode's data path (convert_messages -> convert_tools -> build_kwargs
|
|
-> normalize_response), NOT client construction, streaming, credentials, caching, interrupts
|
|
or retries — those stay on AIAgent."""
|
|
|
|
from abc import ABC, abstractmethod
|
|
from typing import Any, Dict, List, Optional
|
|
|
|
from agent.transports.types import NormalizedResponse
|
|
|
|
|
|
class ProviderTransport(ABC):
|
|
"""Base class for provider-specific format conversion and normalization."""
|
|
|
|
# Provider stop_reason -> OpenAI finish_reason. ``None`` means the provider
|
|
# already speaks OpenAI vocabulary and map_finish_reason passes through.
|
|
_STOP_REASON_MAP: Optional[Dict[str, str]] = None
|
|
|
|
@property
|
|
@abstractmethod
|
|
def api_mode(self) -> str:
|
|
"""The api_mode string this transport handles (e.g. 'anthropic_messages')."""
|
|
|
|
@abstractmethod
|
|
def convert_messages(self, messages: List[Dict[str, Any]], **kwargs) -> Any:
|
|
"""Convert OpenAI-format messages to the provider-native structure (e.g. (system, messages) for Anthropic)."""
|
|
|
|
@abstractmethod
|
|
def convert_tools(self, tools: List[Dict[str, Any]]) -> Any:
|
|
"""Convert OpenAI-format tool definitions to provider-native format."""
|
|
|
|
@abstractmethod
|
|
def build_kwargs(
|
|
self, model: str, messages: List[Dict[str, Any]],
|
|
tools: Optional[List[Dict[str, Any]]] = None, **params,
|
|
) -> Dict[str, Any]:
|
|
"""Primary entry point: convert messages/tools and return kwargs ready for the provider SDK."""
|
|
|
|
@abstractmethod
|
|
def normalize_response(self, response: Any, **kwargs) -> NormalizedResponse:
|
|
"""Normalize a raw provider response to NormalizedResponse (the only transport-layer return type)."""
|
|
|
|
def validate_response(self, response: Any) -> bool:
|
|
"""Optional structural validity check; default accepts everything."""
|
|
return True
|
|
|
|
def extract_cache_stats(self, response: Any) -> Optional[Dict[str, int]]:
|
|
"""Optional: ``{'cached_tokens', 'creation_tokens'}`` or None (default)."""
|
|
return None
|
|
|
|
def map_finish_reason(self, raw_reason: str) -> str:
|
|
"""Map a provider stop reason via ``_STOP_REASON_MAP`` (unknown -> 'stop'); passthrough when no map."""
|
|
return raw_reason if self._STOP_REASON_MAP is None else self._STOP_REASON_MAP.get(raw_reason, "stop")
|