update

app/api/v1/files.py

@@ -77,7 +77,7 @@ async def create_file(
     # 判断文件大小
     if file.size == 0 or file.size > max_size:
         raise HTTPException(status_code=413, detail="File too large")
-    print(FileService)
+    #print(FileService)
     return await FileService.create_file(session=session, purpose=purpose, file=file)
 
 

app/api/v1/runs.py

@@ -15,7 +15,7 @@ from app.tasks.run_task import run_task
 import json
 
 router = APIRouter()
-# print(run_task)
+# #print(run_task)
 
 
 @router.get(
@@ -63,12 +63,12 @@ async def create_run(
     )
     event_handler.pub_run_created(db_run)
     event_handler.pub_run_queued(db_run)
-    print("22222233333333333344444444444444444555555555555555556")
-    print(token_id)
-    # print(run_task)
+    #print("22222233333333333344444444444444444555555555555555556")
+    #print(token_id)
+    # #print(run_task)
     run_task.apply_async(args=(db_run.id, token_id, body.stream))
-    print("22222222222222222222222222222222")
-    print(body.stream)
+    #print("22222222222222222222222222222222")
+    #print(body.stream)
     # db_run.file_ids = json.loads(db_run.file_ids)
     if body.stream:
         return pub_handler.sub_stream(db_run.id, request)
@@ -93,7 +93,7 @@ async def get_run(
     # run.file_ids = json.loads(run.file_ids)
     # run.failed_at = int(run.failed_at.timestamp()) if run.failed_at else None
     # run.completed_at = int(run.completed_at.timestamp()) if run.completed_at else None
-    print(run)
+    #print(run)
     return run.model_dump(by_alias=True)
 
 
@@ -197,10 +197,10 @@ async def submit_tool_outputs_to_run(
     this endpoint can be used to submit the outputs from the tool calls once they're all completed.
     All outputs must be submitted in a single request.
     """
-    print(
+    #print(
         "submit_tool_outputs_to_runsubmit_tool_outputs_to_runsubmit_tool_outputs_to_runsubmit_tool_outputs_to_runsubmit_tool_outputs_to_run"
     )
-    print(token_id)
+    #print(token_id)
     db_run = await RunService.submit_tool_outputs_to_run(
         session=session, thread_id=thread_id, run_id=run_id, body=body
     )

app/core/runner/llm_backend.py

@@ -11,8 +11,8 @@ class LLMBackend:
     """
 
     def __init__(self, base_url: str, api_key) -> None:
-        print("base_url", base_url)
-        print("api_key", api_key)
+        #print("base_url", base_url)
+        #print("api_key", api_key)
         self.base_url = base_url + "/" if base_url else None
         self.api_key = api_key
         self.client = OpenAI(base_url=self.base_url, api_key=self.api_key)
@@ -56,10 +56,10 @@ class LLMBackend:
                 chat_params["stream_options"] = {
                     "include_usage": bool(stream_options_params["include_usage"])
                 }
-        print("stream_optionsstream_optionsstream_optionsstream_optionsstream_options")
-        print(stream_options)
+        #print("stream_optionsstream_optionsstream_optionsstream_optionsstream_options")
+        #print(stream_options)
         if stream_options:
-            print(isinstance(stream_options, dict))
+            #print(isinstance(stream_options, dict))
             if isinstance(stream_options, dict):
                 if "include_usage" in stream_options:
                     chat_params["stream_options"] = {

app/core/runner/llm_callback_handler.py

@@ -154,7 +154,7 @@ class LLMCallbackHandler:
                     '''
                     """
                                     if 'transcript' in chunk.choices[0].delta.audio:
-                                        print(chunk.choices[0].delta.audio['transcript'])
+                                        #print(chunk.choices[0].delta.audio['transcript'])
                                         text_chunk = chunk.choices[0].delta.audio['transcript']
                                         yield "text", text_chunk
                                     if 'data' in chunk.choices[0].delta.audio:
@@ -177,8 +177,8 @@ class LLMCallbackHandler:
         except Exception as e:
             logging.error("handle_llm_response error: %s", e)
             raise e
-        print(
+        #print(
             "handle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_responsehandle_llm_response"
         )
-        print(message)
+        #print(message)
         return message

app/core/runner/pub_handler.py

@@ -45,8 +45,8 @@ def read_event(
     data = redis_client.xread({channel: x_index}, count=1, block=180_000)
     if not data:
         return None, None
-    print("77777777777777777777777777777777777777777777777777777")
-    print(data)
+    #print("77777777777777777777777777777777777777777777777777777")
+    #print(data)
     stream_id = data[0][1][0][0]
     event = data[0][1][0][1]
     return stream_id, event
@@ -106,10 +106,10 @@ def _data_adjust(obj):
     for key, value in data.items():
         if isinstance(value, datetime):
             data[key] = value.timestamp()
-    print(
+    #print(
         "--------------------------------====================================11221212212121212121"
     )
-    print(data)
+    #print(data)
     # data["parallel_tool_calls"] = True
     return data
 
@@ -149,13 +149,13 @@ def sub_stream(
                 break
             if not channel_exist(channel):
                 raise ResourceNotFoundError()
-            print(channel)
-            print(x_index)
+            #print(channel)
+            #print(x_index)
             x_index, data = read_event(channel, x_index)
-            print(
+            #print(
                 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaassssssssssssssssssssssssssssssssssssss"
             )
-            print(data)
+            #print(data)
             if not data:
                 break
 
@@ -187,7 +187,7 @@ class StreamEventHandler:
 
     def pub_run_created(self, run):
         data = _data_adjust(run)
-        print(data)
+        #print(data)
         self.pub_event(events.ThreadRunCreated(data=data, event="thread.run.created"))
 
     def pub_run_queued(self, run):
@@ -289,10 +289,10 @@ class StreamEventHandler:
             "thread_id": "",
             "metadata": {"usage": chunk.usage.json()},
         }
-        print(
+        #print(
             "pub_message_usagepub_message_usagepub_message_usagepub_message_usagepub_message_usagepub_message_usagepub_message_usagepub_message_usage==========================================================="
         )
-        print(data)
+        #print(data)
         self.pub_event(
             events.ThreadMessageInProgress(
                 data=data, event="thread.message.in_progress"
@@ -354,8 +354,8 @@ class StreamEventHandler:
                 }
             ],
         }
-        print("delta================================================================delta")
-        print(delta)
+        #print("delta================================================================delta")
+        #print(delta)
         self.pub_event(
             events.ThreadMessageDelta(
                 data=events.MessageDeltaEvent(

app/core/runner/thread_runner.py

@@ -124,7 +124,7 @@ class ThreadRunner:
         llm = self.__init_llm_backend(run.assistant_id)
         loop = True
         while loop:
-            print(
+            #print(
                 "looplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooplooploop"
             )
             run_steps = RunStepService.get_run_step_list(
@@ -263,10 +263,10 @@ class ThreadRunner:
         if self.stream == False and hasattr(response_stream, "choices"):
             response_stream = [response_stream]
         response_msg = llm_callback_handler.handle_llm_response(response_stream)
-        print("response_msg================================================================response_msg")
-        print(llm_callback_handler)
+        #print("response_msg================================================================response_msg")
+        #print(llm_callback_handler)
         message_creation_run_step = llm_callback_handler.step
-        print("444444444444444444444444455555555577777777777777777777777")
+        #print("444444444444444444444444455555555577777777777777777777777")
         logging.info("chat_response_message: %s", response_msg)
 
         if msg_util.is_tool_call(response_msg):
@@ -303,10 +303,10 @@ class ThreadRunner:
             # 为减少线程同步逻辑，依次处理内/外 tool_call 调用
             if internal_tool_calls:
                 try:
-                    print(
+                    #print(
                         "==========================internal_tool_callsinternal_tool_callsinternal_tool_calls"
                     )
-                    print(internal_tool_calls)
+                    #print(internal_tool_calls)
                     ## 线程执行有问题 可以改成异步, 这里如果是filesearch要确定只执行一次
                     tool_calls_with_outputs = run_with_executor(
                         executor=ThreadRunner.tool_executor,
@@ -324,8 +324,8 @@ class ThreadRunner:
                         },
                         completed=not external_tool_call_dict,
                     )
-                    print("llm_callback_handler.message================================================================llm_callback_handler.message")
-                    print(llm_callback_handler.message)
+                    #print("llm_callback_handler.message================================================================llm_callback_handler.message")
+                    #print(llm_callback_handler.message)
                     self.event_handler.pub_message_delta_tool(
                         message_id=llm_callback_handler.message.id,
                         index=0,
@@ -336,10 +336,10 @@ class ThreadRunner:
                         session=self.session, run_step_id=new_run_step.id, last_error=e
                     )
                     raise e
-            print(
+            #print(
                 "aaaaaaaaaaaaaaa===============================================================8888888888888888888888888"
             )
-            print(external_tool_call_dict)
+            #print(external_tool_call_dict)
             if external_tool_call_dict:
                 # run 设置为 action required，等待业务完成更新并再次拉起
                 run = RunService.to_requires_action(
@@ -357,7 +357,7 @@ class ThreadRunner:
                         "tool_calls": external_tool_call_dict,
                     },
                 )
-                print(run)
+                #print(run)
                 self.event_handler.pub_run_requires_action(run)
             else:
                 self.event_handler.pub_run_step_completed(new_run_step)
@@ -394,7 +394,7 @@ class ThreadRunner:
         return False
 
     def __init_llm_backend(self, assistant_id):
-        print("settings.AUTH_ENABLE", settings.AUTH_ENABLE)
+        #print("settings.AUTH_ENABLE", settings.AUTH_ENABLE)
         if settings.AUTH_ENABLE:
             # init llm backend with token id
             if self.token_id:
@@ -405,20 +405,20 @@ class ThreadRunner:
                     relation_type=RelationType.Assistant,
                     relation_id=assistant_id,
                 )
-            print(
+            #print(
                 "token_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_id"
             )
-            print(self.token_id)
-            print(token_id)
+            #print(self.token_id)
+            #print(token_id)
             try:
                 if token_id is not None and len(token_id) > 0:
                     token = TokenService.get_token_by_id(self.session, token_id)
-                    print(token)
+                    #print(token)
                     return LLMBackend(
                         base_url=token.llm_base_url, api_key=token.llm_api_key
                     )
             except Exception as e:
-                print(e)
+                #print(e)
             token = {
                 "llm_base_url": "http://172.16.12.13:3000/v1",
                 "llm_api_key": "sk-vTqeBKDC2j6osbGt89A2202dAd1c4fE8B1D294388b569e54",

app/core/runner/utils/message_util.py

@@ -82,5 +82,5 @@ def merge_tool_call_delta(tool_calls, tool_call_delta):
         tool_calls.append(tool_call)
 
     # 调试输出可保留，但建议移除或降级为 debug
-    print("=" * 40)
-    print(tool_calls)
+    #print("=" * 40)
+    #print(tool_calls)

app/core/tools/file_search_tool.py

@@ -58,11 +58,11 @@ class FileSearchTool(BaseTool):
                     key
                 )  ## assiatant的id数据，在r2r里没办法检索需要提取filekey字段
 
-        print(
+        #print(
             "document_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_id"
         )
-        # print(document_id)
-        print(file_key)
+        # #print(document_id)
+        #print(file_key)
         files = []
         # 这种情况是uuid.ex 这种格式的在最早的时候存在的，后续要去掉
         if len(file_key) > 0:
@@ -70,7 +70,7 @@ class FileSearchTool(BaseTool):
             files = FileService.get_file_list_by_ids(session=session, file_ids=file_key)
             for file in files:
                 self.__keys.append(file.key)
-            print(files)
+            #print(files)
         """
         # 读取assistant的数据，获取文件夹的id
         db_asst = AssistantService.get_assistant_sync(
@@ -84,26 +84,26 @@ class FileSearchTool(BaseTool):
                 .get("vector_stores")[0]
                 .get("folder_ids")
             )
-            print(asst_folder_ids)
+            #print(asst_folder_ids)
             # folder_fileinfo = []
             if asst_folder_ids:
                 self.__dirkeys = asst_folder_ids
         """
         # pre-cache data to prevent thread conflicts that may occur later on.
-        print(
+        #print(
             "---------ssssssssssss-----------------sssssssssssss---------------ssssssssssssss-------------sssssssssssss-------------ss-------"
         )
-        print(self.__dirkeys)
-        print(self.__keys)
+        #print(self.__dirkeys)
+        #print(self.__keys)
 
     # indexes: List[int],
     def run(self, query: str,full_text_search:bool=False) -> dict:
-        print(
+        #print(
             "file_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keys"
         )
 
-        print(self.__keys)
-        print(self.__dirkeys)
+        #print(self.__keys)
+        #print(self.__dirkeys)
         files = []
         try:
             if full_text_search:
@@ -115,8 +115,8 @@ class FileSearchTool(BaseTool):
                 )
                 self.index = 1
         except Exception as e:
-            print(e)
-        # print(files)
+            #print(e)
+        # #print(files)
         return files
 
     def instruction_supplement(self) -> str:

app/core/tools/knowledge_search_tool.py

@@ -58,11 +58,11 @@ class KnowledgeSearchTool(BaseTool):
                     key
                 )  ## assiatant的id数据，在r2r里没办法检索需要提取filekey字段
 
-        print(
+        #print(
             "document_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_iddocument_id"
         )
-        # print(document_id)
-        print(file_key)
+        # #print(document_id)
+        #print(file_key)
         files = []
         # 这种情况是uuid.ex 这种格式的在最早的时候存在的，后续要去掉
         if len(file_key) > 0:
@@ -70,7 +70,7 @@ class KnowledgeSearchTool(BaseTool):
             files = FileService.get_file_list_by_ids(session=session, file_ids=file_key)
             for file in files:
                 self.__keys.append(file.key)
-            print(files)
+            #print(files)
         # 读取assistant的数据，获取文件夹的id
         """
         db_asst = AssistantService.get_assistant_sync(
@@ -90,8 +90,8 @@ class KnowledgeSearchTool(BaseTool):
                 .get("file_ids")
             )
 
-            print(asst_folder_ids)
-            print(file_key)
+            #print(asst_folder_ids)
+            #print(file_key)
             file_id = []
             # folder_fileinfo = []
             if asst_folder_ids:
@@ -108,23 +108,23 @@ class KnowledgeSearchTool(BaseTool):
                     )
                     for file in files:
                         self.__keys.append(file.key)
-                print(files)
+                #print(files)
 
         # pre-cache data to prevent thread conflicts that may occur later on.
-        print(
+        #print(
             "---------ssssssssssss-----------------sssssssssssss---------------ssssssssssssss-------------sssssssssssss-------------ss-------"
         )
-        print(self.__dirkeys)
-        print(self.__keys)
+        #print(self.__dirkeys)
+        #print(self.__keys)
 
     # indexes: List[int],
     def run(self, query: str) -> dict:
-        print(
+        #print(
             "file_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keysfile_keys"
         )
 
-        print(self.__keys)
-        print(self.__dirkeys)
+        #print(self.__keys)
+        #print(self.__dirkeys)
         files = []
         ## 必须有总结的内容query和才能触发
         if self.index == 0 and query:
@@ -134,8 +134,8 @@ class KnowledgeSearchTool(BaseTool):
                 )
                 self.index = 1
             except Exception as e:
-                print(e)
-        # print(files)
+                #print(e)
+        # #print(files)
         return files
 
     def instruction_supplement(self) -> str:

app/libs/thread_executor.py

@@ -62,7 +62,7 @@ def run_with_executor(executor: Executor, func, tasks: List, timeout: int):
             result = future.result(timeout=timeout)
             results.append(result)
         except Exception as e:
-            print(e)
+            #print(e)
     # executor.shutdown()
     return results
 
@@ -75,7 +75,7 @@ def run_with_executor(executor: Executor, func, tasks: List, timeout: int):
             result = future.result(timeout=timeout)
             results.append(result)
         except Exception as e:
-            print(e)
+            #print(e)
 
     return results
     """

app/libs/util.py

@@ -36,9 +36,9 @@ def verify_jwt_expiration(token):
     )
     expiration_time = datetime.fromtimestamp(decoded_token["exp"])
     current_time = datetime.now()
-    print(
+    #print(
         "time=>time=>time=>time=>time=>time=>time=>time=>time=>time=>time=>time=>time=>time=>time=>time=>time=>"
     )
-    print(f"expiration_time: {expiration_time}")
-    print(f"expiration_time: {current_time}")
+    #print(f"expiration_time: {expiration_time}")
+    #print(f"expiration_time: {current_time}")
     return current_time < expiration_time

app/providers/r2r.py

@@ -34,28 +34,28 @@ class R2R:
         self.client_sync.users.login(
             tool_settings.R2R_USERNAME, tool_settings.R2R_PASSWORD
         )
-        print(
+        #print(
             "1111111111111111111111111111111122222vvdgdfdf" + tool_settings.R2R_USERNAME
         )
-        # print(tool_settings.R2R_USERNAME)
-        # print(tool_settings.R2R_PASSWORD)
-        print(self.client_sync)
+        # #print(tool_settings.R2R_USERNAME)
+        # #print(tool_settings.R2R_PASSWORD)
+        #print(self.client_sync)
         return self.client_sync
 
     async def init(self):
         if not self.auth_enabled:
             return
         # if not self.client:
-        print(
+        #print(
             "1111111111111111111111111111111122222vvdgdfdf" + tool_settings.R2R_USERNAME
         )
-        print(tool_settings.R2R_USERNAME)
-        print(tool_settings.R2R_PASSWORD)
+        #print(tool_settings.R2R_USERNAME)
+        #print(tool_settings.R2R_PASSWORD)
         # client = R2RAsyncClient(tool_settings.R2R_BASE_URL)
         await self.client.users.login(
             tool_settings.R2R_USERNAME, tool_settings.R2R_PASSWORD
         )
-        print(self.client.access_token)
+        #print(self.client.access_token)
         return self.client
 
     async def ingest_file(self, file_path: str, metadata: Optional[dict]):
@@ -78,7 +78,7 @@ class R2R:
 
     def search(self, query: str, filters: dict[str, Any]):
         client = self._check_login_sync()
-        print(
+        #print(
             "aaaaaaaaaaaaaaaaaaaaaaaaaaaasssssssssssssssssssssssssssssssssssssssssgggggggggggggggggggg"
         )
         search_response = client.retrieval.search(
@@ -89,9 +89,9 @@ class R2R:
                 "limit": tool_settings.R2R_SEARCH_LIMIT,
             },
         )
-        print("vvvvvvvvvvvvvvvvvvmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm")
-        # print(search_response)
-        print(search_response.results)
+        #print("vvvvvvvvvvvvvvvvvvmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm")
+        # #print(search_response)
+        #print(search_response.results)
         return search_response.results.chunk_search_results
 
     def ingest_file_sync(self, file_path: str, metadata: Optional[dict]):
@@ -106,10 +106,10 @@ class R2R:
 
     def list_chunks(self, ids: list[str] = []):
         client = self._check_login_sync()
-        print(
+        #print(
             "retrieve_documentsretrieve_documentsretrieve_documentsretrieve_documentsretrieve_documents"
         )
-        print(ids)
+        #print(ids)
         allfile = []
         for id in ids:
             listed = client.documents.list_chunks(id=id)
@@ -128,7 +128,7 @@ class R2R:
             docs = client.collections.list_documents(empty_coll_id).results
             assert len(docs) == 0, "Expected no documents in a new empty collection"
         """
-        print(
+        #print(
             "collectionscollectionscollectionscollectionscollectionscollectionscollectionscollectionscollectionscollectionscollectionscollections"
         )
         if id != "":
@@ -136,10 +136,10 @@ class R2R:
                 listed = client.collections.list_documents(
                     id=id, limit=limit, offset=offset
                 )
-                print(listed.results)
+                #print(listed.results)
                 return listed.results
             except Exception as e:
-                print(e)
+                #print(e)
                 listed = []
                 return listed
 
@@ -155,18 +155,18 @@ class R2R:
             return await self.init()
 
     def _check_login_sync(self):
-        print("access_tokenaccess_tokenaccess_tokenaccess_token")
-        # print(client_sync)
+        #print("access_tokenaccess_tokenaccess_tokenaccess_token")
+        # #print(client_sync)
         if not self.auth_enabled:
             return
         try:
             if self.client_sync.access_token and verify_jwt_expiration(
                 self.client_sync.access_token
             ):
-                print(self.client_sync.access_token)
+                #print(self.client_sync.access_token)
                 return self.client_sync
         except Exception as e:
-            print(e)
+            #print(e)
         return self.init_sync()
 
 

app/services/file/file.py

@@ -5,5 +5,5 @@ from app.services.file.impl.base import BaseFileService
 
 #FileService: Type[BaseFileService] = load_class(name="app.services.file.impl.oss_file.OSSFileService")
 FileService: Type[BaseFileService] = load_class(name=settings.FILE_SERVICE_MODULE)
-print("==========================================1========================1=============================================================1=============")
-print(FileService)
+#print("==========================================1========================1=============================================================1=============")
+#print(FileService)

app/services/file/impl/r2r_file.py

@@ -15,7 +15,17 @@ from app.services.file.impl.oss_file import OSSFileService
 # import asyncio
 from pathlib import Path
 
-allowed_formats = [".bmp", ".heic", ".jpeg", ".png", ".tiff", ".mp3", ".mp4", ".wav"]
+allowed_formats = [
+    ".bmp",
+    ".heic",
+    ".jpeg",
+    ".jpg",
+    ".png",
+    ".tiff",
+    ".mp3",
+    ".mp4",
+    ".wav"
+]
 
 
 class R2RFileService(OSSFileService):
@@ -37,7 +47,7 @@ class R2RFileService(OSSFileService):
         #     return ext_file
         file_extension = Path(file.filename).suffix
         file_key = f"{uuid.uuid4()}{file_extension}"
-        print(file_key)
+        #print(file_key)
         fileinfo = {"document_id": file_key}
         # file_key = f"{uuid.uuid4()}-{file.filename}"
         with tempfile.NamedTemporaryFile(
@@ -78,7 +88,7 @@ class R2RFileService(OSSFileService):
         file_key = {"$in": []}
         document_id = {"$in": []}
         filters = {"$or": []}
-        print(
+        #print(
             "ggggggggggggggggggggggggggggggggggggddddddddddddddddddccccccccccccccccccccc"
         )
         for key in file_keys:
@@ -91,10 +101,10 @@ class R2RFileService(OSSFileService):
         if len(file_key["$in"]) > 0:
             filters["$or"].append({"file_key": file_key})
 
-        print(file_key)
-        print(document_id)
-        print(filters)
-        print(folder_keys)
+        #print(file_key)
+        #print(document_id)
+        #print(filters)
+        #print(folder_keys)
         if folder_keys:
             filters["$or"].append({"collection_ids": {"$overlap": folder_keys}})
         ## {"$or": [filters, {"collection_ids": {"$in": folder_keys}}]}
@@ -108,11 +118,11 @@ class R2RFileService(OSSFileService):
             ]
         }
         """
-        print(filters)
+        #print(filters)
         if len(filters["$or"]) < 2:
             filters = filters["$or"][0]
-        print("filtersfiltersfiltersfiltersfiltersfiltersfiltersfiltersfiltersfilters")
-        print(filters)
+        #print("filtersfiltersfiltersfiltersfiltersfiltersfiltersfiltersfiltersfilters")
+        #print(filters)
         """
         loop = asyncio.get_event_loop()  # 获取当前事件循环
         loop.run_until_complete(r2r.init())  # 确保 r2r 已初始化
@@ -143,7 +153,7 @@ class R2RFileService(OSSFileService):
                         + str(doc.document_id),
                     }
                 )
-            # print(doc.metadata)
+            # #print(doc.metadata)
             else:
                 files.append(
                     {
@@ -159,8 +169,8 @@ class R2RFileService(OSSFileService):
             #     files["text"] += f"\n\n{text}"
             # else:
             #    files["text"] = text
-        # print("aaaaaaaaaaaaaa")
-        # print(files)
+        # #print("aaaaaaaaaaaaaa")
+        # #print(files)
         return files
 
     @staticmethod
@@ -210,9 +220,9 @@ class R2RFileService(OSSFileService):
         if len(ids) > 0:
             r2r = R2R()
             # r2r.init_sync()
-            print("list_chunkslist_chunkslist_chunkslist_chunkslist_chunkslist_chunks")
+            #print("list_chunkslist_chunkslist_chunkslist_chunkslist_chunkslist_chunks")
             list_results = r2r.list_chunks(ids=ids)
-            print(list_results)
+            #print(list_results)
             files = []
 
             for doc in list_results:
@@ -227,7 +237,7 @@ class R2RFileService(OSSFileService):
                             + str(doc.document_id),
                         }
                     )
-                # print(doc.metadata)
+                # #print(doc.metadata)
                 else:
                     files.append(
                         {
@@ -244,7 +254,7 @@ class R2RFileService(OSSFileService):
                 else:
                     files["text"] = text
             """
-            print(files)
+            #print(files)
             return files
         else:
             return {}

app/services/message/message.py

@@ -74,16 +74,16 @@ class MessageService:
     ) -> Message:
         # get thread
         thread = await ThreadService.get_thread(session=session, thread_id=thread_id)
-        print(
+        #print(
             "create_messagecreate_messagecreate_messagecreate_messagecreate_messagecreate_message"
         )
-        # print(thread)
-        # print(body)
+        # #print(thread)
+        # #print(body)
         # TODO message annotations
         body_file_ids = body.file_ids
         if body.attachments:
             body_file_ids = [a.get("file_id") for a in body.attachments]
-        # print(body_file_ids)
+        # #print(body_file_ids)
         if body_file_ids:
             thread_file_ids = []
             if thread.tool_resources and "file_search" in thread.tool_resources:
@@ -96,7 +96,7 @@ class MessageService:
                 if file_id not in thread_file_ids:
                     thread_file_ids.append(file_id)
 
-            print(thread_file_ids)
+            #print(thread_file_ids)
             # if thread_file_ids:
             if not thread.tool_resources:
                 thread.tool_resources = {}
@@ -110,7 +110,7 @@ class MessageService:
             setattr(thread, "tool_resources", thread.tool_resources)
             flag_modified(thread, "tool_resources")
             # thread.tool_resources = thread.tool_resources
-            print(thread)
+            #print(thread)
             session.add(thread)
             await session.commit()
             await session.refresh(thread)

app/services/run/run.py

@@ -91,10 +91,10 @@ class RunService:
             body.model_dump(by_alias=True),
             update={"thread_id": thread_id, "file_ids": file_ids},
         )
-        print(
+        #print(
             "11111111111111111111111111111111111111111111111111111111111888888888888888888888888888888888"
         )
-        # print(db_run)
+        # #print(db_run)
         # db_run.file_ids = json.dumps(db_run.file_ids)
         # db_run.file_ids = json.dumps(db_run.file_ids)
         session.add(db_run)
@@ -112,7 +112,7 @@ class RunService:
         await session.commit()
         await session.refresh(db_run)
         # db_run.file_ids = list(file_ids)
-        print(db_run)
+        #print(db_run)
         return db_run
 
     @staticmethod

app/services/run/run_step.py

@@ -65,12 +65,12 @@ class RunStepService:
 
         #run_step.step_details = step_details
         if isinstance(step_details, dict):
-            print("step_details is a dict")
+            #print("step_details is a dict")
             new_step_details = dict(run_step.step_details or {})
             new_step_details.update(step_details)
             run_step.step_details = new_step_details
-            print("step_details", step_details)
-            print("run_step.step_details", run_step.step_details)
+            #print("step_details", step_details)
+            #print("run_step.step_details", run_step.step_details)
         else:
             run_step.step_details = step_details
 

app/tasks/run_task.py

@@ -17,7 +17,7 @@ def run_task(self, run_id: str, token_id: str, stream: bool = False):
     try:
         ThreadRunner(run_id, token_id, session, stream).run()
     except Exception as e:
-        print("aawwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww")
+        #print("aawwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww")
         logging.exception(e)
         StreamEventHandler(run_id=run_id, is_stream=True).pub_error(str(e))
         RunService.to_failed(session=session, run_id=run_id, last_error=e)

r2r2.py

@@ -35,7 +35,7 @@ class R2R:
                 # ,"do_hybrid_search": True,
             },
         )
-        #print(search_response)
+        ##print(search_response)
         return search_response.get("results").get("chunk_search_results")
 
     #@pytest.fixture(scope="session")
@@ -58,6 +58,6 @@ class R2R:
 r2r = R2R()
 def run_async():
     asyncio.run(r2r.init())  # 运行异步函数
-    print(r2r.search("文档内容",  {'file_key': {'$in': ['5a098a2c-e1ef-40b0-84a0-d6606261fee0-test.txt']}}))
+    #print(r2r.search("文档内容",  {'file_key': {'$in': ['5a098a2c-e1ef-40b0-84a0-d6606261fee0-test.txt']}}))
 
 run_async()

run_task.py

@@ -11,14 +11,14 @@ from app.services.run.run import RunService
 @celery_app.task(bind=True, autoretry_for=())
 def run_task(self, run_id: str, stream: bool = False):
     logging.info(f"[run_task] [{run_id}] running at {datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
-    print("vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv")
+    #print("vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv")
     try:
         ThreadRunner(run_id, session, stream).run()
     except Exception as e:
-        print("aawwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww")
+        #print("aawwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww")
         logging.exception(e)
         StreamEventHandler(run_id=run_id, is_stream=True).pub_error(str(e))
         RunService.to_failed(session=session, run_id=run_id, last_error=e)
     finally:
         session.close()
-print(run_task.apply_async(args=('676588628cba3cec56de2be5', True)))
+#print(run_task.apply_async(args=('676588628cba3cec56de2be5', True)))

testfile.py

@@ -8,8 +8,8 @@ def example_data() -> Optional[str]:
     # 生成一些 UUID
     uuid_list = [uuid.uuid4(), uuid.uuid4(), uuid.uuid4()]
     uuids = [str(uuid_item) for uuid_item in uuid_list]
-    print(uuids)
-    print(uuid_list)
+    #print(uuids)
+    #print(uuid_list)
     # 将 UUID 列表转换为 JSON 字符串
     json_data = json.dumps([str(uuid_item) for uuid_item in uuid_list])
     # 返回 JSON 字符串（或者返回 None）
@@ -18,4 +18,4 @@ def example_data() -> Optional[str]:
 
 # 测试样例
 data = example_data()
-print(data)
+#print(data)

testopenassistant.py

@@ -10,9 +10,9 @@ client = openai.OpenAI(base_url=base_url, api_key=api_key)
 if __name__ == "__main__":
 
     file_path = os.path.join(os.path.dirname(__file__) + "/test.txt")
-    print(file_path)
+    #print(file_path)
     file = client.files.create(file=Path(file_path), purpose="assistants")
-    print(file)
+    #print(file)
 
     assistant = client.beta.assistants.create(
         name="Assistant Demo",
@@ -24,10 +24,10 @@ if __name__ == "__main__":
         tool_resources={"file_search": {"vector_stores": [{"file_ids": [file.id]}]}},
     )
     # assistant = client.beta.assistants.retrieve(assistant_id="67614b38d5f1a0df9dddfba9")
-    print("=====> : %s\n", assistant)
+    #print("=====> : %s\n", assistant)
 
     thread = client.beta.threads.create()
-    print("=====> : %s\n", thread)
+    #print("=====> : %s\n", thread)
 
     message = client.beta.threads.messages.create(
         thread_id=thread.id,
@@ -37,30 +37,30 @@ if __name__ == "__main__":
         #     {"file_id": "67614b375e4b953d7f07c27a", "tools": [{"type": "file_search"}]}
         # ]
     )
-    print("=====> : %s\n", message)
+    #print("=====> : %s\n", message)
 
     run = client.beta.threads.runs.create(
         thread_id=thread.id,
         assistant_id=assistant.id,
     )
-    print("=====> : %s\n", run)
+    #print("=====> : %s\n", run)
 
-    print("checking assistant status. \n")
+    #print("checking assistant status. \n")
     while True:
         run = client.beta.threads.runs.retrieve(thread_id=thread.id, run_id=run.id)
         run_steps = client.beta.threads.runs.steps.list(
             run_id=run.id, thread_id=thread.id
         ).data
         for run_step in run_steps:
-            print("=====> : %s\n", run_step)
+            #print("=====> : %s\n", run_step)
 
         if run.status == "completed":
             messages = client.beta.threads.messages.list(thread_id=thread.id)
 
-            print("=====> messages:")
+            #print("=====> messages:")
             for message in messages:
                 assert message.content[0].type == "text"
-                print(
+                #print(
                     "%s",
                     {"role": message.role, "message": message.content[0].text.value},
                 )
@@ -69,10 +69,10 @@ if __name__ == "__main__":
             client.beta.assistants.delete(assistant.id)
             break
         elif run.status == "failed":
-            print("run failed %s\n", run.last_error)
+            #print("run failed %s\n", run.last_error)
             break
         else:
-            print("in progress...\n")
+            #print("in progress...\n")
             time.sleep(5)
 """
 
@@ -85,7 +85,7 @@ asynopenai = AsyncOpenAI(
 
 assistant = await asynopenai.beta.assistants.retrieve("asst_K0tzaQaDABQ7wELwb27SqadA")
 
-print(assistant)
+#print(assistant)
 
 
 """

testopenassistants.py

@@ -58,10 +58,10 @@
 
 # total1 = bytes/1024/1024/1024
 
-# print("assistants:")
-# print(len(list.data))
-# print(str(total1) + "G")
-# print('')
+# #print("assistants:")
+# #print(len(list.data))
+# #print(str(total1) + "G")
+# #print('')
 
 # list = openai.files.list(
 #   purpose="assistants",
@@ -75,10 +75,10 @@
 
 # total2 = bytes/1024/1024/1024
 
-# print("assistants:")
-# print(len(list.data))
-# print(str(total2) + "G")
-# print('')
+# #print("assistants:")
+# #print(len(list.data))
+# #print(str(total2) + "G")
+# #print('')
 
 # list = openai.files.list(
 #   purpose="assistants",
@@ -92,10 +92,10 @@
 
 # total3 = bytes/1024/1024/1024
 
-# print("assistants:")
-# print(len(list.data))
-# print(str(total3) + "G")
-# print('')
+# #print("assistants:")
+# #print(len(list.data))
+# #print(str(total3) + "G")
+# #print('')
 
 # list = openai.files.list(
 #   purpose="assistants",
@@ -109,10 +109,10 @@
 
 # total4 = bytes/1024/1024/1024
 
-# print("assistants:")
-# print(len(list.data))
-# print(str(total4) + "G")
-# print('')
+# #print("assistants:")
+# #print(len(list.data))
+# #print(str(total4) + "G")
+# #print('')
 
 # list = openai.files.list(
 #   purpose="assistants",
@@ -126,17 +126,17 @@
 
 # total5 = bytes/1024/1024/1024
 
-# print("assistants:")
-# print(len(list.data))
-# print(str(total5) + "G")
-# print('')
+# #print("assistants:")
+# #print(len(list.data))
+# #print(str(total5) + "G")
+# #print('')
 
-# # print(str(bytes/1024/1024/1024) + "G")
-# print(len(list_new_pdf))
-# print(total1 + total2 + total3 + total4 + total5)
+# # #print(str(bytes/1024/1024/1024) + "G")
+# #print(len(list_new_pdf))
+# #print(total1 + total2 + total3 + total4 + total5)
 
 # # for item in list_new_pdf:
-# #   print(item)
+# #   #print(item)
 
 # list_new_pdf_new = []
 # bytes = 0
@@ -145,9 +145,9 @@
 #     bytes = bytes + item.bytes
 #     list_new_pdf_new.append(item)
 
-# print(str(bytes/1024/1024/1024) + "G")
-# print(len(list_new_pdf_new))
-# # print(list_new_pdf_new[3])
+# #print(str(bytes/1024/1024/1024) + "G")
+# #print(len(list_new_pdf_new))
+# # #print(list_new_pdf_new[3])
 # pdf = []
 
 # for item in list_new_pdf_new:
@@ -156,11 +156,11 @@
 
 # bytes = 0
 # for item in pdf:
-#     print(item)
+#     #print(item)
 #     bytes = bytes + item.bytes
 
-# print(str(bytes/1024/1024/1024) + "G")
-# print(len(pdf))
+# #print(str(bytes/1024/1024/1024) + "G")
+# #print(len(pdf))
 
 
 # for item in pdf:
@@ -175,8 +175,8 @@
 #     bytes = bytes + item.bytes
 #     list_new_pdf_new.append(item)
 
-# print(str(bytes/1024/1024/1024) + "G")
-# print(len(list_new_pdf_new))
+# #print(str(bytes/1024/1024/1024) + "G")
+# #print(len(list_new_pdf_new))
 
 # list_new_pdf_new = []
 # bytes = 0
@@ -185,8 +185,8 @@
 #     bytes = bytes + item.bytes
 #     list_new_pdf_new.append(item)
 
-# print(str(bytes/1024/1024/1024) + "G")
-# print(len(list_new_pdf_new))
+# #print(str(bytes/1024/1024/1024) + "G")
+# #print(len(list_new_pdf_new))
 
 # list_new_pdf = []
 # bytes = 0
@@ -195,22 +195,22 @@
 #     bytes = bytes + item.bytes
 #     list_new_pdf.append(item)
 
-# print(str(bytes/1024/1024/1024) + "G")
-# print(len(list_new_pdf))
+# #print(str(bytes/1024/1024/1024) + "G")
+# #print(len(list_new_pdf))
 
 # list = []
 # bytes = 0
 # for i in range(16):
 #     bytes = bytes + list_new[i].bytes
-#     print(list_new[i])
-#     print('')
+#     #print(list_new[i])
+#     #print('')
 #     list.append(list_new[i])
 
-# print(list)
+# #print(list)
 
 # for item in list_new_pdf:
 #   if item.id == "file-1Mbqss6qX6GPnTKM6izCx1":
-#     print(item)
+#     #print(item)
 
 # deleteList = ["file-9uYPz7MWTpjgsUhond2pdFVc","file-U7oU81MT34NTeHaZu6dv2yhq","file-nUyGEdScnyLCuRZ3a2vLCY6B","file-Uy8H9ePoGspsXyTwWUwwhAlK"]
 
@@ -222,15 +222,15 @@
 #   purpose="assistants_output",
 #   extra_query={"order":"desc"}
 # )
-# # print(list)
+# # #print(list)
 # bytes = 0
 # for item in list.data:
 #     if item.bytes != None:
 #         bytes = bytes + item.bytes
-# print("assistants_output:")
-# print(len(list.data))
-# print(str(bytes/1024/1024/1024) + "G")
-# print('')
+# #print("assistants_output:")
+# #print(len(list.data))
+# #print(str(bytes/1024/1024/1024) + "G")
+# #print('')
 
 # list = openai.files.list(
 #   purpose="batch",
@@ -239,18 +239,18 @@
 # bytes = 0
 # for item in list.data:
 #     bytes = bytes + item.bytes
-# print("batch:")
-# print(len(list.data))
-# print(str(bytes/1024/1024/1024) + "G")
-# print('')
+# #print("batch:")
+# #print(len(list.data))
+# #print(str(bytes/1024/1024/1024) + "G")
+# #print('')
 
 # list = openai.files.list(
 #   purpose="batch_output",
 #   extra_query={"order":"desc"}
 # )
-# print("batch_output:")
-# print(len(list.data))
-# print('')
+# #print("batch_output:")
+# #print(len(list.data))
+# #print('')
 
 # list = openai.files.list(
 #   purpose="fine-tune",
@@ -259,18 +259,18 @@
 # bytes = 0
 # for item in list.data:
 #     bytes = bytes + item.bytes
-# print("fine-tune:")
-# print(len(list.data))
-# print(str(bytes/1024/1024/1024) + "G")
-# print('')
+# #print("fine-tune:")
+# #print(len(list.data))
+# #print(str(bytes/1024/1024/1024) + "G")
+# #print('')
 
 # list = openai.files.list(
 #   purpose="fine-tune-results",
 #   extra_query={"order":"desc"}
 # )
-# print("fine-tune-results:")
-# print(len(list.data))
-# print('')
+# #print("fine-tune-results:")
+# #print(len(list.data))
+# #print('')
 
 # list = openai.files.list(
 #   purpose="vision",
@@ -279,9 +279,9 @@
 # bytes = 0
 # for item in list.data:
 #     bytes = bytes + item.bytes
-# print("vision:")
-# print(len(list.data))
-# print(str(bytes/1024/1024/1024) + "G")
+# #print("vision:")
+# #print(len(list.data))
+# #print(str(bytes/1024/1024/1024) + "G")
 
 
 import logging
@@ -346,9 +346,9 @@ class EventHandler(openai.AssistantEventHandler):
 if __name__ == "__main__":
 
     file_path = os.path.join(os.path.dirname(__file__) + "/test.txt")
-    print(file_path)
+    #print(file_path)
     file = client.files.create(file=Path(file_path), purpose="assistants")
-    print(file)
+    #print(file)
 
     assistant = client.beta.assistants.create(
         name="Assistant Demo",
@@ -360,10 +360,10 @@ if __name__ == "__main__":
         tool_resources={"file_search": {"vector_stores": [{"file_ids": [file.id]}]}},
     )
     # assistant = client.beta.assistants.retrieve(assistant_id="67614b38d5f1a0df9dddfba9")
-    print("=====> : %s\n", assistant)
+    #print("=====> : %s\n", assistant)
 
     thread = client.beta.threads.create()
-    print("=====> : %s\n", thread)
+    #print("=====> : %s\n", thread)
 
     message = client.beta.threads.messages.create(
         thread_id=thread.id,
@@ -373,7 +373,7 @@ if __name__ == "__main__":
         #     {"file_id": "67614b375e4b953d7f07c27a", "tools": [{"type": "file_search"}]}
         # ]
     )
-    print("=====> : %s\n", message)
+    #print("=====> : %s\n", message)
 
     event_handler = EventHandler()
 
@@ -389,7 +389,7 @@ if __name__ == "__main__":
                 and event.type == "thread.message.delta"
                 and event.data.delta.content
             ):
-                print(event.data.delta.content[0].text)
+                #print(event.data.delta.content[0].text)
 
 """
     with client.beta.threads.runs.stream(
@@ -398,36 +398,36 @@ if __name__ == "__main__":
         event_handler=event_handler,
         extra_body={"stream_options": {"include_usage": True}},
     ) as stream:
-        print(stream)
+        #print(stream)
         stream.until_done()
 """
 # run = client.beta.threads.runs.create(
 #     thread_id=thread.id,
 #     assistant_id=assistant.id,
 # )
-# print("=====> : %s\n", run)
+# #print("=====> : %s\n", run)
 
-# print("checking assistant status. \n")
+# #print("checking assistant status. \n")
 # while True:
 #     run = client.beta.threads.runs.retrieve(thread_id=thread.id, run_id=run.id)
 #     run_steps = client.beta.threads.runs.steps.list(run_id=run.id, thread_id=thread.id).data
 #     for run_step in run_steps:
-#         print("=====> : %s\n", run_step)
+#         #print("=====> : %s\n", run_step)
 
 #     if run.status == "completed":
 #         messages = client.beta.threads.messages.list(thread_id=thread.id)
 
-#         print("=====> messages:")
+#         #print("=====> messages:")
 #         for message in messages:
 #             assert message.content[0].type == "text"
-#             print("%s", {"role": message.role, "message": message.content[0].text.value})
+#             #print("%s", {"role": message.role, "message": message.content[0].text.value})
 
 #         # delete asst
 #         client.beta.assistants.delete(assistant.id)
 #         break
 #     elif run.status == "failed":
-#         print("run failed %s\n", run.last_error)
+#         #print("run failed %s\n", run.last_error)
 #         break
 #     else:
-#         print("in progress...\n")
+#         #print("in progress...\n")
 #         time.sleep(5)

testr2r.py

@@ -9,7 +9,7 @@ import inspect
 
 import r2r
 
-print(r2r.__version__)
+#print(r2r.__version__)
 
 class R2R:
     client: R2RClient
@@ -43,17 +43,17 @@ class R2R:
     def _login(self):
         if not self.auth_enabled:
             return
-        print("test")
-        print(self.client)
-        print(self.client.users)
-        print(self.client._wrap_v3_methods)
+        #print("test")
+        #print(self.client)
+        #print(self.client.users)
+        #print(self.client._wrap_v3_methods)
         # 获取实例方法
         instance_methods = inspect.getmembers(self.client._wrap_v3_methods, predicate=inspect.isfunction)
-        print("实例方法:", [method[0] for method in instance_methods])
+        #print("实例方法:", [method[0] for method in instance_methods])
 
         # 获取类方法（包括静态方法）
         class_methods = inspect.getmembers(self.client._wrap_v3_methods, predicate=inspect.ismethod)
-        print("类方法:", [method[0] for method in class_methods])
+        #print("类方法:", [method[0] for method in class_methods])
         #self.client.user.login(tool_settings.R2R_USERNAME, tool_settings.R2R_PASSWORD)
 
     def _check_login(self):
@@ -70,15 +70,15 @@ def get_method_parameters(method):
     params = inspect.signature(method).parameters
     for name, param in params.items():
         default_value = param.default if param.default is not param.empty else None
-        print(f"参数名: {name}, 默认值: {default_value}")
+        #print(f"参数名: {name}, 默认值: {default_value}")
 
 # 获取实例方法
 instance_methods = inspect.getmembers(R2RClient, predicate=inspect.isfunction)
-print("实例方法:", [method[0] for method in instance_methods])
+#print("实例方法:", [method[0] for method in instance_methods])
 
 # 获取类方法（包括静态方法）
 class_methods = inspect.getmembers(R2RClient, predicate=inspect.ismethod)
-print("类方法:", [method[0] for method in class_methods])
+#print("类方法:", [method[0] for method in class_methods])
 
 r2r1 = R2R()
 

tests/e2e/run_test.py

@@ -68,11 +68,11 @@ def test_create_run_with_additional_messages_and_other_parmas():
         stream=True,
     )
 
-    print("\nstream message start")
+    #print("\nstream message start")
     for event in stream:
         if event.event == "thread.message.delta":
-            print(event.data.delta.content[0].text.value, end="", flush=True)
-    print("\nstream message finish")
+            #print(event.data.delta.content[0].text.value, end="", flush=True)
+    #print("\nstream message finish")
 
     query = session.query(Run).filter(Run.thread_id == thread.id)
     run = query.one()
@@ -81,7 +81,7 @@ def test_create_run_with_additional_messages_and_other_parmas():
     query = session.query(Message).filter(Message.thread_id == thread.id).order_by(Message.created_at)
     messages = query.all()
     for message in messages:
-        print(message)
+        #print(message)
     assert run.max_completion_tokens == 100
     assert run.max_prompt_tokens == 100
     assert run.temperature == 0.5

tests/e2e/sub_stream_test.py

@@ -23,26 +23,26 @@ def test_sub_stream_with_submit_tool_outputs_stream(client):
             }
         ],
     )
-    print("=====> : %s\n", assistant)
+    #print("=====> : %s\n", assistant)
 
     thread = client.beta.threads.create()
-    print("=====> : %s\n", thread)
+    #print("=====> : %s\n", thread)
 
     message = client.beta.threads.messages.create(
         thread_id=thread.id,
         role="user",
         content="北京天气如何？",
     )
-    print("=====> : %s\n", message)
+    #print("=====> : %s\n", message)
 
     funcs = [get_current_weather]
 
     class EventHandler(AssistantEventHandler):
 
         def on_event(self, event):
-            print(event.event)
+            #print(event.event)
             if event.event == "thread.run.requires_action":
-                print(event)
+                #print(event)
                 run_id = event.data.id  # Retrieve the run ID from the event data
                 self.handle_requires_action(event.data, run_id)
 
@@ -58,7 +58,7 @@ def test_sub_stream_with_submit_tool_outputs_stream(client):
 
                 tool_outputs.append({"tool_call_id": tool.id, "output": json.dumps(output)})
 
-            print(tool_outputs)
+            #print(tool_outputs)
 
             # Submit all tool_outputs at the same time
             self.submit_tool_outputs(tool_outputs, run_id)
@@ -72,13 +72,13 @@ def test_sub_stream_with_submit_tool_outputs_stream(client):
                 event_handler=EventHandler(),
             ) as stream:
                 # for text in stream.text_deltas:
-                #     print(text, end="", flush=True)
-                #     print()
+                #     #print(text, end="", flush=True)
+                #     #print()
                 stream.until_done()
 
         def on_text_delta(self, delta, snapshot) -> None:
-            print("=====> text delta")
-            print("delta   : %s", delta)
+            #print("=====> text delta")
+            #print("delta   : %s", delta)
 
     with client.beta.threads.runs.stream(
         thread_id=thread.id,

tests/e2e/test_thread_api.py

@@ -7,7 +7,7 @@ def test_thread_copy(client):
     contents = ["test1", "test2", "test3"]
     messages = [client.beta.threads.messages.create(thread_id=thread.id, role="user", content=content) for content in contents]
     for index, message in enumerate(messages):
-        print(index)
+        #print(index)
         new_thread = client.beta.threads.create(extra_body={"thread_id": thread.id,
                                                         "end_message_id": message.id})
         new_messages = client.beta.threads.messages.list(thread_id=new_thread.id).data

tests/run/run_with_assistant_extra_body_test.py

@@ -24,35 +24,35 @@ def test_run_with_assistant_extra_body():
             }
         },
     )
-    print(assistant, end="\n\n")
+    #print(assistant, end="\n\n")
 
     thread = client.beta.threads.create()
-    print(thread, end="\n\n")
+    #print(thread, end="\n\n")
 
     message = client.beta.threads.messages.create(
         thread_id=thread.id,
         role="user",
         content="你好,介绍一下你自己",
     )
-    print(message, end="\n\n")
+    #print(message, end="\n\n")
 
     run = client.beta.threads.runs.create(thread_id=thread.id, assistant_id=assistant.id, instructions="")
-    print(run, end="\n\n")
+    #print(run, end="\n\n")
 
     while True:
         # run = client.beta.threads.runs.retrieve(thread_id=thread.id, run_id=run.id)
         run = client.beta.threads.runs.retrieve(thread_id=thread.id, run_id=run.id)
         if run.status == "completed":
-            print("done!", end="\n\n")
+            #print("done!", end="\n\n")
             messages = client.beta.threads.messages.list(thread_id=thread.id)
 
-            print("messages: ")
+            #print("messages: ")
             for message in messages:
                 assert message.content[0].type == "text"
-                print(messages)
-                print({"role": message.role, "message": message.content[0].text.value})
+                #print(messages)
+                #print({"role": message.role, "message": message.content[0].text.value})
 
             break
         else:
-            print("\nin progress...")
+            #print("\nin progress...")
             time.sleep(1)

tests/run/run_with_auth_action_test.py

@@ -90,17 +90,17 @@ def test_run_with_action_auth(create_workspace_with_authentication):
         tools=[{"type": "action", "id": create_workspace_with_authentication.id}],
         model="gpt-3.5-turbo-1106",
     )
-    print(assistant, end="\n\n")
+    #print(assistant, end="\n\n")
 
     thread = client.beta.threads.create()
-    print(thread, end="\n\n")
+    #print(thread, end="\n\n")
 
     message = client.beta.threads.messages.create(
         thread_id=thread.id,
         role="user",
         content="在组织63db49f7dcc8bf7b0990903c下,创建一个随机名字的工作空间",
     )
-    print(message, end="\n\n")
+    #print(message, end="\n\n")
 
     run = client.beta.threads.runs.create(
         # model="gpt-3.5-turbo-1106",
@@ -118,22 +118,22 @@ def test_run_with_action_auth(create_workspace_with_authentication):
             }
         },
     )
-    print(run, end="\n\n")
+    #print(run, end="\n\n")
 
     while True:
         # run = client.beta.threads.runs.retrieve(thread_id=thread.id, run_id=run.id)
         run = client.beta.threads.runs.retrieve(thread_id=thread.id, run_id=run.id)
         if run.status == "completed":
-            print("done!", end="\n\n")
+            #print("done!", end="\n\n")
             messages = client.beta.threads.messages.list(thread_id=thread.id)
 
-            print("messages: ")
+            #print("messages: ")
             for message in messages:
                 assert message.content[0].type == "text"
-                print(messages)
-                print({"role": message.role, "message": message.content[0].text.value})
+                #print(messages)
+                #print({"role": message.role, "message": message.content[0].text.value})
 
             break
         else:
-            print("\nin progress...")
+            #print("\nin progress...")
             time.sleep(1)

tests/tools/assistant_action_test.py

@@ -213,17 +213,17 @@ def test_assistant_with_action_tools(
         ],
         model="gpt-3.5-turbo-1106",
     )
-    print(assistant, end="\n\n")
+    #print(assistant, end="\n\n")
 
     thread = client.beta.threads.create()
-    print(thread, end="\n\n")
+    #print(thread, end="\n\n")
 
     message = client.beta.threads.messages.create(
         thread_id=thread.id,
         role="user",
         content="武汉的天气",
     )
-    print(message, end="\n\n")
+    #print(message, end="\n\n")
 
     run = client.beta.threads.runs.create(
         # model="gpt-3.5-turbo-1106",
@@ -231,21 +231,21 @@ def test_assistant_with_action_tools(
         assistant_id=assistant.id,
         instructions="",
     )
-    print(run, end="\n\n")
+    #print(run, end="\n\n")
 
     while True:
         run = client.beta.threads.runs.retrieve(thread_id=thread.id, run_id=run.id)
         if run.status == "completed":
-            print("done!", end="\n\n")
+            #print("done!", end="\n\n")
             messages = client.beta.threads.messages.list(thread_id=thread.id)
 
-            print("messages: ")
+            #print("messages: ")
             for message in messages:
                 assert message.content[0].type == "text"
-                print(messages)
-                print({"role": message.role, "message": message.content[0].text.value})
+                #print(messages)
+                #print({"role": message.role, "message": message.content[0].text.value})
 
             break
         else:
-            print("\nin progress...")
+            #print("\nin progress...")
             time.sleep(1)