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

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

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

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

@@ -61,7 +61,6 @@ from .promotion_data import (
     PromotionData,
     PromotionV1,
     describe_scope,
-    is_promotion_file,
     strip_schema_field,
     validate_promotion,
 )
@@ -71,13 +70,13 @@ from .service import (
     AccessInterfaceData,
     RateLimit,
     ServiceConstraints,
+    ServiceData,
     UpstreamAccessConfigData,
 )
 from .service_group_data import (
     SERVICE_GROUP_SCHEMA_VERSION,
     ServiceGroupData,
     ServiceGroupV1,
-    is_service_group_file,
     validate_service_group,
 )
 from .validators import (
@@ -111,6 +110,7 @@ __all__ = [
     "UpstreamAccessConfigData",
     "RateLimit",
     "ServiceConstraints",
+    "ServiceData",
     # Enums
     "AccessMethodEnum",
     "AuthMethodEnum",
@@ -176,12 +176,10 @@ __all__ = [
     "suggest_valid_name",
     # Promotions
     "PROMOTION_SCHEMA_VERSION",
-    "is_promotion_file",
     "describe_scope",
     "strip_schema_field",
     "validate_promotion",
     # Service Groups
     "SERVICE_GROUP_SCHEMA_VERSION",
-    "is_service_group_file",
     "validate_service_group",
 ]

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

@@ -241,6 +241,11 @@ class RequestTransformEnum(StrEnum):
     body_transformer = "body_transformer"
     # Simple body replacement from rendered enrollment data
     set_body = "set_body"
+    # Translate the request/response between the client's LLM API format and the
+    # format the upstream provider accepts (e.g. Anthropic Messages -> OpenAI
+    # Chat). Config carries ``upstream_format``; the gateway performs the
+    # conversion in-process (#923/#929).
+    llm_translate = "llm_translate"
 
 
 class ServiceTypeEnum(StrEnum):

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

@@ -10,7 +10,6 @@ and `time_created` for data file validation.
 """
 
 from typing import Any
-from uuid import UUID
 
 from pydantic import BaseModel, Field
 
@@ -43,13 +42,10 @@ class ServiceListingData(BaseModel):
 
     model_config = {"extra": "ignore"}
 
-    # Service ID for updates (set by SDK after first publish)
-    # When provided, updates the existing service. When absent, creates a new service.
-    service_id: UUID | None = Field(
-        default=None,
-        description="Service ID from previous publish. If provided, updates existing service. "
-        "Stored in override file (e.g., listing.override.json) by SDK after first publish.",
-    )
+    # 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.
 
     # Listing identification
     name: str | None = Field(

{unitysvc_core-0.2.0 → unitysvc_core-0.2.2}/src/unitysvc_core/models/promotion_data.py

@@ -100,11 +100,6 @@ class PromotionData(BaseModel):
     )
 
 
-def is_promotion_file(data: dict[str, Any]) -> bool:
-    """Check if a data dict is a promotion file (by schema version)."""
-    return data.get("schema") == PROMOTION_SCHEMA_VERSION
-
-
 def strip_schema_field(data: dict[str, Any]) -> dict[str, Any]:
     """Return a copy of the data dict without the ``schema`` field.
 

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

@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
+from datetime import datetime
 from typing import Any
+from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, Field
 
@@ -140,3 +142,74 @@ class UpstreamAccessConfigData(AccessInterfaceData):
             "credential on the source header."
         ),
     )
+
+
+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.
+    """
+
+    model_config = ConfigDict(extra="ignore")
+
+    service_id: UUID | None = Field(
+        default=None,
+        description=(
+            "Backend-assigned service id from a previous publish. When present "
+            "on upload, the request targets the existing service (revise/"
+            "replace) instead of creating a new one."
+        ),
+    )
+
+    revision_of: UUID | None = Field(
+        default=None,
+        description=(
+            "Set when this record describes a revision: the canonical service "
+            "id the revision derives from. ``service_id`` is then the revision's "
+            "own id."
+        ),
+    )
+
+    status: str | None = Field(
+        default=None,
+        description="Service identity status as resolved by the last ingest.",
+    )
+
+    name: str | None = Field(
+        default=None,
+        description="Backend-derived service name (from listing/offering).",
+    )
+
+    display_name: str | None = Field(
+        default=None,
+        description="Backend-derived human-readable service name.",
+    )
+
+    time_created: datetime | None = Field(
+        default=None,
+        description="When the service was first created (informational provenance).",
+    )
+
+    template_instance_id: UUID | None = Field(
+        default=None,
+        description=(
+            "Set when the service was published from a seller TemplateInstance "
+            "(the seller-instances flow). Like ``service_id`` it is consumed on "
+            "the way *in* to declare the operation — with no ``service_id`` it "
+            "creates a service from the template (the backend pins the form's "
+            "service_id); with one it updates an existing template-generated "
+            "service — and echoed on the way *out* so ``service.json`` records "
+            "the template association. Absent for plain (non-template) services."
+        ),
+    )

{unitysvc_core-0.2.0 → unitysvc_core-0.2.2}/src/unitysvc_core/models/service_group_data.py

@@ -131,11 +131,6 @@ class ServiceGroupData(BaseModel):
 SERVICE_GROUP_SCHEMA_VERSION = "service_group_v1"
 
 
-def is_service_group_file(data: dict[str, Any]) -> bool:
-    """Check if a data dict is a service group file (by schema version)."""
-    return data.get("schema") == SERVICE_GROUP_SCHEMA_VERSION
-
-
 def strip_schema_field(data: dict[str, Any]) -> dict[str, Any]:
     """Return a copy of the data dict without the ``schema`` field."""
     return {k: v for k, v in data.items() if k != "schema"}

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

@@ -1953,20 +1953,6 @@
       "title": "Name",
       "type": "string"
     },
-    "service_id": {
-      "anyOf": [
-        {
-          "format": "uuid",
-          "type": "string"
-        },
-        {
-          "type": "null"
-        }
-      ],
-      "default": null,
-      "description": "Service ID from previous publish. If provided, updates existing service. Stored in override file (e.g., listing.override.json) by SDK after first publish.",
-      "title": "Service Id"
-    },
     "service_options": {
       "anyOf": [
         {

{unitysvc_core-0.2.0 → unitysvc_core-0.2.2}/src/unitysvc_core/utils.py

@@ -408,42 +408,6 @@ def schema_for_path(path: Path) -> str | None:
     return STEM_TO_SCHEMA.get(path.stem)
 
 
-def find_file_by_schema_and_name(
-    data_dir: Path, schema: str, name_field: str, name_value: str
-) -> tuple[Path, str, dict[str, Any]] | None:
-    """
-    Find a data file by schema type and name field value.
-
-    Args:
-        data_dir: Directory to search
-        schema: Schema identifier (e.g., "offering_v1", "listing_v1")
-        name_field: Field name to match (e.g., "name", "seller_name")
-        name_value: Value to match in the name field
-
-    Returns:
-        Tuple of (file_path, format, data) if found, None otherwise
-    """
-    data_files = find_data_files(data_dir)
-
-    for data_file in data_files:
-        try:
-            data, file_format = load_data_file(data_file)
-        except Exception as exc:
-            _warn_skipped(data_file, exc)
-            continue
-        # Discovery walks every ``*.json`` / ``*.toml`` under ``data_dir``,
-        # which sweeps in things like ``package-lock.json`` (top-level dict
-        # but no ``schema`` field) and openapi/mypy-cache files (top-level
-        # list). The schema check ignores the former, but the latter
-        # crashes ``.get`` — skip non-dict roots instead.
-        if not isinstance(data, dict):
-            continue
-        if data_file.stem == SCHEMA_TO_STEM.get(schema) and data.get(name_field) == name_value:
-            return data_file, file_format, data
-
-    return None
-
-
 @lru_cache(maxsize=256)
 def find_files_by_schema(
     data_dir: Path,

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

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

@@ -31,6 +31,7 @@ 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_utils.py
 tests/test_validator.py

unitysvc_core-0.2.2/tests/test_service_data.py

@@ -0,0 +1,49 @@
+"""Tests for the ServiceData model (the service.json provenance structure)."""
+
+from __future__ import annotations
+
+from datetime import datetime
+from uuid import UUID
+
+from unitysvc_core.models import ServiceData
+
+_SID = "2c1f9e7a-0000-0000-0000-000000000000"
+
+
+def test_empty_service_data_has_no_identity() -> None:
+    sd = ServiceData()
+    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})
+    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"})
+    assert sd.time_created == datetime(2026, 1, 1, 0, 0)
+    assert "note" not in sd.model_dump()
+
+
+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(
+        {
+            "service_id": _SID,
+            "revision_of": rev,
+            "status": "revision_created",
+            "name": "acme/widget",
+            "display_name": "ACME Widget",
+            "time_created": "2026-01-01T00:00:00",
+        }
+    )
+    assert sd.service_id == UUID(_SID)
+    assert sd.revision_of == UUID(rev)
+    assert sd.status == "revision_created"
+    assert sd.name == "acme/widget"
+    assert sd.display_name == "ACME Widget"

{unitysvc_core-0.2.0 → unitysvc_core-0.2.2}/tests/test_utils.py

@@ -11,7 +11,6 @@ from unitysvc_core.utils import (
     compute_file_hash,
     deep_merge_dicts,
     expand_presets,
-    find_file_by_schema_and_name,
     find_files_by_schema,
     generate_content_based_key,
     get_basename,
@@ -175,19 +174,6 @@ def test_find_files_by_schema_skips_non_dict_roots(tmp_path: Path) -> None:
     assert {Path(fp).relative_to(tmp_path).as_posix() for fp, _fmt, _data in files} == {"provider.json"}
 
 
-def test_find_file_by_schema_and_name_skips_non_dict_roots(tmp_path: Path) -> None:
-    """Sibling discovery helper has the same surface — pin both."""
-    (tmp_path / "listing.json").write_text(json.dumps({"name": "wanted"}))
-    (tmp_path / "bad").mkdir()
-    (tmp_path / "bad" / "listing.json").write_text(json.dumps([{"x": 1}]))
-
-    result = find_file_by_schema_and_name(tmp_path, "listing_v1", "name", "wanted")
-    assert result is not None
-    fp, _fmt, data = result
-    assert Path(fp).name == "listing.json"
-    assert data["name"] == "wanted"
-
-
 # =============================================================================
 # $preset sentinel expansion
 # =============================================================================
@@ -375,18 +361,6 @@ def test_find_files_by_schema_warns_on_malformed_json(tmp_path: Path) -> None:
     assert results == []
 
 
-def test_find_file_by_schema_and_name_warns_on_load_failure(tmp_path: Path) -> None:
-    """A malformed file in the search directory must surface as a warning,
-    not as a silent ``None`` (which would be indistinguishable from
-    "the name didn't match anything")."""
-    bad = tmp_path / "provider.json"  # spec-named so discovery loads it
-    bad.write_text("{ this is not json")
-
-    with pytest.warns(DataFileLoadWarning, match="provider.json"):
-        result = find_file_by_schema_and_name(tmp_path, "provider_v1", "name", "p")
-    assert result is None
-
-
 def test_find_files_by_schema_can_be_promoted_to_error(tmp_path: Path) -> None:
     """Callers that want fail-fast can promote the warning to an exception."""
     import warnings as _warnings