Fix self-download for agents

openai_server/autogen_2agent_backend.py

@@ -2,7 +2,7 @@
 import tempfile
 import uuid
 
-from openai_server.backend_utils import structure_to_messages
+from openai_server.backend_utils import structure_to_messages, run_download_api_all
 from openai_server.agent_utils import get_ret_dict_and_handle_files, get_openai_client
 from openai_server.agent_prompting import get_full_system_prompt, planning_prompt, planning_final_prompt, \
     get_agent_tools
@@ -92,10 +92,8 @@ def run_autogen_2agent(query=None,
         agent_work_dir = tempfile.mkdtemp()
 
     if agent_files:
-        client = get_openai_client(max_time=autogen_timeout)
         # assume list of file_ids for use with File API
-        from openai_server.openai_client import get_files_from_ids
-        get_files_from_ids(usage=None, client=client, file_ids=agent_files, work_dir=agent_work_dir)
+        run_download_api_all(agent_files, authorization, agent_work_dir)
 
     # iostream = IOStream.get_default()
     # iostream.print("\033[32m", end="")

openai_server/backend_utils.py

@@ -366,6 +366,33 @@ def run_upload_api(content, filename, purpose, authorization, created_at_orig=No
     return response_dict
 
 
+def run_download_api(file_id, authorization):
+    user_dir = get_user_dir(authorization)
+
+    if not os.path.exists(user_dir):
+        os.makedirs(user_dir)
+
+    file_path = os.path.join(user_dir, file_id)
+    file_path_meta = os.path.join(user_dir, file_id + meta_ext)
+
+    with open(file_path, "rb") as f:
+        content = f.read()
+
+    with open(file_path_meta, "rt") as f:
+        response_dict = json.dumps(f.read())
+    assert isinstance(response_dict, dict), "response_dict should be a dict"
+    return response_dict, content
+
+
+def run_download_api_all(agent_files, authorization, agent_work_dir):
+    for file_id in agent_files:
+        response_dict, content = run_download_api(file_id, authorization)
+        filename = response_dict['filename']
+        new_file = os.path.join(agent_work_dir, filename)
+        with open(new_file, "wb") as f:
+            f.write(content)
+
+
 def extract_xml_tags(full_text, tags=['name', 'page']):
     results_dict = {k: None for k in tags}
     for tag in tags:

openai_server/server.py

@@ -1140,7 +1140,7 @@ async def retrieve_file(request: Request, file_id: str, authorization: str = Hea
     file_path = os.path.join(user_dir, file_id)
 
     if not os.path.exists(file_path):
-        raise HTTPException(status_code=404, detail="File not found")
+        raise HTTPException(status_code=404, detail=f"retrieve_file: {file_id}: File not found")
 
     file_path_meta = os.path.join(user_dir, file_id + meta_ext)
     if os.path.isfile(file_path_meta):
@@ -1176,7 +1176,7 @@ async def delete_file(request: Request, file_id: str, authorization: str = Heade
     file_path = os.path.join(user_dir, file_id)
 
     if not os.path.exists(file_path):
-        raise HTTPException(status_code=404, detail="File not found")
+        raise HTTPException(status_code=404, detail=f"delete_file {file_id}: File not found")
 
     try:
         os.remove(file_path)
@@ -1202,7 +1202,7 @@ async def retrieve_file_content(request: Request, file_id: str, stream: bool = Q
     file_path = os.path.join(user_dir, file_id)
 
     if not os.path.exists(file_path):
-        raise HTTPException(status_code=404, detail="File not found")
+        raise HTTPException(status_code=404, detail=f"retrieve_file_content: {file_id}: File not found")
 
     if stream:
         def iter_file():

src/version.py

@@ -1 +1 @@
-__version__ = "bc4706f0996163088f1a157f4ce6d4bff3284225"
+__version__ = "72a3d924763e873162e922ff45bd36559dfe06ed"