agentscope-runtime 1.0.2__py3-none-any.whl → 1.0.3__py3-none-any.whl

agentscope_runtime/cli/commands/deploy.py

@@ -828,6 +828,13 @@ def agentrun(
     help="Target platform (e.g., 'linux/amd64', 'linux/arm64')",
     default="linux/amd64",
 )
+@click.option(
+    "--pypi-mirror",
+    help="PyPI mirror URL for pip package installation (e.g., "
+    "https://pypi.tuna.tsinghua.edu.cn/simple). If not specified, "
+    "uses pip default.",
+    default=None,
+)
 def k8s(
     source: str,
     name: str,
@@ -854,6 +861,7 @@ def k8s(
     deploy_timeout: int,
     health_check: bool,
     platform: str,
+    pypi_mirror: str,
 ):
     """
     Deploy to Kubernetes/ACK.
@@ -898,6 +906,7 @@ def k8s(
             "deploy_timeout": deploy_timeout,
             "health_check": health_check,
             "platform": platform,
+            "pypi_mirror": pypi_mirror,
         }
         merged_config = _merge_config(config_dict, cli_params)
 
@@ -918,6 +927,7 @@ def k8s(
         deploy_timeout = merged_config.get("deploy_timeout", 300)
         health_check = merged_config.get("health_check", True)
         platform = merged_config.get("platform")
+        pypi_mirror = merged_config.get("pypi_mirror")
 
         # Handle requirements (can be comma-separated string, list, or file
         # path)
@@ -1033,6 +1043,8 @@ def k8s(
             deploy_params["health_check"] = health_check
         if platform:
             deploy_params["platform"] = platform
+        if pypi_mirror:
+            deploy_params["pypi_mirror"] = pypi_mirror
 
         # Add agent_source for state saving
         deploy_params["agent_source"] = abs_source

agentscope_runtime/common/collections/redis_mapping.py

@@ -38,7 +38,10 @@ class RedisMapping(Mapping):
                 match=search_pattern,
             )
             for key in keys:
-                decoded_key = key.decode("utf-8")
+                if isinstance(key, bytes):
+                    decoded_key = key.decode("utf-8")
+                else:
+                    decoded_key = str(key)
                 yield self._strip_prefix(decoded_key)
 
             if cursor == 0:

agentscope_runtime/engine/app/agent_app.py

@@ -12,7 +12,11 @@ from pydantic import BaseModel
 
 from .base_app import BaseApp
 from ..deployers import DeployManager
-from ..deployers.adapter.a2a import A2AFastAPIDefaultAdapter
+from ..deployers.adapter.a2a import (
+    A2AFastAPIDefaultAdapter,
+    AgentCardWithRuntimeConfig,
+    extract_a2a_config,
+)
 from ..deployers.adapter.responses.response_api_protocol_adapter import (
     ResponseAPIDefaultAdapter,
 )
@@ -47,14 +51,49 @@ class AgentApp(BaseApp):
         backend_url: Optional[str] = None,
         runner: Optional[Runner] = None,
         enable_embedded_worker: bool = False,
+        a2a_config: Optional["AgentCardWithRuntimeConfig"] = None,
         **kwargs,
     ):
         """
         Initialize the AgentApp.
 
         Args:
-            *args: Variable length argument list.
-            **kwargs: Arbitrary keyword arguments.
+            app_name: Name of the agent application
+            app_description: Description of the agent application
+            endpoint_path: API endpoint path for processing requests
+            response_type: Type of response (default: "sse")
+            stream: Whether to enable streaming responses
+            request_model: Request model class
+            before_start: Callback function to execute before starting
+            after_finish: Callback function to execute after finishing
+            broker_url: URL for message broker
+            backend_url: URL for backend service
+            runner: Optional runner instance
+            enable_embedded_worker: Whether to enable embedded worker
+            a2a_config: Optional A2A runtime configuration.
+                Must be an ``AgentCardWithRuntimeConfig`` instance, which
+                contains ``agent_card`` (AgentCard object or dict) and runtime
+                settings (host, port, registry, task_timeout, etc.).
+                Example:
+                    from a2a.types import AgentCard, AgentCapabilities
+                    from agentscope_runtime.engine.deployers.adapter.a2a import (  # noqa: E501
+                        AgentCardWithRuntimeConfig,
+                    )
+                    config = AgentCardWithRuntimeConfig(
+                        agent_card={
+                            "name": "MyAgent",
+                            "version": "1.0.0",
+                            "description": "My agent",
+                            "url": "http://localhost:8080",
+                            "capabilities": AgentCapabilities(),
+                            "default_input_modes": ["text"],
+                            "default_output_modes": ["text"],
+                            "skills": [],
+                        },
+                        registry=[nacos_registry],
+                        task_timeout=120,
+                    )
+            **kwargs: Additional keyword arguments passed to FastAPI app
         """
 
         self.endpoint_path = endpoint_path
@@ -76,9 +115,13 @@ class AgentApp(BaseApp):
         self._shutdown_handler: Optional[Callable] = None
         self._framework_type: Optional[str] = None
 
+        # Prepare A2A protocol adapter configuration
+        a2a_config = extract_a2a_config(a2a_config=a2a_config)
+
         a2a_protocol = A2AFastAPIDefaultAdapter(
             agent_name=app_name,
             agent_description=app_description,
+            a2a_config=a2a_config,
         )
 
         response_protocol = ResponseAPIDefaultAdapter()
@@ -96,8 +139,8 @@ class AgentApp(BaseApp):
             backend_url=backend_url,
         )
 
-        # Store custom endpoints and tasks for deployment
-        # but don't add them to FastAPI here - let FastAPIAppFactory handle it
+        # Store custom endpoints for deployment
+        # FastAPIAppFactory will handle adding them to FastAPI
 
     def init(self, func):
         """Register init hook (support async and sync functions)."""

agentscope_runtime/engine/deployers/adapter/a2a/__init__.py

@@ -1,2 +1,57 @@
 # -*- coding: utf-8 -*-
-from .a2a_protocol_adapter import A2AFastAPIDefaultAdapter
+from .a2a_protocol_adapter import (
+    A2AFastAPIDefaultAdapter,
+    AgentCardWithRuntimeConfig,
+    extract_a2a_config,
+)
+from .a2a_registry import (
+    A2ARegistry,
+    A2ARegistrySettings,
+    get_registry_settings,
+    create_registry_from_env,
+)
+
+# NOTE: NacosRegistry is NOT imported at module import time to avoid forcing
+# an optional dependency on environments that don't have nacos SDK installed.
+# Instead, NacosRegistry is imported lazily via __getattr__ (see below) when
+# actually needed (e.g., when user does: from ... import NacosRegistry).
+
+__all__ = [
+    "A2AFastAPIDefaultAdapter",
+    "AgentCardWithRuntimeConfig",
+    "extract_a2a_config",
+    "A2ARegistry",
+    "A2ARegistrySettings",
+    "get_registry_settings",
+    "create_registry_from_env",
+    "NacosRegistry",  # pylint: disable=undefined-all-variable
+]
+
+
+def __getattr__(name: str):
+    """
+    Lazy import for NacosRegistry to avoid forcing optional nacos dependency.
+
+    This function is called by Python when an attribute is accessed
+    that doesn't exist at module level. This allows NacosRegistry
+    to be imported only when actually needed, rather than at module
+    import time.
+
+    If the nacos SDK is not installed, provides a helpful error message
+    instead of a confusing ImportError.
+    """
+    if name == "NacosRegistry":
+        try:
+            from .nacos_a2a_registry import NacosRegistry
+
+            return NacosRegistry
+        except ImportError as e:
+            # Check if it's the v2.nacos dependency that's missing
+            if "v2.nacos" in str(e) or "nacos" in str(e).lower():
+                raise ImportError(
+                    "NacosRegistry requires the 'v2-nacos' package. "
+                    "Install it with: pip install v2-nacos",
+                ) from e
+            # Re-raise other import errors as-is
+            raise
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")