glaip-sdk 0.1.0__py3-none-any.whl → 0.6.10__py3-none-any.whl

glaip_sdk/utils/serialization.py

@@ -67,20 +67,12 @@ def read_yaml(file_path: Path) -> dict[str, Any]:
         data = yaml.safe_load(f)
 
     # Handle instruction_lines array format for user-friendly YAML
-    if (
-        isinstance(data, dict)
-        and "instruction_lines" in data
-        and isinstance(data["instruction_lines"], list)
-    ):
+    if isinstance(data, dict) and "instruction_lines" in data and isinstance(data["instruction_lines"], list):
         data["instruction"] = "\n\n".join(data["instruction_lines"])
         del data["instruction_lines"]
 
     # Handle instruction as list from YAML export (convert back to string)
-    if (
-        isinstance(data, dict)
-        and "instruction" in data
-        and isinstance(data["instruction"], list)
-    ):
+    if isinstance(data, dict) and "instruction" in data and isinstance(data["instruction"], list):
         data["instruction"] = "\n\n".join(data["instruction"])
 
     return data
@@ -96,11 +88,20 @@ def write_yaml(file_path: Path, data: dict[str, Any]) -> None:
 
     # Custom YAML dumper for user-friendly instruction formatting
     class LiteralString(str):
+        """String subclass for YAML literal block scalar formatting."""
+
         pass
 
-    def literal_string_representer(
-        dumper: yaml.Dumper, data: "LiteralString"
-    ) -> yaml.nodes.Node:
+    def literal_string_representer(dumper: yaml.Dumper, data: "LiteralString") -> yaml.nodes.Node:
+        """YAML representer for LiteralString to use literal block scalar style.
+
+        Args:
+            dumper: YAML dumper instance.
+            data: LiteralString instance to represent.
+
+        Returns:
+            YAML node with literal block scalar style for multiline strings.
+        """
         # Use literal block scalar (|) for multiline strings to preserve formatting
         if "\n" in data:
             return dumper.represent_scalar("tag:yaml.org,2002:str", data, style="|")
@@ -115,9 +116,7 @@ def write_yaml(file_path: Path, data: dict[str, Any]) -> None:
         data["instruction"] = LiteralString(data["instruction"])
 
     with open(file_path, "w", encoding="utf-8") as f:
-        yaml.dump(
-            data, f, default_flow_style=False, allow_unicode=True, sort_keys=False
-        )
+        yaml.dump(data, f, default_flow_style=False, allow_unicode=True, sort_keys=False)
 
 
 def load_resource_from_file(file_path: Path) -> dict[str, Any]:
@@ -137,15 +136,10 @@ def load_resource_from_file(file_path: Path) -> dict[str, Any]:
     elif file_path.suffix.lower() == ".json":
         return read_json(file_path)
     else:
-        raise ValueError(
-            f"Unsupported file format: {file_path.suffix}. "
-            f"Only JSON and YAML files are supported."
-        )
+        raise ValueError(f"Unsupported file format: {file_path.suffix}. Only JSON and YAML files are supported.")
 
 
-def write_resource_export(
-    file_path: Path, data: dict[str, Any], format: str = "json"
-) -> None:
+def write_resource_export(file_path: Path, data: dict[str, Any], format: str = "json") -> None:
     """Write resource export data to file.
 
     Args:
@@ -190,13 +184,8 @@ def collect_attributes_for_export(resource: Any) -> dict[str, Any]:
     data.
     """
     mapping = _coerce_resource_to_mapping(resource)
-    if (
-        mapping is None
-    ):  # pragma: no cover - defensive fallback when attribute introspection fails
-        items = (
-            (name, _safe_getattr(resource, name))
-            for name in _iter_public_attribute_names(resource)
-        )
+    if mapping is None:  # pragma: no cover - defensive fallback when attribute introspection fails
+        items = ((name, _safe_getattr(resource, name)) for name in _iter_public_attribute_names(resource))
     else:
         items = mapping.items()
 
@@ -249,9 +238,7 @@ def _coerce_resource_to_mapping(resource: Any) -> dict[str, Any] | None:
     try:
         if hasattr(resource, "__dict__"):
             return dict(resource.__dict__)
-    except (
-        Exception
-    ):  # pragma: no cover - pathological objects can still defeat coercion
+    except Exception:  # pragma: no cover - pathological objects can still defeat coercion
         return None
 
     return None
@@ -263,6 +250,11 @@ def _iter_public_attribute_names(resource: Any) -> Iterable[str]:
     names: list[str] = []
 
     def _collect(candidates: Iterable[str] | None) -> None:
+        """Collect unique candidate attribute names.
+
+        Args:
+            candidates: Iterable of candidate attribute names.
+        """
         for candidate in candidates or ():
             if candidate not in seen:
                 seen.add(candidate)
@@ -284,9 +276,7 @@ def _iter_public_attribute_names(resource: Any) -> Iterable[str]:
     return iter(names)
 
 
-def _collect_from_dict(
-    resource: Any, collect_func: Callable[[Iterable[str]], None]
-) -> None:
+def _collect_from_dict(resource: Any, collect_func: Callable[[Iterable[str]], None]) -> None:
     """Safely collect attribute names from __dict__."""
     try:
         if hasattr(resource, "__dict__"):
@@ -297,18 +287,14 @@ def _collect_from_dict(
         pass
 
 
-def _collect_from_annotations(
-    resource: Any, collect_func: Callable[[Iterable[str]], None]
-) -> None:
+def _collect_from_annotations(resource: Any, collect_func: Callable[[Iterable[str]], None]) -> None:
     """Safely collect attribute names from __annotations__."""
     annotations = getattr(resource, "__annotations__", {})
     if annotations:
         collect_func(annotations.keys())
 
 
-def _collect_from_dir(
-    resource: Any, collect_func: Callable[[Iterable[str]], None]
-) -> None:
+def _collect_from_dir(resource: Any, collect_func: Callable[[Iterable[str]], None]) -> None:
     """Safely collect attribute names from dir()."""
     try:
         collect_func(name for name in dir(resource) if not name.startswith("__"))
@@ -317,6 +303,7 @@ def _collect_from_dir(
 
 
 def _safe_getattr(resource: Any, name: str) -> Any:
+    """Return getattr(resource, name) but swallow any exception and return None."""
     try:
         return getattr(resource, name)
     except Exception:
@@ -324,6 +311,7 @@ def _safe_getattr(resource: Any, name: str) -> Any:
 
 
 def _should_include_attribute(key: str, value: Any) -> bool:
+    """Return True when an attribute should be serialized."""
     if key in _EXCLUDED_ATTRS or key in _EXCLUDED_NAMES:
         return False
     if key.startswith("_"):
@@ -387,9 +375,7 @@ def build_mcp_export_payload(
         ImportError: If required modules (auth helpers) are not available
     """
     auth_module = importlib.import_module("glaip_sdk.cli.auth")
-    prepare_authentication_export = getattr(
-        auth_module, "prepare_authentication_export"
-    )
+    prepare_authentication_export = auth_module.prepare_authentication_export
 
     # Start with model dump (excludes None values automatically)
     payload = mcp.model_dump(exclude_none=True)
@@ -435,4 +421,4 @@ def validate_json_string(json_str: str) -> dict[str, Any]:
     try:
         return json.loads(json_str)
     except json.JSONDecodeError as e:
-        raise ValueError(f"Invalid JSON: {e}")
+        raise ValueError(f"Invalid JSON: {e}") from e

glaip_sdk/utils/sync.py

@@ -0,0 +1,142 @@
+"""Agent and tool synchronization (create/update) operations.
+
+This module provides convenience functions for tool classes that need bundling.
+
+For direct upsert operations, use the client methods:
+    - client.agents.upsert_agent(identifier, **kwargs)
+    - client.tools.upsert_tool(identifier, code, **kwargs)
+    - client.mcps.upsert_mcp(identifier, **kwargs)
+
+Authors:
+    Christian Trisno Sen Long Chen (christian.t.s.l.chen@gdplabs.id)
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+from glaip_sdk.utils.bundler import ToolBundler
+from glaip_sdk.utils.import_resolver import load_class
+from gllm_core.utils import LoggerManager
+
+if TYPE_CHECKING:
+    from glaip_sdk.models import Agent, Tool
+
+logger = LoggerManager().get_logger(__name__)
+
+
+def _extract_tool_name(tool_class: Any) -> str:
+    """Extract tool name from a class, handling Pydantic v2 models."""
+    # Direct attribute access (works for non-Pydantic classes)
+    if hasattr(tool_class, "name"):
+        name = getattr(tool_class, "name", None)
+        if isinstance(name, str):
+            return name
+
+    # Pydantic v2 model - check model_fields
+    if hasattr(tool_class, "model_fields"):
+        model_fields = getattr(tool_class, "model_fields", {})
+        if "name" in model_fields:
+            field_info = model_fields["name"]
+            if hasattr(field_info, "default") and isinstance(field_info.default, str):
+                return field_info.default
+
+    raise ValueError(f"Cannot extract name from tool class: {tool_class}")
+
+
+def _extract_tool_description(tool_class: Any) -> str:
+    """Extract tool description from a class, handling Pydantic v2 models."""
+    # Direct attribute access
+    if hasattr(tool_class, "description"):
+        desc = getattr(tool_class, "description", None)
+        if isinstance(desc, str):
+            return desc
+
+    # Pydantic v2 model - check model_fields
+    if hasattr(tool_class, "model_fields"):
+        model_fields = getattr(tool_class, "model_fields", {})
+        if "description" in model_fields:
+            field_info = model_fields["description"]
+            if hasattr(field_info, "default") and isinstance(field_info.default, str):
+                return field_info.default
+
+    return ""
+
+
+def update_or_create_tool(tool_ref: Any) -> Tool:
+    """Create or update a tool from a tool class with bundled source code.
+
+    This function takes a tool class (LangChain BaseTool), bundles its source
+    code with inlined imports, and creates/updates it in the backend.
+
+    Args:
+        tool_ref: A tool class (LangChain BaseTool subclass) or import path string.
+
+    Returns:
+        The created or updated tool.
+
+    Example:
+        >>> from glaip_sdk.utils.sync import update_or_create_tool
+        >>> from my_tools import WeatherAPITool
+        >>> tool = update_or_create_tool(WeatherAPITool)
+    """
+    from glaip_sdk.utils.client import get_client  # noqa: PLC0415
+
+    client = get_client()
+
+    # Handle string import path
+    if isinstance(tool_ref, str):
+        tool_class = load_class(tool_ref)
+    else:
+        tool_class = tool_ref
+
+    # Get tool info - handle Pydantic v2 model classes
+    tool_name = _extract_tool_name(tool_class)
+    tool_description = _extract_tool_description(tool_class)
+
+    # Bundle source code
+    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,
+    )
+
+
+def update_or_create_agent(agent_config: dict[str, Any]) -> Agent:
+    """Create or update an agent from configuration.
+
+    Args:
+        agent_config: Agent configuration dictionary containing:
+            - name (str): Agent name (required)
+            - description (str): Agent description
+            - instruction (str): Agent instruction
+            - tools (list, optional): List of tool IDs
+            - agents (list, optional): List of sub-agent IDs
+            - metadata (dict, optional): Additional metadata
+
+    Returns:
+        The created or updated agent.
+
+    Example:
+        >>> from glaip_sdk.utils.sync import update_or_create_agent
+        >>> config = {
+        ...     "name": "weather_reporter",
+        ...     "description": "Weather reporting agent",
+        ...     "instruction": "You are a weather reporter.",
+        ... }
+        >>> agent = update_or_create_agent(config)
+    """
+    from glaip_sdk.utils.client import get_client  # noqa: PLC0415
+
+    client = get_client()
+    agent_name = agent_config.pop("name")
+
+    # Use client's upsert method
+    return client.agents.upsert_agent(agent_name, **agent_config)

glaip_sdk/utils/tool_detection.py

@@ -0,0 +1,33 @@
+"""Shared utilities for tool type detection.
+
+Authors:
+    Christian Trisno Sen Long Chen (christian.t.s.l.chen@gdplabs.id)
+"""
+
+from typing import Any
+
+
+def is_langchain_tool(ref: Any) -> bool:
+    """Check if ref is a LangChain BaseTool class or instance.
+
+    Shared by:
+    - ToolRegistry._is_custom_tool() (for upload detection)
+    - LangChainToolAdapter._is_langchain_tool() (for adaptation)
+
+    Args:
+        ref: Object to check.
+
+    Returns:
+        True if ref is a LangChain BaseTool class or instance.
+    """
+    try:
+        from langchain_core.tools import BaseTool  # noqa: PLC0415
+
+        if isinstance(ref, type) and issubclass(ref, BaseTool):
+            return True
+        if isinstance(ref, BaseTool):
+            return True
+    except ImportError:
+        pass
+
+    return False

glaip_sdk/utils/validation.py

@@ -18,6 +18,16 @@ from glaip_sdk.utils.resource_refs import validate_name_format
 RESERVED_NAMES = ["admin", "root", "system", "api", "test", "demo"]
 
 
+def _validate_named_resource(name: str, resource_type: str) -> str:
+    """Shared validator that prevents reserved-name duplication."""
+    cleaned_name = validate_name_format(name, resource_type)
+
+    if cleaned_name.lower() in RESERVED_NAMES:
+        raise ValueError(f"{resource_type.capitalize()} name '{cleaned_name}' is reserved and cannot be used")
+
+    return cleaned_name
+
+
 def validate_agent_name(name: str) -> str:
     """Validate agent name and return cleaned version.
 
@@ -30,13 +40,7 @@ def validate_agent_name(name: str) -> str:
     Raises:
         ValueError: If name is invalid
     """
-    cleaned_name = validate_name_format(name, "agent")
-
-    # Check for reserved names
-    if cleaned_name.lower() in RESERVED_NAMES:
-        raise ValueError(f"'{cleaned_name}' is a reserved name and cannot be used")
-
-    return cleaned_name
+    return _validate_named_resource(name, "agent")
 
 
 def validate_agent_instruction(instruction: str) -> str:
@@ -74,13 +78,7 @@ def validate_tool_name(name: str) -> str:
     Raises:
         ValueError: If name is invalid
     """
-    cleaned_name = validate_name_format(name, "tool")
-
-    # Check for reserved names
-    if cleaned_name.lower() in RESERVED_NAMES:
-        raise ValueError(f"'{cleaned_name}' is a reserved name and cannot be used")
-
-    return cleaned_name
+    return _validate_named_resource(name, "tool")
 
 
 def validate_mcp_name(name: str) -> str:
@@ -95,13 +93,7 @@ def validate_mcp_name(name: str) -> str:
     Raises:
         ValueError: If name is invalid
     """
-    cleaned_name = validate_name_format(name, "mcp")
-
-    # Check for reserved names
-    if cleaned_name.lower() in RESERVED_NAMES:
-        raise ValueError(f"'{cleaned_name}' is a reserved name and cannot be used")
-
-    return cleaned_name
+    return _validate_named_resource(name, "mcp")
 
 
 def validate_timeout(timeout: int) -> int:
@@ -155,13 +147,13 @@ def coerce_timeout(value: Any) -> int:
         try:
             fval = float(value)
             return validate_timeout(int(fval))
-        except ValueError:
-            raise ValueError(f"Invalid timeout value: {value}")
+        except ValueError as err:
+            raise ValueError(f"Invalid timeout value: {value}") from err
     else:
         try:
             return validate_timeout(int(value))
-        except (TypeError, ValueError):
-            raise ValueError(f"Invalid timeout value: {value}")
+        except (TypeError, ValueError) as err:
+            raise ValueError(f"Invalid timeout value: {value}") from err
 
 
 def validate_file_path(file_path: str | Path, must_exist: bool = True) -> Path:
@@ -213,7 +205,7 @@ def validate_directory_path(dir_path: str | Path, must_exist: bool = True) -> Pa
 
 
 def validate_url(url: str) -> str:
-    """Validate URL format.
+    """Validate URL format (HTTPS only).
 
     Args:
         url: URL to validate
@@ -225,7 +217,7 @@ def validate_url(url: str) -> str:
         ValueError: If URL is invalid
     """
     url_pattern = re.compile(
-        r"^https?://"  # http:// or https://
+        r"^https://"  # https:// only
         r"(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?|"  # domain...
         r"localhost|"  # localhost...
         r"\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})"  # ...or ip
@@ -235,7 +227,7 @@ def validate_url(url: str) -> str:
     )
 
     if not url_pattern.match(url):
-        raise ValueError(f"Invalid URL format: {url}")
+        raise ValueError("API URL must start with https:// and be a valid host.")
 
     return url
 

{glaip_sdk-0.1.0.dist-info → glaip_sdk-0.6.10.dist-info}/METADATA

@@ -1,25 +1,42 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: glaip-sdk
-Version: 0.1.0
+Version: 0.6.10
 Summary: Python SDK for GL AIP (GDP Labs AI Agent Package) - Simplified CLI Design
 License: MIT
 Author: Raymond Christopher
 Author-email: raymond.christopher@gdplabs.id
-Requires-Python: >=3.10
+Requires-Python: >=3.11,<3.13
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Provides-Extra: dev
+Provides-Extra: memory
+Provides-Extra: privacy
+Requires-Dist: aip-agents-binary (>=0.5.1)
+Requires-Dist: aip-agents[memory] (>=0.5.1) ; (python_version >= "3.11" and python_version < "3.13") and (extra == "memory")
+Requires-Dist: aip-agents[privacy] (>=0.5.1) ; (python_version >= "3.11" and python_version < "3.13") and (extra == "privacy")
 Requires-Dist: click (>=8.2.0,<8.3.0)
+Requires-Dist: gllm-core-binary (>=0.1.0)
+Requires-Dist: gllm-tools-binary (>=0.1.3)
 Requires-Dist: httpx (>=0.28.1)
+Requires-Dist: langchain-core (>=0.3.0)
 Requires-Dist: packaging (>=23.2)
+Requires-Dist: pre-commit (>=4.3.0) ; extra == "dev"
 Requires-Dist: pydantic (>=2.0.0)
+Requires-Dist: pytest (>=7.0.0) ; extra == "dev"
+Requires-Dist: pytest-asyncio (>=0.23.6) ; extra == "dev"
+Requires-Dist: pytest-cov (>=4.0.0) ; extra == "dev"
+Requires-Dist: pytest-dotenv (>=0.5.2) ; extra == "dev"
+Requires-Dist: pytest-timeout (>=2.3.1) ; extra == "dev"
+Requires-Dist: pytest-xdist (>=3.8.0) ; extra == "dev"
 Requires-Dist: python-dotenv (>=1.1.1,<2.0.0)
 Requires-Dist: pyyaml (>=6.0.0)
 Requires-Dist: questionary (>=2.1.0,<3.0.0)
 Requires-Dist: readchar (>=4.2.1,<5.0.0)
 Requires-Dist: rich (>=13.0.0)
+Requires-Dist: ruff (>=0.14.0) ; extra == "dev"
+Requires-Dist: textual (>=0.52.0)
 Description-Content-Type: text/markdown
 
 # GL AIP — GDP Labs AI Agents Package
@@ -193,3 +210,24 @@ Quick links:
 - **[MCP Integration](https://gdplabs.gitbook.io/gl-aip/gl-aip-sdk/guides/mcps-guide)**: Connect external services
 - **[API Reference](https://gdplabs.gitbook.io/gl-aip/gl-aip-sdk/reference/python-sdk-reference)**: Complete SDK reference
 
+## 🧪 Simulate the Update Notifier
+
+Need to verify the in-session upgrade flow without hitting PyPI or actually running `pip install`? Use the bundled helper:
+
+```bash
+cd python/glaip-sdk
+poetry run python scripts/mock_update_notifier.py
+# or customize the mock payload:
+# poetry run python scripts/mock_update_notifier.py --version 3.3.3 --marker "[nightly build]"
+```
+
+The script:
+
+- Launches a SlashSession with prompt-toolkit disabled (so it runs cleanly in tests/CI).
+- Forces the notifier to believe a newer version exists (`--version 9.9.9` by default).
+- Appends a visible marker (default `[mock update]`) to the banner so you can prove the branding reload happened; pass `--marker ""` to skip.
+- Auto-selects “Update now”, mocks the install step, and runs the real branding refresh logic.
+- Resets module metadata afterwards so your environment remains untouched.
+
+You should see the Rich banner re-render with the mocked version (and optional marker) at the end of the run.
+