message update

controller.py

@@ -3,7 +3,12 @@ from app_agent_config import AgentConfig
 from utils.logger import log_response
 from model.custom_agent import CustomHfAgent 
 from model.conversation_chain_singleton import ConversationChainSingleton
-   
+
+def cut_text_after_keyword(text, keyword):
+    index = text.find(keyword)
+    if index != -1:
+        return text[:index].strip()
+    return text
 
 
 class Controller:
@@ -11,41 +16,34 @@ class Controller:
         self.agent_config = AgentConfig()
 
     image = []
-    def handle_submission(user_message, selected_tools, url_endpoint, document, image, context):
+    def handle_submission(self, user_message ):
         
         log_response("User input \n {}".format(user_message))
-        log_response("selected_tools \n {}".format(selected_tools))
-        log_response("url_endpoint \n {}".format(url_endpoint))
-        log_response("document \n {}".format(document))
-        log_response("image \n {}".format(image))
-        log_response("context \n {}".format(context))
+        log_response("selected_tools \n {}".format(self.agent_config.selected_tools))
+        log_response("url_endpoint \n {}".format(self.agent_config.url_endpoint))
+        log_response("document \n {}".format(self.agent_config.document))
+        log_response("image \n {}".format(self.agent_config.image))
+        log_response("context \n {}".format(self.agent_config.context))
         
         agent = CustomHfAgent(
-            url_endpoint=url_endpoint,
+            url_endpoint=self.agent_config.url_endpoint,
             token=os.environ['HF_token'],
-            additional_tools=selected_tools,
+            additional_tools=self.agent_config.elected_tools,
             input_params={"max_new_tokens": 192},
         )
 
-        response = agent.chat(user_message,document=document,image=image, context = context)
-
-        log_response("Agent Response\n {}".format(response))
-
-        return response
+        angent_respone = agent.chat(user_message,document=self.agent_config.document,image=self.agent_config.image, context = self.agent_config.context)
 
-    def cut_text_after_keyword(text, keyword):
-        index = text.find(keyword)
-        if index != -1:
-            return text[:index].strip()
-        return text
+        log_response("Agent Response\n {}".format(angent_respone))
 
+        return angent_respone
 
-    def handle_submission_chat(user_message, response):
+    def handle_submission_chat(self, user_message, angent_respone):
         # os.environ['HUGGINGFACEHUB_API_TOKEN'] = os.environ['HF_token']
         agent_chat_bot = ConversationChainSingleton().get_conversation_chain()    
 
-        if response is not None:
-            text = agent_chat_bot.predict(input=user_message + response)
+        if angent_respone is not None:
+            text = agent_chat_bot.predict(input=user_message + angent_respone)
         else:
             text = agent_chat_bot.predict(input=user_message)
 

view/app_chat.py

@@ -19,13 +19,11 @@ def app_chat(controller):
     if user_message := st.chat_input("Enter message"):
         st.chat_message("user").markdown(user_message)
         st.session_state.messages.append({"role": "user", "content": user_message, "avatar": "🤗"})
-    
-        selected_tools = [agent_config.tool_loader.tools[idx] for idx, checkbox in enumerate(agent_config.tool_checkboxes) if checkbox]
-
+        
         response = ""
         chat_respone = ""
         with st.spinner('Please stand by ...'):
-            response = controller.handle_submission(user_message, selected_tools, agent_config.url_endpoint, agent_config.document, agent_config.image, agent_config.context)
+            response = controller.handle_submission(user_message)
 
         with st.chat_message("assistant"):
             if response is None: