agentkit-sdk-python 0.2.0__tar.gz → 0.2.2__tar.gz

{agentkit_sdk_python-0.2.0/agentkit_sdk_python.egg-info → agentkit_sdk_python-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentkit-sdk-python
-Version: 0.2.0
+Version: 0.2.2
 Summary: Python SDK for transforming any AI agent into a production-ready application. Framework-agnostic primitives for runtime, memory, authentication, and tools with volcengine-managed infrastructure.
 Author-email: Xiangrui Cheng <innsdcc@gmail.com>, Yumeng Bao <baoyumeng.123@gmail.com>, Yaozheng Fang <fangyozheng@gmail.com>, Guodong Li <cu.eric.lee@gmail.com>
 License:                                  Apache License

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/apps/agent_server_app/agent_server_app.py

@@ -102,11 +102,7 @@ class AgentkitAgentServerApp(BaseAgentkitApp):
             user_id = (
                 headers.get("user_id") or headers.get("x-user-id") or "agentkit_user"
             )
-            session_id = (
-                headers.get("session_id")
-                or headers.get("x-session-id")
-                or "agentkit_sample_session"
-            )
+            session_id = headers.get("session_id") or ""
 
             # Determine app_name from loader
             app_names = self.server.agent_loader.list_agents()

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/apps/agent_server_app/middleware.py

@@ -43,8 +43,8 @@ class AgentkitTelemetryHTTPMiddleware:
         }
 
         # Currently unable to retrieve user_id and session_id from headers; keep logic for future use
-        user_id = headers.get("user_id") or headers.get("x-user-id") or ""
-        session_id = headers.get("session_id") or headers.get("x-session-id") or ""
+        user_id = headers.get("user_id")
+        session_id = headers.get("session_id")
         headers["user_id"] = user_id
         headers["session_id"] = session_id
         telemetry.trace_agent_server(

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/apps/agent_server_app/telemetry.py

@@ -72,10 +72,10 @@ class Telemetry:
             value=safe_serialize_to_json_string(headers),
         )
 
-        session_id = headers.get("session_id") or headers.get("x-session-id") or ""
+        session_id = headers.get("session_id")
         if session_id:
             span.set_attribute(key="gen_ai.session.id", value=session_id)
-        user_id = headers.get("user_id") or headers.get("x-user-id") or ""
+        user_id = headers.get("user_id")
         if user_id:
             span.set_attribute(key="gen_ai.user.id", value=user_id)
 

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/client/base_service_client.py

@@ -26,7 +26,10 @@ from volcengine.base.Service import Service
 from volcengine.Credentials import Credentials
 from volcengine.ServiceInfo import ServiceInfo
 
-from agentkit.utils.ve_sign import get_volc_ak_sk_region
+from agentkit.utils.ve_sign import (
+    get_volc_ak_sk_region,
+    ensure_x_custom_source_header,
+)
 
 T = TypeVar("T")
 
@@ -73,7 +76,7 @@ class BaseServiceClient(Service):
         session_token: str = "",
         service_name: str = "",
         credential_env_prefix: str = "",
-        header: Optional[Dict[str, Any]] = {"Accept": "application/json"},
+        header: Optional[Dict[str, Any]] = None,
     ) -> None:
         """
         Initialize the service client.
@@ -105,6 +108,15 @@ class BaseServiceClient(Service):
         self.session_token = session_token
         self.service_name = service_name
 
+        if header is None:
+            effective_header: Dict[str, Any] = {"Accept": "application/json"}
+        else:
+            effective_header = header.copy()
+            if "Accept" not in effective_header:
+                effective_header = {"Accept": "application/json", **effective_header}
+
+        effective_header = ensure_x_custom_source_header(effective_header)
+
         # Get service-specific configuration from subclass
         config = self._get_service_config()
         self.host = config["host"]
@@ -115,7 +127,7 @@ class BaseServiceClient(Service):
         # Create ServiceInfo
         self.service_info = ServiceInfo(
             host=self.host,
-            header=header,
+            header=effective_header,
             credentials=Credentials(
                 ak=self.access_key,
                 sk=self.secret_key,

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/toolkit/builders/local_docker.py

@@ -25,6 +25,7 @@ from dataclasses import dataclass, field
 from datetime import datetime
 from agentkit.toolkit.config import CommonConfig
 from agentkit.toolkit.config.dataclass_utils import AutoSerializableMixin
+from agentkit.toolkit.docker.utils import create_dockerignore_file
 from agentkit.toolkit.models import BuildResult, ImageInfo
 from agentkit.toolkit.reporter import Reporter
 from agentkit.toolkit.errors import ErrorCode
@@ -334,9 +335,7 @@ class LocalDockerBuilder(Builder):
                 force_regenerate=force_regenerate,
             )
 
-            dockerignore_path = self.workdir / ".dockerignore"
-            if not dockerignore_path.exists():
-                renderer.create_dockerignore(str(dockerignore_path))
+            create_dockerignore_file(str(self.workdir))
             image_name = f"{docker_config.image_name or 'agentkit-app'}"
             image_tag = f"{docker_config.image_tag or 'latest'}"
 

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/toolkit/builders/ve_pipeline.py

@@ -32,7 +32,11 @@ from agentkit.toolkit.config.dataclass_utils import AutoSerializableMixin
 from agentkit.toolkit.models import BuildResult, ImageInfo
 from agentkit.toolkit.reporter import Reporter
 from agentkit.toolkit.errors import ErrorCode
-from agentkit.utils.misc import generate_random_id, calculate_nonlinear_progress
+from agentkit.utils.misc import (
+    generate_random_id,
+    calculate_nonlinear_progress,
+    retry,
+)
 from agentkit.toolkit.volcengine.services import CRServiceConfig
 from .base import Builder
 
@@ -1303,11 +1307,12 @@ class VeCPCRBuilder(Builder):
 
                 while True:
                     try:
-                        # Get pipeline run status
-                        status = cp_client.get_pipeline_run_status(
-                            workspace_id=workspace_id,
-                            pipeline_id=pipeline_id,
-                            run_id=run_id,
+                        status = retry(
+                            lambda: cp_client.get_pipeline_run_status(
+                                workspace_id=workspace_id,
+                                pipeline_id=pipeline_id,
+                                run_id=run_id,
+                            )
                         )
 
                         # Update progress description

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/toolkit/cli/cli.py

@@ -14,6 +14,8 @@
 
 """AgentKit CLI - Main entry point for AgentKit Starter Toolkit."""
 
+import os
+
 import typer
 from rich.panel import Panel
 from rich.console import Console
@@ -77,6 +79,7 @@ def main(
     ),
 ):
     """AgentKit CLI - Deploy AI agents with ease."""
+    os.environ.setdefault("AGENTKIT_CLIENT_TYPE", "cli")
     # If no subcommand is provided, show logo
     if ctx.invoked_subcommand is None:
         show_logo()

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/toolkit/config/config.py

@@ -297,7 +297,13 @@ class AgentkitConfigManager:
         """Save configuration file"""
         os.makedirs(self.config_path.parent, exist_ok=True)
         with open(self.config_path, "w", encoding="utf-8") as f:
-            yaml.dump(self._data, f, default_flow_style=False, sort_keys=False)
+            yaml.dump(
+                self._data,
+                f,
+                default_flow_style=False,
+                sort_keys=False,
+                allow_unicode=True,
+            )
 
     def get_common_config(self) -> CommonConfig:
         """Get common configuration"""

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/toolkit/config/dataclass_utils.py

@@ -21,6 +21,40 @@ logger = logging.getLogger(__name__)
 
 T = TypeVar("T")
 
+SENSITIVE_FIELDS = {
+    "runtime_envs",
+    "runtime_apikey_name",
+    "runtime_apikey",
+    "runtime_jwt_discovery_url",
+    "runtime_jwt_allowed_clients",
+}
+
+
+def _get_safe_value(field_name: str, value: Any) -> Any:
+    if field_name in SENSITIVE_FIELDS:
+        return "******"
+    return value
+
+
+def _sanitize_dict(data: Dict[str, Any]) -> Dict[str, Any]:
+    """Sanitize sensitive fields in a dictionary."""
+    if not isinstance(data, dict):
+        return data
+    return {k: _get_safe_value(k, v) for k, v in data.items()}
+
+
+def _sanitize_diff(diff: Dict[str, Any]) -> Dict[str, Any]:
+    """Sanitize sensitive fields in a diff dictionary."""
+    if not isinstance(diff, dict):
+        return diff
+    sanitized = {}
+    for k, v in diff.items():
+        if k in SENSITIVE_FIELDS:
+            sanitized[k] = ("******", "******")
+        else:
+            sanitized[k] = v
+    return sanitized
+
 
 class DataclassSerializer:
     @staticmethod
@@ -50,7 +84,7 @@ class DataclassSerializer:
                 logger.debug(
                     "[DataclassSerializer] source=local field=%s value=%r",
                     field_name,
-                    kwargs[field_name],
+                    _get_safe_value(field_name, kwargs[field_name]),
                 )
             else:
                 # Try aliases (backward compatibility)
@@ -65,7 +99,7 @@ class DataclassSerializer:
                             "[DataclassSerializer] source=alias(%s) -> local field=%s value=%r",
                             alias,
                             field_name,
-                            kwargs[field_name],
+                            _get_safe_value(field_name, kwargs[field_name]),
                         )
                         break
 
@@ -77,7 +111,7 @@ class DataclassSerializer:
                         logger.debug(
                             "[DataclassSerializer] source=default_factory field=%s value=%r",
                             field_name,
-                            kwargs[field_name],
+                            _get_safe_value(field_name, kwargs[field_name]),
                         )
                     elif field.default is not MISSING:
                         kwargs[field_name] = field.default
@@ -85,7 +119,7 @@ class DataclassSerializer:
                         logger.debug(
                             "[DataclassSerializer] source=default field=%s value=%r",
                             field_name,
-                            kwargs[field_name],
+                            _get_safe_value(field_name, kwargs[field_name]),
                         )
                     else:
                         kwargs[field_name] = None
@@ -157,7 +191,11 @@ class AutoSerializableMixin:
             from .global_config import apply_global_config_defaults
 
             before = instance.to_dict()
-            logger.debug("from_dict: before globals for %s -> %r", cls.__name__, before)
+            logger.debug(
+                "from_dict: before globals for %s -> %r",
+                cls.__name__,
+                _sanitize_dict(before),
+            )
             instance = apply_global_config_defaults(instance, data)
             after = instance.to_dict()
             if before != after:
@@ -169,7 +207,7 @@ class AutoSerializableMixin:
                 logger.debug(
                     "from_dict: applied global defaults for %s; changes=%r",
                     cls.__name__,
-                    diff,
+                    _sanitize_diff(diff),
                 )
             else:
                 logger.debug(
@@ -254,7 +292,7 @@ class AutoSerializableMixin:
                         "[%s] [template] start field render check: name=%s, value=%r, has_placeholders=%s",
                         cfg_name,
                         field_info.name,
-                        field_value,
+                        _get_safe_value(field_info.name, field_value),
                         (
                             isinstance(field_value, str)
                             and ("{{" in field_value and "}}" in field_value)
@@ -269,7 +307,7 @@ class AutoSerializableMixin:
                                 "[%s] [template] field %s is Auto/empty -> using default_template=%r",
                                 cfg_name,
                                 field_info.name,
-                                default_template,
+                                _get_safe_value(field_info.name, default_template),
                             )
                             field_value = default_template
                             self._template_originals[field_info.name] = default_template
@@ -300,17 +338,20 @@ class AutoSerializableMixin:
                                     "[%s] [template] save original template for %s: %r",
                                     cfg_name,
                                     field_info.name,
-                                    field_value,
+                                    _get_safe_value(field_info.name, field_value),
                                 )
 
                         try:
-                            rendered = render_template(field_value)
+                            is_sensitive = field_info.name in SENSITIVE_FIELDS
+                            rendered = render_template(
+                                field_value, sensitive=is_sensitive
+                            )
                             logger.debug(
                                 "[%s] [template] rendered field %s: %r -> %r",
                                 cfg_name,
                                 field_info.name,
-                                field_value,
-                                rendered,
+                                _get_safe_value(field_info.name, field_value),
+                                _get_safe_value(field_info.name, rendered),
                             )
                             # Fail if unresolved placeholders remain
                             if "{{" in str(rendered) and "}}" in str(rendered):
@@ -356,7 +397,9 @@ class AutoSerializableMixin:
                         "[%s] [template] field %s is not marked for rendering, value: %r",
                         cfg_name,
                         field_info.name,
-                        getattr(self, field_info.name),
+                        _get_safe_value(
+                            field_info.name, getattr(self, field_info.name)
+                        ),
                     )
         except ImportError:
             # If template utils are not available, no-op

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/toolkit/docker/container.py

@@ -19,6 +19,8 @@ import logging
 import docker
 from docker.errors import DockerException, ImageNotFound
 
+from agentkit.toolkit.docker.utils import create_dockerignore_file
+
 logger = logging.getLogger(__name__)
 
 
@@ -84,10 +86,8 @@ class DockerfileRenderer:
 
             # Create .dockerignore file if requested
             if create_dockerignore:
-                dockerignore_path = os.path.join(
-                    output_dir or os.path.dirname(output_path), ".dockerignore"
-                )
-                self.create_dockerignore(dockerignore_path, dockerignore_entries)
+                target_dir = output_dir or os.path.dirname(output_path)
+                create_dockerignore_file(target_dir, dockerignore_entries)
 
             return rendered_content
 
@@ -106,6 +106,8 @@ class DockerfileRenderer:
         """
         Create .dockerignore file with default and additional entries.
 
+        Deprecated: Use agentkit.toolkit.docker.utils.create_dockerignore_file instead.
+
         Args:
             dockerignore_path: Path to .dockerignore file
             additional_entries: Additional entries to add to .dockerignore
@@ -113,62 +115,8 @@ class DockerfileRenderer:
         Raises:
             IOError: When file write fails
         """
-        try:
-            # Check if .dockerignore already exists
-            if os.path.exists(dockerignore_path):
-                logger.info(
-                    f".dockerignore already exists at: {dockerignore_path}, skipping creation"
-                )
-                return
-
-            # Default entries to exclude
-            default_entries = [
-                "# AgentKit configuration",
-                "agentkit.yaml",
-                "agentkit*.yaml",
-                "",
-                "# Python cache",
-                "__pycache__/",
-                "*.py[cod]",
-                "*$py.class",
-                "",
-                "# Virtual environments",
-                ".venv/",
-                "venv/",
-                "ENV/",
-                "env/",
-                "",
-                "# IDE",
-                ".vscode/",
-                ".idea/",
-                ".windsurf/",
-                "",
-                "# Git",
-                ".git/",
-                ".gitignore",
-                "",
-                "# Docker",
-                "Dockerfile*",
-                ".dockerignore",
-            ]
-
-            # Combine default and additional entries
-            all_entries = default_entries.copy()
-            if additional_entries:
-                all_entries.append("")
-                all_entries.append("# Additional entries")
-                all_entries.extend(additional_entries)
-
-            # Write .dockerignore file
-            with open(dockerignore_path, "w", encoding="utf-8") as f:
-                f.write("\n".join(all_entries))
-                f.write("\n")  # End with newline
-
-            logger.info(f"Successfully created .dockerignore at: {dockerignore_path}")
-
-        except Exception as e:
-            logger.error(f"Error creating .dockerignore: {str(e)}")
-            raise
+        target_dir = os.path.dirname(dockerignore_path)
+        create_dockerignore_file(target_dir, additional_entries)
 
 
 class DockerManager:

agentkit_sdk_python-0.2.2/agentkit/toolkit/docker/utils.py

@@ -0,0 +1,98 @@
+# Copyright (c) 2025 Beijing Volcano Engine Technology Co., Ltd. and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import os
+import logging
+from typing import List, Optional
+
+logger = logging.getLogger(__name__)
+
+
+def create_dockerignore_file(
+    target_dir: str, additional_entries: Optional[List[str]] = None
+) -> bool:
+    """
+    Create .dockerignore file with default and additional entries.
+
+    Args:
+        target_dir: Directory where .dockerignore should be created
+        additional_entries: Additional entries to add to .dockerignore
+
+    Returns:
+        bool: True if file was created, False if it already existed
+
+    Raises:
+        IOError: When file write fails
+    """
+    dockerignore_path = os.path.join(target_dir, ".dockerignore")
+
+    try:
+        # Check if .dockerignore already exists
+        if os.path.exists(dockerignore_path):
+            logger.info(
+                f".dockerignore already exists at: {dockerignore_path}, skipping creation"
+            )
+            return False
+
+        # Default entries to exclude
+        default_entries = [
+            "# AgentKit configuration",
+            "agentkit.yaml",
+            "agentkit*.yaml",
+            ".agentkit/",
+            "",
+            "# Python cache",
+            "__pycache__/",
+            "*.py[cod]",
+            "*$py.class",
+            "",
+            "# Virtual environments",
+            ".venv/",
+            "venv/",
+            "ENV/",
+            "env/",
+            "",
+            "# IDE",
+            ".vscode/",
+            ".idea/",
+            ".windsurf/",
+            "",
+            "# Git",
+            ".git/",
+            ".gitignore",
+            "",
+            "# Docker",
+            "Dockerfile*",
+            ".dockerignore",
+        ]
+
+        # Combine default and additional entries
+        all_entries = default_entries.copy()
+        if additional_entries:
+            all_entries.append("")
+            all_entries.append("# Additional entries")
+            all_entries.extend(additional_entries)
+
+        # Write .dockerignore file
+        with open(dockerignore_path, "w", encoding="utf-8") as f:
+            f.write("\n".join(all_entries))
+            f.write("\n")  # End with newline
+
+        logger.info(f"Successfully created .dockerignore at: {dockerignore_path}")
+        return True
+
+    except Exception as e:
+        logger.error(f"Error creating .dockerignore: {str(e)}")
+        raise

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/toolkit/executors/init_executor.py

@@ -50,6 +50,7 @@ from agentkit.toolkit.config.constants import (
     DEFAULT_CR_INSTANCE_TEMPLATE_NAME,
     DEFAULT_TOS_BUCKET_TEMPLATE_NAME,
 )
+from agentkit.toolkit.docker.utils import create_dockerignore_file
 
 
 TEMPLATES = {
@@ -593,41 +594,8 @@ class InitExecutor(BaseExecutor):
 
     def _create_dockerignore(self, target_dir: Path):
         """Create .dockerignore file."""
-        dockerignore_file_path = target_dir / ".dockerignore"
-        if dockerignore_file_path.exists():
-            self.logger.info("File .dockerignore already exists, skipping")
-            return
-
-        dockerignore_content = """# AgentKit configuration
-agentkit.yaml
-agentkit*.yaml
-
-# Python cache
-__pycache__/
-*.py[cod]
-*$py.class
-
-# Virtual environments
-.venv/
-venv/
-ENV/
-env/
-
-# IDE
-.vscode/
-.idea/
-.windsurf/
-
-# Git
-.git/
-.gitignore
-
-# Docker
-Dockerfile*
-.dockerignore
-"""
-        dockerignore_file_path.write_text(dockerignore_content, encoding="utf-8")
-        self.created_files.append(".dockerignore")
+        if create_dockerignore_file(str(target_dir)):
+            self.created_files.append(".dockerignore")
 
     def init_from_agent_file(
         self,

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/toolkit/runners/ve_agentkit.py

@@ -39,6 +39,7 @@ from agentkit.utils.misc import (
     generate_apikey_name,
     generate_client_token,
     calculate_nonlinear_progress,
+    retry,
 )
 from agentkit.sdk.runtime.client import AgentkitRuntimeClient
 from agentkit.toolkit.volcengine.iam import VeIAM
@@ -834,8 +835,10 @@ class VeAgentkitRuntimeRunner(Runner):
         # Use reporter.long_task() for progress tracking
         with self.reporter.long_task(task_description, total=total_time) as task:
             while True:
-                runtime = self.agentkit_runtime_client.get_runtime(
-                    runtime_types.GetRuntimeRequest(runtime_id=runtime_id)
+                runtime = retry(
+                    lambda: self.agentkit_runtime_client.get_runtime(
+                        runtime_types.GetRuntimeRequest(runtime_id=runtime_id)
+                    )
                 )
 
                 # Check if target status reached

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/toolkit/utils/__init__.py

@@ -16,4 +16,5 @@
 
 from .agent_parser import AgentParser
 
+
 __all__ = ["AgentParser"]

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/toolkit/volcengine/iam.py

@@ -221,7 +221,13 @@ class VeIAM(BaseIAMClient):
                 data="{}",
             )
             response_data = json.loads(res)
-            return GetRoleResponse(**response_data.get("Result", {}))
+            result_data = response_data.get("Result", {})
+            role_data = result_data.get("Role")
+            if isinstance(role_data, dict):
+                tpd = role_data.get("TrustPolicyDocument")
+                if isinstance(tpd, dict):
+                    role_data["TrustPolicyDocument"] = json.dumps(tpd)
+            return GetRoleResponse(**result_data)
         except Exception as e:
             # If role not found, return None
             if "RoleNotExist" in str(e) or "NotFound" in str(e) or "404" in str(e):

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/toolkit/volcengine/utils/project_archiver.py

@@ -34,6 +34,8 @@ class ArchiveConfig:
     exclude_patterns: List[str] = field(
         default_factory=lambda: [
             "__pycache__",
+            "agentkit.yaml",
+            ".env",
             "*.pyc",
             "*.pyo",
             ".git",
@@ -44,6 +46,7 @@ class ArchiveConfig:
             "dist/",
             "build/",
             "*.egg-info/",
+            ".agentkit/",
         ]
     )
 

{agentkit_sdk_python-0.2.0 → agentkit_sdk_python-0.2.2}/agentkit/utils/misc.py

@@ -15,6 +15,10 @@
 import math
 import string
 import random
+import time
+from typing import Callable, TypeVar
+
+T = TypeVar("T")
 
 
 def generate_random_id(length=8):
@@ -102,3 +106,17 @@ def calculate_nonlinear_progress(
     """
     progress = max_time * (1 - math.exp(-elapsed / expected_time))
     return min(progress, max_time * max_ratio)
+
+
+def retry(
+    func: Callable[[], T],
+    retries: int = 3,
+    delay: float = 1.0,
+) -> T:
+    for attempt in range(retries):
+        try:
+            return func()
+        except Exception:  # noqa: BLE001
+            if attempt == retries - 1:
+                raise
+            time.sleep(delay)