eggpool 0.3.7__tar.gz → 0.3.9__tar.gz

{eggpool-0.3.7 → eggpool-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eggpool
-Version: 0.3.7
+Version: 0.3.9
 Summary: A lightweight proxy that aggregates multiple LLM provider accounts behind one OpenAI-compatible endpoint
 Project-URL: Homepage, https://github.com/eggstack/eggpool
 Project-URL: Repository, https://github.com/eggstack/eggpool

{eggpool-0.3.7 → eggpool-0.3.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "eggpool"
-version = "0.3.7"
+version = "0.3.9"
 description = "A lightweight proxy that aggregates multiple LLM provider accounts behind one OpenAI-compatible endpoint"
 readme = "README.md"
 requires-python = ">=3.11"

{eggpool-0.3.7 → eggpool-0.3.9}/src/eggpool/catalog/catalog_resolvers.py

@@ -106,6 +106,59 @@ class CatalogFetchError(RuntimeError):
     """Raised when a catalog fetch fails (network, parse, auth)."""
 
 
+def _safe_parse_catalog_price_per_1k(
+    *,
+    catalog_name: str,
+    model_id: str,
+    category: str,
+    value: object,
+    default_unit: str = "1k",
+) -> float | None:
+    """Parse an untrusted external catalog price field.
+
+    External catalogs are advisory. A malformed or negative field should
+    remove that category from the resolved pricing, not fail the whole
+    refresh cycle or discard other valid rates from the same model row.
+    """
+    from eggpool.catalog.pricing import parse_price_per_1k
+
+    try:
+        return parse_price_per_1k(value, default_unit=default_unit)
+    except Exception as exc:
+        logger.warning(
+            "Ignoring invalid %s %s price for %s: %s",
+            catalog_name,
+            category,
+            model_id,
+            exc,
+        )
+        return None
+
+
+def _safe_parse_catalog_microdollars(
+    *,
+    catalog_name: str,
+    model_id: str,
+    category: str,
+    value: object,
+    default_unit: str | None = None,
+) -> int | None:
+    """Parse an untrusted external catalog cache-rate field."""
+    from eggpool.catalog.pricing import parse_microdollars_per_million
+
+    try:
+        return parse_microdollars_per_million(value, default_unit=default_unit)
+    except Exception as exc:
+        logger.warning(
+            "Ignoring invalid %s %s price for %s: %s",
+            catalog_name,
+            category,
+            model_id,
+            exc,
+        )
+        return None
+
+
 class CatalogHttpClient(Protocol):
     """Minimal async HTTP client interface used by catalog resolvers."""
 
@@ -224,8 +277,13 @@ class OpenRouterCatalogResolver:
                 payload_obj: object = response.json()
             except (httpx.HTTPError, ValueError) as exc:
                 raise CatalogFetchError(f"OpenRouter fetch failed: {exc}") from exc
-            entries = self._parse_catalog(payload_obj)
-            self._cache.store(entries)
+            try:
+                entries = self._parse_catalog(payload_obj)
+                self._cache.store(entries)
+            except Exception as exc:
+                raise CatalogFetchError(
+                    f"OpenRouter catalog parse failed: {exc}"
+                ) from exc
             return entries
 
     @staticmethod
@@ -249,8 +307,13 @@ class OpenRouterCatalogResolver:
                 entry = OpenRouterCatalogResolver._parse_entry(
                     model_id_obj, pricing_obj, raw_dict
                 )
-            except (ValueError, TypeError) as exc:
-                logger.warning("Skipping catalog entry %r: %s", model_id_obj, exc)
+            except Exception as exc:
+                logger.warning(
+                    "Skipping catalog entry %r after unexpected parse failure: %s",
+                    model_id_obj,
+                    exc,
+                    exc_info=True,
+                )
                 continue
             entries[model_id_obj] = entry
         # Strip raw upstream JSON to bound the cache footprint;
@@ -264,27 +327,40 @@ class OpenRouterCatalogResolver:
         model_id: str, pricing: object, raw: dict[str, Any]
     ) -> CatalogEntry:
         """Translate an OpenRouter pricing block into a CatalogEntry."""
-        from eggpool.catalog.pricing import (
-            parse_microdollars_per_million,
-            parse_price_per_1k,
-        )
 
         def _opt(key: str) -> object | None:
             if not isinstance(pricing, dict):
                 return None
-            value: object = pricing.get(key)  # type: ignore[reportUnknownMemberType]
-            if isinstance(value, (str, int, float)):
-                return value
-            return None
+            return pricing.get(key)  # type: ignore[reportUnknownMemberType]
 
         # OpenRouter fields are dollars-per-token numeric strings.
-        input_per_1k = parse_price_per_1k(_opt("prompt"), default_unit="token")
-        output_per_1k = parse_price_per_1k(_opt("completion"), default_unit="token")
-        cache_read = parse_microdollars_per_million(
-            _opt("input_cache_read"), default_unit="token"
+        input_per_1k = _safe_parse_catalog_price_per_1k(
+            catalog_name=OpenRouterCatalogResolver.name,
+            model_id=model_id,
+            category="input",
+            value=_opt("prompt"),
+            default_unit="token",
+        )
+        output_per_1k = _safe_parse_catalog_price_per_1k(
+            catalog_name=OpenRouterCatalogResolver.name,
+            model_id=model_id,
+            category="output",
+            value=_opt("completion"),
+            default_unit="token",
+        )
+        cache_read = _safe_parse_catalog_microdollars(
+            catalog_name=OpenRouterCatalogResolver.name,
+            model_id=model_id,
+            category="cache_read",
+            value=_opt("input_cache_read"),
+            default_unit="token",
         )
-        cache_write = parse_microdollars_per_million(
-            _opt("input_cache_write"), default_unit="token"
+        cache_write = _safe_parse_catalog_microdollars(
+            catalog_name=OpenRouterCatalogResolver.name,
+            model_id=model_id,
+            category="cache_write",
+            value=_opt("input_cache_write"),
+            default_unit="token",
         )
         return CatalogEntry(
             catalog_model_id=model_id,
@@ -375,6 +451,15 @@ class CatalogResolverPipeline:
                     exc,
                 )
                 continue
+            except Exception as exc:
+                logger.exception(
+                    "Catalog %s failed unexpectedly for %s/%s: %s",
+                    resolver.name,
+                    provider_id,
+                    model_id,
+                    exc,
+                )
+                continue
             entry = catalog.get(alias.catalog_model_id)
             if entry is None:
                 logger.warning(
@@ -385,10 +470,20 @@ class CatalogResolverPipeline:
                     model_id,
                 )
                 continue
-            return resolver.to_resolved_pricing(
-                entry=entry,
-                provider_id=provider_id,
-                model_id=model_id,
-                alias=alias,
-            )
+            try:
+                return resolver.to_resolved_pricing(
+                    entry=entry,
+                    provider_id=provider_id,
+                    model_id=model_id,
+                    alias=alias,
+                )
+            except Exception as exc:
+                logger.exception(
+                    "Catalog %s failed to convert pricing for %s/%s: %s",
+                    resolver.name,
+                    provider_id,
+                    model_id,
+                    exc,
+                )
+                continue
         return None

{eggpool-0.3.7 → eggpool-0.3.9}/src/eggpool/cli_full.py

@@ -531,6 +531,12 @@ def _check_stale_contracts(config: AppConfig, config_path: str) -> list[str]:
 
     for provider in config.providers.values():
         endpoint = provider.models_endpoint
+        raw_section_obj = raw_providers.get(provider.id)
+        raw_section: dict[str, object] = (
+            cast("dict[str, object]", raw_section_obj)
+            if isinstance(raw_section_obj, dict)
+            else {}
+        )
 
         if (
             endpoint is not None
@@ -553,13 +559,21 @@ def _check_stale_contracts(config: AppConfig, config_path: str) -> list[str]:
                 "verify.require_models is true; the contract is contradictory"
             )
 
-        if provider.anthropic_path and "anthropic" not in provider.protocols:
+        if (
+            "anthropic_path" in raw_section
+            and provider.anthropic_path
+            and "anthropic" not in provider.protocols
+        ):
             warnings.append(
                 f"[{provider.id}] anthropic_path is set but 'anthropic' is "
                 "not in protocols; the field will be ignored"
             )
 
-        if provider.openai_path and "openai" not in provider.protocols:
+        if (
+            "openai_path" in raw_section
+            and provider.openai_path
+            and "openai" not in provider.protocols
+        ):
             warnings.append(
                 f"[{provider.id}] openai_path is set but 'openai' is not "
                 "in protocols; the field will be ignored"
@@ -595,9 +609,7 @@ def _check_stale_contracts(config: AppConfig, config_path: str) -> list[str]:
                 "providers typically use header='x-api-key'"
             )
 
-        raw_section_obj = raw_providers.get(provider.id)
-        if isinstance(raw_section_obj, dict):
-            raw_section = cast("dict[str, object]", raw_section_obj)
+        if raw_section:
             has_legacy_key = (
                 "models_method" in raw_section or "models_path" in raw_section
             )

{eggpool-0.3.7 → eggpool-0.3.9}/src/eggpool/providers/connect.py

@@ -15,7 +15,7 @@ from typing import Any, cast
 from eggpool.constants import DEFAULT_PROVIDER_ID
 from eggpool.providers.contract import PROVIDER_STATUS_SYMBOLS
 from eggpool.runtime import restart_server as _restart_server
-from eggpool.toml_edit import render_toml_value
+from eggpool.toml_edit import render_toml_value, update_section_value
 
 _REGISTRY_METADATA_FIELDS = frozenset(
     {
@@ -454,10 +454,36 @@ def merge_provider_into_config(
         )
         content = _insert_provider_block(content, block)
 
+    if _provider_needs_transcoder(provider_data):
+        content = _ensure_transcoder_enabled(content)
+
     path.write_text(content, encoding="utf-8")
     return True
 
 
+def _provider_needs_transcoder(provider_data: dict[str, Any]) -> bool:
+    """Return whether this provider needs cross-protocol request bridging."""
+    protocols_value = provider_data.get("protocols")
+    if not isinstance(protocols_value, list):
+        return False
+    protocol_items = cast("list[object]", protocols_value)
+    protocols = {str(protocol) for protocol in protocol_items}
+    return bool(protocols) and not {"openai", "anthropic"}.issubset(protocols)
+
+
+def _ensure_transcoder_enabled(content: str) -> str:
+    """Enable the global transcoder block for single-protocol providers."""
+    result = update_section_value(
+        content.split("\n"),
+        "transcoder",
+        "enabled",
+        "true",
+        insert_missing_key=True,
+        append_missing_section=True,
+    )
+    return "\n".join(result.lines)
+
+
 def _get_existing_accounts(content: str, provider_id: str) -> list[str] | None:
     """Get existing account names for a provider. Returns None if not found."""
     # TOML array-of-tables uses [[providers.X.accounts]] syntax

{eggpool-0.3.7 → eggpool-0.3.9}/src/eggpool/transcoder/openai_to_anthropic.py

@@ -82,7 +82,7 @@ class OpenAIToAnthropic:
             role = str(msg.get("role", ""))  # pyright: ignore[reportUnknownMemberType]
             content = msg.get("content", "")  # pyright: ignore[reportUnknownMemberType]
 
-            if role == "system":
+            if role in ("system", "developer"):
                 if isinstance(content, str):
                     system_parts.append(content)
                 elif isinstance(content, list):
@@ -147,6 +147,8 @@ class OpenAIToAnthropic:
                 out["temperature"] = temperature
 
         max_tokens = payload.get("max_tokens")
+        if max_tokens is None:
+            max_tokens = payload.get("max_completion_tokens")
         if max_tokens is None:
             max_tokens = 4096
             warnings.append(

{eggpool-0.3.7 → eggpool-0.3.9}/src/eggpool/transcoder/streaming.py

@@ -510,6 +510,7 @@ class AnthropicToOpenAIStreaming(_BaseStreamingTranscoder):
         self._id = ""
         self._model = ""
         self._emitted_usage = False
+        self._done_emitted = False
 
     async def feed(self, chunk: bytes) -> list[bytes]:
         self._observer.observe(chunk)
@@ -525,7 +526,9 @@ class AnthropicToOpenAIStreaming(_BaseStreamingTranscoder):
         out: list[bytes] = []
         for event_type, data in frames:
             out.extend(self._translate(event_type, data))
-        out.append(self._openai_done())
+        done = self._emit_done()
+        if done is not None:
+            out.append(done)
         return out
 
     def _translate(
@@ -550,7 +553,7 @@ class AnthropicToOpenAIStreaming(_BaseStreamingTranscoder):
             msg = str(err_typed.get("message", str(err_typed)))
         else:
             msg = str(err)
-        return [
+        out = [
             self._openai_frame(
                 {
                     "error": {
@@ -561,8 +564,11 @@ class AnthropicToOpenAIStreaming(_BaseStreamingTranscoder):
                     },
                 },
             ),
-            self._openai_done(),
         ]
+        done = self._emit_done()
+        if done is not None:
+            out.append(done)
+        return out
 
     def _dispatch(
         self,
@@ -714,9 +720,18 @@ class AnthropicToOpenAIStreaming(_BaseStreamingTranscoder):
                     },
                 ),
             )
-        out.append(self._openai_done())
+        done = self._emit_done()
+        if done is not None:
+            out.append(done)
         return out
 
+    def _emit_done(self) -> bytes | None:
+        """Emit the OpenAI terminal marker at most once."""
+        if self._done_emitted:
+            return None
+        self._done_emitted = True
+        return self._openai_done()
+
 
 def select_streaming_transcoder(
     *,

{eggpool-0.3.7 → eggpool-0.3.9}/uv.lock

@@ -196,7 +196,7 @@ wheels = [
 
 [[package]]
 name = "eggpool"
-version = "0.3.7"
+version = "0.3.9"
 source = { editable = "." }
 dependencies = [
     { name = "aiosqlite" },