agentscope-runtime 0.1.5b1__py3-none-any.whl → 0.1.5b2__py3-none-any.whl

agentscope_runtime/engine/deployers/cli_fc_deploy.py

@@ -60,6 +60,19 @@ def _parse_args() -> argparse.Namespace:
         default=None,
         help="Custom directory for temporary build artifacts (optional)",
     )
+    parser.add_argument(
+        "--update",
+        dest="agent_id",
+        default=None,
+        help="Update an existing agent. "
+        "Specify agent_id to update a particular agent (optional)",
+    )
+    parser.add_argument(
+        "--desc",
+        dest="agent_desc",
+        default=None,
+        help="Add description to current agent(optional)",
+    )
     return parser.parse_args()
 
 
@@ -72,6 +85,8 @@ async def _run(
     build_root: Optional[str],
     mode: str,
     whl_path: Optional[str],
+    agent_id: Optional[str],
+    agent_desc: Optional[str],
 ):
     deployer = ModelstudioDeployManager(build_root=build_root)
     # If a wheel path is provided, skip local build entirely
@@ -83,6 +98,8 @@ async def _run(
             skip_upload=skip_upload,
             telemetry_enabled=telemetry_enabled,
             external_whl_path=whl_path,
+            agent_id=agent_id,
+            agent_desc=agent_desc,
         )
 
     if mode == "native":
@@ -96,20 +113,25 @@ async def _run(
             skip_upload=skip_upload,
             telemetry_enabled=telemetry_enabled,
             external_whl_path=str(built_whl),
+            agent_id=agent_id,
+            agent_desc=agent_desc,
         )
 
     # wrapper mode (default): require dir and cmd
-    if not dir_path or not cmd:
-        raise SystemExit(
-            "In wrapper mode, --dir and --cmd are required. Alternatively "
-            "use --mode native or --whl-path.",
-        )
+    if not agent_id:
+        if not dir_path or not cmd:
+            raise SystemExit(
+                "In wrapper mode, --dir and --cmd are required. Alternatively "
+                "use --mode native or --whl-path.",
+            )
     return await deployer.deploy(
         project_dir=dir_path,
         cmd=cmd,
         deploy_name=deploy_name,
         skip_upload=skip_upload,
         telemetry_enabled=telemetry_enabled,
+        agent_id=agent_id,
+        agent_desc=agent_desc,
     )
 
 
@@ -126,17 +148,36 @@ def main() -> None:
             build_root=args.build_root,
             mode=args.mode,
             whl_path=args.whl_path,
+            agent_id=args.agent_id,
+            agent_desc=args.agent_desc,
         ),
     )
     print("Built wheel at:", result.get("wheel_path", ""))
     if result.get("artifact_url"):
         print("Artifact URL:", result.get("artifact_url"))
-    print("Deploy ID:", result.get("deploy_id"))
     print("Resource Name:", result.get("resource_name"))
     if result.get("workspace_id"):
         print("Workspace:", result.get("workspace_id"))
-    if result.get("url"):
-        print("Console Url:", result.get("url"))
+
+    console_url = result.get("url")
+    deploy_id = result.get("deploy_id")
+    if console_url and deploy_id:
+        title = "Deploy Result"
+        console_url_str = f"Console URL: {console_url}"
+        deploy_id_str = f"Deploy ID: {deploy_id}"
+        url_len = len(console_url_str)
+        box_width = max(url_len, len(title), 20)
+
+        # print title
+        print("")
+        print(title.center(box_width + 4))
+
+        # print content
+        print("┏" + "━" * (box_width + 2) + "┓")
+        print(f"┃ {console_url_str.ljust(box_width)} ┃")
+        print(f"┃ {deploy_id_str.ljust(box_width)} ┃")
+        print("┗" + "━" * (box_width + 2) + "┛")
+        print("")
 
 
 if __name__ == "__main__":  # pragma: no cover

agentscope_runtime/engine/deployers/modelstudio_deployer.py

@@ -163,7 +163,24 @@ async def _oss_create_bucket_if_not_exists(client, bucket_name: str) -> None:
                 storage_class="IA",
             ),
         )
-        client.put_bucket(req)
+        try:
+            put_bucket_result = client.put_bucket(req)
+            logger.info(
+                f"put bucket status code: {put_bucket_result.status_code},"
+                f" request id: {put_bucket_result.request_id}",
+            )
+        except oss.exceptions.OperationError as e:
+            logger.error(
+                "OSS PutBucket failed: Http Status: %s, ErrorCode: %s, RequestId: %s, Message: %s",
+                getattr(e, "http_code", None),
+                getattr(e, "error_code", None),
+                getattr(e, "request_id", None),
+                getattr(e, "message", str(e)),
+            )
+            raise
+        except Exception as e:
+            logger.error("Unexpected put bucket failure: %s", e, exc_info=True)
+            raise
         result = client.put_bucket_tags(
             oss.PutBucketTagsRequest(
                 bucket=bucket_name,
@@ -220,6 +237,8 @@ async def _modelstudio_deploy(
     file_url: str,
     filename: str,
     deploy_name: str,
+    agent_id: Optional[str] = None,
+    agent_desc: Optional[str] = None,
     telemetry_enabled: bool = True,
 ) -> str:
     cfg.ensure_valid()
@@ -230,6 +249,8 @@ async def _modelstudio_deploy(
     config.endpoint = cfg.endpoint
     client_modelstudio = ModelstudioClient(config)
     req = ModelstudioTypes.HighCodeDeployRequest(
+        agent_desc=agent_desc,
+        agent_id=agent_id,
         source_code_name=filename,
         source_code_oss_url=file_url,
         agent_name=deploy_name,
@@ -244,6 +265,10 @@ async def _modelstudio_deploy(
         runtime,
     )
 
+    # logger.info(json.dumps(resp.to_map(), indent=2, ensure_ascii=False))
+    request_id = resp.to_map()["headers"].get("x-acs-request-id")
+    logger.info("deploy request id: %s", request_id)
+
     # Extract deploy identifier string from response
     def _extract_deploy_identifier(response_obj) -> str:
         try:
@@ -473,14 +498,17 @@ class ModelstudioDeployManager(DeployManager):
         self,
         wheel_path: Path,
         name: str,
+        agent_id: Optional[str] = None,
+        agent_desc: Optional[str] = None,
         telemetry_enabled: bool = True,
-    ) -> Tuple[str, str]:
+    ) -> Tuple[str, str, str]:
         logger.info("Uploading wheel to OSS and generating presigned URL")
         client = _oss_get_client(self.oss_config)
-        bucket_name = (
-            f"tmp-bucket-for-code-deployment-"
-            f"{os.getenv('MODELSTUDIO_WORKSPACE_ID', str(uuid.uuid4()))}"
-        )
+
+        bucket_suffix = (
+            os.getenv("MODELSTUDIO_WORKSPACE_ID", str(uuid.uuid4()))
+        ).lower()
+        bucket_name = (f"tmp-code-deploy-" f"{bucket_suffix}")[:63]
         await _oss_create_bucket_if_not_exists(client, bucket_name)
         filename = wheel_path.name
         with wheel_path.open("rb") as f:
@@ -494,6 +522,8 @@ class ModelstudioDeployManager(DeployManager):
 
         logger.info("Triggering Modelstudio Full-Code deploy for %s", name)
         deploy_identifier = await _modelstudio_deploy(
+            agent_desc=agent_desc,
+            agent_id=agent_id,
             cfg=self.modelstudio_config,
             file_url=artifact_url,
             filename=filename,
@@ -501,25 +531,24 @@ class ModelstudioDeployManager(DeployManager):
             telemetry_enabled=telemetry_enabled,
         )
 
-        def _build_console_url(endpoint: str, identifier: str) -> str:
+        def _build_console_url(endpoint: str) -> str:
             # Map API endpoint to console domain (no fragment in base)
             base = (
-                "https://pre-bailian.console.aliyun.com/?tab=app&efm_v=3.4.108#"
+                "https://pre-bailian.console.aliyun.com/?tab=app#"
                 if ("bailian-pre" in endpoint or "pre" in endpoint)
-                else "https://bailian.console.aliyun.com/?tab=app"
+                else "https://bailian.console.aliyun.com/?tab=app#"
             )
             # Optional query can be appended if needed; keep path clean
-            return f"{base}/app-center/high-code-detail/{identifier}"
+            return f"{base}/app-center"
 
         console_url = (
             _build_console_url(
                 self.modelstudio_config.endpoint,
-                deploy_identifier,
             )
             if deploy_identifier
             else ""
         )
-        return artifact_url, console_url
+        return artifact_url, console_url, deploy_identifier
 
     async def deploy(
         self,
@@ -538,6 +567,8 @@ class ModelstudioDeployManager(DeployManager):
         skip_upload: bool = False,
         telemetry_enabled: bool = True,
         external_whl_path: Optional[str] = None,
+        agent_id: Optional[str] = None,
+        agent_desc: Optional[str] = None,
         **kwargs,
     ) -> Dict[str, str]:
         """
@@ -546,8 +577,9 @@ class ModelstudioDeployManager(DeployManager):
         Returns a dict containing deploy_id, wheel_path, artifact_url (if uploaded),
         resource_name (deploy_name), and workspace_id.
         """
-        if not runner and not project_dir and not external_whl_path:
-            raise ValueError("")
+        if not agent_id:
+            if not runner and not project_dir and not external_whl_path:
+                raise ValueError("")
 
         # convert services_config to Model body
         if services_config and isinstance(services_config, dict):
@@ -567,10 +599,18 @@ class ModelstudioDeployManager(DeployManager):
                     extra_packages=extra_packages,
                     **kwargs,
                 )
-                self._generate_env_file(project_dir, environment)
+                if project_dir:
+                    self._generate_env_file(project_dir, environment)
                 cmd = "python main.py"
                 deploy_name = deploy_name or default_deploy_name()
 
+            if agent_id:
+                if not external_whl_path:
+                    raise FileNotFoundError(
+                        "wheel file not found. "
+                        "Please specify your .whl file path by "
+                        "'--whl-path <whlpath>' in command line.",
+                    )
             # if whl exists then skip the project package method
             if external_whl_path:
                 wheel_path = Path(external_whl_path).resolve()
@@ -579,6 +619,9 @@ class ModelstudioDeployManager(DeployManager):
                         f"External wheel file not found: {wheel_path}",
                     )
                 name = deploy_name or default_deploy_name()
+                # 如果是更新agent，且没有传deploy_name, 则不更新名字
+                if agent_id and (deploy_name is None):
+                    name = None
             else:
                 (
                     wheel_path,
@@ -592,25 +635,33 @@ class ModelstudioDeployManager(DeployManager):
 
             artifact_url = ""
             console_url = ""
+            deploy_identifier = ""
             if not skip_upload:
                 # Only require cloud SDKs and credentials when performing upload/deploy
                 _assert_cloud_sdks_available()
                 self.oss_config.ensure_valid()
                 self.modelstudio_config.ensure_valid()
-                artifact_url, console_url = await self._upload_and_deploy(
+                (
+                    artifact_url,
+                    console_url,
+                    deploy_identifier,
+                ) = await self._upload_and_deploy(
                     wheel_path,
                     name,
+                    agent_id,
+                    agent_desc,
                     telemetry_enabled,
                 )
 
             result: Dict[str, str] = {
-                "deploy_id": self.deploy_id,
                 "wheel_path": str(wheel_path),
                 "artifact_url": artifact_url,
                 "resource_name": name,
                 "workspace_id": self.modelstudio_config.workspace_id or "",
                 "url": console_url,
             }
+            if deploy_identifier:
+                result["deploy_id"] = deploy_identifier
 
             return result
         except Exception as e:

agentscope_runtime/engine/deployers/utils/docker_image_utils/docker_image_builder.py

@@ -103,12 +103,12 @@ class DockerImageBuilder:
         """
         if not os.path.exists(build_context):
             raise ValueError(f"Build context does not exist: {build_context}")
-
         config = config or BuildConfig()
         full_image_name = self.get_full_name(image_name, image_tag)
 
-        if not source_updated:
-            return full_image_name
+        # if not source_updated:
+        #     return full_image_name
+        logger.info(f"Source Updated: {source_updated}")
 
         # Prepare docker build command
         build_cmd = ["docker", "build", "-t", full_image_name]

agentscope_runtime/version.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.1.5b1"
+__version__ = "0.1.5b2"

{agentscope_runtime-0.1.5b1.dist-info → agentscope_runtime-0.1.5b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentscope-runtime
-Version: 0.1.5b1
+Version: 0.1.5b2
 Summary: A production-ready runtime framework for agent applications, providing secure sandboxed execution environments and scalable deployment solutions with multi-framework support.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{agentscope_runtime-0.1.5b1.dist-info → agentscope_runtime-0.1.5b2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 agentscope_runtime/__init__.py,sha256=LMAUeUpPo2qzqh3zyZ-JJwc8GrsiT9b-yNhQMxlKmfE,84
-agentscope_runtime/version.py,sha256=s0Y-9zvwHSKPwjich8s41VYb5Y6YcyGmgr3eejmfgHA,48
+agentscope_runtime/version.py,sha256=NQ_vS5I0r9KI9SQUzpGoV5TujO2B5Vk0kBgezNLFI2o,48
 agentscope_runtime/engine/__init__.py,sha256=jsvYM1LlZVP4EFzsE5uu5ycgBU9CVnug7UyTzBmpX5g,213
 agentscope_runtime/engine/runner.py,sha256=tlmE7ev4w6MxC1iTlJQT61EQsNrbWKlmvnZVRKxd_JY,7948
 agentscope_runtime/engine/agents/__init__.py,sha256=xHp7FY6QM-nAhQAECi7xzrJkRkYZpAa5_zHRhO6Zogc,54
@@ -13,10 +13,10 @@ agentscope_runtime/engine/agents/agentscope_agent/agent.py,sha256=73x_KQCE7GjS5m
 agentscope_runtime/engine/agents/agentscope_agent/hooks.py,sha256=iqx-TOQLXUQlQHc2cKjsDfgjO9UWw00AeS3wTymkfYE,5984
 agentscope_runtime/engine/deployers/__init__.py,sha256=l6AVY1bFpsraNbdf7H-djukEfm7Wz63xka_xj3s6H48,362
 agentscope_runtime/engine/deployers/base.py,sha256=0bb3zQiVE1jTMG0NCsjhcSeP7lhnbn1KPQRx1H5hues,494
-agentscope_runtime/engine/deployers/cli_fc_deploy.py,sha256=PO3afMHvr1o0ILT5ldFSzghEucJSOCESF26sjLbOPCs,4310
+agentscope_runtime/engine/deployers/cli_fc_deploy.py,sha256=Pny04BVzkpTS-klBIaB331R1ReP49U7S77zuECUR2go,5612
 agentscope_runtime/engine/deployers/kubernetes_deployer.py,sha256=G6eVeEqhKzBjU4BjNtZcUTaUOWfukaCkms_FCDJ7dz8,9286
 agentscope_runtime/engine/deployers/local_deployer.py,sha256=wJ0wPkQBUJ8ttjpYRBzNzymP00ZDTaNL16k8tuoT9Ho,14911
-agentscope_runtime/engine/deployers/modelstudio_deployer.py,sha256=zBWoAme-x3sGsvbh0IjiwL81F1eE9UeyGQJoY3KqFP4,23106
+agentscope_runtime/engine/deployers/modelstudio_deployer.py,sha256=HUnujS_y1B9k_kXlenc6GsvlfLIkrmv23vTQU5V65YY,25161
 agentscope_runtime/engine/deployers/adapter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentscope_runtime/engine/deployers/adapter/protocol_adapter.py,sha256=OpLfBWiFY_xC0uG53UYSeQuUnw7vZzvNnm5w6QFr9_w,737
 agentscope_runtime/engine/deployers/adapter/a2a/__init__.py,sha256=3D6TxH-seVfR7_SqYttNSkGkZv3o_TS9R5XqUkVxed4,83
@@ -32,7 +32,7 @@ agentscope_runtime/engine/deployers/utils/deployment_modes.py,sha256=vr2UzA1bzAA
 agentscope_runtime/engine/deployers/utils/package_project_utils.py,sha256=e43hDzLxzPnSJE5PLe5GGDq6iqL-3gvwGArsOgpoOPg,38304
 agentscope_runtime/engine/deployers/utils/wheel_packager.py,sha256=zuhgMlfInn9kWd4AsZuOnVXGHOQp9g-BGm4fl_-gMQo,11825
 agentscope_runtime/engine/deployers/utils/docker_image_utils/__init__.py,sha256=8y1N1N7VJduS4YdLL9EN1okB5DFOyvIiuHa9HQqm_RU,248
-agentscope_runtime/engine/deployers/utils/docker_image_utils/docker_image_builder.py,sha256=Q9RhzzMW8u_-U4v3CpIqm9VIymfi7riwGxUXS94TzRw,13483
+agentscope_runtime/engine/deployers/utils/docker_image_utils/docker_image_builder.py,sha256=KCH_AtyaYPCAwnFjjyVlS1GgtOt-V1y0mvDDKLvBZFI,13543
 agentscope_runtime/engine/deployers/utils/docker_image_utils/dockerfile_generator.py,sha256=YfO_S-G8pYZ_E6XKHnCc3fmnU9V-ec0bCpvuYCpy2i8,7520
 agentscope_runtime/engine/deployers/utils/docker_image_utils/runner_image_factory.py,sha256=wWbk-a36fRY0oQq8ssWDk6DfFhTsA3bardR6LRsNMWU,10093
 agentscope_runtime/engine/deployers/utils/service_utils/__init__.py,sha256=KaCyUxNXHOSViZi50Ytz7YtS5XJ8jo3YcEmAqjdmw6Q,261
@@ -159,9 +159,9 @@ agentscope_runtime/sandbox/tools/browser/__init__.py,sha256=gXQx3tXclYqAhPDrXb1-
 agentscope_runtime/sandbox/tools/browser/tool.py,sha256=EJ-uhHX9oIb4Q-hXQhTS-7VRJ-AdCRWXb9HVdOQ5JAc,19206
 agentscope_runtime/sandbox/tools/filesystem/__init__.py,sha256=AJK88YU0ceJe99H7T-on2tgaow4ujqGJ1jwv0sd1TtE,607
 agentscope_runtime/sandbox/tools/filesystem/tool.py,sha256=CPsl4TMf76BOSQtG1dqDcVdymciKhMknIG5FffoI2Eg,9847
-agentscope_runtime-0.1.5b1.dist-info/licenses/LICENSE,sha256=3MckDTgiTJ0E6cxo8FeamFVEFiwz3XJWsriuTtRJzxY,11337
-agentscope_runtime-0.1.5b1.dist-info/METADATA,sha256=iotFHdqJGgheG1OSrddndrXMX4HGpchFR-c9hUPPHm8,21982
-agentscope_runtime-0.1.5b1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agentscope_runtime-0.1.5b1.dist-info/entry_points.txt,sha256=K8Tb95DEHzRW3AxsZAXghmqeDcPpO7n7rNmU5glfmaU,298
-agentscope_runtime-0.1.5b1.dist-info/top_level.txt,sha256=0YHketA7WcMmRmF-3lUzedeTOnP7iL77h-ekb-iG720,19
-agentscope_runtime-0.1.5b1.dist-info/RECORD,,
+agentscope_runtime-0.1.5b2.dist-info/licenses/LICENSE,sha256=3MckDTgiTJ0E6cxo8FeamFVEFiwz3XJWsriuTtRJzxY,11337
+agentscope_runtime-0.1.5b2.dist-info/METADATA,sha256=VLmlFF2I8-LoknaPvYir2wqvPmTlT2peR2bOncTEyf4,21982
+agentscope_runtime-0.1.5b2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agentscope_runtime-0.1.5b2.dist-info/entry_points.txt,sha256=K8Tb95DEHzRW3AxsZAXghmqeDcPpO7n7rNmU5glfmaU,298
+agentscope_runtime-0.1.5b2.dist-info/top_level.txt,sha256=0YHketA7WcMmRmF-3lUzedeTOnP7iL77h-ekb-iG720,19
+agentscope_runtime-0.1.5b2.dist-info/RECORD,,