Update app.py

app.py

@@ -25,6 +25,7 @@ huggingface_token = os.environ.get("HUGGINGFACE_TOKEN")
 llama_cloud_api_key = os.environ.get("LLAMA_CLOUD_API_KEY")
 ACCOUNT_ID = os.environ.get("CLOUDFARE_ACCOUNT_ID")
 AUTH_TOKEN = os.environ.get("CLOUDFLARE_AUTH_TOKEN")
+API_BASE_URL = "https://api.cloudflare.com/client/v4/accounts/a17f03e0f049ccae0c15cdcf3b9737ce/ai/run/"
 
 print(f"ACCOUNT_ID: {ACCOUNT_ID}")
 print(f"CLOUDFLARE_AUTH_TOKEN: {AUTH_TOKEN[:5]}..." if AUTH_TOKEN else "Not set")
@@ -251,49 +252,39 @@ def respond(message, history, model, temperature, num_calls, use_web_search):
 logging.basicConfig(level=logging.DEBUG)
 
 def get_response_from_cloudflare(query, num_calls=3, temperature=0.2):
-    ACCOUNT_ID = "your-account-id"  # Replace with your actual Cloudflare account ID
-    AUTH_TOKEN = os.environ.get("CLOUDFLARE_AUTH_TOKEN")
-    
-    logging.debug(f"ACCOUNT_ID: {ACCOUNT_ID}")
-    logging.debug(f"CLOUDFLARE_AUTH_TOKEN: {AUTH_TOKEN[:5]}...")  # Print only the first 5 characters for security
-    
+    headers = {"Authorization": f"Bearer {API_TOKEN}"}
+    model = "@cf/meta/llama-3.1-8b-instruct"
+
+    logging.debug(f"API_BASE_URL: {API_BASE_URL}")
+    logging.debug(f"API_TOKEN: {API_TOKEN[:5]}...")
+
     prompt = f"Write a detailed and complete response that answers the following user question: '{query}'"
-    
+
+    inputs = [
+        {"role": "system", "content": "You are a friendly assistant that helps answer questions."},
+        {"role": "user", "content": prompt}
+    ]
+
     full_response = ""
     for i in range(num_calls):
         try:
-            response = requests.post(
-                f"https://api.cloudflare.com/client/v4/accounts/{ACCOUNT_ID}/ai/run/@cf/meta/llama-3.1-8b-instruct",
-                headers={"Authorization": f"Bearer {AUTH_TOKEN}"},
-                json={
-                    "messages": [
-                        {"role": "system", "content": "You are a friendly assistant"},
-                        {"role": "user", "content": prompt}
-                    ],
-                    "max_tokens": 1000,
-                    "temperature": temperature
-                }
-            )
+            response = requests.post(f"{API_BASE_URL}{model}", headers=headers, json={"messages": inputs})
             
             logging.debug(f"Cloudflare API Response Status: {response.status_code}")
             logging.debug(f"Cloudflare API Response Headers: {response.headers}")
             logging.debug(f"Cloudflare API Response Content: {response.text[:500]}...")  # First 500 characters
             
             if response.status_code == 200:
-                try:
-                    json_response = response.json()
-                    if 'result' in json_response and 'response' in json_response['result']:
-                        chunk = json_response['result']['response']
-                        full_response += chunk
-                        yield full_response
-                    else:
-                        logging.error(f"Unexpected JSON structure: {json_response}")
-                        yield "I apologize, but I received an unexpected response format. Please try again later."
-                except json.JSONDecodeError as e:
-                    logging.error(f"JSON Decode Error: {str(e)}")
-                    yield "I apologize, but I couldn't parse the response. Please try again later."
+                json_response = response.json()
+                if 'result' in json_response and 'response' in json_response['result']:
+                    chunk = json_response['result']['response']
+                    full_response += chunk
+                    yield full_response
+                else:
+                    logging.error(f"Unexpected JSON structure: {json_response}")
+                    yield "I apologize, but I received an unexpected response format. Please try again later."
             else:
-                logging.error(f"HTTP Error: {response.status_code}")
+                logging.error(f"HTTP Error: {response.status_code}, Response: {response.text}")
                 yield f"I apologize, but I encountered an HTTP error: {response.status_code}. Please try again later."
         except Exception as e:
             logging.error(f"Error in generating response from Cloudflare: {str(e)}")