Update UI

app.py

@@ -1,91 +1,128 @@
-import json
 import gradio as gr
 from huggingface_hub import InferenceClient
 import os
-
-import requests
 from rag import run_rag
-"""
-For more information on `huggingface_hub` Inference API support, please check the docs: https://huggingface.co/docs/huggingface_hub/v0.22.2/en/guides/inference
-"""
- 
+
+#  ================================================================================================================================
 TOKEN = os.getenv("HF_TOKEN")
- 
-client = InferenceClient("HuggingFaceH4/zephyr-7b-beta" , token="")
+client = InferenceClient("HuggingFaceH4/zephyr-7b-beta"  )
 system_message ="You are a capable and freindly assistant."
 history = []
 no_change_btn = gr.Button()
 enable_btn = gr.Button(interactive=True)
 disable_btn = gr.Button(interactive=False)
-
+# ================================================================================================================================
+class Int_State:
+    def __init__(self):
+        # initialise history of type list[tuple[str, str]]
+        self.history = []
+        self.current_query = ""
+        self.current_response = ""
+        self.roles = ["user", "system"]
+        print("State has been initialise")
+    
+    def save_question(self, question):
+    
+        self.current_query = question
+        self.current_response = ""
+        self.history.append({"role": "user", "content": question})
+        print("Question added ")
+ 
+    def save_response(self,  assistant_message):
+        current_question = self.current_query
+        self.current_response = assistant_message
+        self.history.append({"role": "system", "content": assistant_message})
+        print("Response saved  ")
+ 
+ 
+    def get_history(self):
+        return self.history
+  
 #  ================================================================================================================================
+state = Int_State()
 #  ================================================================================================================================
-def initialiate_state():
-    state = gr.State()
-    state.history = list[tuple[str, str]]
-    state.current_query = ""
-    state.current_response = ""
-    state.roles = ["user", "assistant"]
-    return state
-
-def add_question(state, textbox):
-    print(textbox)
-    state.current_query = textbox.value
-    state.current_response = ""
-    state.history.append({"role": "user", "content": textbox.value})
-    return state , textbox
-
-def add_response(state,chatbot,  assistant_message):
-    current_question = state.current_query
-    state.current_response = assistant_message
-    state.history.append({"role": "system", "content": assistant_message})
-    chatbot.append((current_question , assistant_message))
-    return state , assistant_message
-
+# def clear_chat(state):
+#     state.history = []
+#     return ("",) + (disable_btn,) * 3
 
 #  ================================================================================================================================
+# def enable_buttons(btn_list ,upvote=False, downvote=False, flag=False, regenerate=False, clear=False):
+#     return [gr.Button(interactive=upvote), gr.Button(interactive=downvote), gr.Button(interactive=flag), gr.Button(interactive=regenerate), gr.Button(interactive=clear)]
+
+
+# def disable_buttons(btn_list, upvote=True, downvote=True, flag=True, regenerate=False, clear=False):
+#     if upvote:
+#         btn_list[0] = disable_btn
+#     if downvote:
+#         btn_list[1] = disable_btn
+#     if flag:
+#         btn_list[2] = disable_btn
+#     if regenerate:
+#         btn_list[3] = disable_btn
+#     if clear:
+#         btn_list[4] = disable_btn
+#     return btn_list
+
+
+
+# def upvote_last_response(btn_list):
+#     # upvote the last response
+#     print("Upvoted")
+#     return disable_buttons(btn_list)
 
+# def downvote_last_response(btn_list):
+#     # downvote the last response
+#     print("Downvoted")
+#     return disable_buttons(btn_list)
+# def flag_last_response(btn_list):
+#     # flag the last response
+#     print("Flagged")
+#     return disable_buttons(btn_list)
+ 
+     
 def chat(
-    state,
+    
     chatbot,
     message,
-    # history: list[tuple[str, str]],
     max_tokens,
     temperature,
     top_p,
 ):
-    
     print("Message: ", message)
-    print("History: ", history)
     print("System Message: ", system_message)
     print("Max Tokens: ", max_tokens)
     print("Temperature: ", temperature)
     print("Top P: ", top_p)
-
+    question= message
     messages = [{"role": "system", "content": system_message}]
-    history= state.history
+
+    history= state.get_history()
+    state.save_question(message)
+
+ 
     for val in history:
         messages.append(val)
-     
- 
-    messages.append({"role": "user", "content": run_rag(message)})
+
+    messages.append({"role": "user", "content": message})
     response = ""
-    if state is None:
-        state = gr.State()
-        state.messages = [[("assistant", "")]]
 
-    for message in client.chat_completion(
+    for msg in client.chat_completion(
         messages,
- 
         max_tokens=max_tokens,
-        stream=False,
+        stream=True,
         temperature=temperature,
         top_p=top_p,
     ):
-        token = message.choices[0].delta.content
+       
+        token = msg.choices[0].delta.content
         response += str(token)
-    add_response(state,message , response)
-    yield (state, response) + (enable_btn,) * 5
+        # yield "" , chatbot 
+    chatbot.append((question , response))
+    state.save_response(response)
+    # btn_list =enable_buttons(btn_list)
+    # yield "" , chatbot + (enable_btn,) * 5
+
+    yield "" , chatbot  
   
 
 #  ================================================================================================================================
@@ -99,58 +136,51 @@ EXAMPLES = [
     [ "Tell me about the actual situation in Ukraine ?"],
     [ "Tell me about current situation in palestine ?"],
 ]
-max_new_tokens = gr.Slider(
-    minimum=1,
-    maximum=2048,
-    value=1024,
-    step=1,
-    interactive=True,
-    label="Max new tokens",
-)
-temperature = gr.Slider(
-    minimum=0.1,
-    maximum=0.9,
-    value=0.6,
-    step=0.1,
-    visible=True,
-    interactive=True,
-    label="Temperature",
-    info="Higher values will produce more diverse outputs.",
-)
-top_p = gr.Slider(
-    minimum=0.1,
-    maximum=1,
-    value=0.9,
-    step=0.05,
-    visible=True,
-    interactive=True,
-    label="Top-p (nucleus sampling)",
-    info="Higher values is equivalent to sampling more low-probability tokens.",
-)
+# max_new_tokens = gr.Slider(
+#     minimum=1,
+#     maximum=2048,
+#     value=1024,
+#     step=1,
+#     interactive=True,
+#     label="Max new tokens",
+# )
+# temperature = gr.Slider(
+#     minimum=0.1,
+#     maximum=0.9,
+#     value=0.6,
+#     step=0.1,
+#     visible=True,
+#     interactive=True,
+#     label="Temperature",
+#     info="Higher values will produce more diverse outputs.",
+# )
+# top_p = gr.Slider(
+#     minimum=0.1,
+#     maximum=1,
+#     value=0.9,
+#     step=0.05,
+#     visible=True,
+#     interactive=True,
+#     label="Top-p (nucleus sampling)",
+#     info="Higher values is equivalent to sampling more low-probability tokens.",
+# )
 #  ================================================================================================================================
-  
  
 
-
-def upvote_last_response(state):
-    return ("",) + (disable_btn,) * 3
-
-def downvote_last_response(state):
-    return ("",) + (disable_btn,) * 3
-
-def flag_last_response(state):
-    return ("",) + (disable_btn,) * 3
-
 block_css = """
 #buttons button {
     min-width: min(120px,100%);
 }
 """
 #  ================================================================================================================================
+textbox = gr.Textbox(show_label=False,
+                        placeholder="Enter text and press ENTER",
+                        container=False,
+                        show_copy_button=True
+                        )
 
-
-with gr.Blocks(title="CuMo", theme=theme, css=block_css) as demo:
-    state = initialiate_state()
+with gr.Blocks(title="RAG", theme=theme, css=block_css) as demo:
+    
     gr.Markdown("Retrieval Augmented Generation (RAG) Chatbot" )
     with gr.Row():
         with gr.Column(scale=8):
@@ -162,16 +192,12 @@ with gr.Blocks(title="CuMo", theme=theme, css=block_css) as demo:
             )
             with gr.Row():
                 with gr.Column(scale=8):
-                    # textbox.render()
-                    textbox = gr.Textbox(show_label=False,
-                                          placeholder="Enter text and press ENTER",
-                                            container=False,
-                                            show_copy_button=True
-                                            )
+                    textbox.render()
 
                 with gr.Column(scale=1, min_width=100):
-                    submit_btn = gr.Button(value="Submit", variant="primary" )
-               
+                    submit_btn = gr.Button(value="Submit", variant="primary", interactive=True)
+    
+        
             with gr.Row(elem_id="buttons") as button_row:
                 upvote_btn = gr.Button(value="👍  Upvote", interactive=False)
                 downvote_btn = gr.Button(value="👎  Downvote", interactive=False)
@@ -187,6 +213,7 @@ with gr.Blocks(title="CuMo", theme=theme, css=block_css) as demo:
                 [f"Tell me about the actual situation in Ukraine ?"],
                 [f"Tell me about current situation in palestinian ?"],
             ],inputs=[textbox], label="Examples")
+                
             with gr.Accordion("Parameters", open=False) as parameter_row:
                     temperature = gr.Slider(minimum=0.0, maximum=1.0, value=0.2, step=0.1, interactive=True, label="Temperature",)
                     top_p = gr.Slider(minimum=0.0, maximum=1.0, value=0.7, step=0.1, interactive=True, label="Top P",)
@@ -195,35 +222,37 @@ with gr.Blocks(title="CuMo", theme=theme, css=block_css) as demo:
 #  ================================================================================================================================
     btn_list = [upvote_btn, downvote_btn, flag_btn, regenerate_btn, clear_btn]
 
-    upvote_btn.click(
-        upvote_last_response,
-        [state],
-        [textbox, upvote_btn, downvote_btn, flag_btn]
-    )
-    downvote_btn.click(
-        downvote_last_response,
-        [state],
-        [textbox, upvote_btn, downvote_btn, flag_btn]
-    )
-    flag_btn.click(
-        flag_last_response,
-        [state],
-        [textbox, upvote_btn, downvote_btn, flag_btn]
-    )
-
-    submit_btn.click(
-            add_question,
-            [state,  textbox],
-            [state, textbox],
-        ).then(
-            chat,
-            [state, chatbot, textbox , max_new_tokens , temperature ,top_p],
-            [state, textbox] + btn_list,
-
-        )
+    # upvote_btn.click(
+    #     upvote_last_response,
+    #     [btn_list],
+    #     [btn_list]
+    # )
 
- 
+    # downvote_btn.click(
+    #     downvote_last_response,
+    #     [btn_list],
+    #     [btn_list]
     # )
-#  ================================================================================================================================
+    # flag_btn.click(
+    #     flag_last_response,
+    #     [btn_list],
+    #     [btn_list]
+    # )
+    # regenerate_btn.click(
+    #     chat,
+    #     [btn_list, chatbot, textbox, max_output_tokens, temperature, top_p],
+    #     [textbox, chatbot , btn_list]
+    # )
+    # clear_btn.click(
+    #     clear_chat,
+    #     [disable_btn] * 5
+    # )
+    submit_btn.click(    
+        chat ,
+        [chatbot, textbox , max_output_tokens, temperature, top_p],
+        [textbox ,chatbot]  
+                )
+
+ #  ================================================================================================================================
 demo.launch()
 #  ================================================================================================================================