Update app.py

app.py

@@ -19,6 +19,9 @@ import logging
 
 # Set up basic configuration for logging
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
+# In the get_response_from_cloudflare function:
+logging.debug(f"Cloudflare API Response: {response.status_code}")
+logging.debug(f"Cloudflare API Response Content: {response.text[:100]}...")  
 
 # Environment variables and configurations
 huggingface_token = os.environ.get("HUGGINGFACE_TOKEN")
@@ -259,6 +262,7 @@ def get_response_from_cloudflare(query, num_calls=3, temperature=0.2):
     
     prompt = f"Write a detailed and complete response that answers the following user question: '{query}'"
     
+    full_response = ""
     for i in range(num_calls):
         try:
             response = requests.post(
@@ -276,18 +280,21 @@ def get_response_from_cloudflare(query, num_calls=3, temperature=0.2):
                 stream=True
             )
             
-            partial_response = ""
             for line in response.iter_lines():
                 if line:
                     try:
                         json_data = json.loads(line.decode('utf-8').split('data: ')[1])
-                        chunk = json_data['response']
-                        partial_response += chunk
-                        yield partial_response
-                    except json.JSONDecodeError:
+                        chunk = json_data.get('response', '')
+                        full_response += chunk
+                        yield full_response
+                    except (json.JSONDecodeError, IndexError) as e:
+                        print(f"Error parsing response: {str(e)}")
                         continue
         except Exception as e:
             print(f"Error in generating response from Cloudflare: {str(e)}")
+    
+    if not full_response:
+        yield "I apologize, but I couldn't generate a response at this time. Please try again later."
 
 def get_response_with_search(query, model, num_calls=3, temperature=0.2):
     search_results = duckduckgo_search(query)
@@ -301,38 +308,8 @@ After writing the document, please provide a list of sources used in your respon
 
     if model == "@cf/meta/llama-3.1-8b-instruct":
         # Use Cloudflare API
-        ACCOUNT_ID = "your-account-id"  # Replace with your actual Cloudflare account ID
-        AUTH_TOKEN = os.environ.get("CLOUDFLARE_AUTH_TOKEN")
-        
-        main_content = ""
-        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={
-                        "stream": True,
-                        "messages": [
-                            {"role": "system", "content": "You are a friendly assistant"},
-                            {"role": "user", "content": prompt}
-                        ],
-                        "max_tokens": 1000,
-                        "temperature": temperature
-                    },
-                    stream=True
-                )
-                
-                for line in response.iter_lines():
-                    if line:
-                        try:
-                            json_data = json.loads(line.decode('utf-8').split('data: ')[1])
-                            chunk = json_data['response']
-                            main_content += chunk
-                            yield main_content, ""  # Yield partial main content without sources
-                        except json.JSONDecodeError:
-                            continue
-            except Exception as e:
-                print(f"Error in generating response from Cloudflare: {str(e)}")
+        for response in get_response_from_cloudflare(prompt, num_calls, temperature):
+            yield response, ""  # Yield response without sources
     else:
         # Use Hugging Face API
         client = InferenceClient(model, token=huggingface_token)