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

{unitysvc_core-0.2.24/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.24
+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.24 → unitysvc_core-0.2.25}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unitysvc-core"
-version = "0.2.24"
+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.24 → 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.24 → 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.24
+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.24 → 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]