unitysvc-core 0.2.23__tar.gz → 0.2.25__tar.gz

{unitysvc_core-0.2.23/src/unitysvc_core.egg-info → unitysvc_core-0.2.25}/PKG-INFO

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

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

@@ -1,4 +1,5 @@
 from .base import (
+    ROUTABLE_GROUP_TYPES,
     AccessMethodEnum,
     AuthMethodEnum,
     ContentFilterEnum,
@@ -131,6 +132,7 @@ __all__ = [
     "QuotaResetCycleEnum",
     "RateLimitUnitEnum",
     "RequestTransformEnum",
+    "ROUTABLE_GROUP_TYPES",
     "SellerTypeEnum",
     "ServiceGroupStatusEnum",
     "ServiceTypeEnum",

{unitysvc_core-0.2.23 → unitysvc_core-0.2.25}/src/unitysvc_core/models/base.py

@@ -136,16 +136,21 @@ class GroupOwnerTypeEnum(StrEnum):
 
 
 class GroupTypeEnum(StrEnum):
-    """Type of service group.
+    """Type of service group. Derived from members, not authored.
 
-    - ``regular``: Enrollable, services-bearing group (the common case).
-    - ``category``: Non-enrollable parent that organizes child groups.
-    - ``misc``: System-generated catch-all for uncategorized services.
+    - ``category``: Parent group for browsing/organization only.
+    - ``collection``: Services-bearing group that is not routable.
+    - ``open``: Routable group where keyless requests can fan safely.
+    - ``keyed``: Routable group where callers must provide a routing key.
     """
 
-    regular = "regular"
     category = "category"
-    misc = "misc"
+    collection = "collection"
+    open = "open"
+    keyed = "keyed"
+
+
+ROUTABLE_GROUP_TYPES = frozenset({GroupTypeEnum.open, GroupTypeEnum.keyed})
 
 
 class SellerTypeEnum(StrEnum):

{unitysvc_core-0.2.23 → unitysvc_core-0.2.25}/src/unitysvc_core/models/service_group_data.py

@@ -84,10 +84,11 @@ class ServiceGroupData(BaseModel):
     )
 
     group_type: GroupTypeEnum = Field(
-        default=GroupTypeEnum.regular,
+        default=GroupTypeEnum.category,
         description=(
-            "Type of group: regular (enrollable), category (non-enrollable "
-            "parent), or misc (system-generated catch-all)."
+            "Backend-derived group type: category (browse-only parent), "
+            "collection (not routable), open (routable keyless fanout), "
+            "or keyed (routable by key)."
         ),
     )
 

{unitysvc_core-0.2.23 → unitysvc_core-0.2.25}/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.23 → unitysvc_core-0.2.25}/src/unitysvc_core/schema/service_group_v1.json

@@ -11,11 +11,12 @@
       "type": "string"
     },
     "GroupTypeEnum": {
-      "description": "Type of service group.\n\n- ``regular``: Enrollable, services-bearing group (the common case).\n- ``category``: Non-enrollable parent that organizes child groups.\n- ``misc``: System-generated catch-all for uncategorized services.",
+      "description": "Type of service group. Derived from members, not authored.\n\n- ``category``: Parent group for browsing/organization only.\n- ``collection``: Services-bearing group that is not routable.\n- ``open``: Routable group where keyless requests can fan safely.\n- ``keyed``: Routable group where callers must provide a routing key.",
       "enum": [
-        "regular",
         "category",
-        "misc"
+        "collection",
+        "open",
+        "keyed"
       ],
       "title": "GroupTypeEnum",
       "type": "string"
@@ -69,8 +70,8 @@
     },
     "group_type": {
       "$ref": "#/$defs/GroupTypeEnum",
-      "default": "regular",
-      "description": "Type of group: regular (enrollable), category (non-enrollable parent), or misc (system-generated catch-all)."
+      "default": "category",
+      "description": "Backend-derived group type: category (browse-only parent), collection (not routable), open (routable keyless fanout), or keyed (routable by key)."
     },
     "membership_rules": {
       "anyOf": [

{unitysvc_core-0.2.23 → unitysvc_core-0.2.25/src/unitysvc_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-core
-Version: 0.2.23
+Version: 0.2.25
 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.23 → unitysvc_core-0.2.25}/tests/test_service_group.py

@@ -46,22 +46,44 @@ class TestServiceGroupDataAdminFields:
         g = ServiceGroupData(name="ok", display_name="X")
         assert g.owner_type is GroupOwnerTypeEnum.platform
         assert g.owner_id is None
-        assert g.group_type is GroupTypeEnum.regular
+        assert g.group_type is GroupTypeEnum.category
         assert g.access_interface_data_template is None
 
+    @pytest.mark.parametrize(
+        "group_type",
+        [
+            GroupTypeEnum.category,
+            GroupTypeEnum.collection,
+            GroupTypeEnum.open,
+            GroupTypeEnum.keyed,
+        ],
+    )
+    def test_backend_group_types_set(self, group_type: GroupTypeEnum):
+        g = ServiceGroupData(
+            name="ok",
+            display_name="X",
+            group_type=group_type,
+        )
+        assert g.group_type is group_type
+
     def test_admin_fields_set(self):
         g = ServiceGroupData(
             name="ok",
             display_name="X",
             owner_type=GroupOwnerTypeEnum.seller,
             owner_id="00000000-0000-0000-0000-000000000001",
-            group_type=GroupTypeEnum.category,
+            group_type=GroupTypeEnum.open,
             access_interface_data_template='{"base_url": "https://x"}',
         )
         assert g.owner_type is GroupOwnerTypeEnum.seller
-        assert g.group_type is GroupTypeEnum.category
+        assert g.group_type is GroupTypeEnum.open
         assert g.access_interface_data_template == '{"base_url": "https://x"}'
 
+    @pytest.mark.parametrize("legacy_type", ["regular", "misc"])
+    def test_legacy_group_types_rejected(self, legacy_type: str):
+        with pytest.raises(ValidationError):
+            ServiceGroupData(name="ok", display_name="X", group_type=legacy_type)
+
 
 class TestServiceGroupV1FileModel:
     """``extra='forbid'`` keeps file-level validation strict."""
@@ -78,10 +100,11 @@ class TestServiceGroupV1FileModel:
             name="my-group",
             display_name="X",
             owner_type="platform",
-            group_type="regular",
+            group_type="keyed",
             status="active",
         )
         assert g.status is ServiceGroupStatusEnum.active
+        assert g.group_type is GroupTypeEnum.keyed
 
 
 class TestValidateServiceGroupDict:

{unitysvc_core-0.2.23 → unitysvc_core-0.2.25}/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]