unitysvc-core 0.2.2__tar.gz → 0.2.4__tar.gz

{unitysvc_core-0.2.2/src/unitysvc_core.egg-info → unitysvc_core-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-core
-Version: 0.2.2
+Version: 0.2.4
 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.2 → unitysvc_core-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unitysvc-core"
-version = "0.2.2"
+version = "0.2.4"
 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.2 → unitysvc_core-0.2.4}/src/unitysvc_core/models/__init__.py

@@ -43,6 +43,7 @@ from .pricing import (
     ImagePriceData,
     MaxPriceData,
     MinPriceData,
+    ModePriceData,
     MultiplyPriceData,
     PercentageStr,
     PriceStr,
@@ -70,7 +71,7 @@ from .service import (
     AccessInterfaceData,
     RateLimit,
     ServiceConstraints,
-    ServiceData,
+    ServiceStatus,
     UpstreamAccessConfigData,
 )
 from .service_group_data import (
@@ -110,7 +111,7 @@ __all__ = [
     "UpstreamAccessConfigData",
     "RateLimit",
     "ServiceConstraints",
-    "ServiceData",
+    "ServiceStatus",
     # Enums
     "AccessMethodEnum",
     "AuthMethodEnum",
@@ -158,6 +159,7 @@ __all__ = [
     "MultiplyPriceData",
     "MaxPriceData",
     "MinPriceData",
+    "ModePriceData",
     "FirstPriceData",
     "TieredPriceData",
     "GraduatedPriceData",

{unitysvc_core-0.2.2 → unitysvc_core-0.2.4}/src/unitysvc_core/models/base.py

@@ -216,6 +216,8 @@ class PricingTypeEnum(StrEnum):
     graduated = "graduated"  # Graduated tiers (each tier's units at that rate)
     # Expression-based pricing (payout_price only)
     expr = "expr"  # Arbitrary expression using usage metrics
+    # Mode-based pricing: select a sub-price by the request's resolved mode
+    mode = "mode"  # Per-mode pricing keyed by mode name (e.g. managed, byok)
 
 
 class QuotaResetCycleEnum(StrEnum):

{unitysvc_core-0.2.2 → unitysvc_core-0.2.4}/src/unitysvc_core/models/listing_data.py

@@ -44,8 +44,8 @@ class ServiceListingData(BaseModel):
 
     # NOTE: a listing carries no service_id. Service identity is backend-
     # assigned provenance, not authored listing content — it lives in
-    # ``service.json`` and travels as the top-level ``ServiceDataInput.service_id``
-    # field on upload/revision, never embedded in the listing.
+    # ``service.json`` (the ``ServiceStatus`` sidecar) and travels separately
+    # on upload/revision, never embedded in the listing.
 
     # Listing identification
     name: str | None = Field(

{unitysvc_core-0.2.2 → unitysvc_core-0.2.4}/src/unitysvc_core/models/pricing.py

@@ -280,6 +280,7 @@ class TokenPriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Calculate cost for token-based pricing.
 
@@ -346,6 +347,7 @@ class TimePriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Calculate cost for time-based pricing.
 
@@ -386,6 +388,7 @@ class ImagePriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Calculate cost for image-based pricing.
 
@@ -422,6 +425,7 @@ class StepPriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Calculate cost for step-based pricing.
 
@@ -461,6 +465,7 @@ class DataPriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Calculate cost for data-volume pricing.
 
@@ -504,6 +509,7 @@ class CountPriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Calculate cost for count-scaled pricing.
 
@@ -566,6 +572,7 @@ class RevenueSharePriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Calculate cost for revenue share pricing.
 
@@ -605,6 +612,7 @@ class ConstantPriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Return the constant price regardless of usage.
 
@@ -677,6 +685,7 @@ class AddPriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Calculate total cost by summing all price components.
 
@@ -691,7 +700,7 @@ class AddPriceData(BasePriceData):
         total = Decimal("0")
         for price_data in self.prices:
             component = validate_pricing(price_data)
-            total += component.calculate_cost(usage, customer_charge, request_count)
+            total += component.calculate_cost(usage, customer_charge, request_count, mode)
         return total
 
 
@@ -736,6 +745,7 @@ class MultiplyPriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Calculate cost by multiplying base price by factor.
 
@@ -748,7 +758,7 @@ class MultiplyPriceData(BasePriceData):
             Base cost multiplied by factor
         """
         base_pricing = validate_pricing(self.base)
-        base_cost = base_pricing.calculate_cost(usage, customer_charge, request_count)
+        base_cost = base_pricing.calculate_cost(usage, customer_charge, request_count, mode)
         return base_cost * Decimal(self.factor)
 
 
@@ -789,6 +799,7 @@ class MaxPriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Return the highest cost among applicable children.
 
@@ -799,7 +810,7 @@ class MaxPriceData(BasePriceData):
         for price_data in self.prices:
             try:
                 component = validate_pricing(price_data)
-                costs.append(component.calculate_cost(usage, customer_charge, request_count))
+                costs.append(component.calculate_cost(usage, customer_charge, request_count, mode))
             except ValueError:
                 continue
         if not costs:
@@ -846,6 +857,7 @@ class MinPriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Return the lowest cost among applicable children.
 
@@ -856,7 +868,7 @@ class MinPriceData(BasePriceData):
         for price_data in self.prices:
             try:
                 component = validate_pricing(price_data)
-                costs.append(component.calculate_cost(usage, customer_charge, request_count))
+                costs.append(component.calculate_cost(usage, customer_charge, request_count, mode))
             except ValueError:
                 continue
         if not costs:
@@ -902,6 +914,7 @@ class FirstPriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Return the cost from the first child that can handle the usage.
 
@@ -912,7 +925,7 @@ class FirstPriceData(BasePriceData):
         for price_data in self.prices:
             try:
                 component = validate_pricing(price_data)
-                return component.calculate_cost(usage, customer_charge, request_count)
+                return component.calculate_cost(usage, customer_charge, request_count, mode)
             except ValueError:
                 continue
         raise ValueError("No child pricing could handle the provided usage data")
@@ -1127,6 +1140,7 @@ class ExprPriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Calculate cost by evaluating the expression with usage data.
 
@@ -1200,6 +1214,7 @@ class TieredPriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Calculate cost based on which tier the usage falls into.
 
@@ -1217,7 +1232,7 @@ class TieredPriceData(BasePriceData):
         for tier in self.tiers:
             if tier.up_to is None or metric_value <= tier.up_to:
                 tier_pricing = validate_pricing(tier.price)
-                return tier_pricing.calculate_cost(usage, customer_charge, request_count)
+                return tier_pricing.calculate_cost(usage, customer_charge, request_count, mode)
 
         # Should not reach here if tiers are properly configured
         raise ValueError("No matching tier found")
@@ -1282,6 +1297,7 @@ class GraduatedPriceData(BasePriceData):
         usage: UsageData,
         customer_charge: Decimal | None = None,
         request_count: int | None = None,
+        mode: str | None = None,
     ) -> Decimal:
         """Calculate cost with graduated pricing across tiers.
 
@@ -1317,6 +1333,83 @@ class GraduatedPriceData(BasePriceData):
         return total_cost
 
 
+class ModePriceData(BasePriceData):
+    """
+    Mode-based pricing that selects a sub-price by the request's resolved mode.
+
+    The active mode is decided elsewhere — e.g. the gateway picks which keyed
+    ``upstream_access_config`` a request routes through (``"managed"``,
+    ``"byok"``, ``"byoe"``, …) — and threads it into
+    ``calculate_cost(..., mode=...)``. The matching entry in ``modes`` is
+    evaluated; when the mode is unknown or unset, the ``default`` mode is used.
+
+    There is no special-casing on the consumer side: every pricing type accepts
+    an optional ``mode`` and a mode-independent price simply ignores it, so a
+    plain price behaves identically for all modes. Mode-dependent pricing is
+    just this one extra optional pricing type.
+
+    Each ``modes`` value is itself any pricing object (flat, composite, tiered,
+    or even nested mode-based), validated lazily — mirroring how tiered pricing
+    holds per-tier prices.
+
+    Example:
+        {
+            "type": "mode",
+            "default": "managed",
+            "modes": {
+                "managed": {"type": "one_million_tokens", "input": "0.50", "output": "1.50"},
+                "byok": {"type": "constant", "price": "0"}
+            }
+        }
+    """
+
+    type: Literal["mode"] = "mode"
+
+    default: str = Field(
+        description="Mode key evaluated when the request's mode is unknown or unset. "
+        "Must be one of the keys in `modes`.",
+    )
+
+    modes: dict[str, dict[str, Any]] = Field(
+        description="Per-mode pricing keyed by mode name (e.g. 'managed', 'byok'). "
+        "Each value is a nested pricing object of any type.",
+        min_length=1,
+    )
+
+    @model_validator(mode="after")
+    def _validate_default_and_price(self) -> ModePriceData:
+        """Require ``default`` to exist and auto-compute the nominal price from it."""
+        if self.default not in self.modes:
+            raise ValueError(f"default mode {self.default!r} is not defined in modes ({sorted(self.modes)})")
+        if self.price is None:
+            self.price = _extract_nominal_price(self.modes[self.default])
+        return self
+
+    def calculate_cost(
+        self,
+        usage: UsageData,
+        customer_charge: Decimal | None = None,
+        request_count: int | None = None,
+        mode: str | None = None,
+    ) -> Decimal:
+        """Evaluate the price for the resolved ``mode`` (falling back to ``default``).
+
+        Args:
+            usage: Usage data passed to the selected mode's price.
+            customer_charge: Customer charge passed through.
+            request_count: Request count passed through.
+            mode: The resolved mode; unknown/``None`` falls back to ``default``.
+
+        Returns:
+            Cost from the selected mode's pricing.
+        """
+        selected = self.modes.get(mode) if mode is not None else None
+        if selected is None:
+            selected = self.modes[self.default]
+        pricing = validate_pricing(selected)
+        return pricing.calculate_cost(usage, customer_charge, request_count, mode)
+
+
 # Discriminated union of all pricing types
 # This is the type used for payout_price and list_price fields
 # Note: ExprPriceData should only be used for payout_price
@@ -1336,7 +1429,8 @@ Pricing = Annotated[
     | FirstPriceData
     | TieredPriceData
     | GraduatedPriceData
-    | ExprPriceData,
+    | ExprPriceData
+    | ModePriceData,
     Field(discriminator="type"),
 ]
 
@@ -1360,6 +1454,7 @@ def validate_pricing(
     | TieredPriceData
     | GraduatedPriceData
     | ExprPriceData
+    | ModePriceData
 ):
     """
     Validate pricing dict and return the appropriate typed model.

{unitysvc_core-0.2.2 → unitysvc_core-0.2.4}/src/unitysvc_core/models/service.py

@@ -144,21 +144,22 @@ class UpstreamAccessConfigData(AccessInterfaceData):
     )
 
 
-class ServiceData(BaseModel):
-    """Backend-assigned service identity record (the ``service.json`` file).
-
-    A service's ``provider_data`` / ``offering_data`` / ``listing_data`` are
-    authored by the seller; this is the *other* half — the record the backend
-    materializes once a service exists. It is the **round-trip** structure:
-    the ingest task returns it, the seller stores it in ``service.json`` beside
-    the spec files, and it travels back as the top-level ``service_data`` field
-    on the next upload/revision so the backend can match the upload to the
-    existing service.
-
-    Of these fields, only ``service_id`` is consumed on the way *in* (it
-    targets revise/replace vs create); the rest are populated on the way *out*
-    and are informational provenance for the seller. ``extra="ignore"`` keeps
-    unknown keys from breaking either direction.
+class ServiceStatus(BaseModel):
+    """Backend-assigned service **status / identity sidecar** (the ``service.json``
+    file) — *not* the authored service data.
+
+    A service's ``provider_data`` / ``offering_data`` / ``listing_data`` are the
+    authored service data; this is the *other*, backend-owned half — the status
+    record the backend materializes once a service exists. It is the
+    **round-trip** sidecar: the ingest task returns it, the seller stores it in
+    ``service.json`` beside the spec files, and replays it on the next
+    upload/revision so the backend can match the upload to the existing service.
+
+    Of these fields, ``service_id`` and ``template_instance_id`` are consumed on
+    the way *in* (they declare which service / which template the publish
+    targets); the rest are populated on the way *out* as informational status /
+    provenance for the seller. ``extra="ignore"`` keeps unknown keys from
+    breaking either direction.
     """
 
     model_config = ConfigDict(extra="ignore")

{unitysvc_core-0.2.2 → unitysvc_core-0.2.4}/src/unitysvc_core/schema/listing_v1.json

@@ -964,6 +964,78 @@
       "title": "MinPriceData",
       "type": "object"
     },
+    "ModePriceData": {
+      "additionalProperties": false,
+      "description": "Mode-based pricing that selects a sub-price by the request's resolved mode.\n\nThe active mode is decided elsewhere — e.g. the gateway picks which keyed\n``upstream_access_config`` a request routes through (``\"managed\"``,\n``\"byok\"``, ``\"byoe\"``, …) — and threads it into\n``calculate_cost(..., mode=...)``. The matching entry in ``modes`` is\nevaluated; when the mode is unknown or unset, the ``default`` mode is used.\n\nThere is no special-casing on the consumer side: every pricing type accepts\nan optional ``mode`` and a mode-independent price simply ignores it, so a\nplain price behaves identically for all modes. Mode-dependent pricing is\njust this one extra optional pricing type.\n\nEach ``modes`` value is itself any pricing object (flat, composite, tiered,\nor even nested mode-based), validated lazily — mirroring how tiered pricing\nholds per-tier prices.\n\nExample:\n    {\n        \"type\": \"mode\",\n        \"default\": \"managed\",\n        \"modes\": {\n            \"managed\": {\"type\": \"one_million_tokens\", \"input\": \"0.50\", \"output\": \"1.50\"},\n            \"byok\": {\"type\": \"constant\", \"price\": \"0\"}\n        }\n    }",
+      "properties": {
+        "default": {
+          "description": "Mode key evaluated when the request's mode is unknown or unset. Must be one of the keys in `modes`.",
+          "title": "Default",
+          "type": "string"
+        },
+        "description": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Human-readable description of the pricing model",
+          "title": "Description"
+        },
+        "modes": {
+          "additionalProperties": {
+            "additionalProperties": true,
+            "type": "object"
+          },
+          "description": "Per-mode pricing keyed by mode name (e.g. 'managed', 'byok'). Each value is a nested pricing object of any type.",
+          "minProperties": 1,
+          "title": "Modes",
+          "type": "object"
+        },
+        "price": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Summary price for marketplace comparison and sorting. For simple pricing types this is the billing rate. For composite types (add, multiply, tiered, graduated) this is a seller-provided nominal value for marketplace display.",
+          "title": "Price"
+        },
+        "reference": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "URL to upstream provider's pricing page",
+          "title": "Reference"
+        },
+        "type": {
+          "const": "mode",
+          "default": "mode",
+          "title": "Type",
+          "type": "string"
+        }
+      },
+      "required": [
+        "default",
+        "modes"
+      ],
+      "title": "ModePriceData",
+      "type": "object"
+    },
     "MultiplyPriceData": {
       "additionalProperties": false,
       "description": "Composite pricing that multiplies a base price by a factor.\n\nUseful for applying percentage-based adjustments to a base price.\n\nExample:\n    {\n        \"type\": \"multiply\",\n        \"factor\": \"0.70\",\n        \"base\": {\"type\": \"one_million_tokens\", \"input\": \"0.50\", \"output\": \"1.50\"}\n    }",
@@ -1867,6 +1939,7 @@
               "image": "#/$defs/ImagePriceData",
               "max": "#/$defs/MaxPriceData",
               "min": "#/$defs/MinPriceData",
+              "mode": "#/$defs/ModePriceData",
               "multiply": "#/$defs/MultiplyPriceData",
               "one_byte": "#/$defs/DataPriceData",
               "one_day": "#/$defs/TimePriceData",
@@ -1936,6 +2009,9 @@
             },
             {
               "$ref": "#/$defs/ExprPriceData"
+            },
+            {
+              "$ref": "#/$defs/ModePriceData"
             }
           ]
         },

{unitysvc_core-0.2.2 → unitysvc_core-0.2.4}/src/unitysvc_core/schema/offering_v1.json

@@ -834,6 +834,78 @@
       "title": "MinPriceData",
       "type": "object"
     },
+    "ModePriceData": {
+      "additionalProperties": false,
+      "description": "Mode-based pricing that selects a sub-price by the request's resolved mode.\n\nThe active mode is decided elsewhere — e.g. the gateway picks which keyed\n``upstream_access_config`` a request routes through (``\"managed\"``,\n``\"byok\"``, ``\"byoe\"``, …) — and threads it into\n``calculate_cost(..., mode=...)``. The matching entry in ``modes`` is\nevaluated; when the mode is unknown or unset, the ``default`` mode is used.\n\nThere is no special-casing on the consumer side: every pricing type accepts\nan optional ``mode`` and a mode-independent price simply ignores it, so a\nplain price behaves identically for all modes. Mode-dependent pricing is\njust this one extra optional pricing type.\n\nEach ``modes`` value is itself any pricing object (flat, composite, tiered,\nor even nested mode-based), validated lazily — mirroring how tiered pricing\nholds per-tier prices.\n\nExample:\n    {\n        \"type\": \"mode\",\n        \"default\": \"managed\",\n        \"modes\": {\n            \"managed\": {\"type\": \"one_million_tokens\", \"input\": \"0.50\", \"output\": \"1.50\"},\n            \"byok\": {\"type\": \"constant\", \"price\": \"0\"}\n        }\n    }",
+      "properties": {
+        "default": {
+          "description": "Mode key evaluated when the request's mode is unknown or unset. Must be one of the keys in `modes`.",
+          "title": "Default",
+          "type": "string"
+        },
+        "description": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Human-readable description of the pricing model",
+          "title": "Description"
+        },
+        "modes": {
+          "additionalProperties": {
+            "additionalProperties": true,
+            "type": "object"
+          },
+          "description": "Per-mode pricing keyed by mode name (e.g. 'managed', 'byok'). Each value is a nested pricing object of any type.",
+          "minProperties": 1,
+          "title": "Modes",
+          "type": "object"
+        },
+        "price": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Summary price for marketplace comparison and sorting. For simple pricing types this is the billing rate. For composite types (add, multiply, tiered, graduated) this is a seller-provided nominal value for marketplace display.",
+          "title": "Price"
+        },
+        "reference": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "URL to upstream provider's pricing page",
+          "title": "Reference"
+        },
+        "type": {
+          "const": "mode",
+          "default": "mode",
+          "title": "Type",
+          "type": "string"
+        }
+      },
+      "required": [
+        "default",
+        "modes"
+      ],
+      "title": "ModePriceData",
+      "type": "object"
+    },
     "MultiplyPriceData": {
       "additionalProperties": false,
       "description": "Composite pricing that multiplies a base price by a factor.\n\nUseful for applying percentage-based adjustments to a base price.\n\nExample:\n    {\n        \"type\": \"multiply\",\n        \"factor\": \"0.70\",\n        \"base\": {\"type\": \"one_million_tokens\", \"input\": \"0.50\", \"output\": \"1.50\"}\n    }",
@@ -1949,6 +2021,7 @@
               "image": "#/$defs/ImagePriceData",
               "max": "#/$defs/MaxPriceData",
               "min": "#/$defs/MinPriceData",
+              "mode": "#/$defs/ModePriceData",
               "multiply": "#/$defs/MultiplyPriceData",
               "one_byte": "#/$defs/DataPriceData",
               "one_day": "#/$defs/TimePriceData",
@@ -2018,6 +2091,9 @@
             },
             {
               "$ref": "#/$defs/ExprPriceData"
+            },
+            {
+              "$ref": "#/$defs/ModePriceData"
             }
           ]
         },

{unitysvc_core-0.2.2 → unitysvc_core-0.2.4/src/unitysvc_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-core
-Version: 0.2.2
+Version: 0.2.4
 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.2 → unitysvc_core-0.2.4}/src/unitysvc_core.egg-info/SOURCES.txt

@@ -31,8 +31,8 @@ src/unitysvc_core/schema/promotion_v1.json
 src/unitysvc_core/schema/provider_v1.json
 src/unitysvc_core/schema/service_group_v1.json
 tests/test_pricing.py
-tests/test_service_data.py
 tests/test_service_group.py
+tests/test_service_status.py
 tests/test_utils.py
 tests/test_validator.py
 tests/test_validators.py

{unitysvc_core-0.2.2 → unitysvc_core-0.2.4}/tests/test_pricing.py

@@ -1806,3 +1806,124 @@ class TestNominalPriceAutoCompute:
         )
         # Explicit price on the child is preserved
         assert pricing.price == "9.00"
+
+
+class TestModePriceData:
+    """Tests for mode-based pricing (select a sub-price by resolved mode)."""
+
+    def _managed_byok(self) -> dict:
+        """Canonical managed+byok: managed is paid, byok is free.
+
+        Uses ``constant`` sub-prices so the tests exercise mode *selection*
+        independently of any usage-metric math.
+        """
+        return {
+            "type": "mode",
+            "default": "managed",
+            "modes": {
+                "managed": {"type": "constant", "price": "6.00"},
+                "byok": {"type": "constant", "price": "0"},
+            },
+        }
+
+    def test_selects_matching_mode(self) -> None:
+        """The resolved mode picks that mode's price."""
+        pricing = validate_pricing(self._managed_byok())
+        usage = UsageData()
+
+        assert pricing.calculate_cost(usage, mode="managed") == Decimal("6.00")
+        assert pricing.calculate_cost(usage, mode="byok") == Decimal("0")
+
+    def test_unknown_mode_falls_back_to_default(self) -> None:
+        """An unrecognised mode evaluates the default mode."""
+        pricing = validate_pricing(self._managed_byok())
+
+        assert pricing.calculate_cost(UsageData(), mode="nonexistent") == Decimal("6.00")
+
+    def test_none_mode_falls_back_to_default(self) -> None:
+        """No mode (the common case for non-mode-aware callers) uses the default."""
+        pricing = validate_pricing(self._managed_byok())
+
+        assert pricing.calculate_cost(UsageData()) == Decimal("6.00")
+
+    def test_non_mode_price_ignores_mode(self) -> None:
+        """A plain (mode-independent) price yields the same cost for every mode."""
+        pricing = validate_pricing({"type": "constant", "price": "6.00"})
+        usage = UsageData()
+
+        base = pricing.calculate_cost(usage)
+        assert pricing.calculate_cost(usage, mode="byok") == base
+        assert pricing.calculate_cost(usage, mode="managed") == base
+        assert base == Decimal("6.00")
+
+    def test_default_must_exist(self) -> None:
+        """`default` must name one of the modes."""
+        with pytest.raises(ValueError, match="default mode"):
+            validate_pricing(
+                {
+                    "type": "mode",
+                    "default": "missing",
+                    "modes": {"managed": {"type": "constant", "price": "1"}},
+                }
+            )
+
+    def test_nominal_price_from_default_mode(self) -> None:
+        """The summary price auto-computes from the default mode when unset."""
+        pricing = validate_pricing(self._managed_byok())
+        assert pricing.price == "6.00"  # managed (default) summary price
+
+    def test_explicit_nominal_price_preserved(self) -> None:
+        """A seller-provided summary price is not overwritten."""
+        data = self._managed_byok()
+        data["price"] = "1.50"
+        pricing = validate_pricing(data)
+        assert pricing.price == "1.50"
+
+    def test_mode_threads_through_composite(self) -> None:
+        """`mode` propagates into nested children (e.g. a mode price inside `add`)."""
+        pricing = validate_pricing(
+            {
+                "type": "add",
+                "prices": [
+                    {
+                        "type": "mode",
+                        "default": "managed",
+                        "modes": {
+                            "managed": {"type": "constant", "price": "10"},
+                            "byok": {"type": "constant", "price": "0"},
+                        },
+                    },
+                    {"type": "constant", "price": "1.00"},  # flat platform fee
+                ],
+            }
+        )
+        usage = UsageData()
+
+        # byok: 0 (mode price) + 1.00 (fee); managed: 10 + 1.00
+        assert pricing.calculate_cost(usage, mode="byok") == Decimal("1.00")
+        assert pricing.calculate_cost(usage, mode="managed") == Decimal("11.00")
+
+    def test_mode_price_can_nest_tiered(self) -> None:
+        """A mode's pricing may itself be any pricing type (here: tiered)."""
+        pricing = validate_pricing(
+            {
+                "type": "mode",
+                "default": "managed",
+                "modes": {
+                    "managed": {
+                        "type": "tiered",
+                        "based_on": "request_count",
+                        "tiers": [
+                            {"up_to": 100, "price": {"type": "constant", "price": "5"}},
+                            {"up_to": None, "price": {"type": "constant", "price": "50"}},
+                        ],
+                    },
+                    "byok": {"type": "constant", "price": "0"},
+                },
+            }
+        )
+        usage = UsageData()
+
+        assert pricing.calculate_cost(usage, request_count=10, mode="managed") == Decimal("5")
+        assert pricing.calculate_cost(usage, request_count=10_000, mode="managed") == Decimal("50")
+        assert pricing.calculate_cost(usage, request_count=10_000, mode="byok") == Decimal("0")

unitysvc_core-0.2.2/tests/test_service_data.py → unitysvc_core-0.2.4/tests/test_service_status.py

@@ -1,30 +1,30 @@
-"""Tests for the ServiceData model (the service.json provenance structure)."""
+"""Tests for the ServiceStatus model (the service.json provenance structure)."""
 
 from __future__ import annotations
 
 from datetime import datetime
 from uuid import UUID
 
-from unitysvc_core.models import ServiceData
+from unitysvc_core.models import ServiceStatus
 
 _SID = "2c1f9e7a-0000-0000-0000-000000000000"
 
 
 def test_empty_service_data_has_no_identity() -> None:
-    sd = ServiceData()
+    sd = ServiceStatus()
     assert sd.service_id is None
     assert sd.time_created is None
 
 
 def test_service_id_coerced_to_uuid() -> None:
-    sd = ServiceData.model_validate({"service_id": _SID})
+    sd = ServiceStatus.model_validate({"service_id": _SID})
     assert sd.service_id == UUID(_SID)
 
 
 def test_time_created_and_extra_fields() -> None:
     # time_created is a recognized provenance field; unknown extras are
     # tolerated (extra="ignore") rather than rejected.
-    sd = ServiceData.model_validate({"service_id": _SID, "time_created": "2026-01-01T00:00:00", "note": "x"})
+    sd = ServiceStatus.model_validate({"service_id": _SID, "time_created": "2026-01-01T00:00:00", "note": "x"})
     assert sd.time_created == datetime(2026, 1, 1, 0, 0)
     assert "note" not in sd.model_dump()
 
@@ -32,7 +32,7 @@ def test_time_created_and_extra_fields() -> None:
 def test_full_identity_record_round_trips() -> None:
     # The shape the ingest task returns and the seller persists to service.json.
     rev = "11111111-0000-0000-0000-000000000000"
-    sd = ServiceData.model_validate(
+    sd = ServiceStatus.model_validate(
         {
             "service_id": _SID,
             "revision_of": rev,