glaip-sdk 0.7.2__py3-none-any.whl → 0.7.4__py3-none-any.whl

glaip_sdk/agents/base.py

@@ -46,8 +46,6 @@ import inspect
 import logging
 import warnings
 from collections.abc import AsyncGenerator
-
-
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
@@ -942,7 +940,16 @@ class Agent:
 
         if check_local_runtime_available():
             return get_default_runner()
-        raise ValueError(f"{_AGENT_NOT_DEPLOYED_MSG}\n\n{get_local_runtime_missing_message()}")
+
+        # If agent is not deployed, it *must* use local runtime
+        if not self.id:
+            raise ValueError(f"{_AGENT_NOT_DEPLOYED_MSG}\n\n{get_local_runtime_missing_message()}")
+
+        # If agent IS deployed but local execution was forced (local=True)
+        raise ValueError(
+            f"Local execution override was requested, but local runtime is missing.\n\n"
+            f"{get_local_runtime_missing_message()}"
+        )
 
     def _prepare_local_runner_kwargs(
         self,
@@ -977,6 +984,7 @@ class Agent:
         self,
         message: str,
         verbose: bool = False,
+        local: bool = False,
         runtime_config: dict[str, Any] | None = None,
         chat_history: list[dict[str, str]] | None = None,
         **kwargs: Any,
@@ -989,9 +997,13 @@ class Agent:
         - **Local**: When the agent is not deployed and glaip-sdk[local] is installed,
           execution happens locally via aip-agents (no server required).
 
+        You can force local execution for a deployed agent by passing `local=True`.
+
         Args:
             message: The message to send to the agent.
             verbose: If True, print streaming output to console. Defaults to False.
+            local: If True, force local execution even if the agent is deployed.
+                Defaults to False.
             runtime_config: Optional runtime configuration for tools, MCPs, and agents.
                 Keys can be SDK objects, UUIDs, or names. Example:
                 {
@@ -1013,16 +1025,19 @@ class Agent:
             RuntimeError: If server-backed execution fails due to client issues.
         """
         # Backend routing: deployed agents use server, undeployed use local (if available)
-        if self.id:
+        if self.id and not local:
             # Server-backed execution path (agent is deployed)
             agent_client, call_kwargs = self._prepare_run_kwargs(
-                message, verbose, runtime_config or kwargs.get("runtime_config"), **kwargs
+                message,
+                verbose,
+                runtime_config or kwargs.get("runtime_config"),
+                **kwargs,
             )
             if chat_history is not None:
                 call_kwargs["chat_history"] = chat_history
             return agent_client.run_agent(**call_kwargs)
 
-        # Local execution path (agent is not deployed)
+        # Local execution path (agent is not deployed OR local=True)
         runner = self._get_local_runner_or_raise()
         local_kwargs = self._prepare_local_runner_kwargs(message, verbose, runtime_config, chat_history, **kwargs)
         return runner.run(**local_kwargs)
@@ -1031,6 +1046,7 @@ class Agent:
         self,
         message: str,
         verbose: bool = False,
+        local: bool = False,
         runtime_config: dict[str, Any] | None = None,
         chat_history: list[dict[str, str]] | None = None,
         **kwargs: Any,
@@ -1043,9 +1059,13 @@ class Agent:
         - **Local**: When the agent is not deployed and glaip-sdk[local] is installed,
           execution happens locally via aip-agents (no server required).
 
+        You can force local execution for a deployed agent by passing `local=True`.
+
         Args:
             message: The message to send to the agent.
             verbose: If True, print streaming output to console. Defaults to False.
+            local: If True, force local execution even if the agent is deployed.
+                Defaults to False.
             runtime_config: Optional runtime configuration for tools, MCPs, and agents.
                 Keys can be SDK objects, UUIDs, or names. Example:
                 {
@@ -1067,10 +1087,13 @@ class Agent:
             RuntimeError: If server-backed execution fails due to client issues.
         """
         # Backend routing: deployed agents use server, undeployed use local (if available)
-        if self.id:
+        if self.id and not local:
             # Server-backed execution path (agent is deployed)
             agent_client, call_kwargs = self._prepare_run_kwargs(
-                message, verbose, runtime_config or kwargs.get("runtime_config"), **kwargs
+                message,
+                verbose,
+                runtime_config or kwargs.get("runtime_config"),
+                **kwargs,
             )
             if chat_history is not None:
                 call_kwargs["chat_history"] = chat_history
@@ -1079,7 +1102,7 @@ class Agent:
                 yield chunk
             return
 
-        # Local execution path (agent is not deployed)
+        # Local execution path (agent is not deployed OR local=True)
         runner = self._get_local_runner_or_raise()
         local_kwargs = self._prepare_local_runner_kwargs(message, verbose, runtime_config, chat_history, **kwargs)
         result = await runner.arun(**local_kwargs)

glaip_sdk/cli/entrypoint.py

@@ -0,0 +1,20 @@
+"""Entry point wrapper for early logging configuration.
+
+This must be imported BEFORE glaip_sdk.cli.main to catch import-time warnings.
+
+Authors:
+    Raymond Christopher (raymond.christopher@gdplabs.id)
+"""
+
+import sys
+
+# Configure logging BEFORE importing anything else
+from glaip_sdk.runner.logging_config import setup_cli_logging
+
+setup_cli_logging()
+
+# Now import and run CLI
+from glaip_sdk.cli import main  # noqa: E402
+
+if __name__ == "__main__":
+    sys.exit(main())  # pylint: disable=no-value-for-parameter

glaip_sdk/cli/main.py

@@ -73,6 +73,12 @@ def _resolve_client_class() -> type[Any]:
 
 def _suppress_chatty_loggers() -> None:
     """Silence noisy SDK/httpx logs for CLI output."""
+    # Ensure CLI logging is configured (idempotent)
+    from glaip_sdk.runner.logging_config import setup_cli_logging  # noqa: PLC0415
+
+    setup_cli_logging()
+
+    # Also suppress SDK-specific loggers
     noisy_loggers = [
         "glaip_sdk.client",
         "httpx",

glaip_sdk/hitl/__init__.py

@@ -13,10 +13,16 @@ Authors:
     GLAIP SDK Team
 """
 
+from typing import TYPE_CHECKING, Any
+
+# These don't require aip_agents, so import them directly
 from glaip_sdk.hitl.base import HITLCallback, HITLDecision, HITLRequest, HITLResponse
-from glaip_sdk.hitl.local import LocalPromptHandler, PauseResumeCallback
+from glaip_sdk.hitl.callback import PauseResumeCallback
 from glaip_sdk.hitl.remote import RemoteHITLHandler
 
+if TYPE_CHECKING:
+    from glaip_sdk.hitl.local import LocalPromptHandler
+
 __all__ = [
     "LocalPromptHandler",
     "PauseResumeCallback",
@@ -26,3 +32,17 @@ __all__ = [
     "HITLResponse",
     "RemoteHITLHandler",
 ]
+
+
+def __getattr__(name: str) -> Any:  # noqa: ANN401
+    """Lazy import for LocalPromptHandler.
+
+    This defers the import of aip_agents until LocalPromptHandler is actually accessed,
+    preventing ImportError when aip-agents is not installed but HITL is not being used.
+    """
+    if name == "LocalPromptHandler":
+        from glaip_sdk.hitl.local import LocalPromptHandler  # noqa: PLC0415
+
+        globals()["LocalPromptHandler"] = LocalPromptHandler
+        return LocalPromptHandler
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

glaip_sdk/hitl/callback.py

@@ -0,0 +1,43 @@
+"""Pause/resume callback for HITL renderer control.
+
+This module provides PauseResumeCallback which allows HITL prompt handlers
+to control the live renderer without directly coupling to the renderer implementation.
+
+Author:
+    Putu Ravindra Wiguna (putu.r.wiguna@gdplabs.id)
+"""
+
+from typing import Any
+
+
+class PauseResumeCallback:
+    """Simple callback object for pausing/resuming the live renderer.
+
+    This allows the LocalPromptHandler to control the renderer without
+    directly coupling to the renderer implementation.
+    """
+
+    def __init__(self) -> None:
+        """Initialize the callback."""
+        self._renderer: Any | None = None
+
+    def set_renderer(self, renderer: Any) -> None:
+        """Set the renderer instance.
+
+        Args:
+            renderer: RichStreamRenderer instance with pause_live() and resume_live() methods.
+        """
+        self._renderer = renderer
+
+    def pause(self) -> None:
+        """Pause the live renderer before prompting."""
+        if self._renderer and hasattr(self._renderer, "_shutdown_live"):
+            self._renderer._shutdown_live()
+
+    def resume(self) -> None:
+        """Resume the live renderer after prompting."""
+        if self._renderer and hasattr(self._renderer, "_ensure_live"):
+            self._renderer._ensure_live()
+
+
+__all__ = ["PauseResumeCallback"]

glaip_sdk/hitl/local.py

@@ -118,34 +118,4 @@ class LocalPromptHandler(BasePromptHandler):
             self._console.print(f"[dim]Context: {request.context}[/dim]")
 
 
-class PauseResumeCallback:
-    """Simple callback object for pausing/resuming the live renderer.
-
-    This allows the LocalPromptHandler to control the renderer without
-    directly coupling to the renderer implementation.
-    """
-
-    def __init__(self) -> None:
-        """Initialize the callback."""
-        self._renderer: Any | None = None
-
-    def set_renderer(self, renderer: Any) -> None:
-        """Set the renderer instance.
-
-        Args:
-            renderer: RichStreamRenderer instance with pause_live() and resume_live() methods.
-        """
-        self._renderer = renderer
-
-    def pause(self) -> None:
-        """Pause the live renderer before prompting."""
-        if self._renderer and hasattr(self._renderer, "_shutdown_live"):
-            self._renderer._shutdown_live()
-
-    def resume(self) -> None:
-        """Resume the live renderer after prompting."""
-        if self._renderer and hasattr(self._renderer, "_ensure_live"):
-            self._renderer._ensure_live()
-
-
-__all__ = ["LocalPromptHandler", "PauseResumeCallback"]
+__all__ = ["LocalPromptHandler"]

glaip_sdk/runner/__init__.py

@@ -19,18 +19,19 @@ Example:
     >>> result = runner.run(agent, "Hello!")
 """
 
+from typing import TYPE_CHECKING, Any
+
 from glaip_sdk.runner.deps import (
     LOCAL_RUNTIME_AVAILABLE,
     check_local_runtime_available,
     get_local_runtime_missing_message,
 )
-from glaip_sdk.runner.langgraph import LangGraphRunner
 
 # Default runner instance
-_default_runner: LangGraphRunner | None = None
+_default_runner: Any | None = None
 
 
-def get_default_runner() -> LangGraphRunner:
+def get_default_runner() -> Any:
     """Get the default runner instance for local agent execution.
 
     Returns:
@@ -45,11 +46,17 @@ def get_default_runner() -> LangGraphRunner:
         raise RuntimeError(get_local_runtime_missing_message())
 
     if _default_runner is None:
+        # Lazy import to avoid requiring aip-agents when runner is not used
+        from glaip_sdk.runner.langgraph import LangGraphRunner  # noqa: PLC0415
+
         _default_runner = LangGraphRunner()
 
     return _default_runner
 
 
+if TYPE_CHECKING:
+    from glaip_sdk.runner.langgraph import LangGraphRunner
+
 __all__ = [
     "LOCAL_RUNTIME_AVAILABLE",
     "LangGraphRunner",
@@ -57,3 +64,13 @@ __all__ = [
     "get_default_runner",
     "get_local_runtime_missing_message",
 ]
+
+
+def __getattr__(name: str) -> Any:
+    """Lazy import for LangGraphRunner to avoid requiring aip-agents when not used."""
+    if name == "LangGraphRunner":
+        from glaip_sdk.runner.langgraph import LangGraphRunner  # noqa: PLC0415
+
+        globals()["LangGraphRunner"] = LangGraphRunner
+        return LangGraphRunner
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

glaip_sdk/runner/langgraph.py

@@ -23,11 +23,10 @@ import logging
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any
 
-from aip_agents.agent.hitl.manager import ApprovalManager  # noqa: PLC0415
 from gllm_core.utils import LoggerManager
 
 from glaip_sdk.client.run_rendering import AgentRunRenderingManager
-from glaip_sdk.hitl import LocalPromptHandler, PauseResumeCallback
+from glaip_sdk.hitl import PauseResumeCallback
 from glaip_sdk.runner.base import BaseRunner
 from glaip_sdk.runner.deps import (
     check_local_runtime_available,
@@ -434,6 +433,9 @@ class LangGraphRunner(BaseRunner):
         hitl_enabled = merged_agent_config.get("hitl_enabled", False)
         if hitl_enabled:
             try:
+                from aip_agents.agent.hitl.manager import ApprovalManager  # noqa: PLC0415
+                from glaip_sdk.hitl import LocalPromptHandler  # noqa: PLC0415
+
                 local_agent.hitl_manager = ApprovalManager(
                     prompt_handler=LocalPromptHandler(pause_resume_callback=pause_resume_callback)
                 )

glaip_sdk/runner/logging_config.py

@@ -0,0 +1,77 @@
+"""Logging configuration for CLI to suppress noisy dependency warnings.
+
+This module provides centralized logging suppression for optional dependencies
+that emit noisy warnings during CLI usage. Warnings are suppressed by default
+but can be shown using GLAIP_LOG_LEVEL=DEBUG.
+
+Authors:
+    Raymond Christopher (raymond.christopher@gdplabs.id)
+"""
+
+import logging
+import os
+import warnings
+
+NOISY_LOGGERS = ["transformers", "gllm_privacy", "google.cloud.aiplatform"]
+
+
+class NameFilter(logging.Filter):
+    """Filter logs by logger name prefix."""
+
+    def __init__(self, prefixes: list[str]) -> None:
+        """Initialize filter with logger name prefixes to suppress.
+
+        Args:
+            prefixes: List of logger name prefixes to filter out.
+        """
+        super().__init__()
+        self.prefixes = prefixes
+
+    def filter(self, record: logging.LogRecord) -> bool:
+        """Filter log records by name prefix.
+
+        Args:
+            record: Log record to filter.
+
+        Returns:
+            False if record should be suppressed, True otherwise.
+        """
+        return not any(record.name.startswith(p) for p in self.prefixes)
+
+
+def setup_cli_logging() -> None:
+    """Suppress INFO from noisy third-party libraries.
+
+    Use GLAIP_LOG_LEVEL=DEBUG to see all warnings.
+    This function is idempotent - calling it multiple times is safe.
+    """
+    # Check env level FIRST before any suppression
+    env_level = os.getenv("GLAIP_LOG_LEVEL", "").upper()
+    is_debug = env_level == "DEBUG"
+
+    if is_debug:
+        # Debug mode: show everything, no suppression
+        if env_level and hasattr(logging, env_level):
+            logging.basicConfig(level=getattr(logging, env_level))
+        return
+
+    # Default mode: suppress noisy warnings
+    if env_level and hasattr(logging, env_level):
+        logging.basicConfig(level=getattr(logging, env_level))
+
+    # Add handler filter to suppress by name prefix (handles child loggers)
+    # Check if filter already exists to ensure idempotency
+    root_logger = logging.getLogger()
+    has_name_filter = any(isinstance(f, NameFilter) for h in root_logger.handlers for f in h.filters)
+
+    if not has_name_filter:
+        handler = logging.StreamHandler()
+        handler.addFilter(NameFilter(NOISY_LOGGERS))
+        root_logger.addHandler(handler)
+
+    # Suppress FutureWarning for GCS (idempotent - multiple calls are safe)
+    warnings.filterwarnings(
+        "ignore",
+        category=FutureWarning,
+        message=r".*google-cloud-storage.*",
+    )

glaip_sdk/utils/bundler.py

@@ -14,6 +14,7 @@ import inspect
 from pathlib import Path
 
 from glaip_sdk.utils.import_resolver import ImportResolver
+from glaip_sdk.utils.tool_detection import is_tool_plugin_decorator
 
 
 class ToolBundler:
@@ -50,9 +51,14 @@ class ToolBundler:
         self.tool_dir = self.tool_file.parent
         self._import_resolver = ImportResolver(self.tool_dir)
 
-    def bundle(self) -> str:
+    def bundle(self, add_tool_plugin_decorator: bool = True) -> str:
         """Bundle tool source code with inlined local imports.
 
+        Args:
+            add_tool_plugin_decorator: If True, add @tool_plugin decorator to BaseTool classes.
+                Set to False for newer servers (0.1.85+) where decorator is optional.
+                Defaults to True for backward compatibility with older servers.
+
         Returns:
             Bundled source code with all local dependencies inlined.
         """
@@ -62,6 +68,16 @@ class ToolBundler:
         tree = ast.parse(full_source)
         local_imports, external_imports = self._import_resolver.categorize_imports(tree)
 
+        # NOTE: The @tool_plugin decorator is REQUIRED by older servers (< 0.1.85) for remote execution.
+        # Newer servers (0.1.85+) make the decorator optional.
+        # The server validates uploaded tool code and will reject tools without the decorator
+        # with error: "No classes found with @tool_plugin decorator".
+        # See: docs/resources/reference/schemas/tools.md - "Plugin Requirements"
+        # TESTED: Commenting out this decorator addition causes HTTP 400 ValidationError from older servers.
+        # We try without decorator first (for new servers), then retry with decorator if validation fails.
+        if add_tool_plugin_decorator:
+            self._add_tool_plugin_decorator(tree)
+
         # Extract main code nodes (excluding imports, docstrings, glaip_sdk.Tool subclasses)
         main_code_nodes = self._extract_main_code_nodes(tree)
 
@@ -71,6 +87,13 @@ class ToolBundler:
         # Merge all external imports
         all_external_imports = external_imports + inlined_external_imports
 
+        # NOTE: The gllm_plugin.tools import is REQUIRED when decorator is added.
+        # Without this import, the decorator will cause a NameError when the server executes the code.
+        # TESTED: Commenting out this import causes NameError when server tries to use the decorator.
+        # This import is added automatically during bundling so source files can remain clean.
+        if add_tool_plugin_decorator:
+            self._ensure_tool_plugin_import(all_external_imports)
+
         # Build bundled code
         bundled_code = ["# Bundled tool with inlined local imports\n"]
         bundled_code.extend(self._import_resolver.format_external_imports(all_external_imports))
@@ -109,6 +132,103 @@ class ToolBundler:
             main_code_nodes.append(ast.unparse(node))
         return main_code_nodes
 
+    @staticmethod
+    def _add_tool_plugin_decorator(tree: ast.AST) -> None:
+        """Add @tool_plugin decorator to BaseTool classes that don't have it.
+
+        This allows tools to be clean (without decorator) for local use,
+        while the decorator is automatically added during bundling for remote execution.
+
+        Args:
+            tree: AST tree to modify in-place.
+        """
+        for node in ast.walk(tree):
+            if not isinstance(node, ast.ClassDef):
+                continue
+
+            if not ToolBundler._inherits_from_base_tool(node):
+                continue
+
+            if ToolBundler._has_tool_plugin_decorator(node):
+                continue
+
+            decorator_call = ToolBundler._create_tool_plugin_decorator()
+            node.decorator_list.insert(0, decorator_call)
+
+    @staticmethod
+    def _inherits_from_base_tool(class_node: ast.ClassDef) -> bool:
+        """Check if a class inherits from BaseTool.
+
+        Args:
+            class_node: AST ClassDef node to check.
+
+        Returns:
+            True if class inherits from BaseTool.
+        """
+        for base in class_node.bases:
+            if isinstance(base, ast.Name) and base.id == "BaseTool":
+                return True
+            if isinstance(base, ast.Attribute) and base.attr == "BaseTool":
+                # Handle nested attributes like langchain_core.tools.BaseTool
+                # Check if the value chain leads to langchain_core
+                value = base.value
+                while isinstance(value, ast.Attribute):
+                    value = value.value
+                if isinstance(value, ast.Name) and value.id == "langchain_core":
+                    return True
+        return False
+
+    @staticmethod
+    def _has_tool_plugin_decorator(class_node: ast.ClassDef) -> bool:
+        """Check if a class already has the @tool_plugin decorator.
+
+        Args:
+            class_node: AST ClassDef node to check.
+
+        Returns:
+            True if decorator already exists.
+        """
+        for decorator in class_node.decorator_list:
+            if is_tool_plugin_decorator(decorator):
+                return True
+        return False
+
+    @staticmethod
+    def _create_tool_plugin_decorator() -> ast.Call:
+        """Create a @tool_plugin decorator AST node.
+
+        Returns:
+            AST Call node representing @tool_plugin(version="1.0.0").
+        """
+        return ast.Call(
+            func=ast.Name(id="tool_plugin", ctx=ast.Load()),
+            args=[],
+            keywords=[ast.keyword(arg="version", value=ast.Constant(value="1.0.0"))],
+        )
+
+    @staticmethod
+    def _ensure_tool_plugin_import(external_imports: list) -> None:
+        """Ensure gllm_plugin.tools import is present in external imports.
+
+        Args:
+            external_imports: List of external import nodes (modified in-place).
+        """
+        # Check if import already exists
+        for import_node in external_imports:
+            if isinstance(import_node, ast.ImportFrom) and import_node.module == "gllm_plugin.tools":
+                # Check if tool_plugin is in the names
+                for alias in import_node.names:
+                    if alias.name == "tool_plugin":
+                        return  # Import already present
+
+        # Add the import
+        import_node = ast.ImportFrom(
+            module="gllm_plugin.tools",
+            names=[ast.alias(name="tool_plugin")],
+            level=0,
+        )
+        external_imports.append(import_node)
+
     @staticmethod
     def _is_sdk_tool_subclass(node: ast.ClassDef) -> bool:
         """Check if AST class definition inherits from Tool.
@@ -135,7 +255,7 @@ class ToolBundler:
         return False
 
     @classmethod
-    def bundle_from_source(cls, file_path: Path) -> tuple[str, str, str]:
+    def bundle_from_source(cls, file_path: Path, add_tool_plugin_decorator: bool = True) -> tuple[str, str, str]:
         """Extract tool info directly from source file without importing.
 
         This is used as a fallback when the tool class cannot be imported
@@ -143,6 +263,9 @@ class ToolBundler:
 
         Args:
             file_path: Path to the tool source file.
+            add_tool_plugin_decorator: If True, add @tool_plugin decorator to BaseTool classes.
+                Set to False for newer servers (0.1.85+) where decorator is optional.
+                Defaults to True for backward compatibility with older servers.
 
         Returns:
             Tuple of (name, description, bundled_source_code).
@@ -160,6 +283,12 @@ class ToolBundler:
         tool_dir = file_path.parent
         import_resolver = ImportResolver(tool_dir)
 
+        # NOTE: The @tool_plugin decorator is REQUIRED by older servers (< 0.1.85) for remote execution.
+        # Newer servers (0.1.85+) make the decorator optional.
+        # See bundle() method for detailed explanation.
+        if add_tool_plugin_decorator:
+            cls._add_tool_plugin_decorator(tree)
+
         # Find tool name and description from class definitions
         tool_name, tool_description = cls._extract_tool_metadata(tree, file_path.stem)
 
@@ -180,6 +309,13 @@ class ToolBundler:
 
         # Build bundled code
         all_external_imports = external_imports + inlined_external_imports
+
+        # NOTE: The gllm_plugin.tools import is REQUIRED when decorator is added.
+        # See bundle() method for detailed explanation.
+        # TESTED: Commenting out this import causes NameError when server tries to use the decorator.
+        if add_tool_plugin_decorator:
+            cls._ensure_tool_plugin_import(all_external_imports)
+
         bundled_code = ["# Bundled tool with inlined local imports\n"]
         bundled_code.extend(import_resolver.format_external_imports(all_external_imports))
 

glaip_sdk/utils/import_resolver.py

@@ -13,6 +13,8 @@ import ast
 import importlib
 from pathlib import Path
 
+from glaip_sdk.utils.tool_detection import is_tool_plugin_decorator
+
 
 class ImportResolver:
     """Resolves and categorizes Python imports for tool bundling.
@@ -482,15 +484,7 @@ class ImportResolver:
         Returns:
             True if decorator is @tool_plugin.
         """
-        if isinstance(decorator, ast.Name) and decorator.id == "tool_plugin":
-            return True
-        if (
-            isinstance(decorator, ast.Call)
-            and isinstance(decorator.func, ast.Name)
-            and decorator.func.id == "tool_plugin"
-        ):
-            return True
-        return False
+        return is_tool_plugin_decorator(decorator)
 
     @staticmethod
     def _filter_bases(bases: list) -> list:

glaip_sdk/utils/sync.py

@@ -15,6 +15,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
+from glaip_sdk.exceptions import ValidationError
 from glaip_sdk.utils.bundler import ToolBundler
 from glaip_sdk.utils.import_resolver import load_class
 from gllm_core.utils import LoggerManager
@@ -94,19 +95,38 @@ def update_or_create_tool(tool_ref: Any) -> Tool:
     tool_name = _extract_tool_name(tool_class)
     tool_description = _extract_tool_description(tool_class)
 
-    # Bundle source code
+    # Bundle source code - try without decorator first (for newer servers 0.1.85+)
+    # If validation fails, retry with decorator for older servers (< 0.1.85)
     bundler = ToolBundler(tool_class)
-    bundled_source = bundler.bundle()
 
-    logger.info("Tool info: name='%s', description='%s...'", tool_name, tool_description[:50])
-    logger.info("Bundled source code: %d characters", len(bundled_source))
-
-    # Use client's upsert method
-    return client.tools.upsert_tool(
-        tool_name,
-        code=bundled_source,
-        description=tool_description,
-    )
+    try:
+        # Try without decorator first (for newer servers where it's optional)
+        bundled_source = bundler.bundle(add_tool_plugin_decorator=False)
+        logger.info("Tool info: name='%s', description='%s...'", tool_name, tool_description[:50])
+        logger.info("Bundled source code (without decorator): %d characters", len(bundled_source))
+
+        # Attempt upload without decorator
+        return client.tools.upsert_tool(
+            tool_name,
+            code=bundled_source,
+            description=tool_description,
+        )
+    except ValidationError as e:
+        # Check if error is about missing @tool_plugin decorator
+        error_message = str(e).lower()
+        if "@tool_plugin decorator" in error_message or "no classes found" in error_message:
+            # Retry with decorator for older servers (< 0.1.85)
+            logger.info("Server requires @tool_plugin decorator, retrying with decorator added")
+            bundled_source = bundler.bundle(add_tool_plugin_decorator=True)
+            logger.info("Bundled source code (with decorator): %d characters", len(bundled_source))
+
+            return client.tools.upsert_tool(
+                tool_name,
+                code=bundled_source,
+                description=tool_description,
+            )
+        # Re-raise if it's a different validation error
+        raise
 
 
 def update_or_create_agent(agent_config: dict[str, Any]) -> Agent:

glaip_sdk/utils/tool_detection.py

@@ -4,6 +4,7 @@ Authors:
     Christian Trisno Sen Long Chen (christian.t.s.l.chen@gdplabs.id)
 """
 
+import ast
 from typing import Any
 
 
@@ -31,3 +32,23 @@ def is_langchain_tool(ref: Any) -> bool:
         pass
 
     return False
+
+
+def is_tool_plugin_decorator(decorator: ast.expr) -> bool:
+    """Check if an AST decorator node is @tool_plugin.
+
+    Shared by:
+    - ToolBundler._has_tool_plugin_decorator() (for bundling)
+    - ImportResolver._is_tool_plugin_decorator() (for import resolution)
+
+    Args:
+        decorator: AST decorator expression node to check.
+
+    Returns:
+        True if decorator is @tool_plugin.
+    """
+    if isinstance(decorator, ast.Name) and decorator.id == "tool_plugin":
+        return True
+    if isinstance(decorator, ast.Call) and isinstance(decorator.func, ast.Name) and decorator.func.id == "tool_plugin":
+        return True
+    return False

{glaip_sdk-0.7.2.dist-info → glaip_sdk-0.7.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: glaip-sdk
-Version: 0.7.2
+Version: 0.7.4
 Summary: Python SDK and CLI for GL AIP (GDP Labs AI Agent Package) - Build, run, and manage AI agents
 Author-email: Raymond Christopher <raymond.christopher@gdplabs.id>
 License: MIT

{glaip_sdk-0.7.2.dist-info → glaip_sdk-0.7.4.dist-info}/RECORD

@@ -5,7 +5,7 @@ glaip_sdk/exceptions.py,sha256=iAChFClkytXRBLP0vZq1_YjoZxA9i4m4bW1gDLiGR1g,2321
 glaip_sdk/icons.py,sha256=J5THz0ReAmDwIiIooh1_G3Le-mwTJyEjhJDdJ13KRxM,524
 glaip_sdk/rich_components.py,sha256=44Z0V1ZQleVh9gUDGwRR5mriiYFnVGOhm7fFxZYbP8c,4052
 glaip_sdk/agents/__init__.py,sha256=VfYov56edbWuySXFEbWJ_jLXgwnFzPk1KB-9-mfsUCc,776
-glaip_sdk/agents/base.py,sha256=D3Ll2l_uxv2kIwPCuDhfy_bbSxHrHPaxp6op2c7TBl0,43580
+glaip_sdk/agents/base.py,sha256=GQnzCw2cqlrbxwdoWFfhBcBlEDgubY4tlD6gr1b3zps,44539
 glaip_sdk/cli/__init__.py,sha256=xCCfuF1Yc7mpCDcfhHZTX0vizvtrDSLeT8MJ3V7m5A0,156
 glaip_sdk/cli/account_store.py,sha256=TK4iTV93Q1uD9mCY_2ZMT6EazHKU2jX0qhgWfEM4V-4,18459
 glaip_sdk/cli/agent_config.py,sha256=YAbFKrTNTRqNA6b0i0Q3pH-01rhHDRi5v8dxSFwGSwM,2401
@@ -14,9 +14,10 @@ glaip_sdk/cli/config.py,sha256=s0_xBB1e5YE4I_Wc4q-ayY3dwsBU1JrHAF-8ySlim7Y,3040
 glaip_sdk/cli/constants.py,sha256=zqcVtzfj6huW97gbCmhkFqntge1H-c1vnkGqTazADgU,895
 glaip_sdk/cli/context.py,sha256=--Y5vc6lgoAV7cRoUAr9UxSQaLmkMg29FolA7EwoRqM,3803
 glaip_sdk/cli/display.py,sha256=ojgWdGeD5KUnGOmWNqqK4JP-1EaWHWX--DWze3BmIz0,12137
+glaip_sdk/cli/entrypoint.py,sha256=ODrNZT1c7mFtNuXn4CrJgs06-xIhrqUMi1rKzkYJ21c,516
 glaip_sdk/cli/hints.py,sha256=ca4krG103IS43s5BSLr0-N7uRMpte1_LY4nAXVvgDxo,1596
 glaip_sdk/cli/io.py,sha256=ChP6CRKbtuENsNomNEaMDfPDU0iqO-WuVvl4_y7F2io,3871
-glaip_sdk/cli/main.py,sha256=mSaiIRl9UDcJ5LvahHo3gHioZxd1owaKVrFFSFiOfqs,24478
+glaip_sdk/cli/main.py,sha256=bi_SBrRWWMcdbl28zbNMrzp8i5SKCKTb2CWN-hLIx94,24680
 glaip_sdk/cli/masking.py,sha256=2lrXQ-pfL7N-vNEQRT1s4Xq3JPDPDT8RC61OdaTtkkc,4060
 glaip_sdk/cli/mcp_validators.py,sha256=cwbz7p_p7_9xVuuF96OBQOdmEgo5UObU6iWWQ2X03PI,10047
 glaip_sdk/cli/pager.py,sha256=TmiMDNpUMuZju7QJ6A_ITqIoEf8Dhv8U6mTXx2Fga1k,7935
@@ -116,9 +117,10 @@ glaip_sdk/client/payloads/agent/__init__.py,sha256=gItEH2zt2secVq6n60oGA-ztdE5mc
 glaip_sdk/client/payloads/agent/requests.py,sha256=5FuGEuypaEXlWBhB07JrDca_ecLg4bvo8mjyFBxAV9U,17139
 glaip_sdk/client/payloads/agent/responses.py,sha256=1eRMI4JAIGqTB5zY_7D9ILQDRHPXR06U7JqHSmRp3Qs,1243
 glaip_sdk/config/constants.py,sha256=Y03c6op0e7K0jTQ8bmWXhWAqsnjWxkAhWniq8Z0iEKY,1081
-glaip_sdk/hitl/__init__.py,sha256=PHayqIUL9BOh9QZQilisThisPL3G7ylG-XaPdllC_zc,851
+glaip_sdk/hitl/__init__.py,sha256=hi_SwW1oBimNnSFPo9Yc-mZWVPzpytlnDWNq2h1_fPo,1572
 glaip_sdk/hitl/base.py,sha256=EUN2igzydlYZ6_qmHU46Gyk3Bk9uyalZkCJ06XMRKJ8,1484
-glaip_sdk/hitl/local.py,sha256=rzmaRK15BxgRX7cmklUcGQUotMYg8x2Gd9BWf39k6hw,5661
+glaip_sdk/hitl/callback.py,sha256=icKxxa_f8lxFQuXrZVoTt6baWivFL4a4YioWG_U_8k8,1336
+glaip_sdk/hitl/local.py,sha256=7Qf-O62YcVXpOHdckm1-g4wwvHQCvwg4D1ikK-xwgqA,4642
 glaip_sdk/hitl/remote.py,sha256=cdO-wWwRGdyb0HYNMwIvHfvKwOqhqp-l7efnaC9b85M,18914
 glaip_sdk/mcps/__init__.py,sha256=4jYrt8K__oxrxexHRcmnRBXt-W_tbJN61H9Kf2lVh4Q,551
 glaip_sdk/mcps/base.py,sha256=jWwHjDF67_mtDGRp9p5SolANjVeB8jt1PSwPBtX876M,11654
@@ -136,10 +138,11 @@ glaip_sdk/registry/agent.py,sha256=F0axW4BIUODqnttIOzxnoS5AqQkLZ1i48FTeZNnYkhA,5
 glaip_sdk/registry/base.py,sha256=0x2ZBhiERGUcf9mQeWlksSYs5TxDG6FxBYQToYZa5D4,4143
 glaip_sdk/registry/mcp.py,sha256=kNJmiijIbZL9Btx5o2tFtbaT-WG6O4Xf_nl3wz356Ow,7978
 glaip_sdk/registry/tool.py,sha256=QnbAlk09lYvEb9PEdCsvpg4CGxlLbvvFWBS8WkM1ZoM,12955
-glaip_sdk/runner/__init__.py,sha256=8RrngoGfpF8x9X27RPdX4gJjch75ZvhtVt_6UV0ULLQ,1615
+glaip_sdk/runner/__init__.py,sha256=orJ3nLR9P-n1qMaAMWZ_xRS4368YnDpdltg-bX5BlUk,2210
 glaip_sdk/runner/base.py,sha256=KIjcSAyDCP9_mn2H4rXR5gu1FZlwD9pe0gkTBmr6Yi4,2663
 glaip_sdk/runner/deps.py,sha256=Du3hr2R5RHOYCRAv7RVmx661x-ayVXIeZ8JD7ODirTA,3884
-glaip_sdk/runner/langgraph.py,sha256=-3BMJRww3S3dboS3uyR3QrxV-3p-1i2X5ObxdTTGRdg,32955
+glaip_sdk/runner/langgraph.py,sha256=HWzEkmkQqvAOKat3lENVf0zDaypj7HMeny5thDyprWY,33031
+glaip_sdk/runner/logging_config.py,sha256=OrQgW23t42qQRqEXKH8U4bFg4JG5EEkUJTlbvtU65iE,2528
 glaip_sdk/runner/mcp_adapter/__init__.py,sha256=Rdttfg3N6kg3-DaTCKqaGXKByZyBt0Mwf6FV8s_5kI8,462
 glaip_sdk/runner/mcp_adapter/base_mcp_adapter.py,sha256=ic56fKgb3zgVZZQm3ClWUZi7pE1t4EVq8mOg6AM6hdA,1374
 glaip_sdk/runner/mcp_adapter/langchain_mcp_adapter.py,sha256=b58GuadPz7q7aXoJyTYs0eeJ_oqp-wLR1tcr_5cbV1s,9723
@@ -153,7 +156,7 @@ glaip_sdk/tools/__init__.py,sha256=rhGzEqQFCzeMrxmikBuNrMz4PyYczwic28boDKVmoHs,5
 glaip_sdk/tools/base.py,sha256=hkz2NZFHW1PqsRiXh3kKTVLIjMPR274Uwml944vH5tg,16325
 glaip_sdk/utils/__init__.py,sha256=ntohV7cxlY2Yksi2nFuFm_Mg2XVJbBbSJVRej7Mi9YE,2770
 glaip_sdk/utils/agent_config.py,sha256=RhcHsSOVwOaSC2ggnPuHn36Aa0keGJhs8KGb2InvzRk,7262
-glaip_sdk/utils/bundler.py,sha256=fQWAv0e5qNjF1Lah-FGoA9W5Q59YaHbQfX_4ZB84YRw,9120
+glaip_sdk/utils/bundler.py,sha256=fLumFj1MqqqGA1Mwn05v_cEKPALv3rIPEMvaURpxZ80,15171
 glaip_sdk/utils/client.py,sha256=otPUOIDvLCCsvFBNR8YMZFtRrORggmvvlFjl3YeeTqQ,3121
 glaip_sdk/utils/client_utils.py,sha256=hzHxxNuM37mK4HhgIdS0qg4AqjAA5ai2irPO6Nr1Uzo,15350
 glaip_sdk/utils/datetime_helpers.py,sha256=QLknNLEAY56628-MTRKnCXAffATkF33erOqBubKmU98,1544
@@ -162,14 +165,14 @@ glaip_sdk/utils/display.py,sha256=zu3SYqxj9hPyEN8G1vIXv_yXBkV8jLLCXEg2rs8NlzM,44
 glaip_sdk/utils/export.py,sha256=1NxxE3wGsA1auzecG5oJw5ELB4VmPljoeIkGhrGOh1I,5006
 glaip_sdk/utils/general.py,sha256=3HSVIopUsIymPaim-kP2lqLX75TkkdIVLe6g3UKabZ0,1507
 glaip_sdk/utils/import_export.py,sha256=RCvoydm_6_L7_J1igcE6IYDunqgS5mQUbWT4VGrytMw,5510
-glaip_sdk/utils/import_resolver.py,sha256=x--2oo_QXqmESd8gdYzYD3gGIWOkC-IgfTziA300r5w,17358
+glaip_sdk/utils/import_resolver.py,sha256=X2qUV4_XmwStccGjnQ0YcxXAFyxZzwaKpfxjAW4Ev2o,17159
 glaip_sdk/utils/instructions.py,sha256=MTk93lsq3I8aRnvnRMSXXNMzcpnaIM_Pm3Aiiiq3GBc,2997
 glaip_sdk/utils/resource_refs.py,sha256=vF34kyAtFBLnaKnQVrsr2st1JiSxVbIZ4yq0DelJvCI,5966
 glaip_sdk/utils/run_renderer.py,sha256=d_VMI6LbvHPUUeRmGqh5wK_lHqDEIAcym2iqpbtDad0,1365
 glaip_sdk/utils/runtime_config.py,sha256=Gl9-CQ4lYZ39vRSgtdfcSU3CXshVDDuTOdSzjvsCgG0,14070
 glaip_sdk/utils/serialization.py,sha256=z-qpvWLSBrGK3wbUclcA1UIKLXJedTnMSwPdq-FF4lo,13308
-glaip_sdk/utils/sync.py,sha256=3VKqs1UfNGWSobgRXohBKP7mMMzdUW3SU0bJQ1uxOgw,4872
-glaip_sdk/utils/tool_detection.py,sha256=g410GNug_PhLye8rd9UU-LVFIKq3jHPbmSItEkLxPTc,807
+glaip_sdk/utils/sync.py,sha256=71egWp5qm_8tYpWZyGazvnP4NnyW16rcmzjGVicmQEE,6043
+glaip_sdk/utils/tool_detection.py,sha256=6dHp0naLnvY6jwy_38k4kyTgQnizgcsq9hpeLSjAmcc,1471
 glaip_sdk/utils/tool_storage_provider.py,sha256=lampwUeWu4Uy8nBG7C4ZT-M6AHoWZS0m67HdLx21VDg,5396
 glaip_sdk/utils/validation.py,sha256=hB_k3lvHdIFUiSwHStrC0Eqnhx0OG2UvwqASeem0HuQ,6859
 glaip_sdk/utils/a2a/__init__.py,sha256=_X8AvDOsHeppo5n7rP5TeisVxlAdkZDTFReBk_9lmxo,876
@@ -203,8 +206,8 @@ glaip_sdk/utils/rendering/steps/format.py,sha256=Chnq7OBaj8XMeBntSBxrX5zSmrYeGcO
 glaip_sdk/utils/rendering/steps/manager.py,sha256=BiBmTeQMQhjRMykgICXsXNYh1hGsss-fH9BIGVMWFi0,13194
 glaip_sdk/utils/rendering/viewer/__init__.py,sha256=XrxmE2cMAozqrzo1jtDFm8HqNtvDcYi2mAhXLXn5CjI,457
 glaip_sdk/utils/rendering/viewer/presenter.py,sha256=mlLMTjnyeyPVtsyrAbz1BJu9lFGQSlS-voZ-_Cuugv0,5725
-glaip_sdk-0.7.2.dist-info/METADATA,sha256=0gHQhB9kdAJTmvFzXjZhBow1FXy9Of97WFQrwqcUEhg,8365
-glaip_sdk-0.7.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-glaip_sdk-0.7.2.dist-info/entry_points.txt,sha256=65vNPUggyYnVGhuw7RhNJ8Fp2jygTcX0yxJBcBY3iLU,48
-glaip_sdk-0.7.2.dist-info/top_level.txt,sha256=td7yXttiYX2s94-4wFhv-5KdT0rSZ-pnJRSire341hw,10
-glaip_sdk-0.7.2.dist-info/RECORD,,
+glaip_sdk-0.7.4.dist-info/METADATA,sha256=r36rVJdxsiV-fUHo3SRNf_pakOeHayQy1KyL3ZCqN-M,8365
+glaip_sdk-0.7.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+glaip_sdk-0.7.4.dist-info/entry_points.txt,sha256=NkhO6FfgX9Zrjn63GuKphf-dLw7KNJvucAcXc7P3aMk,54
+glaip_sdk-0.7.4.dist-info/top_level.txt,sha256=td7yXttiYX2s94-4wFhv-5KdT0rSZ-pnJRSire341hw,10
+glaip_sdk-0.7.4.dist-info/RECORD,,

glaip_sdk-0.7.4.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+aip = glaip_sdk.cli.entrypoint:main

glaip_sdk-0.7.2.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-aip = glaip_sdk.cli.main:main