|
29 | 29 | evaluate_agent_hard_fail, |
30 | 30 | mark_episode_execution_window_start, |
31 | 31 | ) |
| 32 | +from controller.agent.prompt_manager import PromptManager |
| 33 | +from controller.agent.provider_tool_call_adapters import extract_tool_calls |
32 | 34 | from controller.agent.runtime_models import ( |
33 | 35 | FileListEntry, |
34 | 36 | MessageContentBlock, |
35 | 37 | NativeProviderMessage, |
36 | 38 | ProviderResponseEnvelope, |
37 | 39 | ) |
38 | | -from controller.agent.prompt_manager import PromptManager |
39 | | -from controller.agent.provider_tool_call_adapters import extract_tool_calls |
40 | 40 | from controller.clients.worker import WorkerClient |
41 | 41 | from controller.middleware.remote_fs import RemoteFilesystemMiddleware |
42 | 42 | from controller.observability.database import DatabaseCallbackHandler |
@@ -880,10 +880,7 @@ def _coerce_message_text(content: Any) -> str: |
880 | 880 | if isinstance(block_model.text, str) and block_model.text.strip(): |
881 | 881 | text_chunks.append(block_model.text.strip()) |
882 | 882 | continue |
883 | | - if ( |
884 | | - isinstance(block_model.content, str) |
885 | | - and block_model.content.strip() |
886 | | - ): |
| 883 | + if isinstance(block_model.content, str) and block_model.content.strip(): |
887 | 884 | text_chunks.append(block_model.content.strip()) |
888 | 885 | if text_chunks: |
889 | 886 | return "\n".join(text_chunks) |
@@ -936,7 +933,9 @@ def _assistant_message_with_tool_calls( |
936 | 933 | with suppress(Exception): |
937 | 934 | message_model = NativeProviderMessage.model_validate(message) |
938 | 935 | provider_specific_fields = ( |
939 | | - message_model.provider_specific_fields if message_model is not None else None |
| 936 | + message_model.provider_specific_fields |
| 937 | + if message_model is not None |
| 938 | + else None |
940 | 939 | ) |
941 | 940 | if isinstance(provider_specific_fields, dict) and provider_specific_fields: |
942 | 941 | assistant_message["provider_specific_fields"] = provider_specific_fields |
|
0 commit comments