Update app.py

app.py

@@ -21,6 +21,21 @@ chat_sessions_cache = {}
 # Store uploaded files metadata
 files_cache = {}
 
+def cleanup_expired_files():
+    """Remove files from cache that are older than 5 minutes"""
+    current_time = int(time.time())
+    expiry_seconds = 5 * 60
+    expired_ids = [fid for fid, record in files_cache.items() 
+                   if current_time - record.get('created_at', record.get('uploaded_at', 0)) > expiry_seconds]
+    
+    for fid in expired_ids:
+        print(f"Cleaning up expired file: {fid}")
+        del files_cache[fid]
+
+@app.before_request
+def run_cleanup():
+    cleanup_expired_files()
+
 
 def get_headers():
     """Get authorization headers"""
@@ -165,16 +180,21 @@ def extract_files_from_messages(messages, msg_format="openai"):
             if block_type == 'image_url':
                 image_url_obj = block.get('image_url', {})
                 url = image_url_obj.get('url', '')
+                print(f"[DEBUG] Found image_url block with URL: {url}")
                 
                 # Check if it's a file ID or our own proxy URL
                 file_id = get_id_from_url(url)
+                print(f"[DEBUG] Extracted file_id: {file_id}")
                 if file_id:
-                    record = files_cache[file_id]
+                    print(f"[DEBUG] File ID found in cache: {file_id in files_cache}")
+                    if file_id in files_cache:
+                        record = files_cache[file_id]
                     files.append({
                         "base64_data": record.get('_data', ''),
                         "media_type": record.get('content_type', 'image/png'),
                         "filename": record.get('filename', f"file_{uuid.uuid4().hex[:8]}"),
                         "onyx_file_id": record.get('onyx_file_id'),
+                        "proxy_id": file_id,
                         "type": "image"
                     })
                 
@@ -316,6 +336,7 @@ def upload_file_to_onyx(file_data, chat_session_id):
             "id": file_data['onyx_file_id'],
             "type": file_data.get('type', 'document'),
             "name": file_data.get('filename', 'file'),
+            "proxy_id": file_data.get('proxy_id'),
         }
 
     # Decode base64 to binary
@@ -367,6 +388,7 @@ def upload_file_to_onyx(file_data, chat_session_id):
                     "id": f_id,
                     "type": file_data.get('type', 'document'),
                     "name": file_data['filename'],
+                    "proxy_id": file_data.get('proxy_id'),
                 }
                 
                 # If the response includes the full descriptor, use it
@@ -748,8 +770,19 @@ def build_onyx_payload(messages, model_provider, model_version, temperature, cha
     # If files were uploaded, add a note to the message
     file_note = ""
     if file_descriptors:
-        file_names = ", ".join([f.get('name', 'file') for f in file_descriptors])
-        file_note = f"\n[Note: {len(file_descriptors)} file(s) ({file_names}) have been attached to this message. Please analyze them as requested.]\n"
+        file_info = []
+        host_url = request.host_url.rstrip('/')
+        for f in file_descriptors:
+            name = f.get('name', 'file')
+            proxy_id = f.get('proxy_id')
+            if proxy_id:
+                url = f"{host_url}/v1/files/{proxy_id}/content"
+                file_info.append(f"{name} ({url})")
+            else:
+                file_info.append(name)
+        
+        file_names_str = ", ".join(file_info)
+        file_note = f"\n[Note: {len(file_descriptors)} file(s) ({file_names_str}) have been attached to this message. These links expire in 5 minutes. Please analyze them as requested.]\n"
 
 
     # Construct the full message
@@ -842,8 +875,19 @@ def build_anthropic_payload_from_messages(messages, system_prompt, model_provide
     # If files were uploaded, add a note
     file_note = ""
     if file_descriptors:
-        file_names = ", ".join([f.get('name', 'file') for f in file_descriptors])
-        file_note = f"\n[Note: {len(file_descriptors)} file(s) ({file_names}) have been attached to this message. Please analyze them as requested.]\n"
+        file_info = []
+        host_url = request.host_url.rstrip('/')
+        for f in file_descriptors:
+            name = f.get('name', 'file')
+            proxy_id = f.get('proxy_id')
+            if proxy_id:
+                url = f"{host_url}/v1/files/{proxy_id}/content"
+                file_info.append(f"{name} ({url})")
+            else:
+                file_info.append(name)
+        
+        file_names_str = ", ".join(file_info)
+        file_note = f"\n[Note: {len(file_descriptors)} file(s) ({file_names_str}) have been attached to this message. These links expire in 5 minutes. Please analyze them as requested.]\n"
 
 
     # Construct full message
@@ -1002,7 +1046,7 @@ def stream_onyx_response(payload, model, session_key, has_tools=False):
         try:
             print(f"Trying endpoint: {url}")
 
-            with requests.post(url, json=payload, headers=get_headers(), stream=True, timeout=120) as response:
+            with requests.post(url, json=payload, headers=get_headers(), stream=True, timeout=300) as response:
                 print(f"Response status: {response.status_code}")
 
                 if response.status_code != 200:
@@ -1105,7 +1149,7 @@ def collect_full_response(payload, model, session_key, has_tools=False):
 
             is_streaming_request = payload.get('stream', False)
 
-            with requests.post(url, json=payload, headers=get_headers(), stream=is_streaming_request, timeout=120) as response:
+            with requests.post(url, json=payload, headers=get_headers(), stream=is_streaming_request, timeout=300) as response:
                 print(f"Response status: {response.status_code}")
 
                 if response.status_code == 404:
@@ -1263,7 +1307,7 @@ def generate_anthropic_stream_events(payload, model, session_key, has_tools=Fals
 
     for url in endpoints:
         try:
-            with requests.post(url, json=payload, headers=get_headers(), stream=True, timeout=120) as response:
+            with requests.post(url, json=payload, headers=get_headers(), stream=True, timeout=300) as response:
                 if response.status_code != 200:
                     continue
 
@@ -1416,7 +1460,7 @@ def collect_anthropic_full_response(payload, model, session_key, has_tools=False
         try:
             is_streaming_request = payload.get('stream', False)
 
-            with requests.post(url, json=payload, headers=get_headers(), stream=is_streaming_request, timeout=120) as response:
+            with requests.post(url, json=payload, headers=get_headers(), stream=is_streaming_request, timeout=300) as response:
                 if response.status_code == 404:
                     continue