jack пре 3 месеци
родитељ
комит
0eccc7b8e5
2 измењених фајлова са 14 додато и 5 уклоњено
  1. 5 0
      app/api/v1/runs.py
  2. 9 5
      app/core/runner/thread_runner.py

+ 5 - 0
app/api/v1/runs.py

@@ -64,6 +64,7 @@ async def create_run(
     event_handler.pub_run_created(db_run)
     event_handler.pub_run_created(db_run)
     event_handler.pub_run_queued(db_run)
     event_handler.pub_run_queued(db_run)
     print("22222233333333333344444444444444444555555555555555556")
     print("22222233333333333344444444444444444555555555555555556")
+    print(token_id)
     # print(run_task)
     # print(run_task)
     run_task.apply_async(args=(db_run.id, token_id, body.stream))
     run_task.apply_async(args=(db_run.id, token_id, body.stream))
     print("22222222222222222222222222222222")
     print("22222222222222222222222222222222")
@@ -196,6 +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.
     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(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
     )
     )

+ 9 - 5
app/core/runner/thread_runner.py

@@ -315,14 +315,18 @@ class ThreadRunner:
     def __init_llm_backend(self, assistant_id):
     def __init_llm_backend(self, assistant_id):
         if settings.AUTH_ENABLE:
         if settings.AUTH_ENABLE:
             # init llm backend with token id
             # init llm backend with token id
-            token_id = TokenRelationService.get_token_id_by_relation(
-                session=self.session,
-                relation_type=RelationType.Assistant,
-                relation_id=assistant_id,
-            )
+            if self.token_id:
+                token_id = self.token_id
+            else:
+                token_id = TokenRelationService.get_token_id_by_relation(
+                    session=self.session,
+                    relation_type=RelationType.Assistant,
+                    relation_id=assistant_id,
+                )
             print(
             print(
                 "token_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_id"
                 "token_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_idtoken_id"
             )
             )
+            print(self.token_id)
             print(token_id)
             print(token_id)
             if token_id is not None and token.llm_api_key is not None:
             if token_id is not None and token.llm_api_key is not None:
                 token = TokenService.get_token_by_id(self.session, token_id)
                 token = TokenService.get_token_by_id(self.session, token_id)