updated version with chatbot

src/control/control.py

@@ -14,7 +14,7 @@ class Controller:
         self.specials = specials
         self.llm = llm
 
-    def get_response(self, query_fr: str) -> (str, [Block]):
+    def get_response(self, query_fr: str, histo_fr: [(str, str)]) -> (str, [Block]):
         query = self.llm.translate(text=query_fr) if self.plan_language == 'en' else query_fr
         block_sources = self.retriever.similarity_search(query=query)
         block_sources = self._select_best_sources(block_sources)
@@ -22,7 +22,8 @@ class Controller:
             self._expand_block_with_specials(block, query_fr)
         sources_contents = [s.content for s in block_sources]
         context = '\n'.join(sources_contents)
-        answer = self.llm.generate_paragraph(query=query, context=context, language=self.content_language)
+        histo = self._get_histo_str(histo_fr)
+        answer = self.llm.generate_paragraph(query=query, histo=histo, context=context, language=self.content_language)
         sources_contents_fr = [s.content_fr for s in block_sources[:2]]
         context_fr = '\n'.join(sources_contents_fr)
         if self.content_language == 'en':
@@ -31,7 +32,14 @@ class Controller:
         return answer, block_sources
 
     @staticmethod
-    def _select_best_sources(sources: [Block], delta_1_2=0.1, delta_1_n=0.25, absolute=1.1, alpha=0.85) -> [Block]:
+    def _get_histo_str(histo: [(str, str)]) -> str:
+        histo_str = ""
+        for (query, answer) in histo[1:5]:
+            histo_str += f'user: {query} \n botagent: {answer}\n'
+        return histo_str
+
+    @staticmethod
+    def _select_best_sources(sources: [Block], delta_1_2=0.15, delta_1_n=0.3, absolute=1.2, alpha=0.9) -> [Block]:
         """
         Select the best sources: not far from the very best, not far from the last selected, and not too bad per se
         """

src/model/container.py

@@ -58,7 +58,7 @@ class Container:
                     special_action = p.text.lstrip('##### ')
                     block.specials.append(special_action)
                 else:
-                    block.content += p.text + '. '
+                    block.content += p.text
         blocks = [block] if block.content or block.specials else []
         for child in self.children:
             blocks += child.blocks

src/tools/llm.py

@@ -3,17 +3,19 @@ class LlmAgent:
     def __init__(self, llm):
         self.llm = llm
 
-    def generate_paragraph(self, query: str, context: {}, language='fr') -> str:
-        """generates the final answer"""
-        template = (f" You are an agent designed to answer to the {query} based on the context delimited by triple backticks:\n"
-                 f"``` {context}```\n"
-                 f"    The response shall be in {language} and shall be concise and based on the context provided\n"
-                 f"    In case the provided context is not relevant to answer to the question, just return that you "
-                 f"    don't know the answer ")
+    def generate_paragraph(self, query: str, context: {}, histo: [(str, str)], language='fr') -> str:
+        """generates the  answer"""
+        template = (f"You are a botagent designed to answer to the {query} from users based on the context "
+                    f"delimited by triple backticks: ``` {context}``` and on the previous part of the conversation in"
+                    f"french and delimited by triple backticks ``` {histo} ```"
+                    f" The response shall be in {language} and shall be concise and based on the context provided. "
+                    f"In case the provided context is not relevant to answer to the question, just return that you "
+                    f"don't know the answer ")
 
         p = self.llm(template)
         return p
 
+
     def translate(self, text: str, language="en") -> str:
         """translates"""
 
@@ -37,9 +39,10 @@ class LlmAgent:
                     f"by triple backticks: ```{context_fr}``` and the answer in english delimited by triple "
                     f"backticks: ```{answer_en}```"
                     )
-        print(template)
+
         p = self.llm(template)
         p = _cut_unfinished_sentence(p)
-        print(p)
         return p
 
+
+

src/view/view.py

@@ -12,6 +12,10 @@ def run(ctrl: Controller, config: {}):
 
                 gr.Markdown(config['title'])
 
+                histo_text_comp = gr.Chatbot(
+                    visible=False,
+                    value=[],
+                )
                 input_text_comp = gr.Textbox(
                     label="",
                     lines=1,
@@ -19,22 +23,14 @@ def run(ctrl: Controller, config: {}):
                     interactive=True,
                     placeholder="Posez votre question ici",
                 )
-                input_example_comp = gr.Radio(
-                    label="Examples de questions",
-                    choices=list(config['examples'].keys()),
-                )
-                output_text_comp = gr.Textbox(
-                    label="La réponse automatique",
-                    lines=12,
-                    max_lines=12,
-                    interactive=False,
-                    visible=False,
-                )
-                sources_title_comp = gr.CheckboxGroup(
-                    label="Documents sources",
-                    visible=False,
-                    interactive=False,
+                gr.Examples(
+                    list(config['examples'].values()),
+                    input_text_comp,
+                    None,
+                    lambda: None,
                 )
+
+                clear_btn = gr.Button("Clear")
                 source_text_comp = []
                 for i in range(4):
                     source_text_comp.append(gr.Textbox(
@@ -47,42 +43,50 @@ def run(ctrl: Controller, config: {}):
             with gr.Column():
                 pass
 
-        def input_text_fn1():
+        def input_text_fn1(input_text_, histo_text_):
+            histo_text_.append((input_text_, None))
             update_ = {
-                output_text_comp: gr.update(visible=True),
+                histo_text_comp: gr.update(visible=True, value=histo_text_),
             }
+            for i in range(4):
+                update_[source_text_comp[i]] = gr.update(visible=False)
             return update_
 
-        def input_text_fn2(input_text_):
-            answer, sources = ctrl.get_response(query_fr=input_text_)
-            source_labels = [f'{s.distance_str} {s.index} {s.title} from {s.doc}' for s in sources]
-
+        def input_text_fn2(input_text_, histo_text_):
+            answer, sources = ctrl.get_response(query_fr=input_text_, histo_fr=histo_text_)
+            histo_text_[-1] = (input_text_, answer)
             update_ = {
-                output_text_comp: gr.update(value=answer),
-                sources_title_comp: gr.update(visible=False, choices=source_labels, value=source_labels),
+                histo_text_comp: gr.update(value=histo_text_),
+                input_text_comp: gr.update(value=''),
             }
-            for i in range(min(len(sources), 4)):
+            for i in range(min(len(sources), 3)):
                 s = sources[i]
                 source_label = f'{s.index}   {s.title_fr}                        score = {s.distance_str}'
                 source_text = s.content_fr
                 update_[source_text_comp[i]] = gr.update(visible=True, value=source_text, label=source_label)
             return update_
 
-        def input_example_fn(input_example_):
+        def clear_fn():
             update_ = {
-                input_text_comp: gr.update(value=config['examples'][input_example_]),
-                output_text_comp: gr.update(visible=True),
+                input_text_comp: gr.update(value=''),
+                histo_text_comp: gr.update(value='', visible=False),
             }
+            for i in range(4):
+                update_[source_text_comp[i]] = gr.update(visible=False, value='hello')
             return update_
 
         input_text_comp \
-            .submit(input_text_fn1, inputs=[], outputs=[output_text_comp]) \
-            .then(input_text_fn2, inputs=[input_text_comp], outputs=[output_text_comp, sources_title_comp])
-        input_example_comp \
-            .change(input_example_fn, inputs=[input_example_comp], outputs=[input_text_comp, output_text_comp]) \
+            .submit(input_text_fn1,
+                    inputs=[input_text_comp, histo_text_comp],
+                    outputs=[histo_text_comp,
+                             source_text_comp[0], source_text_comp[1], source_text_comp[2], source_text_comp[3]])\
             .then(input_text_fn2,
-                  inputs=[input_text_comp],
-                  outputs=[output_text_comp, sources_title_comp,
+                  inputs=[input_text_comp, histo_text_comp],
+                  outputs=[input_text_comp, histo_text_comp,
                            source_text_comp[0], source_text_comp[1], source_text_comp[2], source_text_comp[3]])
+        clear_btn.click(clear_fn,
+                        inputs=None,
+                        outputs=[input_text_comp, histo_text_comp,
+                                 source_text_comp[0], source_text_comp[1], source_text_comp[2], source_text_comp[3]])
 
     return qna