glchat-plugin 0.4.0__py3-none-any.whl → 0.4.2__py3-none-any.whl

glchat_plugin/pipeline/pipeline_handler.py

@@ -166,7 +166,7 @@ class PipelineHandler(PluginHandler):
                 if pipeline_type != instance._chatbot_configs[chatbot_organization_id].pipeline_type:
                     continue
 
-                await cls._build_plugin(instance, chatbot_id, preset.supported_models, plugin)
+                await cls._build_plugin(instance, chatbot_id, preset.supported_models, plugin, organization_id)
             except Exception as e:
                 logger.warning(f"Failed when ainit pliugin {traceback.format_exc()}")
                 logger.warning(f"Error initializing plugin for chatbot `{chatbot_id}`: {e}")
@@ -186,7 +186,12 @@ class PipelineHandler(PluginHandler):
 
     @classmethod
     async def _build_plugin(
-        cls, instance: "PipelineHandler", chatbot_id: str, supported_models: list[dict[str, Any]], plugin: Plugin
+        cls,
+        instance: "PipelineHandler",
+        chatbot_id: str,
+        supported_models: list[dict[str, Any]],
+        plugin: Plugin,
+        organization_id: str = DEFAULT_ORGANIZATION_ID,
     ) -> None:
         """Build a plugin for the given chatbot.
 
@@ -195,8 +200,8 @@ class PipelineHandler(PluginHandler):
             chatbot_id (str): The chatbot ID.
             supported_models (list[dict[str, Any]]): List of models (including config).
             plugin (Plugin): The pipeline builder plugin instance.
+            organization_id (str): The organization ID.
         """
-        organization_id = plugin.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
@@ -376,7 +381,7 @@ class PipelineHandler(PluginHandler):
                 return
 
             # Use the existing _build_plugin method to rebuild the pipeline
-            await __class__._build_plugin(self, chatbot_id, [model_config], plugin)
+            await __class__._build_plugin(self, chatbot_id, [model_config], plugin, organization_id)
 
             logger.info(f"Successfully rebuilt pipeline for chatbot `{chatbot_organization_id}` model `{model_id}`")
 
@@ -519,7 +524,7 @@ class PipelineHandler(PluginHandler):
         )
 
         supported_models = list(pipeline_info["config"].get("supported_models", {}).values())
-        await __class__._build_plugin(self, chatbot_id, supported_models, plugin)
+        await __class__._build_plugin(self, chatbot_id, supported_models, plugin, organization_id)
 
     async def delete_chatbot(self, chatbot_id: str, organization_id: str = DEFAULT_ORGANIZATION_ID) -> None:
         """Delete a chatbot.
@@ -594,15 +599,16 @@ class PipelineHandler(PluginHandler):
                 self._builders.pop(chatbot_organization_id, None)
                 self._builders[chatbot_organization_id] = plugin
 
-                await __class__._build_plugin(self, chatbot_id, supported_models, plugin)
+                await __class__._build_plugin(self, chatbot_id, supported_models, plugin, organization_id)
             except Exception as e:
                 logger.warning(f"Error updating chatbot `{chatbot_id}`: {e}")
 
     def _prepare_pipelines(self) -> None:
         """Build pipeline configurations from the chatbots configuration."""
         pipeline_types: set[tuple[str, str]] = set()
-        chatbot_preset_map: dict[str, PipelinePresetConfig] = {}
+        chatbot_preset_map: dict[str, dict[str, PipelinePresetConfig]] = {}
         for org_id, org_app_config in self.app_config.items():
+            chatbot_preset_map.setdefault(org_id, {})
             for chatbot_id, chatbot_info in org_app_config.chatbots.items():
                 if not chatbot_info.pipeline:
                     logger.warning(f"Pipeline config not found for chatbot `{chatbot_id}`")
@@ -611,7 +617,7 @@ class PipelineHandler(PluginHandler):
                 pipeline_info = chatbot_info.pipeline
                 pipeline_type = pipeline_info["type"]
 
-                chatbot_preset_map[chatbot_id] = PipelinePresetConfig(
+                chatbot_preset_map[org_id][chatbot_id] = PipelinePresetConfig(
                     preset_id=pipeline_info["config"]["pipeline_preset_id"],
                     supported_models=list(pipeline_info["config"].get("supported_models", {}).values()),
                 )
@@ -628,7 +634,7 @@ class PipelineHandler(PluginHandler):
         for pipeline_type, org_id in pipeline_types:
             self._activated_configs[(pipeline_type, org_id)] = ChatbotPresetMapping(
                 pipeline_type=pipeline_type,
-                chatbot_preset_map=chatbot_preset_map,
+                chatbot_preset_map=chatbot_preset_map[org_id],
             )
 
     def _validate_pipeline(self, chatbot_id: str, organization_id: str) -> None:
@@ -745,7 +751,7 @@ class PipelineHandler(PluginHandler):
                 return
 
             # Use the existing _build_plugin method to rebuild the plugin
-            await __class__._build_plugin(self, chatbot_id, supported_models, plugin)
+            await __class__._build_plugin(self, chatbot_id, supported_models, plugin, organization_id)
 
             logger.info(f"Successfully rebuilt pipeline builder for chatbot `{chatbot_id}`")
 

{glchat_plugin-0.4.0.dist-info → glchat_plugin-0.4.2.dist-info}/METADATA

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

{glchat_plugin-0.4.0.dist-info → glchat_plugin-0.4.2.dist-info}/RECORD

@@ -8,7 +8,7 @@ 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=N4RAtsfZitcJedB4Cstm3prJr7sxzj3w2iL3aqrRiXw,33941
+glchat_plugin/pipeline/pipeline_handler.py,sha256=Kp2LBqtVHzJ2twLaUvYXnL-1QGkqL_8h21IAR7FxBTI,34203
 glchat_plugin/pipeline/pipeline_plugin.py,sha256=eBrg4THS0P49Mz4glEjrwqe1pxnvOn_UitJ9gOBVcac,4562
 glchat_plugin/service/__init__.py,sha256=9T4qzyYL052qLqva5el1F575OTRNaaf9tb9UvW-leTc,47
 glchat_plugin/service/base_rate_limiter_service.py,sha256=tgKwdr4EqnGo5iDRVJPnlg8W9q0hiUzfeewAtdW4IjU,1232
@@ -19,7 +19,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.0.dist-info/METADATA,sha256=AwvZd71FAS5UVDD1ApT_RclgF5mFcf0FTmFINKRB3Wo,2063
-glchat_plugin-0.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-glchat_plugin-0.4.0.dist-info/top_level.txt,sha256=fzKSXmct5dY4CAKku4-mkdHX-QPAyQVvo8vpQj8qizY,14
-glchat_plugin-0.4.0.dist-info/RECORD,,
+glchat_plugin-0.4.2.dist-info/METADATA,sha256=ESq6bUqzvyNim1Y_FggGMfTXbhQcDoYUbh_jRWBv8-M,2063
+glchat_plugin-0.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+glchat_plugin-0.4.2.dist-info/top_level.txt,sha256=fzKSXmct5dY4CAKku4-mkdHX-QPAyQVvo8vpQj8qizY,14
+glchat_plugin-0.4.2.dist-info/RECORD,,