glchat-plugin 0.4.3__py3-none-any.whl → 0.4.5__py3-none-any.whl

glchat_plugin/pipeline/pipeline_handler.py

@@ -7,11 +7,13 @@ Authors:
     Hermes Vincentius Gani (hermes.v.gani@gdplabs.id)
 """
 
+import inspect
 import traceback
 from typing import Any, Type
 
 from bosa_core import Plugin
 from bosa_core.plugin.handler import PluginHandler
+from gllm_core.schema import Tool
 from gllm_core.utils import LoggerManager
 from gllm_inference.catalog import LMRequestProcessorCatalog, PromptBuilderCatalog
 from gllm_pipeline.pipeline.pipeline import Pipeline
@@ -19,6 +21,7 @@ from pydantic import BaseModel, ConfigDict
 
 from glchat_plugin.config.app_config import AppConfig
 from glchat_plugin.config.constant import DEFAULT_ORGANIZATION_ID
+from glchat_plugin.pipeline.tool_processor import ToolProcessor
 from glchat_plugin.storage.base_chat_history_storage import BaseChatHistoryStorage
 
 
@@ -64,6 +67,73 @@ class ChatbotPresetMapping(BaseModel):
     chatbot_preset_map: dict[str, PipelinePresetConfig]
 
 
+class PipelineBundle:
+    """Pipeline bundle.
+
+    Attributes:
+        pipeline (Pipeline): The pipeline.
+        tools (list[ToolProcessor]): The tools.
+    """
+
+    pipeline: Pipeline
+    tools: dict[str, ToolProcessor]
+
+    def __init__(self, pipeline: Pipeline, tools: list[ToolProcessor]):
+        """Initialize the pipeline bundle.
+
+        Args:
+            pipeline (Pipeline): The pipeline.
+            tools (list[ToolProcessor]): The tools.
+        """
+        self.pipeline = pipeline
+        self.tools = {tool.name: tool for tool in tools}
+
+    async def invoke(self, **kwargs: Any) -> dict[str, Any]:
+        """Invoke the pipeline bundle.
+
+        Args:
+            kwargs (Any): The keyword arguments to pass to the pipeline.
+
+        Returns:
+            dict[str, Any]: The result of the pipeline invocation.
+        """
+        return await self.pipeline.invoke(**kwargs)
+
+    async def invoke_as_tool(
+        self,
+        tool_name: str,
+        pipeline_config: dict[str, Any],
+        inputs: dict[str, Any],
+        config: dict[str, Any],
+        **kwargs: Any,
+    ) -> Any:
+        """Invoke the pipeline bundle as a tool.
+
+        Args:
+            tool_name (str): The name of the tool.
+            pipeline_config (dict[str, Any]): The pipeline configuration.
+            inputs (dict[str, Any]): The inputs to the tool.
+            config (dict[str, Any]): The configuration of the tool.
+            kwargs (Any): The keyword arguments to pass to the tool.
+
+        Returns:
+            Any: The result of the tool invocation.
+
+        Raises:
+            ValueError: If the tool is not found in the pipeline bundle.
+        """
+        tool = self.tools.get(tool_name)
+        if not tool:
+            raise ValueError(f"Tool `{tool_name}` not found in pipeline bundle")
+
+        return await tool.process(
+            pipeline_config=pipeline_config,
+            inputs=inputs,
+            config=config,
+            **kwargs,
+        )
+
+
 logger = LoggerManager().get_logger(__name__)
 
 
@@ -98,7 +168,7 @@ class PipelineHandler(PluginHandler):
     _chatbot_configs: dict[tuple[str, str], ChatbotConfig] = {}
     _builders: dict[tuple[str, str], Plugin] = {}
     _plugins: dict[tuple[str, str], Plugin] = {}
-    _pipeline_cache: dict[tuple[str, str, str], Pipeline] = {}
+    _pipeline_cache: dict[tuple[str, str, str], PipelineBundle] = {}
     _chatbot_pipeline_keys: dict[tuple[str, str], set[tuple[str, str, str]]] = {}
     _pipeline_build_errors: dict[tuple[str, str, str], str] = {}
 
@@ -203,8 +273,13 @@ class PipelineHandler(PluginHandler):
             organization_id (str): The organization ID.
         """
         chatbot_organization_id = (chatbot_id, organization_id)
-        plugin.prompt_builder_catalogs = instance._chatbot_configs[chatbot_organization_id].prompt_builder_catalogs
-        plugin.lmrp_catalogs = instance._chatbot_configs[chatbot_organization_id].lmrp_catalogs
+
+        prompt_builder_catalogs = instance._chatbot_configs[chatbot_organization_id].prompt_builder_catalogs
+        plugin.prompt_builder_catalogs = prompt_builder_catalogs
+
+        lmrp_catalogs = instance._chatbot_configs[chatbot_organization_id].lmrp_catalogs
+        plugin.lmrp_catalogs = lmrp_catalogs
+
         instance._builders[chatbot_organization_id] = plugin
 
         for pipeline_type in INTERNAL_PIPELINES:
@@ -212,15 +287,19 @@ class PipelineHandler(PluginHandler):
             internal_plugin = instance._plugins.get(pipeline_type_organization_id)
             if internal_plugin:
                 try:
-                    internal_plugin.prompt_builder_catalogs = instance._chatbot_configs[
-                        chatbot_organization_id
-                    ].prompt_builder_catalogs
-                    internal_plugin.lmrp_catalogs = instance._chatbot_configs[chatbot_organization_id].lmrp_catalogs
+                    internal_plugin.prompt_builder_catalogs = prompt_builder_catalogs
+                    internal_plugin.lmrp_catalogs = lmrp_catalogs
                     pipeline_config = instance._chatbot_configs[chatbot_organization_id].pipeline_config.copy()
-                    pipeline = await internal_plugin.build(pipeline_config)
+                    pipeline = await cls._call_build(
+                        internal_plugin,
+                        pipeline_config,
+                        prompt_builder_catalogs,
+                        lmrp_catalogs,
+                    )
+                    pipeline_tools = await internal_plugin.build_tools(pipeline_config)
                     pipeline_key = (chatbot_id, f"__{pipeline_type}__", organization_id)
                     instance._chatbot_pipeline_keys.setdefault(chatbot_organization_id, set()).add(pipeline_key)
-                    instance._pipeline_cache[pipeline_key] = pipeline
+                    instance._pipeline_cache[pipeline_key] = PipelineBundle(pipeline, pipeline_tools)
 
                     # Clear any previous error for this internal pipeline if build succeeded
                     instance._pipeline_build_errors.pop(pipeline_key, None)
@@ -251,10 +330,16 @@ class PipelineHandler(PluginHandler):
                 if credentials:
                     pipeline_config["api_key"] = credentials
 
-                pipeline = await plugin.build(pipeline_config)
+                pipeline = await cls._call_build(
+                    plugin,
+                    pipeline_config,
+                    prompt_builder_catalogs,
+                    lmrp_catalogs,
+                )
+                pipeline_tools = await plugin.build_tools(pipeline_config)
                 pipeline_key = (chatbot_id, str(model_id), organization_id)
                 instance._chatbot_pipeline_keys.setdefault(chatbot_organization_id, set()).add(pipeline_key)
-                instance._pipeline_cache[pipeline_key] = pipeline
+                instance._pipeline_cache[pipeline_key] = PipelineBundle(pipeline, pipeline_tools)
 
                 # Clear any previous error for this pipeline if build succeeded
                 instance._pipeline_build_errors.pop(pipeline_key, None)
@@ -266,6 +351,41 @@ class PipelineHandler(PluginHandler):
                 # Store the error message for later retrieval
                 instance._store_pipeline_build_error(chatbot_id, str(model_id), organization_id, error_message)
 
+    @classmethod
+    async def _call_build(
+        cls,
+        plugin: Plugin,
+        pipeline_config: dict[str, Any],
+        prompt_builder_catalogs: dict[str, PromptBuilderCatalog] | None,
+        lmrp_catalogs: dict[str, LMRequestProcessorCatalog] | None,
+    ) -> Pipeline:
+        """Call plugin.build in a backward-compatible way.
+
+        If the plugin.build signature declares prompt_builder_catalogs or lmrp_catalogs,
+        they will be passed as keyword arguments. Otherwise, only pipeline_config is passed.
+        """
+        try:
+            sig = inspect.signature(plugin.build)
+        except (TypeError, ValueError):
+            # Fallback: call with just pipeline_config
+            return await plugin.build(pipeline_config)
+
+        params = list(sig.parameters.values())
+        # Skip 'self' if present
+        if params and params[0].name == "self":
+            params = params[1:]
+
+        param_names = {p.name for p in params}
+
+        if "prompt_builder_catalogs" in param_names or "lmrp_catalogs" in param_names:
+            return await plugin.build(
+                pipeline_config,
+                prompt_builder_catalogs=prompt_builder_catalogs,
+                lmrp_catalogs=lmrp_catalogs,
+            )
+
+        return await plugin.build(pipeline_config)
+
     def get_pipeline_builder(self, chatbot_id: str, organization_id: str = DEFAULT_ORGANIZATION_ID) -> Plugin:
         """Get a pipeline builder instance for the given chatbot.
 
@@ -394,7 +514,7 @@ class PipelineHandler(PluginHandler):
 
     async def aget_pipeline(
         self, chatbot_id: str, model_id: str, organization_id: str = DEFAULT_ORGANIZATION_ID
-    ) -> Pipeline:
+    ) -> PipelineBundle:
         """Get a pipeline instance for the given chatbot and model ID (async version).
 
         Args:
@@ -403,7 +523,7 @@ class PipelineHandler(PluginHandler):
             organization_id (str): The organization ID.
 
         Returns:
-            Pipeline: The pipeline instance.
+            PipelineBundle: The pipeline bundle instance.
 
         Raises:
             ValueError: If the chatbot ID is invalid.

glchat_plugin/pipeline/pipeline_plugin.py

@@ -11,11 +11,13 @@ from abc import ABC, abstractmethod
 from typing import Any, Generic, Type, TypeVar
 
 from bosa_core.plugin.plugin import Plugin
+from gllm_core.schema import Tool
 from gllm_inference.catalog.catalog import BaseCatalog
 from gllm_pipeline.pipeline.pipeline import Pipeline
 
 from glchat_plugin.config.constant import DEFAULT_ORGANIZATION_ID
 from glchat_plugin.pipeline.pipeline_handler import PipelineHandler
+from glchat_plugin.pipeline.tool_processor import ToolProcessor
 
 PipelineState = TypeVar("PipelineState")
 PipelinePresetConfig = TypeVar("PipelinePresetConfig", bound="BasePipelinePresetConfig")
@@ -131,3 +133,17 @@ class PipelineBuilderPlugin(Plugin, Generic[PipelineState, PipelinePresetConfig]
         if self.preset_config_class:
             return self.preset_config_class().model_dump()
         return {}
+
+    async def build_tools(
+        self,
+        pipeline_config: dict[str, Any],
+    ) -> list[ToolProcessor]:
+        """Build a pipeline instance.
+
+        Args:
+            pipeline_config (dict[str, Any]): Pipeline configuration including model name and other settings.
+
+        Returns:
+            list[ToolProcessor]: Built tool processors.
+        """
+        return []

glchat_plugin/pipeline/tool_processor.py

@@ -0,0 +1,105 @@
+"""Tool processor.
+
+This module provides a base class for tool processors.
+
+Authors:
+    Surya Mahadi (surya.mahadi@gdplabs.id)
+
+References:
+    None
+"""
+
+from abc import ABC, abstractmethod
+from typing import Any
+
+from gllm_core.schema import Tool
+
+
+class ToolProcessor(ABC):
+    """Tool processor.
+
+    This class is responsible for processing tools.
+
+    Attributes:
+        tool (Tool): The tool.
+    """
+
+    def __init__(self, tool: Tool):
+        """Initialize the tool processor.
+
+        Args:
+            tool (Tool): The tool.
+        """
+        self.tool = tool
+
+    @property
+    def name(self) -> str:
+        """Get the name of the tool.
+
+        Returns:
+            str: The name of the tool.
+        """
+        return self.tool.name
+
+    @abstractmethod
+    async def preprocess(
+        self,
+        pipeline_config: dict[str, Any],
+        inputs: dict[str, Any],
+        config: dict[str, Any],
+        **kwargs: Any,
+    ) -> tuple[dict[str, Any], dict[str, Any]]:
+        """Process a tool.
+
+        Args:
+            pipeline_config (dict[str, Any]): The pipeline configuration.
+            inputs (dict[str, Any]): The inputs to the tool.
+            config (dict[str, Any]): The configuration of the tool.
+            kwargs (Any): The keyword arguments to pass to the tool.
+
+        Returns:
+            tuple[dict[str, Any], dict[str, Any]]: The inputs and configuration for the tool invocation.
+        """
+        raise NotImplementedError
+
+    @abstractmethod
+    async def postprocess(self, result: Any) -> dict[str, Any]:
+        """Postprocess a tool for json friendly output.
+
+        Args:
+            result (Any): The result of the tool invocation.
+
+        Returns:
+            dict[str, Any]: The result of the tool invocation.
+        """
+        raise NotImplementedError
+
+    async def process(
+        self,
+        pipeline_config: dict[str, Any],
+        inputs: dict[str, Any],
+        config: dict[str, Any],
+        **kwargs: Any,
+    ) -> Any:
+        """Process a tool.
+
+        Args:
+            pipeline_config (dict[str, Any]): The pipeline configuration.
+            inputs (dict[str, Any]): The inputs to the tool.
+            config (dict[str, Any]): The configuration of the tool.
+            kwargs (Any): The keyword arguments to pass to the tool.
+
+        Returns:
+            Any: The result of the tool invocation.
+        """
+        tool_input, config = await self.preprocess(
+            pipeline_config=pipeline_config,
+            inputs=inputs,
+            config=config,
+            **kwargs,
+        )
+        result = await self.tool.invoke(
+            input=tool_input,
+            context=config,
+        )
+        return await self.postprocess(result)

{glchat_plugin-0.4.3.dist-info → glchat_plugin-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: glchat-plugin
-Version: 0.4.3
+Version: 0.4.5
 Author-email: GenAI SDK Team <gat-sdk@gdplabs.id>
 Requires-Python: <3.13,>=3.11
 Description-Content-Type: text/markdown

{glchat_plugin-0.4.3.dist-info → glchat_plugin-0.4.5.dist-info}/RECORD

@@ -8,8 +8,9 @@ glchat_plugin/handler/__init__.py,sha256=H5DJaAfwwtRsvMcOaEzHfGMQk25H7la0E7uPfks
 glchat_plugin/handler/base_post_login_handler.py,sha256=48xSbe_LwTCjRY-lCuzWXqbnEr1ql8bAhQih1Xeh8f8,2835
 glchat_plugin/pipeline/__init__.py,sha256=Sk-NfIGyA9VKIg0Bt5OHatNUYyWVPh9i5xhE5DFAfbo,41
 glchat_plugin/pipeline/base_pipeline_preset_config.py,sha256=lbMH8y_HU3LrqtMYXLzQ2906ZkMXARKY5vBuIGvRVdA,2969
-glchat_plugin/pipeline/pipeline_handler.py,sha256=Kp2LBqtVHzJ2twLaUvYXnL-1QGkqL_8h21IAR7FxBTI,34203
-glchat_plugin/pipeline/pipeline_plugin.py,sha256=eBrg4THS0P49Mz4glEjrwqe1pxnvOn_UitJ9gOBVcac,4562
+glchat_plugin/pipeline/pipeline_handler.py,sha256=sBD9Ohkd6GIIiTxgRAm81HuQJIzcNmV7KjE3hHQiftw,38108
+glchat_plugin/pipeline/pipeline_plugin.py,sha256=fDQWJkEMgbbY6bK81gHjzp3fLZZN0a0Pv6_DS4wSKL0,5040
+glchat_plugin/pipeline/tool_processor.py,sha256=pc-uHoBqOSXjLM8R_Wgws_z5ehPtaSeb9Bhk9aeLDus,2731
 glchat_plugin/service/__init__.py,sha256=9T4qzyYL052qLqva5el1F575OTRNaaf9tb9UvW-leTc,47
 glchat_plugin/service/base_rate_limiter_service.py,sha256=tgKwdr4EqnGo5iDRVJPnlg8W9q0hiUzfeewAtdW4IjU,1232
 glchat_plugin/service/base_tenant_service.py,sha256=CB-jJWXi87nTcjO1XhPoSgNMf2YA_LfXoHr30ye0VtI,734
@@ -19,7 +20,7 @@ glchat_plugin/storage/base_anonymizer_storage.py,sha256=oFwovWrsjM7v1YjeN-4p-M3O
 glchat_plugin/storage/base_chat_history_storage.py,sha256=YIGM8zv7s5BQ8O7W1LfaLyQW4SF9Bt3aolowsoDaQw8,11257
 glchat_plugin/tools/__init__.py,sha256=OFotHbgQ8mZEbdlvlv5aVMdxfubPvkVWAcTwhIPdIqQ,542
 glchat_plugin/tools/decorators.py,sha256=AvQBV18wzXWdC483RSSmpfh92zsqTyp8SzDLIkreIGU,3925
-glchat_plugin-0.4.3.dist-info/METADATA,sha256=Annr1O57pSyLVG6niQiTXTZT7A2s9R1QWlo5nqzgur4,2063
-glchat_plugin-0.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-glchat_plugin-0.4.3.dist-info/top_level.txt,sha256=fzKSXmct5dY4CAKku4-mkdHX-QPAyQVvo8vpQj8qizY,14
-glchat_plugin-0.4.3.dist-info/RECORD,,
+glchat_plugin-0.4.5.dist-info/METADATA,sha256=8lU2TR_qmgA8oM25F_Kq7g0v5YAKiGJuLUsFvKO2P1k,2063
+glchat_plugin-0.4.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+glchat_plugin-0.4.5.dist-info/top_level.txt,sha256=fzKSXmct5dY4CAKku4-mkdHX-QPAyQVvo8vpQj8qizY,14
+glchat_plugin-0.4.5.dist-info/RECORD,,