jack 4 days ago
parent
commit
c25cd91e8d
2 changed files with 22 additions and 20 deletions
  1. 21 19
      app/core/runner/llm_callback_handler.py
  2. 1 1
      app/core/runner/thread_runner.py

+ 21 - 19
app/core/runner/llm_callback_handler.py

@@ -72,6 +72,23 @@ class LLMCallbackHandler:
                 )
                 )
 
 
                 logging.debug(delta.tool_calls)
                 logging.debug(delta.tool_calls)
+                    # call on delta message received
+                if not self.final_message_started:
+                    self.final_message_started = True
+
+                    self.message = self.on_message_create_func(content="")
+                    self.step = self.on_step_create_func(self.message.id)
+                    logging.debug(
+                        "create message and step (%s), (%s)",
+                        self.message,
+                        self.step,
+                    )
+
+                    self.event_handler.pub_run_step_created(self.step)
+                    self.event_handler.pub_run_step_in_progress(self.step)
+                    self.event_handler.pub_message_created(self.message)
+                    self.event_handler.pub_message_in_progress(self.message)
+
                 # merge tool call delta
                 # merge tool call delta
                 if delta.tool_calls:
                 if delta.tool_calls:
                     for tool_call_delta in delta.tool_calls:
                     for tool_call_delta in delta.tool_calls:
@@ -80,23 +97,6 @@ class LLMCallbackHandler:
                         )
                         )
 
 
                 elif delta.content is not None:
                 elif delta.content is not None:
-                    # call on delta message received
-                    if not self.final_message_started:
-                        self.final_message_started = True
-
-                        self.message = self.on_message_create_func(content="")
-                        self.step = self.on_step_create_func(self.message.id)
-                        logging.debug(
-                            "create message and step (%s), (%s)",
-                            self.message,
-                            self.step,
-                        )
-
-                        self.event_handler.pub_run_step_created(self.step)
-                        self.event_handler.pub_run_step_in_progress(self.step)
-                        self.event_handler.pub_message_created(self.message)
-                        self.event_handler.pub_message_in_progress(self.message)
-
                     # append message content delta
                     # append message content delta
                     message.content += delta.content
                     message.content += delta.content
                     self.event_handler.pub_message_delta(
                     self.event_handler.pub_message_delta(
@@ -106,6 +106,7 @@ class LLMCallbackHandler:
                     hasattr(delta, "reasoning_content")
                     hasattr(delta, "reasoning_content")
                     and delta.reasoning_content is not None
                     and delta.reasoning_content is not None
                 ):
                 ):
+                    '''
                     # call on delta message received
                     # call on delta message received
                     if not self.final_message_started:
                     if not self.final_message_started:
                         self.final_message_started = True
                         self.final_message_started = True
@@ -122,7 +123,7 @@ class LLMCallbackHandler:
                         self.event_handler.pub_run_step_in_progress(self.step)
                         self.event_handler.pub_run_step_in_progress(self.step)
                         self.event_handler.pub_message_created(self.message)
                         self.event_handler.pub_message_created(self.message)
                         self.event_handler.pub_message_in_progress(self.message)
                         self.event_handler.pub_message_in_progress(self.message)
-
+                    '''
                     # append message content delta
                     # append message content delta
                     # message.reasoning_content += delta.reasoning_content
                     # message.reasoning_content += delta.reasoning_content
                     self.event_handler.pub_message_delta(
                     self.event_handler.pub_message_delta(
@@ -133,6 +134,7 @@ class LLMCallbackHandler:
                         delta.reasoning_content,
                         delta.reasoning_content,
                     )
                     )
                 elif hasattr(delta, "audio") and delta.audio is not None:
                 elif hasattr(delta, "audio") and delta.audio is not None:
+                    '''
                     if not self.final_message_started:
                     if not self.final_message_started:
                         self.final_message_started = True
                         self.final_message_started = True
 
 
@@ -148,7 +150,7 @@ class LLMCallbackHandler:
                         self.event_handler.pub_run_step_in_progress(self.step)
                         self.event_handler.pub_run_step_in_progress(self.step)
                         self.event_handler.pub_message_created(self.message)
                         self.event_handler.pub_message_created(self.message)
                         self.event_handler.pub_message_in_progress(self.message)
                         self.event_handler.pub_message_in_progress(self.message)
-
+                    '''
                     """
                     """
                                     if 'transcript' in chunk.choices[0].delta.audio:
                                     if 'transcript' in chunk.choices[0].delta.audio:
                                         print(chunk.choices[0].delta.audio['transcript'])
                                         print(chunk.choices[0].delta.audio['transcript'])

+ 1 - 1
app/core/runner/thread_runner.py

@@ -237,7 +237,7 @@ class ThreadRunner:
             response_stream = [response_stream]
             response_stream = [response_stream]
         response_msg = llm_callback_handler.handle_llm_response(response_stream)
         response_msg = llm_callback_handler.handle_llm_response(response_stream)
         print("response_msg================================================================response_msg")
         print("response_msg================================================================response_msg")
-        print(response_msg)
+        print(llm_callback_handler)
         message_creation_run_step = llm_callback_handler.step
         message_creation_run_step = llm_callback_handler.step
         print("444444444444444444444444455555555577777777777777777777777")
         print("444444444444444444444444455555555577777777777777777777777")
         logging.info("chat_response_message: %s", response_msg)
         logging.info("chat_response_message: %s", response_msg)