Update app.py

app.py

@@ -129,17 +129,9 @@ memory_bandi_sistema_puglia = None
 stream_response = None
 divDocumenti = None
 
-def main():
-    setGPU()
-    llm = setLLM()
-    Settings.llm = llm
-    Settings.embed_model = "local:google-bert/bert-base-multilingual-cased"
-    embed_model = Settings.embed_model
-    text_qa_template, refine_template = setPromptTemplate()
-    select_initial_collection()
-    set_chat_engine()
 
-    def select_initial_collection():
+
+def select_initial_collection():
         global current_collection
         global retriever
 
@@ -163,7 +155,7 @@ def main():
         current_collection = "BANDI_SISTEMA_PUGLIA"
         return "collezione settata"
 
-    def select_collection(evt: gr.SelectData):
+def select_collection(evt: gr.SelectData):
         global current_collection
         global retriever
         global chat_engine_bandi
@@ -228,12 +220,12 @@ def main():
         
         return "<div class='alert alert-success' role='alert'> Collezione "+selected_collection+" selezionata </div>"
     
-    def select_response_mode(evt: gr.SelectData):
+def select_response_mode(evt: gr.SelectData):
         global current_response_mode
         current_response_mode = evt.value
         return "<div class='alert alert-success' role='alert'>"+current_response_mode+" selezionato </div>"
 
-    def select_chat_mode():
+def select_chat_mode():
         global current_chat_mode
         global memory_bandi
         global memory_bandi_sistema_puglia
@@ -251,12 +243,12 @@ def main():
 
         return "<div class='alert alert-success' role='alert'>Hai selezionato la modalità "+current_chat_mode+" </div>"
 
-    def select_standard_mode():
+def select_standard_mode():
         global current_chat_mode
         current_chat_mode = "STANDARD"
         return "<div class='alert alert-success' role='alert'>Hai selezionato la modalità "+current_chat_mode+" </div>"
 
-    def set_chat_engine():
+def set_chat_engine():
         global chat_engine_bandi
         global chat_engine_bandi_sistema_puglia
         global memory_bandi
@@ -308,7 +300,7 @@ def main():
                 "\n", llm=llm, memory=memory_bandi_sistema_puglia, prefix_messages=[])
 
 
-    def html_escape(text):
+def html_escape(text):
         html_entities = {
             'à': '&agrave;',
             'è': '&egrave;',
@@ -349,7 +341,7 @@ def main():
         }
         return ''.join(html_entities.get(c, c) for c in text)
 
-    def reset():
+def reset():
         global chat_engine_bandi
         global chat_engine_bandi_sistema_puglia
         global memory_bandi
@@ -364,28 +356,7 @@ def main():
         token_count_bandi_sistema_puglia = 0
         return "<div class='alert alert-success' role='alert'>Cronologia chat eliminata</div>"
 
-    with gr.Blocks(css=css, head=head) as demo:
-
-        with gr.Row():
-            output = gr.HTML()
-        with gr.Row(elem_id="buttonChat"):
-            gr.Button("STANDARD", size="sm").click(fn=select_standard_mode, outputs=output)
-            gr.Button("CHAT",size="sm").click(fn=select_chat_mode, outputs=output)
-
-        chatbot = gr.Chatbot(elem_id="chatbot", container=False)
-
-        with gr.Column(elem_id="colonnaElementi"):
-            gr.Dropdown(
-            ["BANDI_SISTEMA_PUGLIA","BANDI"], label="Collezione di documenti", info="", container=False, interactive=True, value="BANDI_SISTEMA_PUGLIA", elem_id="dropdown"
-            ).select(fn=select_collection, outputs=output)
-            
-            gr.Radio(["compact","tree_summarize"], label="Response mode", info="Influenzerà il modo in cui il chatbot risponde", interactive=True,container=False, value="compact",elem_id="responseMode").select(fn=select_response_mode, outputs=output),
-            divDocumenti = gr.HTML("<div id='divDocumenti'></div>")
-        msg = gr.Textbox(elem_id="textBox", container=False)
-        clear = gr.ClearButton([msg, chatbot], elem_id="btnClear")
-        clear.click(fn=reset, outputs=output)
-        
-        def user(userMessage, history):
+def user(userMessage, history):
             global user_message 
             user_message = userMessage
             if history is None:
@@ -393,15 +364,8 @@ def main():
 
             return "", history + [[user_message, None]]
 
-        def getStreamResponse(type_engine, engine, message):
-            response = None
-            if(type_engine=="CHAT"):
-                response = engine.stream_chat(message)
-            else:
-                response = engine.query(message)
-            return response
-        @spaces.GPU(duration=120)    
-        def bot(history):
+@spaces.GPU(duration=120)    
+def bot(history):
             global chat_engine_bandi
             global chat_engine_bandi_sistema_puglia
             global memory_bandi
@@ -506,13 +470,46 @@ def main():
             torch.cuda.reset_max_memory_allocated()
             torch.cuda.reset_max_memory_cached()
 
+        
+
 
-        msg.submit(user, [msg, chatbot], [msg, chatbot], queue=False).then(
-            bot, chatbot, [chatbot, divDocumenti]
-        )
+def main():
+    setGPU()
+    llm = setLLM()
+    Settings.llm = llm
+    Settings.embed_model = "local:google-bert/bert-base-multilingual-cased"
+    embed_model = Settings.embed_model
+    text_qa_template, refine_template = setPromptTemplate()
+    
+    with gr.Blocks(css=css, head=head) as demo:
+        with gr.Row():
+            output = gr.HTML()
+        with gr.Row(elem_id="buttonChat"):
+            gr.Button("STANDARD", size="sm").click(fn=select_standard_mode, outputs=output)
+            gr.Button("CHAT",size="sm").click(fn=select_chat_mode, outputs=output)
+        chatbot = gr.Chatbot(elem_id="chatbot", container=False)
         
-        demo.queue()
-        demo.launch(debug=True, share=True)
+        with gr.Column(elem_id="colonnaElementi"):
+            gr.Dropdown(
+            ["BANDI_SISTEMA_PUGLIA","BANDI"], label="Collezione di documenti", info="", container=False, interactive=True, value="BANDI_SISTEMA_PUGLIA", elem_id="dropdown"
+            ).select(fn=select_collection, outputs=output)
+            
+            gr.Radio(["compact","tree_summarize"], label="Response mode", info="Influenzerà il modo in cui il chatbot risponde", interactive=True,container=False, value="compact",elem_id="responseMode").select(fn=select_response_mode, outputs=output),
+            divDocumenti = gr.HTML("<div id='divDocumenti'></div>")
+        msg = gr.Textbox(elem_id="textBox", container=False)
+        clear = gr.ClearButton([msg, chatbot], elem_id="btnClear")
+        clear.click(fn=reset, outputs=output)
+        
+    msg.submit(user, [msg, chatbot], [msg, chatbot], queue=False).then(
+        bot, chatbot, [chatbot, divDocumenti]
+    )
+    
+    demo.queue()
+    demo.launch(debug=True, share=True)
+
+    select_initial_collection()
+    set_chat_engine()
+
 
 if __name__ == "__main__":
     main()