Update app.py

app.py

@@ -1,5 +1,9 @@
-### title: 010125-daysoff-assistant-api
-### file: app.py
+
+# ===========================================
+# ver2-----app.py
+# ===========================================
+
+
 
 import asyncio
 import os
@@ -107,28 +111,6 @@ def setup_multiple_chains():
         frequency_penalty=0.5,
         presence_penalty=0.3   
     )
-
-    
-    #llm = HuggingFaceEndpoint(
-        #repo_id="google/gemma-2-2b", #"norallm/normistral-7b-warm-instruct", 
-        #endpoint_url="http://localhost:8010/",
-    
-        #model="google/gemma-2-2b",
-        #max_new_tokens=512,
-        #top_k=10,
-        #top_p=0.95,
-        #typical_p=0.95,
-        #temperature=0.7,
-        #repetition_penalty=1.03,
-        #huggingfacehub_api_token=HUGGINGFACEHUB_API_TOKEN,
-        #task="text-generation"
-    #)
-
-    #llm = HuggingFacePipeline.from_model_id(
-    #model_id="normistral-7b-warm-instruct",
-    #task="text-generation",
-    #pipeline_kwargs={"max_new_tokens": 10},
-    #)
     
     conversation_memory = ConversationBufferMemory(memory_key="chat_history",
                                                    max_len=300,
@@ -147,7 +129,7 @@ def setup_multiple_chains():
         api_url_prompt=api_url_prompt,
         api_response_prompt=api_response_prompt,
         verbose=True,
-        limit_to_domains=None #["https://670dccd0073307b4ee447f2f.mockapi.io/daysoff/api/V1"]
+        limit_to_domains=None 
     )
 
     cl.user_session.set("api_chain", api_chain)
@@ -171,26 +153,11 @@ async def handle_message(message: cl.Message):
             response = await api_chain.acall(
                 {
                     "booking_id": booking_id,
-                    "question": question
+                    "question": question,
+                    "url": url
                 },
                 callbacks=[cl.AsyncLangchainCallbackHandler()])
 
-            booking_info = response.get("output", {})
-            
-            if booking_info:
-                markdown_response = f"""
-                Informasjon for bestillingskode: {booking_id}
-
-                | Felt       | Detaljer                      |
-                |-----------------|-----------------------------------|
-                | Navn:       | {booking_info.get('full_name', 'N/A')} |
-                | Beløp:      | {booking_info.get('amount', 'N/A')} NOK |
-                | Check-In:   | {booking_info.get('checkin', 'N/A')} |
-                | Check-Out:  | {booking_info.get('checkout', 'N/A')} |
-                | Addresse:   | {booking_info.get('address', 'N/A')} |
-                | Bruker ID:  | {booking_info.get('user_id', 'N/A')} |
-                """
-                await cl.Message(content=markdown_response).send()
             else:
                 await cl.Message("Vi kan desverre ikke finne noen informasjon for det oppgitte bookingnummeret.").send()
 
@@ -204,53 +171,3 @@ async def handle_message(message: cl.Message):
     response_key = "output" if "output" in response else "text"
     await cl.Message(response.get(response_key, "")).send()
     return message.content
-
-    
-"""
-@cl.on_message
-async def handle_message(message: cl.Message):
-    user_message = message.content
-    llm_chain = cl.user_session.get("llm_chain")
-    api_chain = cl.user_session.get("api_chain")
-
-    # api_keywords = ["firmahytteordning", "personvernspolicy"]
-
-    #base_url = "https://670dccd0073307b4ee447f2f.mockapi.io/daysoff/api/V1/booking"
-    #url = f"{base_url}?search={booking_id}"
-    
-    try:
-        # --check message for booking ID
-        if re.search(r'\b[A-Z]{6}\d{6}\b', user_message):  
-            logging.debug(f"Booking ID detected in message: {user_message}")
-            response = await api_chain.acall(user_message, callbacks=[cl.AsyncLangchainCallbackHandler()])
-
-        # --check message for  keywords
-        #elif any(keyword in user_message for keyword in ["firmahytteordning", "personvernspolicy"]):   # any(keyword in user_message for keyword in api_keywords):
-            #logging.debug(f"API keyword detected in message: {user_message}")
-            #response = await api_chain.acall(user_message, callbacks=[cl.AsyncLangchainCallbackHandler()])
-
-        else: 
-            logging.debug("Triggers LLMChain for everything else.")
-            response = await llm_chain.acall(user_message, callbacks=[cl.AsyncLangchainCallbackHandler()])
-
-    except Exception as e:
-        logging.error(f"Error in processing message: {str(e)}")
-        response = {"output": "Jeg får desverre ikke hentet fram din informasjon akkurat nå."}
-
-    response_key = "output" if "output" in response else "text"
-    await cl.Message(response.get(response_key, "")).send()
-    return message.content
-
-"""
-
-
-
-
-#def is_booking_query(user_message):
-        #match = re.search(r'\b[A-Z]{6}\d{6}\b', user_message)
-        #return match is not None  # --works boolean
-    #booked = is_booking_query(user_message)
-    #if booked:
-        #response = await api_chain.acall(user_message, callbacks=[cl.AsyncLangchainCallbackHandler()])
-    # etc..
-