Update app.py

app.py

@@ -1,15 +1,9 @@
 
-# ===================================================
-# "the-very-latest-latest-POST-it"-----app.py✍🏽 👾
-# ===================================================
-"""
-    Change from APIChain to EnhancedRequestsPostTool was heisted by the need to handle POST requests.
-    APIChain internally was responsible for URL construction, API interaction, and response formatting:
-    EnhancedRequestsPostTool is an enabler for POST handling@RequestsPostTool.
-    Routing mechanisms for prompts (api_url_prompt+api_response_prompt) remain are being used across distinct components.
-"""
+# ===========================================
+# aha-----app.py
+# ===========================================
+
 import asyncio
-import concurrent.futures
 import os
 import re
 import time
@@ -18,72 +12,24 @@ import json
 import chainlit as cl
 from dotenv import load_dotenv
 
-from pydantic import BaseModel, PrivateAttr
+from langchain_community.tools.requests.tool import RequestsPostTool
+from langchain_community.utilities.requests import TextRequestsWrapper
+
 
 from langchain import hub
 from langchain_openai import OpenAI
 from tiktoken import encoding_for_model
-from langchain.chains import LLMChain #APIChain
+from langchain.chains import LLMChain, APIChain
 from langchain_core.prompts import PromptTemplate
-
-from langchain_community.tools.requests.tool import RequestsPostTool
-from langchain_community.utilities.requests import TextRequestsWrapper
-
 from langchain.memory.buffer import ConversationBufferMemory
 from langchain.memory import ConversationTokenBufferMemory
 from langchain.memory import ConversationSummaryMemory
 
 from api_docs import api_docs_str
-
 load_dotenv()
 OPENAI_API_KEY = os.environ.get("OPENAI_API_KEY")
-auth_token = os.getenv("DAYSOFF_API_TOKEN")
-
-"""
-class EnhancedRequestsPostTool(RequestsPostTool, BaseModel):
-    url_chain: LLMChain
-    response_chain: LLMChain
-    api_docs: str
-
-    def __init__(self, requests_wrapper, llm, api_docs, api_url_prompt, api_response_prompt):
-        super().__init__(requests_wrapper=requests_wrapper, allow_dangerous_requests=True)
-        object.__setattr__(self, 'url_chain', LLMChain(llm=llm, prompt=api_url_prompt))  # object.__setattr__ (’set attribute’, i.e error with "fields")
-        object.__setattr__(self, 'response_chain', LLMChain(llm=llm, prompt=api_response_prompt))
-        object.__setattr__(self, 'api_docs', api_docs)
-"""
+auth = os.environ.get("CHAINLIT_AUTH_SECRET")
 
-class EnhancedRequestsPostTool(RequestsPostTool, BaseModel):
-    api_docs: str = api_docs_str
-
-    # --PrivateAttr@dynanmc init attrbts
-    _url_chain: LLMChain = PrivateAttr()
-    _response_chain: LLMChain = PrivateAttr()
-  
-    def __init__(self, requests_wrapper, llm, api_docs_str, api_url_prompt, api_response_prompt):
-        super().__init__(requests_wrapper=requests_wrapper, allow_dangerous_requests=True)
-        object.__setattr__(self, 'api_docs', api_docs_str) # self.api_docs = api_docs_str
-        object.__setattr__(self, 'url_chain', LLMChain(llm=llm, prompt=api_url_prompt))  # --dynanmc init1
-        object.__setattr__(self, 'response_chain', LLMChain(llm=llm, prompt=api_response_prompt)) # --dynanmc init2
-        
-    async def ainvoke(self, input_data, callbacks=None):
-        # -- create API URL
-        url_response = await self.url_chain.ainvoke({
-            "api_docs": self.api_docs,
-            "question": input_data.get("question")
-        })
-        
-        api_response = await super().ainvoke(input_data, callbacks) # --make POST request
-        
-        # --form(at) response/:response_chain
-        formatted_response = await self.response_chain.ainvoke({
-            "api_docs": self.api_docs,
-            "question": input_data.get("question"),
-            "api_url": url_response.get("text"),
-            "api_response": api_response
-        })
-        
-        return formatted_response 
-     
 daysoff_assistant_template = """
 #You are a customer support assistant (’kundeservice AI assistent’) for Daysoff.
 #By default, you respond in Norwegian language, using a warm, direct, and professional tone.
@@ -130,6 +76,7 @@ api_response_prompt = PromptTemplate(
 )
 
 
+
 @cl.on_chat_start
 def setup_multiple_chains():
     llm = OpenAI(
@@ -153,35 +100,47 @@ def setup_multiple_chains():
         memory=conversation_memory,
     )
 
+    cl.user_session.set("llm_chain", llm_chain)
+
+    api_chain = APIChain.from_llm_and_api_docs(
+        llm=llm,
+        api_docs=api_docs_str,
+        api_url_prompt=api_url_prompt,
+        api_response_prompt=api_response_prompt,
+        verbose=True,
+        limit_to_domains=["http://0.0.0.0:7860/"]
+    )
+
+    cl.user_session.set("api_chain", api_chain)
+
     requests_wrapper = TextRequestsWrapper(
-        headers={
-            "Authorization": auth_token,
-            "Content-Type": "application/json"
+    headers={
+        "Authorization": auth_token,
+        "Content-Type": "application/json"
         }
     )
-    
-    post_tool = EnhancedRequestsPostTool(
+
+    post_tool = RequestsPostTool(
         requests_wrapper=requests_wrapper,
-        llm=llm,
-        api_docs_str=api_docs_str,
-        api_url_prompt=api_url_prompt,
-        api_response_prompt=api_response_prompt
+        allow_dangerous_requests=True
     )
-    
-    cl.user_session.set("llm_chain", llm_chain)
+
     cl.user_session.set("post_tool", post_tool)
-    
+
 
 @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")
     post_tool = cl.user_session.get("post_tool")
 
     booking_pattern = r'\b[A-Z]{6}\d{6}\b'
     endpoint_url = "https://aivisions.no/data/daysoff/api/v1/booking/"
 
+
     match = re.search(booking_pattern, user_message)
+
     if match:
         bestillingskode = match.group()
         post_data = {
@@ -190,21 +149,17 @@ async def handle_message(message: cl.Message):
                 "booking_id": bestillingskode
             }
         }
-        
+
         response = await post_tool.acall(
             json.dumps(post_data),
             callbacks=[cl.AsyncLangchainCallbackHandler()]
         )
-               
-    else:
-        response = await llm_chain.ainvoke(      
-            user_message,                                # {"chat_history": "", "question": user_message}
-        )
-        await cl.Message(content=response).send()
 
-    response_key = "output" if "output" in response else "text"
+    else:
+        response = await llm_chain.ainvoke(user_message, callbacks=[cl.AsyncLangchainCallbackHandler()])
 
-    await cl.Message(response.get(response_key, "")).send()
-    return message.content
+        response_key = "output" if "output" in response else "text"
+        await cl.Message(response.get(response_key, "")).send()
+        return message.content