agentscope-runtime 1.0.4__py3-none-any.whl → 1.0.5__py3-none-any.whl

agentscope_runtime/cli/commands/deploy.py

@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 """agentscope deploy command - Deploy agents to various platforms."""
 # pylint: disable=too-many-statements, too-many-branches
+# pylint: disable=too-many-nested-blocks
 
 import asyncio
 import json
 import os
 import sys
+from typing import Optional
 
 import click
 import yaml
@@ -65,6 +67,17 @@ try:
 except ImportError:
     KNATIVE_AVAILABLE = False
 
+try:
+    from agentscope_runtime.engine.deployers.pai_deployer import (
+        PAI_AVAILABLE,
+        PAIDeployConfig,
+        PAIDeployManager,
+    )
+except ImportError:
+    PAI_AVAILABLE = False
+    PAIDeployConfig = None
+    PAIDeployManager = None
+
 
 def _validate_source(source: str) -> tuple[str, str]:
     """
@@ -90,7 +103,10 @@ def _validate_source(source: str) -> tuple[str, str]:
         raise ValueError(f"Source must be a file or directory: {abs_source}")
 
 
-def _find_entrypoint(project_dir: str, entrypoint: str = None) -> str:
+def _find_entrypoint(
+    project_dir: str,
+    entrypoint: Optional[str] = None,
+) -> str:
     """
     Find or validate entrypoint file in project directory.
 
@@ -185,6 +201,33 @@ def _merge_config(config_dict: dict, cli_params: dict) -> dict:
     return merged
 
 
+def _parse_tags(tag_tuples: tuple) -> dict:
+    """
+    Parse tags from --tag options.
+
+    Args:
+        tag_tuples: Tuple of KEY=VALUE strings from --tag options
+
+    Returns:
+        Dictionary of tags
+
+    Raises:
+        ValueError: If tag format is invalid
+    """
+    tags = {}
+
+    for tag_pair in tag_tuples:
+        if "=" not in tag_pair:
+            raise ValueError(
+                f"Invalid tag format: '{tag_pair}'. Use KEY=VALUE format",
+            )
+
+        key, value = tag_pair.split("=", 1)
+        tags[key.strip()] = value.strip()
+
+    return tags
+
+
 def _parse_environment(env_tuples: tuple, env_file: str = None) -> dict:
     """
     Parse environment variables from --env options and --env-file.
@@ -254,6 +297,7 @@ def deploy():
     \b
     - modelstudio: Alibaba Cloud ModelStudio
     - agentrun: Alibaba Cloud AgentRun
+    - pai: Alibaba Cloud PAI (Platform for AI)
     - k8s: Kubernetes/ACK
     - local: Local deployment (detached mode)
     - Knative: Knative/ACK Knative
@@ -711,6 +755,426 @@ def agentrun(
         sys.exit(1)
 
 
+@deploy.command()
+@click.argument("source", required=False, default=None)
+@click.option(
+    "--config",
+    "-c",
+    type=click.Path(exists=True),
+    help="Path to deployment config file (.yaml or .yml). "
+    "See pai_deploy_config.yaml for example.",
+)
+@click.option("--name", help="Service name (required)", default=None)
+@click.option(
+    "--workspace-id",
+    help="PAI workspace ID (or PAI_WORKSPACE_ID env var)",
+    default=None,
+)
+@click.option(
+    "--region",
+    help="Region ID (e.g., cn-hangzhou)",
+    default=None,
+)
+@click.option(
+    "--entrypoint",
+    help="Entrypoint file name (default: app.py, agent.py, or main.py)",
+    default=None,
+)
+@click.option(
+    "--oss-path",
+    help="OSS work directory (e.g., oss://bucket/path/)",
+    default=None,
+)
+@click.option(
+    "--instance-type",
+    help="Instance type for public resource (e.g., ecs.c6.large)",
+    default=None,
+)
+@click.option(
+    "--instance-count",
+    help="Number of instances",
+    type=int,
+    default=None,
+)
+@click.option(
+    "--resource-id",
+    help="EAS resource group ID (for resource mode)",
+    default=None,
+)
+@click.option(
+    "--quota-id",
+    help="PAI quota ID (for quota mode)",
+    default=None,
+)
+@click.option("--cpu", help="CPU cores", type=int, default=None)
+@click.option("--memory", help="Memory in MB", type=int, default=None)
+@click.option("--service-group", help="Service group name", default=None)
+@click.option(
+    "--resource-type",
+    type=click.Choice(["public", "resource", "quota"]),
+    help="Resource type: public (instance), resource (EAS group), quota",
+    default=None,
+)
+@click.option(
+    "--vpc-id",
+    help="VPC ID for network configuration",
+    default=None,
+)
+@click.option(
+    "--vswitch-id",
+    help="VSwitch ID for network configuration",
+    default=None,
+)
+@click.option(
+    "--security-group-id",
+    help="Security group ID for network configuration",
+    default=None,
+)
+@click.option("--ram-role-arn", help="RAM role ARN", default=None)
+@click.option(
+    "--enable-trace/--no-trace",
+    help="Enable/disable tracing",
+    default=None,
+)
+@click.option(
+    "--wait/--no-wait",
+    help="Wait for deployment to complete",
+    default=None,
+)
+@click.option(
+    "--timeout",
+    help="Deployment timeout in seconds",
+    type=int,
+    default=None,
+)
+@click.option(
+    "--auto-approve/--no-auto-approve",
+    help="Auto approve the deployment",
+    default=None,
+)
+@click.option(
+    "--env",
+    "-E",
+    multiple=True,
+    help="Environment variable in KEY=VALUE format (can be repeated)",
+)
+@click.option(
+    "--env-file",
+    type=click.Path(exists=True),
+    help="Path to .env file with environment variables",
+)
+@click.option(
+    "--tag",
+    "-T",
+    multiple=True,
+    help="Tag in KEY=VALUE format (can be repeated)",
+)
+def pai(
+    source: str,
+    config: str,
+    name: str,
+    workspace_id: str,
+    region: str,
+    entrypoint: str,
+    oss_path: str,
+    instance_type: str,
+    instance_count: int,
+    resource_id: str,
+    quota_id: str,
+    cpu: int,
+    memory: int,
+    service_group: str,
+    resource_type: str,
+    vpc_id: str,
+    vswitch_id: str,
+    security_group_id: str,
+    ram_role_arn: str,
+    enable_trace: bool,
+    wait: bool,
+    timeout: int,
+    auto_approve: bool,
+    env: tuple,
+    env_file: str,
+    tag: tuple,
+):
+    """
+    Deploy to Alibaba Cloud PAI (Platform for AI).
+
+    \b
+    Usage:
+      # Using config file (recommended)
+      agentscope deploy pai --config pai_deploy_config.yaml
+
+      # Using config file with CLI overrides
+      agentscope deploy pai --config pai_deploy_config.yaml --name new-name
+
+      # Using CLI only
+      agentscope deploy pai ./my_agent --name my-service --workspace-id 12345
+
+    \b
+    Required:
+      - Service name (--name or spec.name in config)
+      - Source directory (SOURCE argument or spec.code.source_dir in config)
+      - Workspace ID (--workspace-id, context.workspace_id, or env)
+
+    \b
+    Environment variables:
+      - ALIBABA_CLOUD_ACCESS_KEY_ID
+      - ALIBABA_CLOUD_ACCESS_KEY_SECRET
+      - PAI_WORKSPACE_ID (optional if --workspace-id provided)
+      - REGION_ID or ALIBABA_CLOUD_REGION_ID (optional)
+    """
+    if not PAI_AVAILABLE:
+        echo_error("PAI deployer is not available")
+        echo_info(
+            "Please install required dependencies via "
+            "pip install 'agentscope-runtime[ext]'",
+        )
+        sys.exit(1)
+
+    try:
+        # Step 1: Build configuration from config file or defaults
+        if config:
+            echo_info(f"Loading configuration from {config}...")
+            deploy_config = PAIDeployConfig.from_yaml(config)
+        else:
+            deploy_config = PAIDeployConfig()
+
+        # Step 2: Parse CLI environment variables and tags
+        cli_env = _parse_environment(env, env_file)
+        cli_tags = _parse_tags(tag)
+
+        # Step 3: Resolve source path
+        resolved_source = None
+        if source:
+            abs_source, source_type = _validate_source(source)
+            if source_type == "file":
+                # For single file: use parent directory as project_dir
+                resolved_source = os.path.dirname(abs_source)
+                if not entrypoint:
+                    entrypoint = os.path.basename(abs_source)
+            else:
+                resolved_source = abs_source
+
+        # Step 4: Merge CLI parameters (CLI takes precedence)
+        deploy_config = deploy_config.merge_cli(
+            source=resolved_source,
+            name=name,
+            entrypoint=entrypoint,
+            workspace_id=workspace_id,
+            region=region,
+            oss_path=oss_path,
+            instance_type=instance_type,
+            instance_count=instance_count,
+            resource_id=resource_id,
+            quota_id=quota_id,
+            cpu=cpu,
+            memory=memory,
+            service_group=service_group,
+            resource_type=resource_type,
+            vpc_id=vpc_id,
+            vswitch_id=vswitch_id,
+            security_group_id=security_group_id,
+            ram_role_arn=ram_role_arn,
+            enable_trace=enable_trace,
+            wait=wait,
+            timeout=timeout,
+            auto_approve=auto_approve,
+            environment=cli_env if cli_env else None,
+            tags=cli_tags if cli_tags else None,
+        )
+
+        # Step 5: Resolve source_dir to absolute path
+        if deploy_config.spec.code.source_dir:
+            source_dir = deploy_config.spec.code.source_dir
+            if not os.path.isabs(source_dir):
+                # If config file provided, resolve relative to config file dir
+                if config:
+                    base_dir = os.path.dirname(os.path.abspath(config))
+                    source_dir = os.path.join(base_dir, source_dir)
+                else:
+                    source_dir = os.path.abspath(source_dir)
+            # Update with resolved path
+            deploy_config.spec.code.source_dir = source_dir
+
+        # Step 6: Find entrypoint if not specified
+        if (
+            deploy_config.spec.code.source_dir
+            and not deploy_config.spec.code.entrypoint
+        ):
+            entry_script = _find_entrypoint(
+                deploy_config.spec.code.source_dir,
+            )
+            deploy_config.spec.code.entrypoint = entry_script
+
+        # Step 7: Validate configuration
+        try:
+            deploy_config.validate_for_deploy()
+        except ValueError as e:
+            echo_error(str(e))
+            sys.exit(1)
+
+        # Step 8: Create deployer
+        # Use resolved OSS work dir (spec.storage -> context.storage fallback)
+        resolved_oss_path = deploy_config.resolve_oss_work_dir()
+        deployer = PAIDeployManager(
+            workspace_id=deploy_config.context.workspace_id,
+            region_id=deploy_config.context.region,
+            oss_path=resolved_oss_path,
+        )
+
+        # Validate workspace_id (may come from env var in deployer)
+        if not deployer.workspace_id:
+            echo_error(
+                "PAI workspace ID is required. Set PAI_WORKSPACE_ID "
+                "environment variable, use --workspace-id, or set "
+                "context.workspace_id in config file.",
+            )
+            sys.exit(1)
+
+        # Step 9: Display deployment info
+        service_name = deploy_config.spec.name
+        resource_type = deploy_config.resolve_resource_type()
+
+        echo_info(f"Service Name: {service_name}")
+        echo_info(f"Workspace ID: {deployer.workspace_id}")
+        echo_info(f"Region: {deployer.region_id}")
+        echo_info(f"Resource Type: {resource_type}")
+        echo_info(f"Source: {deploy_config.spec.code.source_dir}")
+        if deploy_config.spec.code.entrypoint:
+            echo_info(f"Entrypoint: {deploy_config.spec.code.entrypoint}")
+        if deployer.oss_path:
+            echo_info(f"OSS Path: {deployer.oss_path}")
+        if deploy_config.spec.tags:
+            echo_info(f"Tags: {deploy_config.spec.tags}")
+
+        # Step 10: Deploy
+        echo_info(f"Deploying to PAI as service '{service_name}'...")
+
+        deploy_kwargs = deploy_config.to_deployer_kwargs()
+        # Add deploy_method to indicate this is a CLI deployment
+        deploy_kwargs["deploy_method"] = "cli"
+        result = asyncio.run(deployer.deploy(**deploy_kwargs))
+
+        # Step 11: Display results
+        deploy_id = result.get("deploy_id")
+        flow_id = result.get("flow_id")
+        snapshot_id = result.get("snapshot_id")
+        console_url = result.get("url")
+        status = result.get("status")
+
+        echo_success("Deployment created!")
+        echo_info(f"Deployment ID: {deploy_id}")
+        echo_info(f"Project ID: {flow_id}")
+        echo_info(f"Snapshot ID: {snapshot_id}")
+        echo_info(f"Service Name: {service_name}")
+        echo_info(f"Status: {status}")
+        echo_info(f"Deployment Console URL: {console_url}")
+
+        # Step 12: Handle approval flow for auto_approve=False
+        if not deploy_config.auto_approve:
+            # Interactive approval flow
+            echo_info("\n" + "=" * 60)
+            echo_warning(
+                "Deployment created but waiting for approval.",
+            )
+            echo_info(
+                f"View deployment details at:\n  {console_url}",
+            )
+            echo_info("=" * 60)
+
+            # Check if we're in an interactive terminal
+            if sys.stdin.isatty():
+                echo_info("\nWhat would you like to do?")
+                echo_info("  [A]pprove - Approve and start deployment")
+                echo_info("  [C]ancel  - Cancel this deployment")
+                echo_info("  [S]kip    - Skip (approve later in console)")
+
+                choice = click.prompt(
+                    "\nYour choice(case insensitive)",
+                    type=click.Choice(
+                        ["A", "C", "S"],
+                        case_sensitive=False,
+                    ),
+                    default="S",
+                )
+                choice = choice.upper()
+
+                if choice == "A":
+                    echo_info("\nApproving deployment...")
+                    try:
+                        # Wait for deployment to reach approval stage
+                        asyncio.run(
+                            deployer.wait_for_approval_stage(deploy_id),
+                        )
+                        # Approve the deployment
+                        echo_info("Deployment approved by CLI.")
+                        asyncio.run(
+                            deployer.approve_deployment(
+                                deploy_id,
+                                wait=deploy_config.wait,
+                                timeout=deploy_config.timeout,
+                            ),
+                        )
+                        echo_success("Deployment completed!")
+
+                        # Get updated service info
+                        if deploy_config.wait:
+                            service = asyncio.run(
+                                deployer.get_service(service_name),
+                            )
+                            if service and service.internet_endpoint:
+                                echo_info(
+                                    f"Service Endpoint: "
+                                    f"{service.internet_endpoint}",
+                                )
+                            echo_info(
+                                f"\nDeployment is running. Use "
+                                f"'agentscope stop {deploy_id}' to stop it.",
+                            )
+                    except Exception as e:
+                        echo_error(f"Failed to approve deployment: {e}")
+                        sys.exit(1)
+
+                elif choice == "C":
+                    echo_info("\nCancelling deployment...")
+                    try:
+                        asyncio.run(
+                            deployer.wait_for_approval_stage(deploy_id),
+                        )
+                        asyncio.run(deployer.cancel_deployment(deploy_id))
+                        echo_warning("Deployment cancelled.")
+                    except Exception as e:
+                        echo_error(f"Failed to cancel deployment: {e}")
+                        sys.exit(1)
+
+                else:  # choice == "S"
+                    echo_info(
+                        "\nSkipped. Please approve or cancel the deployment "
+                        "in the PAI console.",
+                    )
+            else:
+                # Non-interactive mode
+                echo_warning(
+                    "\nNon-interactive mode: Please approve or cancel the "
+                    "deployment in the PAI console.",
+                )
+
+        elif deploy_config.wait:
+            echo_success("Deployment completed successfully!")
+            echo_info(
+                f"\nDeployment is running. Use 'agentscope stop "
+                f"{deploy_id}' to stop it.",
+            )
+
+    except Exception as e:
+        echo_error(f"Deployment failed: {e}")
+        import traceback
+
+        echo_error(traceback.format_exc())
+        sys.exit(1)
+
+
 @deploy.command()
 @click.argument("source", required=True)
 @click.option("--name", help="Deployment name", default=None)

agentscope_runtime/cli/commands/stop.py

@@ -61,6 +61,22 @@ def _create_deployer(
             )
 
             return AgentRunDeployManager()
+
+        elif platform == "pai":
+            from agentscope_runtime.engine.deployers.pai_deployer import (
+                PAIDeployManager,
+            )
+
+            # Extract workspace_id from deployment config
+            config = deployment_state.get("config", {})
+            workspace_id = config.get("workspace_id")
+            region = config.get("region_id")
+            oss_path = config.get("oss_path")
+            return PAIDeployManager(
+                workspace_id=workspace_id,
+                region_id=region,
+                oss_path=oss_path,
+            )
         else:
             echo_warning(f"Unknown platform: {platform}")
             return None

agentscope_runtime/common/container_clients/__init__.py

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+import sys
+from typing import TYPE_CHECKING
+
+from ..utils.lazy_loader import install_lazy_loader
+
+if TYPE_CHECKING:
+    from .docker_client import DockerClient
+    from .kubernetes_client import KubernetesClient
+    from .knative_client import KnativeClient
+    from .fc_client import FCClient
+    from .agentrun_client import AgentRunClient
+    from .gvisor_client import GVisorDockerClient
+    from .boxlite_client import BoxliteClient
+
+install_lazy_loader(
+    globals(),
+    {
+        "DockerClient": ".docker_client",
+        "KubernetesClient": ".kubernetes_client",
+        "KnativeClient": ".knative_client",
+        "FCClient": ".fc_client",
+        "AgentRunClient": ".agentrun_client",
+        "GVisorDockerClient": ".gvisor_client",
+        "BoxliteClient": ".boxlite_client",
+    },
+)
+
+
+class ContainerClientFactory:
+    _CLIENT_MAPPING = {
+        "docker": "DockerClient",
+        "k8s": "KubernetesClient",
+        "knative": "KnativeClient",
+        "fc": "FCClient",
+        "agentrun": "AgentRunClient",
+        "gvisor": "GVisorDockerClient",
+        "boxlite": "BoxliteClient",
+    }
+
+    @classmethod
+    def create_client(cls, deployment_type, config):
+        try:
+            class_name = cls._CLIENT_MAPPING[deployment_type]
+        except KeyError as e:
+            raise NotImplementedError(
+                f"Container deployment '{deployment_type}' not implemented",
+            ) from e
+
+        module = sys.modules[__name__]
+        client_class = getattr(module, class_name)
+        return client_class(config=config)

agentscope_runtime/common/container_clients/agentrun_client.py

@@ -1078,13 +1078,15 @@ class AgentRunClient(BaseClient):
         """
         replacement_map = {
             "agentscope/runtime-sandbox-base": "serverless-registry.cn-hangzhou.cr.aliyuncs.com/functionai"  # noqa: E501
-            "/agentscope_runtime-sandbox-base:20251027",
+            "/agentscope_runtime-sandbox-base:20260106",
             "agentscope/runtime-sandbox-browser": "serverless-registry.cn-hangzhou.cr.aliyuncs.com/functionai"  # noqa: E501
-            "/agentscope_runtime-sandbox-browser:20251027",
+            "/agentscope_runtime-sandbox-browser:20260106",
             "agentscope/runtime-sandbox-filesystem": "serverless-registry.cn-hangzhou.cr.aliyuncs.com/functionai"  # noqa: E501
-            "/agentscope_runtime-sandbox-filesystem:20251027",
+            "/agentscope_runtime-sandbox-filesystem:20260106",
             "agentscope/runtime-sandbox-gui": "serverless-registry.cn-hangzhou.cr.aliyuncs.com/functionai"  # noqa: E501
-            "/agentscope_runtime-sandbox-gui:20251027",
+            "/agentscope_runtime-sandbox-gui:20260106",
+            "agentscope/runtime-sandbox-mobile": "serverless-registry.cn-hangzhou.cr.aliyuncs.com/functionai"  # noqa: E501
+            "/agentscope_runtime-sandbox-mobile:20251217",
         }
 
         if ":" in image: