glchat-plugin 0.4.4__py3-none-any.whl → 0.4.6__py3-none-any.whl

glchat_plugin/pipeline/pipeline_handler.py

@@ -7,6 +7,7 @@ Authors:
     Hermes Vincentius Gani (hermes.v.gani@gdplabs.id)
 """
 
+import inspect
 import traceback
 from typing import Any, Type
 
@@ -272,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:
@@ -281,13 +287,16 @@ 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_tools = await internal_plugin.build_tools(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, prompt_builder_catalogs, lmrp_catalogs)
                     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] = PipelineBundle(pipeline, pipeline_tools)
@@ -321,8 +330,13 @@ class PipelineHandler(PluginHandler):
                 if credentials:
                     pipeline_config["api_key"] = credentials
 
-                pipeline = await plugin.build(pipeline_config)
-                pipeline_tools = await plugin.build_tools(pipeline_config)
+                pipeline = await cls._call_build(
+                    plugin,
+                    pipeline_config,
+                    prompt_builder_catalogs,
+                    lmrp_catalogs,
+                )
+                pipeline_tools = await plugin.build_tools(pipeline_config, prompt_builder_catalogs, lmrp_catalogs)
                 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] = PipelineBundle(pipeline, pipeline_tools)
@@ -337,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.
 

glchat_plugin/pipeline/pipeline_plugin.py

@@ -137,6 +137,8 @@ class PipelineBuilderPlugin(Plugin, Generic[PipelineState, PipelinePresetConfig]
     async def build_tools(
         self,
         pipeline_config: dict[str, Any],
+        prompt_builder_catalogs: dict[str, BaseCatalog[Any]] | None = None,
+        lmrp_catalogs: dict[str, BaseCatalog[Any]] | None = None,
     ) -> list[ToolProcessor]:
         """Build a pipeline instance.
 

{glchat_plugin-0.4.4.dist-info → glchat_plugin-0.4.6.dist-info}/METADATA

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

{glchat_plugin-0.4.4.dist-info → glchat_plugin-0.4.6.dist-info}/RECORD

@@ -8,8 +8,8 @@ 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=BaGnbH4sy0DXyoZpeAlp6gWmqJMZlg7W9KpxCSMu-u8,36527
-glchat_plugin/pipeline/pipeline_plugin.py,sha256=fDQWJkEMgbbY6bK81gHjzp3fLZZN0a0Pv6_DS4wSKL0,5040
+glchat_plugin/pipeline/pipeline_handler.py,sha256=JPJypNA1YdE6EGJg8gEq2xqDtWdxwxqpdqmbIlG6Ls8,38188
+glchat_plugin/pipeline/pipeline_plugin.py,sha256=xUOVnMu2Skc1QseVpCAm45YBFnQIOEuSAqpHoBVsyJc,5182
 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
@@ -20,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.4.dist-info/METADATA,sha256=bQlhz2exJI-pcGGfjYFNpbdV5kMSePxbdCYhO6cvxZo,2063
-glchat_plugin-0.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-glchat_plugin-0.4.4.dist-info/top_level.txt,sha256=fzKSXmct5dY4CAKku4-mkdHX-QPAyQVvo8vpQj8qizY,14
-glchat_plugin-0.4.4.dist-info/RECORD,,
+glchat_plugin-0.4.6.dist-info/METADATA,sha256=1g9LlVnwamc7VP3r-wCs293gBhCkcoWQUiaiVnwbhtc,2063
+glchat_plugin-0.4.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+glchat_plugin-0.4.6.dist-info/top_level.txt,sha256=fzKSXmct5dY4CAKku4-mkdHX-QPAyQVvo8vpQj8qizY,14
+glchat_plugin-0.4.6.dist-info/RECORD,,