Bot content api fixes.

kairon/api/app/routers/bot/data.py

@@ -1,6 +1,7 @@
 import os
 
 from fastapi import UploadFile, File, Security, APIRouter
+from starlette.requests import Request
 from starlette.responses import FileResponse
 
 from kairon.api.models import Response, TextData, CognitiveDataRequest
@@ -50,10 +51,11 @@ async def download_faq_files(
     return response
 
 
-@router.post("/text/faq", response_model=Response)
-def save_bot_text(
+@router.post("/text/faq/{collection}", response_model=Response)
+async def save_bot_text(
         text: TextData,
         current_user: User = Security(Authentication.get_current_user_and_bot, scopes=DESIGNER_ACCESS),
+        collection: str = None
 ):
     """
     Saves text content into the bot
@@ -65,16 +67,18 @@ def save_bot_text(
                     text.data,
                     current_user.get_user(),
                     current_user.get_bot(),
+                    collection
             )
         }
     }
 
 
-@router.put("/text/faq/{text_id}", response_model=Response)
-def update_bot_text(
+@router.put("/text/faq/{text_id}/{collection}", response_model=Response)
+async def update_bot_text(
         text_id: str,
         text: TextData,
         current_user: User = Security(Authentication.get_current_user_and_bot, scopes=DESIGNER_ACCESS),
+        collection: str = None,
 ):
     """
     Updates text content into the bot
@@ -87,13 +91,14 @@ def update_bot_text(
                 text.data,
                 current_user.get_user(),
                 current_user.get_bot(),
+                collection
             )
         }
     }
 
 
 @router.delete("/text/faq/{text_id}", response_model=Response)
-def delete_bot_text(
+async def delete_bot_text(
         text_id: str,
         current_user: User = Security(Authentication.get_current_user_and_bot, scopes=DESIGNER_ACCESS),
 ):
@@ -107,17 +112,29 @@ def delete_bot_text(
 
 
 @router.get("/text/faq", response_model=Response)
-def get_text(
+async def get_text(
+        request: Request,
         current_user: User = Security(Authentication.get_current_user_and_bot, scopes=DESIGNER_ACCESS),
 ):
     """
     Fetches text content of the bot
     """
-    return {"data": list(processor.get_content(current_user.get_bot()))}
+    kwargs = request.query_params._dict.copy()
+    return {"data": list(processor.get_content(current_user.get_bot(), **kwargs))}
+
+
+@router.get("/text/faq/collection", response_model=Response)
+async def list_collection(
+        current_user: User = Security(Authentication.get_current_user_and_bot, scopes=DESIGNER_ACCESS),
+):
+    """
+    Fetches text content of the bot
+    """
+    return {"data": processor.list_collection(current_user.get_bot())}
 
 
 @router.post("/cognition", response_model=Response)
-def save_cognition_data(
+async def save_cognition_data(
         cognition: CognitiveDataRequest,
         current_user: User = Security(Authentication.get_current_user_and_bot, scopes=DESIGNER_ACCESS),
 ):
@@ -137,7 +154,7 @@ def save_cognition_data(
 
 
 @router.put("/cognition/{cognition_id}", response_model=Response)
-def update_cognition_data(
+async def update_cognition_data(
         cognition_id: str,
         cognition: CognitiveDataRequest,
         current_user: User = Security(Authentication.get_current_user_and_bot, scopes=DESIGNER_ACCESS),
@@ -159,7 +176,7 @@ def update_cognition_data(
 
 
 @router.delete("/cognition/{cognition_id}", response_model=Response)
-def delete_cognition_data(
+async def delete_cognition_data(
         cognition_id: str,
         current_user: User = Security(Authentication.get_current_user_and_bot, scopes=DESIGNER_ACCESS),
 ):
@@ -173,7 +190,7 @@ def delete_cognition_data(
 
 
 @router.get("/cognition", response_model=Response)
-def list_cognition_data(
+async def list_cognition_data(
         current_user: User = Security(Authentication.get_current_user_and_bot, scopes=DESIGNER_ACCESS),
 ):
     """

kairon/api/models.py

@@ -883,6 +883,7 @@ class PromptActionConfigRequest(BaseModel):
     hyperparameters: dict = None
     llm_prompts: List[LlmPromptRequest]
     instructions: List[str] = []
+    collection: str = None
     set_slots: List[SetSlotsUsingActionResponse] = []
     dispatch_response: bool = True
 

kairon/chat/converters/channels/telegram.py

@@ -34,6 +34,27 @@ def link_transformer(self, message):
         except Exception as ex:
             raise Exception(f" Error in TelegramResponseConverter::link_transformer {str(ex)}")
 
+    def button_transformer(self, message):
+        try:
+            jsoniterator = ElementTransformerOps.json_generator(message)
+            reply_markup = {}
+            inline_keyboard = []
+            reply_markup.update({"inline_keyboard": inline_keyboard})
+            inline_keyboard_array = []
+            for item in jsoniterator:
+                if item.get("type") == ElementTypes.BUTTON.value:
+                    title = ElementTransformerOps.json_generator(item.get("children"))
+                    for titletext in title:
+                        button_text = titletext.get("text")
+                    btn_body = {}
+                    btn_body.update({"text": button_text})
+                    btn_body.update({"callback_data": item.get("value")})
+                    inline_keyboard_array.append(btn_body)
+            inline_keyboard.append(inline_keyboard_array)
+            return reply_markup
+        except Exception as ex:
+            raise Exception(f"Exception in TelegramResponseConverter::button_transfomer: {str(ex)}")
+
     async def messageConverter(self, message):
         try:
             if self.message_type == ElementTypes.IMAGE.value:
@@ -42,5 +63,7 @@ async def messageConverter(self, message):
                 return self.link_transformer(message)
             elif self.message_type == ElementTypes.VIDEO.value:
                 return super().video_transformer(message)
+            elif self.message_type == ElementTypes.BUTTON.value:
+                return self.button_transformer(message)
         except Exception as ex:
             raise Exception(f"Error in TelegramResponseConverter::messageConverter {str(ex)}")

kairon/chat/handlers/channels/telegram.py

@@ -25,6 +25,8 @@
 from kairon.chat.agent_processor import AgentProcessor
 from kairon import Utility
 from kairon.chat.converters.channels.response_factory import ConverterFactory
+from kairon.chat.converters.channels.responseconverter import ElementTransformerOps
+import json
 
 logger = logging.getLogger(__name__)
 
@@ -159,6 +161,9 @@ async def send_custom_json(
                     del response["text"]
                     api_call = getattr(self, send_functions[("text",)])
                     api_call(recipient_id, *response_list, **response)
+                elif ops_type in ["button"]:
+                    body_default = ElementTransformerOps.getChannelConfig(ChannelTypes.TELEGRAM.value, "body_message")
+                    self.send_message(recipient_id, text=body_default, reply_markup=json.dumps(response))
             else:
                 self.send_message(recipient_id, str(json_message))
         except Exception as ap:

kairon/shared/data/data_objects.py

@@ -30,10 +30,10 @@
 from validators import url, ValidationFailure
 
 from kairon.exceptions import AppException
+from kairon.shared.data.audit.data_objects import Auditlog
 from kairon.shared.data.signals import push_notification, auditlogger
 from kairon.shared.models import TemplateType, StoryStepType, StoryType, CognitionDataType, CognitionMetadataType
 from kairon.shared.utils import Utility
-from kairon.shared.data.audit.data_objects import Auditlog
 from .constant import EVENT_STATUS, SLOT_MAPPING_TYPE, TrainingDataSourceType
 from ..constants import WhatsappBSPTypes, LLMResourceProvider
 
@@ -717,7 +717,7 @@ def clean(self):
 
 @auditlogger.log
 @push_notification.apply
-class CognitionData(Auditlog):
+class CognitionData(Document):
     vector_id = SequenceField(required=True)
     data = DynamicField(required=True)
     content_type = StringField(default=CognitionDataType.text.value, choices=[CognitionDataType.text.value,
@@ -728,7 +728,7 @@ class CognitionData(Auditlog):
     bot = StringField(required=True)
     timestamp = DateTimeField(default=datetime.utcnow)
 
-    meta = {"indexes": [{"fields": ["bot"]}]}
+    meta = {"indexes": [{"fields": ["$data", "bot"]}]}
 
     def validate(self, clean=True):
         if clean:

kairon/shared/data/processor.py

@@ -5438,6 +5438,7 @@ def edit_prompt_action(self, prompt_action_id: str, request_data: dict, bot: Tex
         action.hyperparameters = request_data.get('hyperparameters', Utility.get_llm_hyperparameters())
         action.llm_prompts = [LlmPrompt(**prompt) for prompt in request_data.get('llm_prompts', [])]
         action.instructions = request_data.get('instructions', [])
+        action.collection = request_data.get('collection')
         action.set_slots = request_data.get('set_slots', [])
         action.dispatch_response = request_data.get('dispatch_response', True)
         action.timestamp = datetime.utcnow()
@@ -5754,7 +5755,7 @@ def get_razorpay_action_config(self, bot: Text, with_doc_id: bool = True):
 
             yield action
 
-    def save_content(self, content: Text, user: Text, bot: Text):
+    def save_content(self, content: Text, user: Text, bot: Text, collection: Text = None):
         bot_settings = self.get_bot_settings(bot=bot, user=user)
         if not bot_settings["llm_settings"]['enable_faq']:
             raise AppException('Faq feature is disabled for the bot! Please contact support.')
@@ -5763,14 +5764,15 @@ def save_content(self, content: Text, user: Text, bot: Text):
 
         content_obj = CognitionData()
         content_obj.data = content
+        content_obj.collection = collection
         content_obj.user = user
         content_obj.bot = bot
         id = (
             content_obj.save().id.__str__()
         )
         return id
 
-    def update_content(self, content_id: str, content: Text, user: Text, bot: Text):
+    def update_content(self, content_id: str, content: Text, user: Text, bot: Text, collection: Text = None):
         if len(content.split()) < 10:
             raise AppException("Content should contain atleast 10 words.")
 
@@ -5780,6 +5782,7 @@ def update_content(self, content_id: str, content: Text, user: Text, bot: Text):
         try:
             content_obj = CognitionData.objects(bot=bot, id=content_id).get()
             content_obj.data = content
+            content_obj.collection = collection
             content_obj.user = user
             content_obj.timestamp = datetime.utcnow()
             content_obj.save()
@@ -5793,20 +5796,35 @@ def delete_content(self, content_id: str, user: Text, bot: Text):
         except DoesNotExist:
             raise AppException("Text does not exists!")
 
-    def get_content(self, bot: Text):
+    def get_content(self, bot: Text, **kwargs):
         """
         fetches content
 
         :param bot: bot id
+        :param collection: name of the collection
         :return: yield dict
         """
-        for value in CognitionData.objects(bot=bot):
-            final_data = {}
+        kwargs["bot"] = bot
+        search = kwargs.pop('data', None)
+        start_idx = kwargs.pop('start_idx', None)
+        page_size = kwargs.pop('page_size', None)
+        cognition_data = CognitionData.objects(**kwargs)
+        if search:
+            cognition_data = cognition_data.search_text(search)
+        for value in cognition_data.skip(start_idx).limit(page_size):
             item = value.to_mongo().to_dict()
-            data = item.pop("data")
-            final_data["_id"] = item["_id"].__str__()
-            final_data['content'] = data
-            yield final_data
+            item.pop('timestamp')
+            item["_id"] = item["_id"].__str__()
+            yield item
+
+    def list_collection(self, bot: Text):
+        """
+        Retrieve cognition data.
+
+        :param bot: bot id
+        """
+        collections = list(CognitionData.objects(bot=bot).distinct(field='collection'))
+        return collections
 
     def save_cognition_data(self, payload: Dict, user: Text, bot: Text):
         bot_settings = self.get_bot_settings(bot=bot, user=user)

metadata/message_template.yml

@@ -122,6 +122,7 @@ telegram:
   "disable_notification":false,
   "reply_to_message_id":0}'
   video: '{"text":"<data>"}'
+  body_message: 'Please select from quick buttons:'
 
 msteams:
   body_message: "Please select from quick buttons:"