jack 1 week ago
parent
commit
4b65738011

+ 1 - 3
app/api/v1/runs.py

@@ -197,9 +197,7 @@ 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.
     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.
     All outputs must be submitted in a single request.
     """
     """
-    #print(
-        "submit_tool_outputs_to_runsubmit_tool_outputs_to_runsubmit_tool_outputs_to_runsubmit_tool_outputs_to_runsubmit_tool_outputs_to_run"
-    )
+    #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(
     db_run = await RunService.submit_tool_outputs_to_run(
         session=session, thread_id=thread_id, run_id=run_id, body=body
         session=session, thread_id=thread_id, run_id=run_id, body=body

+ 3 - 9
app/core/tools/knowledge_search_tool.py

@@ -58,9 +58,7 @@ class KnowledgeSearchTool(BaseTool):
                     key
                     key
                 )  ## assiatant的id数据,在r2r里没办法检索需要提取filekey字段
                 )  ## assiatant的id数据,在r2r里没办法检索需要提取filekey字段
 
 
-        #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_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(document_id)
         #print(file_key)
         #print(file_key)
         files = []
         files = []
@@ -111,17 +109,13 @@ class KnowledgeSearchTool(BaseTool):
                 #print(files)
                 #print(files)
 
 
         # pre-cache data to prevent thread conflicts that may occur later on.
         # pre-cache data to prevent thread conflicts that may occur later on.
-        #print(
-            "---------ssssssssssss-----------------sssssssssssss---------------ssssssssssssss-------------sssssssssssss-------------ss-------"
-        )
+        #print(            "---------ssssssssssss-----------------sssssssssssss---------------ssssssssssssss-------------sssssssssssss-------------ss-------")
         #print(self.__dirkeys)
         #print(self.__dirkeys)
         #print(self.__keys)
         #print(self.__keys)
 
 
     # indexes: List[int],
     # indexes: List[int],
     def run(self, query: str) -> dict:
     def run(self, query: str) -> dict:
-        #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(            "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.__keys)
         #print(self.__dirkeys)
         #print(self.__dirkeys)

+ 5 - 15
app/providers/r2r.py

@@ -34,9 +34,7 @@ class R2R:
         self.client_sync.users.login(
         self.client_sync.users.login(
             tool_settings.R2R_USERNAME, tool_settings.R2R_PASSWORD
             tool_settings.R2R_USERNAME, tool_settings.R2R_PASSWORD
         )
         )
-        #print(
-            "1111111111111111111111111111111122222vvdgdfdf" + tool_settings.R2R_USERNAME
-        )
+        #print(            "1111111111111111111111111111111122222vvdgdfdf" + tool_settings.R2R_USERNAME)
         # #print(tool_settings.R2R_USERNAME)
         # #print(tool_settings.R2R_USERNAME)
         # #print(tool_settings.R2R_PASSWORD)
         # #print(tool_settings.R2R_PASSWORD)
         #print(self.client_sync)
         #print(self.client_sync)
@@ -46,9 +44,7 @@ class R2R:
         if not self.auth_enabled:
         if not self.auth_enabled:
             return
             return
         # if not self.client:
         # if not self.client:
-        #print(
-            "1111111111111111111111111111111122222vvdgdfdf" + tool_settings.R2R_USERNAME
-        )
+        #print(            "1111111111111111111111111111111122222vvdgdfdf" + tool_settings.R2R_USERNAME)
         #print(tool_settings.R2R_USERNAME)
         #print(tool_settings.R2R_USERNAME)
         #print(tool_settings.R2R_PASSWORD)
         #print(tool_settings.R2R_PASSWORD)
         # client = R2RAsyncClient(tool_settings.R2R_BASE_URL)
         # client = R2RAsyncClient(tool_settings.R2R_BASE_URL)
@@ -78,9 +74,7 @@ class R2R:
 
 
     def search(self, query: str, filters: dict[str, Any]):
     def search(self, query: str, filters: dict[str, Any]):
         client = self._check_login_sync()
         client = self._check_login_sync()
-        #print(
-            "aaaaaaaaaaaaaaaaaaaaaaaaaaaasssssssssssssssssssssssssssssssssssssssssgggggggggggggggggggg"
-        )
+        #print(            "aaaaaaaaaaaaaaaaaaaaaaaaaaaasssssssssssssssssssssssssssssssssssssssssgggggggggggggggggggg")
         search_response = client.retrieval.search(
         search_response = client.retrieval.search(
             query=query,
             query=query,
             # search_mode="basic",
             # search_mode="basic",
@@ -106,9 +100,7 @@ class R2R:
 
 
     def list_chunks(self, ids: list[str] = []):
     def list_chunks(self, ids: list[str] = []):
         client = self._check_login_sync()
         client = self._check_login_sync()
-        #print(
-            "retrieve_documentsretrieve_documentsretrieve_documentsretrieve_documentsretrieve_documents"
-        )
+        #print(            "retrieve_documentsretrieve_documentsretrieve_documentsretrieve_documentsretrieve_documents")
         #print(ids)
         #print(ids)
         allfile = []
         allfile = []
         for id in ids:
         for id in ids:
@@ -128,9 +120,7 @@ class R2R:
             docs = client.collections.list_documents(empty_coll_id).results
             docs = client.collections.list_documents(empty_coll_id).results
             assert len(docs) == 0, "Expected no documents in a new empty collection"
             assert len(docs) == 0, "Expected no documents in a new empty collection"
         """
         """
-        #print(
-            "collectionscollectionscollectionscollectionscollectionscollectionscollectionscollectionscollectionscollectionscollectionscollections"
-        )
+        #print(            "collectionscollectionscollectionscollectionscollectionscollectionscollectionscollectionscollectionscollectionscollectionscollections")
         if id != "":
         if id != "":
             try:
             try:
                 listed = client.collections.list_documents(
                 listed = client.collections.list_documents(

+ 1 - 3
app/services/run/run.py

@@ -91,9 +91,7 @@ class RunService:
             body.model_dump(by_alias=True),
             body.model_dump(by_alias=True),
             update={"thread_id": thread_id, "file_ids": file_ids},
             update={"thread_id": thread_id, "file_ids": file_ids},
         )
         )
-        #print(
-            "11111111111111111111111111111111111111111111111111111111111888888888888888888888888888888888"
-        )
+        #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)
         # db_run.file_ids = json.dumps(db_run.file_ids)
         # db_run.file_ids = json.dumps(db_run.file_ids)

+ 1 - 4
testopenassistant.py

@@ -60,10 +60,7 @@ if __name__ == "__main__":
             #print("=====> messages:")
             #print("=====> messages:")
             for message in messages:
             for message in messages:
                 assert message.content[0].type == "text"
                 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
             # delete asst
             client.beta.assistants.delete(assistant.id)
             client.beta.assistants.delete(assistant.id)