unitysvc-core 0.2.20__tar.gz → 0.2.22__tar.gz

{unitysvc_core-0.2.20/src/unitysvc_core.egg-info → unitysvc_core-0.2.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-core
-Version: 0.2.20
+Version: 0.2.22
 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>
@@ -18,7 +18,6 @@ Requires-Dist: pydantic>=2
 Requires-Dist: email-validator
 Requires-Dist: jsonschema
 Requires-Dist: jinja2
-Requires-Dist: json5
 Requires-Dist: tomli-w
 Requires-Dist: unitysvc-data>=0.1.9
 Provides-Extra: test
@@ -95,7 +94,7 @@ pip install unitysvc-core
 ```
 
 Dependencies: `pydantic`, `email-validator`, `jsonschema`, `jinja2`,
-`json5`, `tomli-w`. No `typer`, no `rich`, no `httpx`.
+`tomli-w`. No `typer`, no `rich`, no `httpx`.
 
 ## Usage
 

{unitysvc_core-0.2.20 → unitysvc_core-0.2.22}/README.md

@@ -59,7 +59,7 @@ pip install unitysvc-core
 ```
 
 Dependencies: `pydantic`, `email-validator`, `jsonschema`, `jinja2`,
-`json5`, `tomli-w`. No `typer`, no `rich`, no `httpx`.
+`tomli-w`. No `typer`, no `rich`, no `httpx`.
 
 ## Usage
 

{unitysvc_core-0.2.20 → unitysvc_core-0.2.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unitysvc-core"
-version = "0.2.20"
+version = "0.2.22"
 description = "Shared data models and validation helpers for UnitySVC packages"
 readme = "README.md"
 authors = [{ name = "Bo Peng", email = "bo.peng@unitysvc.com" }]
@@ -21,7 +21,6 @@ dependencies = [
   "email-validator",
   "jsonschema",
   "jinja2",
-  "json5",
   "tomli-w",
   # Presets exposed under $<fn> sentinels that load_data_file expands
   # transparently after parse + override-merge. The actual set of

{unitysvc_core-0.2.20 → unitysvc_core-0.2.22}/src/unitysvc_core/models/provider_data.py

@@ -36,6 +36,16 @@ class ProviderAccountRateLimit(BaseModel):
 
     model_config = ConfigDict(extra="forbid")
 
+    name: str = Field(
+        min_length=1,
+        max_length=100,
+        description=(
+            "Seller-scoped rate-limit bucket name. Channels reference this "
+            "name via rate_limit_refs / ops_rate_limit_refs; all matching refs "
+            "for the same seller consume the same live gateway bucket."
+        ),
+    )
+
     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, …)")

{unitysvc_core-0.2.20 → unitysvc_core-0.2.22}/src/unitysvc_core/schema/provider_v1.json

@@ -179,6 +179,13 @@
           "title": "Limit",
           "type": "integer"
         },
+        "name": {
+          "description": "Seller-scoped rate-limit bucket name. Channels reference this name via rate_limit_refs / ops_rate_limit_refs; all matching refs for the same seller consume the same live gateway bucket.",
+          "maxLength": 100,
+          "minLength": 1,
+          "title": "Name",
+          "type": "string"
+        },
         "unit": {
           "$ref": "#/$defs/RateLimitUnitEnum",
           "description": "What is being limited (requests, tokens, concurrent, …)"
@@ -197,6 +204,7 @@
         }
       },
       "required": [
+        "name",
         "limit",
         "unit"
       ],

{unitysvc_core-0.2.20 → unitysvc_core-0.2.22}/src/unitysvc_core/utils.py

@@ -19,7 +19,6 @@ from functools import lru_cache
 from pathlib import Path
 from typing import Any
 
-import json5
 import tomli_w
 
 # Presets discovered dynamically from unitysvc-data's registry. Any
@@ -297,7 +296,7 @@ def load_data_file(
     preset_fns: Mapping[str, Callable[[Any], Any]] | None = DEFAULT_PRESET_FNS,
 ) -> tuple[dict[str, Any], str]:
     """
-    Load a data file (JSON/JSON5 or TOML) and return (data, format).
+    Load a data file (JSON or TOML) and return (data, format).
 
     :func:`expand_presets` walks the result and replaces every
     ``$doc_preset`` / ``$file_preset`` sentinel with the matching preset
@@ -320,7 +319,7 @@ def load_data_file(
     """
     if file_path.suffix == ".json":
         with open(file_path, encoding="utf-8") as f:
-            data = json5.load(f)
+            data = json.load(f)
         file_format = "json"
     elif file_path.suffix == ".toml":
         with open(file_path, "rb") as f:

{unitysvc_core-0.2.20 → unitysvc_core-0.2.22/src/unitysvc_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-core
-Version: 0.2.20
+Version: 0.2.22
 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>
@@ -18,7 +18,6 @@ Requires-Dist: pydantic>=2
 Requires-Dist: email-validator
 Requires-Dist: jsonschema
 Requires-Dist: jinja2
-Requires-Dist: json5
 Requires-Dist: tomli-w
 Requires-Dist: unitysvc-data>=0.1.9
 Provides-Extra: test
@@ -95,7 +94,7 @@ pip install unitysvc-core
 ```
 
 Dependencies: `pydantic`, `email-validator`, `jsonschema`, `jinja2`,
-`json5`, `tomli-w`. No `typer`, no `rich`, no `httpx`.
+`tomli-w`. No `typer`, no `rich`, no `httpx`.
 
 ## Usage
 

{unitysvc_core-0.2.20 → unitysvc_core-0.2.22}/src/unitysvc_core.egg-info/requires.txt

@@ -2,7 +2,6 @@ pydantic>=2
 email-validator
 jsonschema
 jinja2
-json5
 tomli-w
 unitysvc-data>=0.1.9
 

{unitysvc_core-0.2.20 → unitysvc_core-0.2.22}/tests/test_provider_account_rate_limits.py

@@ -21,39 +21,46 @@ BASE = {
 
 
 def test_concurrency_needs_no_window() -> None:
-    limit = ProviderAccountRateLimit(limit=10, unit="concurrent")
+    limit = ProviderAccountRateLimit(name="fireworks_concurrency", limit=10, unit="concurrent")
+    assert limit.name == "fireworks_concurrency"
     assert limit.window is None
 
 
+def test_name_is_required() -> None:
+    with pytest.raises(ValidationError):
+        ProviderAccountRateLimit(limit=10, unit="concurrent")
+
+
 def test_concurrency_rejects_a_window() -> None:
     # A gauge has no window. Accepting one would let a seller author a limit
     # the enforcement layer cannot honour as written.
     with pytest.raises(ValidationError, match="takes no window"):
-        ProviderAccountRateLimit(limit=10, unit="concurrent", window="minute")
+        ProviderAccountRateLimit(name="fireworks_concurrency", limit=10, unit="concurrent", window="minute")
 
 
 @pytest.mark.parametrize("unit", ["requests", "tokens", "input_tokens", "output_tokens", "bytes"])
 def test_counted_units_require_a_window(unit: str) -> None:
     with pytest.raises(ValidationError, match="counted over a window"):
-        ProviderAccountRateLimit(limit=100, unit=unit)
-    assert ProviderAccountRateLimit(limit=100, unit=unit, window="minute").window is not None
+        ProviderAccountRateLimit(name=f"fireworks_{unit}", limit=100, unit=unit)
+    assert ProviderAccountRateLimit(name=f"fireworks_{unit}", limit=100, unit=unit, window="minute").window is not None
 
 
 def test_limit_must_be_positive() -> None:
     with pytest.raises(ValidationError):
-        ProviderAccountRateLimit(limit=0, unit="concurrent")
+        ProviderAccountRateLimit(name="fireworks_concurrency", limit=0, unit="concurrent")
 
 
 def test_unknown_field_is_rejected() -> None:
     # extra="forbid": a typo'd key must not silently become a limit nobody enforces,
     # which is the failure mode of the per-channel `rate_limits` this replaces.
     with pytest.raises(ValidationError):
-        ProviderAccountRateLimit(limit=10, unit="concurrent", scope="account")
+        ProviderAccountRateLimit(name="fireworks_concurrency", limit=10, unit="concurrent", scope="account")
 
 
 def test_provider_accepts_the_block() -> None:
-    provider = ProviderV1(**BASE, rate_limits=[{"limit": 10, "unit": "concurrent"}])
+    provider = ProviderV1(**BASE, rate_limits=[{"name": "fireworks_concurrency", "limit": 10, "unit": "concurrent"}])
     assert provider.rate_limits is not None
+    assert provider.rate_limits[0].name == "fireworks_concurrency"
     assert provider.rate_limits[0].limit == 10
 
 
@@ -67,9 +74,14 @@ def test_several_dimensions_coexist() -> None:
     provider = ProviderV1(
         **BASE,
         rate_limits=[
-            {"limit": 10, "unit": "concurrent", "description": "engine capacity"},
-            {"limit": 600, "unit": "requests", "window": "minute"},
-            {"limit": 60000, "unit": "input_tokens", "window": "minute"},
+            {
+                "name": "fireworks_concurrency",
+                "limit": 10,
+                "unit": "concurrent",
+                "description": "engine capacity",
+            },
+            {"name": "fireworks_perminute", "limit": 600, "unit": "requests", "window": "minute"},
+            {"name": "fireworks_input_tokens", "limit": 60000, "unit": "input_tokens", "window": "minute"},
         ],
     )
     assert [rl.unit.value for rl in provider.rate_limits] == [