glchat-plugin 0.3.10__py3-none-any.whl → 0.4.1__py3-none-any.whl

glchat_plugin/config/constant.py

@@ -106,3 +106,5 @@ GUARDRAIL_ERR_MSG = (
     "- Content that may violate legal or ethical standards\n\n"
     "Please rephrase your question or ask about a different topic that complies with our guidelines."
 )
+
+DEFAULT_ORGANIZATION_ID = "-"

glchat_plugin/context/context_manager.py

@@ -1,7 +1,6 @@
 """Provides a class for context manager.
 
 Authors:
-    Ricky Setiawan (ricky.setiawan@gdplabs.id)
     Ryan Ignatius Hadiwijaya (ryan.i.hadiwijaya@gdplabs.id)
 
 References:
@@ -9,7 +8,6 @@ References:
 """
 
 from contextvars import ContextVar
-from typing import Any
 
 
 class ContextManager:
@@ -20,8 +18,6 @@ class ContextManager:
 
     _tenant: ContextVar[str | None] = ContextVar("tenant_id", default=None)
     _user: ContextVar[str | None] = ContextVar("user_id", default=None)
-    _user_session: ContextVar[Any | None] = ContextVar("user_session", default=None)
-    _request_id: ContextVar[str | None] = ContextVar("request_id", default=None)
 
     @classmethod
     def set_tenant(cls, tenant_id: str | None) -> None:
@@ -59,47 +55,3 @@ class ContextManager:
             str | None: The user id.
         """
         return cls._user.get()
-
-    @classmethod
-    def set_user_session(cls, user_session: Any | None) -> None:
-        """Set the user session in the context.
-
-        Args:
-            user_session (Any | None): The user session.
-        """
-        cls._user_session.set(user_session)
-
-    @classmethod
-    def get_user_session(cls) -> Any | None:
-        """Get the user session from the context.
-
-        Returns:
-            Any | None: The user session.
-        """
-        return cls._user_session.get()
-
-    @classmethod
-    def set_request_id(cls, request_id: str | None) -> None:
-        """Set the request id in the context.
-
-        Args:
-            request_id (str | None): The request id.
-        """
-        cls._request_id.set(request_id)
-
-    @classmethod
-    def get_request_id(cls) -> str | None:
-        """Get the request id from the context.
-
-        Returns:
-            str | None: The request id.
-        """
-        return cls._request_id.get()
-
-    @classmethod
-    def clear(cls) -> None:
-        """Clear the context."""
-        cls._tenant.set(None)
-        cls._user.set(None)
-        cls._user_session.set(None)
-        cls._request_id.set(None)

glchat_plugin/pipeline/pipeline_handler.py

@@ -18,6 +18,7 @@ from gllm_pipeline.pipeline.pipeline import Pipeline
 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.storage.base_chat_history_storage import BaseChatHistoryStorage
 
 
@@ -75,32 +76,37 @@ class PipelineHandler(PluginHandler):
     This handler manages pipeline builder plugins and provides caching for built pipelines.
 
     Attributes:
-        app_config (AppConfig): Application configuration.
-        _activated_configs (dict[str, ChatbotPresetMapping]): Collection of chatbot preset mapping by pipeline types.
-        _chatbot_configs (dict[str, ChatbotConfig]): Mapping of chatbot IDs to their configurations.
-        _builders (dict[str, Plugin]): Mapping of chatbot IDs to their pipeline builder plugins.
-        _plugins (dict[str, Plugin]): Mapping of pipeline types to their plugins.
-        _pipeline_cache (dict[tuple[str, str], Pipeline]):
-            Cache mapping (chatbot_id, model_id) to Pipeline instances.
-        _chatbot_pipeline_keys (dict[str, set[tuple[str, str]]]): Mapping of chatbot IDs to their pipeline keys.
-        _pipeline_build_errors (dict[tuple[str, str], str]):
-            Cache mapping (chatbot_id, model_id) to error messages from failed pipeline builds.
+        app_config (dict[str, AppConfig]): Application configuration.
+        _activated_configs (dict[tuple[str, str], ChatbotPresetMapping]):
+            Collection of chatbot preset mapping by pipeline types.
+        _chatbot_configs (dict[tuple[str, str], ChatbotConfig]):
+            Mapping of chatbot IDs to their configurations.
+        _builders (dict[tuple[str, str], Plugin]):
+            Mapping of chatbot IDs to their pipeline builder plugins.
+        _plugins (dict[tuple[str, str], Plugin]):
+            Mapping of pipeline types to their plugins.
+        _pipeline_cache (dict[tuple[str, str, str], Pipeline]):
+            Cache mapping (chatbot_id, model_id, organization_id) to Pipeline instances.
+        _chatbot_pipeline_keys (dict[tuple[str, str], set[tuple[str, str, str]]]):
+            Mapping of chatbot IDs to their pipeline keys.
+        _pipeline_build_errors (dict[tuple[str, str, str], str]):
+            Cache mapping (chatbot_id, model_id, organization_id) to error messages from failed pipeline builds.
     """
 
-    app_config: AppConfig
-    _activated_configs: dict[str, ChatbotPresetMapping] = {}
-    _chatbot_configs: dict[str, ChatbotConfig] = {}
-    _builders: dict[str, Plugin] = {}
-    _plugins: dict[str, Plugin] = {}
-    _pipeline_cache: dict[tuple[str, str], Pipeline] = {}
-    _chatbot_pipeline_keys: dict[str, set[tuple[str, str]]] = {}
-    _pipeline_build_errors: dict[tuple[str, str], str] = {}
+    app_config: dict[str, AppConfig] = {}
+    _activated_configs: dict[tuple[str, str], ChatbotPresetMapping] = {}
+    _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] = {}
+    _chatbot_pipeline_keys: dict[tuple[str, str], set[tuple[str, str, str]]] = {}
+    _pipeline_build_errors: dict[tuple[str, str, str], str] = {}
 
-    def __init__(self, app_config: AppConfig, chat_history_storage: BaseChatHistoryStorage):
+    def __init__(self, app_config: dict[str, AppConfig], chat_history_storage: BaseChatHistoryStorage):
         """Initialize the pipeline handler.
 
         Args:
-            app_config (AppConfig): Application configuration.
+            app_config (dict[str, AppConfig]): Application configuration.
             chat_history_storage (BaseChatHistoryStorage): Chat history storage.
         """
         self.app_config = app_config
@@ -118,7 +124,6 @@ class PipelineHandler(PluginHandler):
             dict[Type[Any], Any]: Dictionary mapping service types to their instances.
         """
         return {
-            AppConfig: instance.app_config,
             BaseChatHistoryStorage: instance.chat_history_storage,
         }
 
@@ -147,15 +152,18 @@ class PipelineHandler(PluginHandler):
             plugin (Plugin): The pipeline builder plugin instance.
         """
         pipeline_type = plugin.name
-        instance._plugins[pipeline_type] = plugin
+        organization_id = plugin.organization_id
+        pipeline_type_organization_id = (pipeline_type, organization_id)
+        instance._plugins[pipeline_type_organization_id] = plugin
 
-        if pipeline_type not in instance._activated_configs:
+        if pipeline_type_organization_id not in instance._activated_configs:
             return
 
-        active_config = instance._activated_configs[pipeline_type]
+        active_config = instance._activated_configs[pipeline_type_organization_id]
         for chatbot_id, preset in active_config.chatbot_preset_map.items():
             try:
-                if pipeline_type != instance._chatbot_configs[chatbot_id].pipeline_type:
+                chatbot_organization_id = (chatbot_id, organization_id)
+                if pipeline_type != instance._chatbot_configs[chatbot_organization_id].pipeline_type:
                     continue
 
                 await cls._build_plugin(instance, chatbot_id, preset.supported_models, plugin)
@@ -188,22 +196,25 @@ class PipelineHandler(PluginHandler):
             supported_models (list[dict[str, Any]]): List of models (including config).
             plugin (Plugin): The pipeline builder plugin instance.
         """
-        plugin.prompt_builder_catalogs = instance._chatbot_configs[chatbot_id].prompt_builder_catalogs
-        plugin.lmrp_catalogs = instance._chatbot_configs[chatbot_id].lmrp_catalogs
-        instance._builders[chatbot_id] = plugin
+        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
+        instance._builders[chatbot_organization_id] = plugin
 
         for pipeline_type in INTERNAL_PIPELINES:
-            internal_plugin = instance._plugins.get(pipeline_type)
+            pipeline_type_organization_id = (pipeline_type, organization_id)
+            internal_plugin = instance._plugins.get(pipeline_type_organization_id)
             if internal_plugin:
                 try:
                     internal_plugin.prompt_builder_catalogs = instance._chatbot_configs[
-                        chatbot_id
+                        chatbot_organization_id
                     ].prompt_builder_catalogs
-                    internal_plugin.lmrp_catalogs = instance._chatbot_configs[chatbot_id].lmrp_catalogs
-                    pipeline_config = instance._chatbot_configs[chatbot_id].pipeline_config.copy()
+                    internal_plugin.lmrp_catalogs = instance._chatbot_configs[chatbot_organization_id].lmrp_catalogs
+                    pipeline_config = instance._chatbot_configs[chatbot_organization_id].pipeline_config.copy()
                     pipeline = await internal_plugin.build(pipeline_config)
-                    pipeline_key = (chatbot_id, f"__{pipeline_type}__")
-                    instance._chatbot_pipeline_keys.setdefault(chatbot_id, set()).add(pipeline_key)
+                    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
 
                     # Clear any previous error for this internal pipeline if build succeeded
@@ -216,7 +227,9 @@ class PipelineHandler(PluginHandler):
                     logger.warning(error_message)
 
                     # Store the error message for later retrieval
-                    instance._store_pipeline_build_error(chatbot_id, f"__{pipeline_type}__", error_message)
+                    instance._store_pipeline_build_error(
+                        chatbot_id, f"__{pipeline_type}__", organization_id, error_message
+                    )
 
         for model in supported_models:
             try:
@@ -224,7 +237,7 @@ class PipelineHandler(PluginHandler):
                 if not model_id:
                     continue
 
-                pipeline_config = instance._chatbot_configs[chatbot_id].pipeline_config.copy()
+                pipeline_config = instance._chatbot_configs[chatbot_organization_id].pipeline_config.copy()
                 # use original model name
                 pipeline_config["model_name"] = model.get("name", model_id)
                 pipeline_config["model_kwargs"] = model.get("model_kwargs", {})
@@ -234,8 +247,8 @@ class PipelineHandler(PluginHandler):
                     pipeline_config["api_key"] = credentials
 
                 pipeline = await plugin.build(pipeline_config)
-                pipeline_key = (chatbot_id, str(model_id))
-                instance._chatbot_pipeline_keys.setdefault(chatbot_id, set()).add(pipeline_key)
+                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
 
                 # Clear any previous error for this pipeline if build succeeded
@@ -246,13 +259,14 @@ class PipelineHandler(PluginHandler):
                 logger.warning(error_message)
 
                 # Store the error message for later retrieval
-                instance._store_pipeline_build_error(chatbot_id, str(model_id), error_message)
+                instance._store_pipeline_build_error(chatbot_id, str(model_id), organization_id, error_message)
 
-    def get_pipeline_builder(self, chatbot_id: str) -> Plugin:
+    def get_pipeline_builder(self, chatbot_id: str, organization_id: str = DEFAULT_ORGANIZATION_ID) -> Plugin:
         """Get a pipeline builder instance for the given chatbot.
 
         Args:
             chatbot_id (str): The chatbot ID.
+            organization_id (str): The organization ID.
 
         Returns:
             Plugin: The pipeline builder instance.
@@ -260,37 +274,45 @@ class PipelineHandler(PluginHandler):
         Raises:
             ValueError: If the chatbot ID is invalid or the model name is not supported.
         """
-        if chatbot_id not in self._builders:
-            logger.warning(f"Pipeline builder not found for chatbot `{chatbot_id}`, attempting to rebuild...")
+        chatbot_organization_id = (chatbot_id, organization_id)
+        if chatbot_organization_id not in self._builders:
+            logger.warning(
+                f"Pipeline builder not found for chatbot `{chatbot_organization_id}`, attempting to rebuild..."
+            )
             # Try to rebuild the plugin if it's not found
-            self._try_rebuild_plugin(chatbot_id)
+            self._try_rebuild_plugin(chatbot_id, organization_id)
 
-        if chatbot_id not in self._builders:
-            raise ValueError(f"Pipeline builder for chatbot `{chatbot_id}` not found and could not be rebuilt")
+        if chatbot_organization_id not in self._builders:
+            raise ValueError(
+                f"Pipeline builder for chatbot `{chatbot_organization_id}` not found and could not be rebuilt"
+            )
 
-        return self._builders[chatbot_id]
+        return self._builders[chatbot_organization_id]
 
-    def _try_rebuild_plugin(self, chatbot_id: str) -> None:
+    def _try_rebuild_plugin(self, chatbot_id: str, organization_id: str = DEFAULT_ORGANIZATION_ID) -> None:
         """Try to rebuild a plugin for the given chatbot.
 
         Args:
             chatbot_id (str): The chatbot ID.
+            organization_id (str): The organization ID.
         """
+        chatbot_organization_id = (chatbot_id, organization_id)
         try:
             # Check if we have the chatbot configuration
-            if chatbot_id not in self._chatbot_configs:
-                logger.warning(f"Chatbot configuration not found for `{chatbot_id}`")
+            if chatbot_organization_id not in self._chatbot_configs:
+                logger.warning(f"Chatbot configuration not found for `{chatbot_organization_id}`")
                 return
 
-            chatbot_config = self._chatbot_configs[chatbot_id]
+            chatbot_config = self._chatbot_configs[chatbot_organization_id]
             pipeline_type = chatbot_config.pipeline_type
+            pipeline_organization_id = (pipeline_type, organization_id)
 
             # Check if we have the plugin for this pipeline type
-            if pipeline_type not in self._plugins:
-                logger.warning(f"Plugin not found for pipeline type `{pipeline_type}`")
+            if pipeline_organization_id not in self._plugins:
+                logger.warning(f"Plugin not found for pipeline type `{pipeline_organization_id}`")
                 return
 
-            plugin = self._plugins[pipeline_type]
+            plugin = self._plugins[pipeline_organization_id]
 
             # Get supported models from the configuration
             supported_models = list(chatbot_config.pipeline_config.get("supported_models", {}).values())
@@ -303,36 +325,40 @@ class PipelineHandler(PluginHandler):
             # Set the catalogs
             plugin.prompt_builder_catalogs = chatbot_config.prompt_builder_catalogs
             plugin.lmrp_catalogs = chatbot_config.lmrp_catalogs
-            self._builders[chatbot_id] = plugin
+            self._builders[chatbot_organization_id] = plugin
 
-            logger.info(f"Successfully rebuilt pipeline builder for chatbot `{chatbot_id}`")
+            logger.info(f"Successfully rebuilt pipeline builder for chatbot `{chatbot_organization_id}`")
 
         except Exception as e:
-            logger.warning(f"Error rebuilding plugin for chatbot `{chatbot_id}`: {e}")
+            logger.warning(f"Error rebuilding plugin for chatbot `{chatbot_organization_id}`: {e}")
 
-    async def _async_rebuild_pipeline(self, chatbot_id: str, model_id: str) -> None:
+    async def _async_rebuild_pipeline(
+        self, chatbot_id: str, model_id: str, organization_id: str = DEFAULT_ORGANIZATION_ID
+    ) -> None:
         """Asynchronously rebuild a pipeline for the given chatbot and model.
 
         Args:
             chatbot_id (str): The chatbot ID.
             model_id (str): The model ID.
+            organization_id (str): The organization ID.
         """
+        chatbot_organization_id = (chatbot_id, organization_id)
         try:
             # First, ensure we have the pipeline builder
-            if chatbot_id not in self._builders:
-                await self._async_rebuild_plugin(chatbot_id)
+            if chatbot_organization_id not in self._builders:
+                await self._async_rebuild_plugin(chatbot_id, organization_id)
 
-            if chatbot_id not in self._builders:
-                logger.warning(f"Could not rebuild pipeline builder for chatbot `{chatbot_id}`")
+            if chatbot_organization_id not in self._builders:
+                logger.warning(f"Could not rebuild pipeline builder for chatbot `{chatbot_organization_id}`")
                 return
 
             # Check if we have the chatbot configuration
-            if chatbot_id not in self._chatbot_configs:
-                logger.warning(f"Chatbot configuration not found for `{chatbot_id}`")
+            if chatbot_organization_id not in self._chatbot_configs:
+                logger.warning(f"Chatbot configuration not found for `{chatbot_organization_id}`")
                 return
 
-            chatbot_config = self._chatbot_configs[chatbot_id]
-            plugin = self._builders[chatbot_id]
+            chatbot_config = self._chatbot_configs[chatbot_organization_id]
+            plugin = self._builders[chatbot_organization_id]
 
             # Find the model configuration
             supported_models = list(chatbot_config.pipeline_config.get("supported_models", {}).values())
@@ -352,21 +378,24 @@ class PipelineHandler(PluginHandler):
             # Use the existing _build_plugin method to rebuild the pipeline
             await __class__._build_plugin(self, chatbot_id, [model_config], plugin)
 
-            logger.info(f"Successfully rebuilt pipeline for chatbot `{chatbot_id}` model `{model_id}`")
+            logger.info(f"Successfully rebuilt pipeline for chatbot `{chatbot_organization_id}` model `{model_id}`")
 
         except Exception as e:
-            error_message = f"Error rebuilding pipeline for chatbot `{chatbot_id}` model `{model_id}`: {e}"
+            error_message = f"Error rebuilding pipeline for chatbot `{chatbot_organization_id}` model `{model_id}`: {e}"
             logger.warning(error_message)
 
             # Store the error message for later retrieval
-            self._store_pipeline_build_error(chatbot_id, model_id, error_message)
+            self._store_pipeline_build_error(chatbot_id, model_id, organization_id, error_message)
 
-    async def aget_pipeline(self, chatbot_id: str, model_id: str) -> Pipeline:
+    async def aget_pipeline(
+        self, chatbot_id: str, model_id: str, organization_id: str = DEFAULT_ORGANIZATION_ID
+    ) -> Pipeline:
         """Get a pipeline instance for the given chatbot and model ID (async version).
 
         Args:
             chatbot_id (str): The chatbot ID.
             model_id (str): The model ID to use for inference.
+            organization_id (str): The organization ID.
 
         Returns:
             Pipeline: The pipeline instance.
@@ -374,18 +403,18 @@ class PipelineHandler(PluginHandler):
         Raises:
             ValueError: If the chatbot ID is invalid.
         """
-        pipeline_key = (chatbot_id, str(model_id))
+        pipeline_key = (chatbot_id, str(model_id), organization_id)
 
         if pipeline_key not in self._pipeline_cache:
             logger.warning(
                 f"Pipeline not found for chatbot `{chatbot_id}` model `{model_id}`, attempting to rebuild..."
             )
             # Try to rebuild the pipeline if it's not found
-            await self._async_rebuild_pipeline(chatbot_id, str(model_id))
+            await self._async_rebuild_pipeline(chatbot_id, str(model_id), organization_id)
 
         if pipeline_key not in self._pipeline_cache:
             # Check if there's a stored error message for this pipeline
-            stored_error = self.get_pipeline_build_error(chatbot_id, str(model_id))
+            stored_error = self.get_pipeline_build_error(chatbot_id, str(model_id), organization_id)
             if stored_error:
                 raise ValueError(
                     f"Pipeline for chatbot `{chatbot_id}` model `{model_id}` not found and could not be rebuilt. "
@@ -398,11 +427,12 @@ class PipelineHandler(PluginHandler):
 
         return self._pipeline_cache[pipeline_key]
 
-    def get_pipeline_config(self, chatbot_id: str) -> dict[str, Any]:
+    def get_pipeline_config(self, chatbot_id: str, organization_id: str = DEFAULT_ORGANIZATION_ID) -> dict[str, Any]:
         """Get the pipeline configuration by chatbot ID.
 
         Args:
             chatbot_id (str): The chatbot ID.
+            organization_id (str): The organization ID.
 
         Returns:
             dict[str, Any]: The pipeline configuration.
@@ -410,22 +440,24 @@ class PipelineHandler(PluginHandler):
         Raises:
             ValueError: If the chatbot or pipeline is not found.
         """
-        self._validate_pipeline(chatbot_id)
-        return self._chatbot_configs[chatbot_id].pipeline_config
+        self._validate_pipeline(chatbot_id, organization_id)
+        return self._chatbot_configs[(chatbot_id, organization_id)].pipeline_config
 
-    def get_pipeline_type(self, chatbot_id: str) -> str:
+    def get_pipeline_type(self, chatbot_id: str, organization_id: str = DEFAULT_ORGANIZATION_ID) -> str:
         """Get the pipeline type for the given chatbot.
 
         Args:
             chatbot_id (str): The chatbot ID.
+            organization_id (str): The organization ID.
         """
-        return self._chatbot_configs[chatbot_id].pipeline_type
+        return self._chatbot_configs[(chatbot_id, organization_id)].pipeline_type
 
-    def get_use_docproc(self, chatbot_id: str) -> bool:
+    def get_use_docproc(self, chatbot_id: str, organization_id: str = DEFAULT_ORGANIZATION_ID) -> bool:
         """Get whether DocProc should be used for this chatbot.
 
         Args:
             chatbot_id (str): The chatbot ID.
+            organization_id (str): The organization ID.
 
         Returns:
             bool: Whether DocProc should be used.
@@ -433,15 +465,16 @@ class PipelineHandler(PluginHandler):
         Raises:
             ValueError: If the chatbot or pipeline is not found.
         """
-        self._validate_pipeline(chatbot_id)
-        config = self._chatbot_configs[chatbot_id].pipeline_config
+        self._validate_pipeline(chatbot_id, organization_id)
+        config = self._chatbot_configs[(chatbot_id, organization_id)].pipeline_config
         return config["use_docproc"]
 
-    def get_max_file_size(self, chatbot_id: str) -> int | None:
+    def get_max_file_size(self, chatbot_id: str, organization_id: str = DEFAULT_ORGANIZATION_ID) -> int | None:
         """Get maximum file size for the given chatbot.
 
         Args:
             chatbot_id (str): The chatbot ID.
+            organization_id (str): The organization ID.
 
         Returns:
             int | None: The maximum file size if provided.
@@ -449,16 +482,19 @@ class PipelineHandler(PluginHandler):
         Raises:
             ValueError: If the chatbot or pipeline is not found.
         """
-        self._validate_pipeline(chatbot_id)
-        config = self._chatbot_configs[chatbot_id].pipeline_config
+        self._validate_pipeline(chatbot_id, organization_id)
+        config = self._chatbot_configs[(chatbot_id, organization_id)].pipeline_config
         return config.get("max_file_size")
 
-    async def create_chatbot(self, app_config: AppConfig, chatbot_id: str) -> None:
+    async def create_chatbot(
+        self, app_config: AppConfig, chatbot_id: str, organization_id: str = DEFAULT_ORGANIZATION_ID
+    ) -> None:
         """Create a new chatbot.
 
         Args:
             app_config (AppConfig): The application configuration.
             chatbot_id (str): The ID of the chatbot.
+            organization_id (str): The organization ID.
         """
         chatbot_info = app_config.chatbots.get(chatbot_id)
 
@@ -468,13 +504,14 @@ class PipelineHandler(PluginHandler):
 
         pipeline_info = chatbot_info.pipeline
         pipeline_type = pipeline_info["type"]
-        plugin = self._plugins.get(pipeline_type)
+        pipeline_organization_id = (pipeline_type, organization_id)
+        plugin = self._plugins.get(pipeline_organization_id)
         if not plugin:
             logger.warning(f"Pipeline plugin not found for chatbot `{chatbot_id}`")
             return
 
         logger.info(f"Storing pipeline config for chatbot `{chatbot_id}`")
-        self._chatbot_configs[chatbot_id] = ChatbotConfig(
+        self._chatbot_configs[(chatbot_id, organization_id)] = ChatbotConfig(
             pipeline_type=pipeline_type,
             pipeline_config=pipeline_info["config"],
             prompt_builder_catalogs=pipeline_info["prompt_builder_catalogs"],
@@ -484,32 +521,38 @@ class PipelineHandler(PluginHandler):
         supported_models = list(pipeline_info["config"].get("supported_models", {}).values())
         await __class__._build_plugin(self, chatbot_id, supported_models, plugin)
 
-    async def delete_chatbot(self, chatbot_id: str) -> None:
+    async def delete_chatbot(self, chatbot_id: str, organization_id: str = DEFAULT_ORGANIZATION_ID) -> None:
         """Delete a chatbot.
 
         Args:
             chatbot_id (str): The ID of the chatbot.
+            organization_id (str): The organization ID.
         """
-        for pipeline_key in self._chatbot_pipeline_keys.get(chatbot_id, set()):
+        chatbot_organization_id = (chatbot_id, organization_id)
+        for pipeline_key in self._chatbot_pipeline_keys.get(chatbot_organization_id, set()):
             self._pipeline_cache.pop(pipeline_key, None)
 
         # Clear stored error messages for this chatbot
-        error_keys_to_remove = [key for key in self._pipeline_build_errors.keys() if key[0] == chatbot_id]
+        error_keys_to_remove = [key for key in self._pipeline_build_errors.keys() if key[0] == chatbot_organization_id]
         for key in error_keys_to_remove:
             self._pipeline_build_errors.pop(key, None)
 
-        self._chatbot_pipeline_keys.pop(chatbot_id, None)
-        self._chatbot_configs.pop(chatbot_id, None)
-        self._builders.pop(chatbot_id, None)
+        self._chatbot_pipeline_keys.pop(chatbot_organization_id, None)
+        self._chatbot_configs.pop(chatbot_organization_id, None)
+        self._builders.pop(chatbot_organization_id, None)
 
-    async def update_chatbots(self, app_config: AppConfig, chatbot_ids: list[str]) -> None:
+    async def update_chatbots(
+        self, app_config: AppConfig, chatbot_ids: list[str], organization_id: str = DEFAULT_ORGANIZATION_ID
+    ) -> None:
         """Update the chatbots.
 
         Args:
             app_config (AppConfig): The application configuration.
             chatbot_ids (list[str]): The updated chatbot IDs.
+            organization_id (str): The organization ID.
         """
         for chatbot_id in chatbot_ids:
+            chatbot_organization_id = (chatbot_id, organization_id)
             try:
                 chatbot_info = app_config.chatbots.get(chatbot_id)
                 if not chatbot_info or not chatbot_info.pipeline:
@@ -522,8 +565,8 @@ class PipelineHandler(PluginHandler):
                 supported_models = list(pipeline_info["config"].get("supported_models", {}).values())
 
                 logger.info(f"Storing pipeline config for chatbot `{chatbot_id}`")
-                self._chatbot_configs.pop(chatbot_id, None)
-                self._chatbot_configs[chatbot_id] = ChatbotConfig(
+                self._chatbot_configs.pop(chatbot_organization_id, None)
+                self._chatbot_configs[chatbot_organization_id] = ChatbotConfig(
                     pipeline_type=pipeline_type,
                     pipeline_config=pipeline_info["config"],
                     prompt_builder_catalogs=pipeline_info["prompt_builder_catalogs"],
@@ -533,22 +576,23 @@ class PipelineHandler(PluginHandler):
                 new_pipeline_keys = set()
                 for model in supported_models:
                     model_id = model.get("model_id", model.get("name"))
-                    new_pipeline_key = (chatbot_id, str(model_id))
+                    new_pipeline_key = (chatbot_id, str(model_id), organization_id)
                     new_pipeline_keys.add(new_pipeline_key)
 
-                for pipeline_key in self._chatbot_pipeline_keys.get(chatbot_id, set()):
+                for pipeline_key in self._chatbot_pipeline_keys.get(chatbot_organization_id, set()):
                     if pipeline_key not in new_pipeline_keys:
                         self._pipeline_cache.pop(pipeline_key, None)
 
-                self._chatbot_pipeline_keys[chatbot_id] = set()
+                self._chatbot_pipeline_keys[chatbot_organization_id] = set()
 
-                plugin = self._plugins.get(pipeline_type)
+                pipeline_organization_id = (pipeline_type, organization_id)
+                plugin = self._plugins.get(pipeline_organization_id)
                 if not plugin:
                     logger.warning(f"Pipeline plugin not found for chatbot `{chatbot_id}`")
                     continue
 
-                self._builders.pop(chatbot_id, None)
-                self._builders[chatbot_id] = plugin
+                self._builders.pop(chatbot_organization_id, None)
+                self._builders[chatbot_organization_id] = plugin
 
                 await __class__._build_plugin(self, chatbot_id, supported_models, plugin)
             except Exception as e:
@@ -556,77 +600,86 @@ class PipelineHandler(PluginHandler):
 
     def _prepare_pipelines(self) -> None:
         """Build pipeline configurations from the chatbots configuration."""
-        pipeline_types: set[str] = set()
-        chatbot_preset_map: dict[str, PipelinePresetConfig] = {}
-        for chatbot_id, chatbot_info in self.app_config.chatbots.items():
-            if not chatbot_info.pipeline:
-                logger.warning(f"Pipeline config not found for chatbot `{chatbot_id}`")
-                continue
-
-            pipeline_info = chatbot_info.pipeline
-            pipeline_type = pipeline_info["type"]
-
-            chatbot_preset_map[chatbot_id] = PipelinePresetConfig(
-                preset_id=pipeline_info["config"]["pipeline_preset_id"],
-                supported_models=list(pipeline_info["config"].get("supported_models", {}).values()),
-            )
+        pipeline_types: set[tuple[str, str]] = set()
+        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}`")
+                    continue
 
-            logger.info(f"Storing pipeline config for chatbot `{chatbot_id}`")
-            self._chatbot_configs[chatbot_id] = ChatbotConfig(
-                pipeline_type=pipeline_type,
-                pipeline_config=pipeline_info["config"],
-                prompt_builder_catalogs=pipeline_info["prompt_builder_catalogs"],
-                lmrp_catalogs=pipeline_info["lmrp_catalogs"],
-            )
-            pipeline_types.add(pipeline_type)
+                pipeline_info = chatbot_info.pipeline
+                pipeline_type = pipeline_info["type"]
+
+                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()),
+                )
 
-        for pipeline_type in pipeline_types:
-            self._activated_configs[pipeline_type] = ChatbotPresetMapping(
+                logger.info(f"Storing pipeline config for chatbot `{chatbot_id}`")
+                self._chatbot_configs[(chatbot_id, org_id)] = ChatbotConfig(
+                    pipeline_type=pipeline_type,
+                    pipeline_config=pipeline_info["config"],
+                    prompt_builder_catalogs=pipeline_info["prompt_builder_catalogs"],
+                    lmrp_catalogs=pipeline_info["lmrp_catalogs"],
+                )
+                pipeline_types.add((pipeline_type, org_id))
+
+        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) -> None:
+    def _validate_pipeline(self, chatbot_id: str, organization_id: str) -> None:
         """Validate the pipeline configuration exists.
 
         Args:
             chatbot_id (str): The chatbot ID.
+            organization_id (str): The organization ID.
 
         Raises:
             ValueError: If the chatbot or pipeline configuration is not found.
         """
-        if chatbot_id not in self._chatbot_configs:
-            raise ValueError(f"Pipeline configuration for chatbot `{chatbot_id}` not found")
+        chatbot_organization_id = (chatbot_id, organization_id)
+        if chatbot_organization_id not in self._chatbot_configs:
+            raise ValueError(f"Pipeline configuration for chatbot `{chatbot_organization_id}` not found")
 
-    def _store_pipeline_build_error(self, chatbot_id: str, model_id: str, error_message: str) -> None:
+    def _store_pipeline_build_error(
+        self, chatbot_id: str, model_id: str, organization_id: str, error_message: str
+    ) -> None:
         """Store error message for failed pipeline build.
 
         Args:
             chatbot_id (str): The chatbot ID.
             model_id (str): The model ID.
+            organization_id (str): The organization ID.
             error_message (str): The error message to store.
         """
-        pipeline_key = (chatbot_id, str(model_id))
+        pipeline_key = (chatbot_id, str(model_id), organization_id)
         self._pipeline_build_errors[pipeline_key] = error_message
 
-    def get_pipeline_build_error(self, chatbot_id: str, model_id: str) -> str | None:
+    def get_pipeline_build_error(self, chatbot_id: str, model_id: str, organization_id: str) -> str | None:
         """Get stored error message for failed pipeline build.
 
         Args:
             chatbot_id (str): The chatbot ID.
             model_id (str): The model ID.
+            organization_id (str): The organization ID.
 
         Returns:
             str | None: The stored error message if available, None otherwise.
         """
-        pipeline_key = (chatbot_id, str(model_id))
+        pipeline_key = (chatbot_id, str(model_id), organization_id)
         return self._pipeline_build_errors.get(pipeline_key)
 
-    async def aget_pipeline_builder(self, chatbot_id: str) -> Plugin:
+    async def aget_pipeline_builder(self, chatbot_id: str, organization_id: str) -> Plugin:
         """Get a pipeline builder instance for the given chatbot (async version).
 
         Args:
             chatbot_id (str): The chatbot ID.
+            organization_id (str): The organization ID.
 
         Returns:
             Plugin: The pipeline builder instance.
@@ -634,16 +687,19 @@ class PipelineHandler(PluginHandler):
         Raises:
             ValueError: If the chatbot ID is invalid or the model name is not supported.
         """
-        if chatbot_id not in self._builders:
-            logger.warning(f"Pipeline builder not found for chatbot `{chatbot_id}`, attempting to rebuild...")
+        chatbot_organization_id = (chatbot_id, organization_id)
+        if chatbot_organization_id not in self._builders:
+            logger.warning(
+                f"Pipeline builder not found for chatbot `{chatbot_organization_id}`, attempting to rebuild..."
+            )
             # Try to rebuild the plugin if it's not found
-            await self._async_rebuild_plugin(chatbot_id)
+            await self._async_rebuild_plugin(chatbot_id, organization_id)
 
-        if chatbot_id not in self._builders:
+        if chatbot_organization_id not in self._builders:
             # Check if there are any stored error messages for this chatbot
             chatbot_errors = []
-            for (c_id, m_id), error_msg in self._pipeline_build_errors.items():
-                if c_id == chatbot_id:
+            for (c_id, m_id, o_id), error_msg in self._pipeline_build_errors.items():
+                if c_id == chatbot_id and o_id == organization_id:
                     chatbot_errors.append(f"Model `{m_id}`: {error_msg}")
 
             if chatbot_errors:
@@ -655,29 +711,32 @@ class PipelineHandler(PluginHandler):
             else:
                 raise ValueError(f"Pipeline builder for chatbot `{chatbot_id}` not found and could not be rebuilt")
 
-        return self._builders[chatbot_id]
+        return self._builders[chatbot_organization_id]
 
-    async def _async_rebuild_plugin(self, chatbot_id: str) -> None:
+    async def _async_rebuild_plugin(self, chatbot_id: str, organization_id: str) -> None:
         """Asynchronously rebuild a plugin for the given chatbot.
 
         Args:
             chatbot_id (str): The chatbot ID.
+            organization_id (str): The organization ID.
         """
         try:
             # Check if we have the chatbot configuration
-            if chatbot_id not in self._chatbot_configs:
-                logger.warning(f"Chatbot configuration not found for `{chatbot_id}`")
+            chatbot_organization_id = (chatbot_id, organization_id)
+            if chatbot_organization_id not in self._chatbot_configs:
+                logger.warning(f"Chatbot configuration not found for `{chatbot_organization_id}`")
                 return
 
-            chatbot_config = self._chatbot_configs[chatbot_id]
+            chatbot_config = self._chatbot_configs[chatbot_organization_id]
             pipeline_type = chatbot_config.pipeline_type
+            pipeline_organization_id = (pipeline_type, organization_id)
 
             # Check if we have the plugin for this pipeline type
-            if pipeline_type not in self._plugins:
-                logger.warning(f"Plugin not found for pipeline type `{pipeline_type}`")
+            if pipeline_organization_id not in self._plugins:
+                logger.warning(f"Plugin not found for pipeline type `{pipeline_organization_id}`")
                 return
 
-            plugin = self._plugins[pipeline_type]
+            plugin = self._plugins[pipeline_organization_id]
 
             # Get supported models from the configuration
             supported_models = list(chatbot_config.pipeline_config.get("supported_models", {}).values())
@@ -696,4 +755,4 @@ class PipelineHandler(PluginHandler):
             logger.warning(error_message)
 
             # Store the error message for later retrieval (using a generic model_id for plugin-level errors)
-            self._store_pipeline_build_error(chatbot_id, "__plugin__", error_message)
+            self._store_pipeline_build_error(chatbot_id, "__plugin__", organization_id, error_message)

glchat_plugin/pipeline/pipeline_plugin.py

@@ -14,6 +14,7 @@ from bosa_core.plugin.plugin import Plugin
 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
 
 PipelineState = TypeVar("PipelineState")
@@ -31,6 +32,7 @@ class PipelineBuilderPlugin(Plugin, Generic[PipelineState, PipelinePresetConfig]
         name (str): The name of the plugin.
         description (str): The description of the plugin.
         version (str): The version of the plugin.
+        organization_id (str): The organization ID.
         lmrp_catalogs (dict[str, BaseCatalog[Any]] | None): The LM request processor catalogs.
         prompt_builder_catalogs (dict[str, BaseCatalog[Any]] | None): The prompt builder catalogs.
         additional_config_class (Type[PipelineRuntimeConfig] | None): The additional runtime configuration class.
@@ -40,6 +42,7 @@ class PipelineBuilderPlugin(Plugin, Generic[PipelineState, PipelinePresetConfig]
     name: str
     description: str = "Pipeline builder plugin"
     version: str = "0.0.0"
+    organization_id: str = DEFAULT_ORGANIZATION_ID
 
     lmrp_catalogs: dict[str, BaseCatalog[Any]] | None = None
     prompt_builder_catalogs: dict[str, BaseCatalog[Any]] | None = None

glchat_plugin/service/base_user_service.py

@@ -3,7 +3,6 @@
 Authors:
     Immanuel Rhesa (immanuel.rhesa@gdplabs.id)
     Hermes Vincentius Gani (hermes.v.gani@gdplabs.id)
-    Ricky Setiawan (ricky.setiawan@gdplabs.id)
 
 References:
     NONE
@@ -31,21 +30,6 @@ class BaseUserService(ABC):
         """
         raise NotImplementedError
 
-    @abstractmethod
-    async def get_user_session(self, **kwargs: Any) -> Any | None:
-        """Abstract method to get the user session.
-
-        Args:
-            **kwargs (Any): Additional keyword arguments for user session retrieval.
-
-        Returns:
-            Any | None: User session, None if not found.
-
-        Raises:
-            NotImplementedError: If the method is not implemented.
-        """
-        raise NotImplementedError
-
     @abstractmethod
     async def register(self, **kwargs: Any):
         """Abstract method to register a new user.

{glchat_plugin-0.3.10.dist-info → glchat_plugin-0.4.1.dist-info}/METADATA

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

{glchat_plugin-0.3.10.dist-info → glchat_plugin-0.4.1.dist-info}/RECORD

@@ -1,25 +1,25 @@
 glchat_plugin/__init__.py,sha256=SHSBMz7JDU6MecyIrhHu5-3NVs89JkXhyvD3ZGOkWOE,37
 glchat_plugin/config/__init__.py,sha256=DNnX8B_TvAN89oyMgq32zG1DeaezODrihiAXTwOPT5o,39
 glchat_plugin/config/app_config.py,sha256=9_ShYtaQ7Rp14sSkrIFLoOAMlbwVlm13EuCxzOn4NCI,426
-glchat_plugin/config/constant.py,sha256=DB6-XlINqhRU6qGrDbOA7OSMk9uiq4l2nYYMVjEnDTY,3590
+glchat_plugin/config/constant.py,sha256=zZO4WCkozvm6i_rMquTp99Q3alom0SN_P9SNqAHO3ko,3621
 glchat_plugin/context/__init__.py,sha256=3Wx_apMIS6z-m6eRs6hoyOsJFLJfKmMFOkrPDkPQfJI,40
-glchat_plugin/context/context_manager.py,sha256=4UWsdXV-5JkVfwltxR1PxIYiPpodhxo-CTo8am4qVQ8,2717
+glchat_plugin/context/context_manager.py,sha256=AVTs30Tg5EbPb5HDZfW9RI3lY24Pc0-NhOPFxw5XG5U,1330
 glchat_plugin/handler/__init__.py,sha256=H5DJaAfwwtRsvMcOaEzHfGMQk25H7la0E7uPfksWtoQ,40
 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=CrC4PU5nLU-7QkebUMUsK4M3R55MwvXiX4tNiyb9_HE,29273
-glchat_plugin/pipeline/pipeline_plugin.py,sha256=fozvxVrOphgwLIF7uPrEkF8ZQcu8xgifYAQyuxj9628,4393
+glchat_plugin/pipeline/pipeline_handler.py,sha256=1XkTfhmoIViJKVhRbaKisCRSWR5lzQO6aCP6O8-qqOo,34022
+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
 glchat_plugin/service/base_tenant_service.py,sha256=CB-jJWXi87nTcjO1XhPoSgNMf2YA_LfXoHr30ye0VtI,734
-glchat_plugin/service/base_user_service.py,sha256=DlVj0pimzTgvgz2dqpVkfhMK8PWEwQ9LyukzGoVZgYc,2703
+glchat_plugin/service/base_user_service.py,sha256=qnRKl2u1xhGc4wMaOd_h_mAuxM7GduyDbqebj-k3GDE,2211
 glchat_plugin/storage/__init__.py,sha256=VNO7ua2yAOLzXwe6H6zDZz9yXbhQfKqNJzxE3G8IyfA,50
 glchat_plugin/storage/base_anonymizer_storage.py,sha256=oFwovWrsjM7v1YjeN-4p-M3OGnAeo_Y7-9xqlToI180,1969
 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.3.10.dist-info/METADATA,sha256=EmSiCAPQSCg2qIbBkAG0B8VXXdB65o9mkCKIt3_6wb8,2064
-glchat_plugin-0.3.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-glchat_plugin-0.3.10.dist-info/top_level.txt,sha256=fzKSXmct5dY4CAKku4-mkdHX-QPAyQVvo8vpQj8qizY,14
-glchat_plugin-0.3.10.dist-info/RECORD,,
+glchat_plugin-0.4.1.dist-info/METADATA,sha256=q3Po_AA7fAbEOEMH-EiCgX5VxEOH774fbfnQ_qD8tyc,2063
+glchat_plugin-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+glchat_plugin-0.4.1.dist-info/top_level.txt,sha256=fzKSXmct5dY4CAKku4-mkdHX-QPAyQVvo8vpQj8qizY,14
+glchat_plugin-0.4.1.dist-info/RECORD,,