unitysvc-core 0.2.24__tar.gz → 0.2.26__tar.gz

{unitysvc_core-0.2.24/src/unitysvc_core.egg-info → unitysvc_core-0.2.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-core
-Version: 0.2.24
+Version: 0.2.26
 Summary: Shared data models and validation helpers for UnitySVC packages
 Author-email: Bo Peng <bo.peng@unitysvc.com>
 Maintainer-email: Bo Peng <bo.peng@unitysvc.com>

{unitysvc_core-0.2.24 → unitysvc_core-0.2.26}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unitysvc-core"
-version = "0.2.24"
+version = "0.2.26"
 description = "Shared data models and validation helpers for UnitySVC packages"
 readme = "README.md"
 authors = [{ name = "Bo Peng", email = "bo.peng@unitysvc.com" }]

{unitysvc_core-0.2.24 → unitysvc_core-0.2.26}/src/unitysvc_core/models/__init__.py

@@ -17,13 +17,13 @@ from .base import (
     PricingTypeEnum,
     ProviderStatusEnum,
     QuotaResetCycleEnum,
-    RateLimitUnitEnum,
+    RateLimitUnit,
     RequestTransformEnum,
     SellerTypeEnum,
     ServiceGroupStatusEnum,
     ServiceTypeEnum,
     ServiceVisibilityEnum,
-    TimeWindowEnum,
+    TimeWindow,
     UpstreamStatusEnum,  # Backwards compatibility alias for OfferingStatusEnum
 )
 from .documents import DocumentData
@@ -130,14 +130,14 @@ __all__ = [
     "PricingTypeEnum",
     "ProviderStatusEnum",
     "QuotaResetCycleEnum",
-    "RateLimitUnitEnum",
+    "RateLimitUnit",
     "RequestTransformEnum",
     "ROUTABLE_GROUP_TYPES",
     "SellerTypeEnum",
     "ServiceGroupStatusEnum",
     "ServiceTypeEnum",
     "ServiceVisibilityEnum",
-    "TimeWindowEnum",
+    "TimeWindow",
     "UpstreamStatusEnum",  # Backwards compatibility alias for OfferingStatusEnum
     # Pricing — primitives
     "PriceStr",

{unitysvc_core-0.2.24 → unitysvc_core-0.2.26}/src/unitysvc_core/models/base.py

@@ -1,6 +1,7 @@
 """Enum types and basic definitions shared across the data models.
 
-This module contains only enums and simple constants. Data classes with
+This module contains only enums, closed-value type aliases, and simple
+constants. Data classes with
 behavior (pricing, documents, service constraints, etc.) and validation
 functions live in their own modules:
 
@@ -13,6 +14,7 @@ functions live in their own modules:
 from __future__ import annotations
 
 from enum import StrEnum
+from typing import Literal
 
 
 class AccessMethodEnum(StrEnum):
@@ -234,13 +236,37 @@ class QuotaResetCycleEnum(StrEnum):
     yearly = "yearly"
 
 
-class RateLimitUnitEnum(StrEnum):
-    requests = "requests"
-    tokens = "tokens"
-    input_tokens = "input_tokens"
-    output_tokens = "output_tokens"
-    bytes = "bytes"
-    concurrent = "concurrent"
+# Rate-limit unit and time window: Literals, not StrEnums.
+#
+# Both are used by ``ProviderAccountRateLimit``, which is nested inside
+# ``ProviderData`` — a model the unitysvc backend serves in BOTH directions (a
+# request-body field on ``POST /seller/services``, a response field on
+# ``GET /seller/services/{id}``).
+#
+# An enum one level down makes pydantic treat the *outer* model's validation and
+# serialization schemas as distinct, so FastAPI emits an ``X-Input``/``X-Output``
+# pair — both halves carrying the same ``title``. Python SDK codegen names a
+# top-level component from its title, so the halves collide on one class name:
+# the generator drops the second and silently removes every schema that
+# ``$ref``s it. That is how ``ServiceDetailResponse`` vanished from
+# unitysvc-sellers 0.3.7+, leaving ``client.services.get()`` returning raw dicts
+# (unitysvc/unitysvc-sellers#205).
+#
+# An enum *directly* on a served model is fine, and the rendered JSON schema is
+# identical either way — the split is an artifact of how the two modes are
+# deduplicated, not a real difference. A Literal sidesteps it and keeps the
+# values just as closed: same ``enum`` in the JSON schema, same rejection of an
+# unlisted value, and a string-literal union in every generated client.
+RateLimitUnit = Literal[
+    "requests",
+    "tokens",
+    "input_tokens",
+    "output_tokens",
+    "bytes",
+    "concurrent",
+]
+
+TimeWindow = Literal["second", "minute", "hour", "day", "month"]
 
 
 class RequestTransformEnum(StrEnum):
@@ -317,14 +343,6 @@ class ServiceVisibilityEnum(StrEnum):
     private = "private"
 
 
-class TimeWindowEnum(StrEnum):
-    second = "second"
-    minute = "minute"
-    hour = "hour"
-    day = "day"
-    month = "month"
-
-
 class OfferingStatusEnum(StrEnum):
     """
     Status values that sellers can set for service offerings.

{unitysvc_core-0.2.24 → unitysvc_core-0.2.26}/src/unitysvc_core/models/provider_data.py

@@ -13,7 +13,7 @@ from typing import Any
 
 from pydantic import BaseModel, ConfigDict, EmailStr, Field, HttpUrl, model_validator
 
-from .base import ProviderStatusEnum, RateLimitUnitEnum, TimeWindowEnum
+from .base import ProviderStatusEnum, RateLimitUnit, TimeWindow
 
 
 class ProviderAccountRateLimit(BaseModel):
@@ -48,9 +48,12 @@ class ProviderAccountRateLimit(BaseModel):
 
     limit: int = Field(gt=0, description="Maximum allowed — in flight for `concurrent`, per window otherwise")
 
-    unit: RateLimitUnitEnum = Field(description="What is being limited (requests, tokens, concurrent, …)")
+    # RateLimitUnit / TimeWindow are Literals rather than enums, because an enum
+    # nested this deep splits every model that carries one. See base.py for the
+    # mechanism — it is not a style preference.
+    unit: RateLimitUnit = Field(description="What is being limited (requests, tokens, concurrent, …)")
 
-    window: TimeWindowEnum | None = Field(
+    window: TimeWindow | None = Field(
         default=None,
         description="Time window. Omitted for `concurrent`, which is a gauge rather than a counter.",
     )
@@ -72,11 +75,11 @@ class ProviderAccountRateLimit(BaseModel):
         it. Requiring the field to match the unit stops a limit being authored
         that the enforcement layer cannot honour as written.
         """
-        if self.unit is RateLimitUnitEnum.concurrent:
+        if self.unit == "concurrent":
             if self.window is not None:
                 raise ValueError("`concurrent` is an in-flight gauge and takes no window; omit it")
         elif self.window is None:
-            raise ValueError(f"`{self.unit.value}` is counted over a window; set `window`")
+            raise ValueError(f"`{self.unit}` is counted over a window; set `window`")
         return self
 
 

{unitysvc_core-0.2.24 → unitysvc_core-0.2.26}/src/unitysvc_core/models/service.py

@@ -14,8 +14,8 @@ from .base import (
     ContentFilterEnum,
     OveragePolicyEnum,
     QuotaResetCycleEnum,
-    RateLimitUnitEnum,
-    TimeWindowEnum,
+    RateLimitUnit,
+    TimeWindow,
 )
 
 
@@ -26,8 +26,8 @@ class RateLimit(BaseModel):
 
     # Core rate limit definition
     limit: int = Field(description="Maximum allowed in the time window")
-    unit: RateLimitUnitEnum = Field(description="What is being limited")
-    window: TimeWindowEnum = Field(description="Time window for the limit")
+    unit: RateLimitUnit = Field(description="What is being limited")
+    window: TimeWindow = Field(description="Time window for the limit")
 
     # Optional additional info
     description: str | None = Field(default=None, max_length=255, description="Human-readable description")
@@ -52,7 +52,7 @@ class ServiceConstraints(BaseModel):
     # Usage Quotas & Billing
     monthly_quota: int | None = Field(default=None, description="Monthly usage quota (requests, tokens, etc.)")
     daily_quota: int | None = Field(default=None, description="Daily usage quota (requests, tokens, etc.)")
-    quota_unit: RateLimitUnitEnum | None = Field(default=None, description="Unit for quota limits")
+    quota_unit: RateLimitUnit | None = Field(default=None, description="Unit for quota limits")
     quota_reset_cycle: QuotaResetCycleEnum | None = Field(default=None, description="How often quotas reset")
     overage_policy: OveragePolicyEnum | None = Field(default=None, description="What happens when quota is exceeded")
 

{unitysvc_core-0.2.24 → unitysvc_core-0.2.26}/src/unitysvc_core/models/validators.py

@@ -815,20 +815,39 @@ def validate_mcp_offering(data: dict[str, Any] | None) -> list[str]:
     """
     if not data or not isinstance(data, dict):
         return []
-    if data.get("service_type") != "mcp":
-        return []
 
+    service_type = data.get("service_type")
+    capabilities = data.get("capabilities")
     channels = data.get("upstream_access_config")
+    mcp_channels = (
+        sorted(
+            name
+            for name, config in (channels or {}).items()
+            if isinstance(config, dict) and config.get("access_method") == "mcp"
+        )
+        if isinstance(channels, dict)
+        else []
+    )
+
+    if service_type != "mcp":
+        declarations: list[str] = []
+        if isinstance(capabilities, list) and "mcp-delegation" in capabilities:
+            declarations.append("capability 'mcp-delegation'")
+        if mcp_channels:
+            declarations.append("MCP upstream channel(s) " + ", ".join(repr(name) for name in mcp_channels))
+        if declarations:
+            return [
+                f"service_type {service_type!r} may not declare "
+                + "; ".join(declarations)
+                + "; use service_type 'mcp' instead"
+            ]
+        return []
+
     if not channels or not isinstance(channels, dict):
         return ["upstream_access_config: an MCP service must declare at least one channel"]
 
-    if not any(
-        isinstance(cfg, dict) and cfg.get("access_method") == "mcp" for cfg in channels.values()
-    ):
-        return [
-            "upstream_access_config: an MCP service must have at least one channel "
-            "with access_method 'mcp'"
-        ]
+    if not mcp_channels:
+        return ["upstream_access_config: an MCP service must have at least one channel with access_method 'mcp'"]
 
     return []
 
@@ -901,9 +920,7 @@ def validate_listing_mcp_base_urls(user_access_interfaces: dict[str, Any] | None
                     f"a non-empty 'namespace' in routing_key"
                 )
             else:
-                errors.extend(
-                    validate_mcp_namespace(namespace, f"{field}.routing_key.namespace")
-                )
+                errors.extend(validate_mcp_namespace(namespace, f"{field}.routing_key.namespace"))
 
     return errors
 

{unitysvc_core-0.2.24 → unitysvc_core-0.2.26}/src/unitysvc_core/schema/provider_v1.json

@@ -187,20 +187,37 @@
           "type": "string"
         },
         "unit": {
-          "$ref": "#/$defs/RateLimitUnitEnum",
-          "description": "What is being limited (requests, tokens, concurrent, …)"
+          "description": "What is being limited (requests, tokens, concurrent, …)",
+          "enum": [
+            "requests",
+            "tokens",
+            "input_tokens",
+            "output_tokens",
+            "bytes",
+            "concurrent"
+          ],
+          "title": "Unit",
+          "type": "string"
         },
         "window": {
           "anyOf": [
             {
-              "$ref": "#/$defs/TimeWindowEnum"
+              "enum": [
+                "second",
+                "minute",
+                "hour",
+                "day",
+                "month"
+              ],
+              "type": "string"
             },
             {
               "type": "null"
             }
           ],
           "default": null,
-          "description": "Time window. Omitted for `concurrent`, which is a gauge rather than a counter."
+          "description": "Time window. Omitted for `concurrent`, which is a gauge rather than a counter.",
+          "title": "Window"
         }
       },
       "required": [
@@ -221,18 +238,6 @@
       "title": "ProviderStatusEnum",
       "type": "string"
     },
-    "RateLimitUnitEnum": {
-      "enum": [
-        "requests",
-        "tokens",
-        "input_tokens",
-        "output_tokens",
-        "bytes",
-        "concurrent"
-      ],
-      "title": "RateLimitUnitEnum",
-      "type": "string"
-    },
     "ServicesPopulator": {
       "additionalProperties": false,
       "description": "Configuration for automatically populating service data.",
@@ -289,17 +294,6 @@
       },
       "title": "ServicesPopulator",
       "type": "object"
-    },
-    "TimeWindowEnum": {
-      "enum": [
-        "second",
-        "minute",
-        "hour",
-        "day",
-        "month"
-      ],
-      "title": "TimeWindowEnum",
-      "type": "string"
     }
   },
   "additionalProperties": false,

{unitysvc_core-0.2.24 → unitysvc_core-0.2.26/src/unitysvc_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-core
-Version: 0.2.24
+Version: 0.2.26
 Summary: Shared data models and validation helpers for UnitySVC packages
 Author-email: Bo Peng <bo.peng@unitysvc.com>
 Maintainer-email: Bo Peng <bo.peng@unitysvc.com>

{unitysvc_core-0.2.24 → unitysvc_core-0.2.26}/tests/test_provider_account_rate_limits.py

@@ -7,10 +7,13 @@ can state an individual customer's share, which depends on who is active at
 request time.
 """
 
+from typing import get_args
+
 import pytest
 from pydantic import ValidationError
 
 from unitysvc_core.models import ProviderAccountRateLimit, ProviderV1
+from unitysvc_core.models.base import RateLimitUnit, TimeWindow
 
 BASE = {
     "name": "fireworks",
@@ -84,8 +87,63 @@ def test_several_dimensions_coexist() -> None:
             {"name": "fireworks_input_tokens", "limit": 60000, "unit": "input_tokens", "window": "minute"},
         ],
     )
-    assert [rl.unit.value for rl in provider.rate_limits] == [
+    assert [rl.unit for rl in provider.rate_limits] == [
         "concurrent",
         "requests",
         "input_tokens",
     ]
+
+
+def test_the_value_sets_are_the_documented_ones() -> None:
+    """``RateLimitUnit``/``TimeWindow`` are the only definition of these sets.
+
+    They replaced ``RateLimitUnitEnum``/``TimeWindowEnum`` (see base.py for why
+    a Literal and not an enum). Pinning the members here makes a silent
+    widening or narrowing fail rather than quietly changing what a provider may
+    author and what every generated client will accept.
+    """
+    assert set(get_args(RateLimitUnit)) == {
+        "requests",
+        "tokens",
+        "input_tokens",
+        "output_tokens",
+        "bytes",
+        "concurrent",
+    }
+    assert set(get_args(TimeWindow)) == {"second", "minute", "hour", "day", "month"}
+
+
+def test_the_nested_model_pulls_in_no_named_subschema() -> None:
+    """The condition that broke Python SDK codegen — kept from coming back.
+
+    An enum (or any named sub-schema) one level down makes pydantic treat the
+    *outer* model's validation and serialization schemas as distinct. FastAPI
+    then splits every model that carries this one into an ``X-Input``/
+    ``X-Output`` pair whose halves share a title, and Python SDK codegen drops
+    one of them plus everything referencing it — silently. ``ProviderData`` is
+    such a carrier: it is a request body on ``POST /seller/services`` and a
+    response field on ``GET /seller/services/{id}``.
+    """
+    assert ProviderAccountRateLimit.model_json_schema().get("$defs", {}) == {}
+
+
+def test_the_value_set_is_still_closed() -> None:
+    with pytest.raises(ValidationError):
+        ProviderAccountRateLimit(name="fireworks_typo", limit=10, unit="concurent")
+    with pytest.raises(ValidationError):
+        ProviderAccountRateLimit(name="fireworks_rpm", limit=10, unit="requests", window="fortnight")
+
+
+def test_values_read_back_as_plain_strings() -> None:
+    """The one behaviour change from dropping the enums.
+
+    ``.unit``/``.window`` are ``str``, not enum members, so ``.unit.value`` no
+    longer works — ``.unit`` does. Consumers already saw strings over the wire
+    and in ``model_dump(mode="json")``; only in-process attribute access
+    differs.
+    """
+    limit = ProviderAccountRateLimit(name="fireworks_rpm", limit=600, unit="requests", window="minute")
+
+    assert limit.unit == "requests"
+    assert type(limit.unit) is str
+    assert limit.model_dump(mode="json")["window"] == "minute"

{unitysvc_core-0.2.24 → unitysvc_core-0.2.26}/tests/test_validators.py

@@ -583,9 +583,28 @@ class TestValidateMcpOffering:
     def test_valid_mcp_offering_passes(self) -> None:
         assert validate_mcp_offering(self._offering()) == []
 
-    def test_non_mcp_offering_is_ignored(self) -> None:
+    def test_non_mcp_offering_without_mcp_declarations_is_ignored(self) -> None:
         assert validate_mcp_offering({"service_type": "llm"}) == []
 
+    def test_non_mcp_offering_cannot_declare_mcp_delegation(self) -> None:
+        errors = validate_mcp_offering({"service_type": "proxy", "capabilities": ["mcp-delegation"]})
+        assert errors
+        assert "mcp-delegation" in errors[0]
+        assert "service_type 'mcp'" in errors[0]
+
+    def test_non_mcp_offering_cannot_declare_an_mcp_channel(self) -> None:
+        errors = validate_mcp_offering(
+            {
+                "service_type": "proxy",
+                "upstream_access_config": {
+                    "upstream": {"access_method": "mcp", "base_url": "https://mcp.example.test"}
+                },
+            }
+        )
+        assert errors
+        assert "MCP upstream channel" in errors[0]
+        assert "service_type 'mcp'" in errors[0]
+
     def test_requires_a_channel(self) -> None:
         errors = validate_mcp_offering(self._offering(upstream_access_config={}))
         assert errors
@@ -593,9 +612,7 @@ class TestValidateMcpOffering:
 
     def test_requires_an_mcp_access_method_channel(self) -> None:
         errors = validate_mcp_offering(
-            self._offering(
-                upstream_access_config={"x": {"access_method": "http", "base_url": "https://x"}}
-            )
+            self._offering(upstream_access_config={"x": {"access_method": "http", "base_url": "https://x"}})
         )
         assert errors
         assert "access_method 'mcp'" in errors[0]