github/ChatDev
1
0
Fork 0
mirror of https://github.com/OpenBMB/ChatDev.git synced 2026-04-25 11:18:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #517 from zxrys/feature/fortune-telling

Browse Source 
fix: parallel image generation error
This commit is contained in:
Yufan Dang 2026-01-16 18:25:22 +08:00 committed by GitHub
commit ba86d34eb1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
runtime/node/agent/providers/gemini_provider.py
View File

@ -558,8 +558,22 @@ class GeminiProvider(ModelProvider):
config_kwargs["safety_settings"] = safety_settings config_kwargs["safety_settings"] = safety_settings
image_config = params.pop("image_config", None) image_config = params.pop("image_config", None)
aspect_ratio = params.pop("aspect_ratio", None)
if aspect_ratio:
if image_config is None:
image_config = {"aspect_ratio": aspect_ratio}
elif isinstance(image_config, dict):
image_config = dict(image_config)
image_config.setdefault("aspect_ratio", aspect_ratio)
elif isinstance(image_config, genai_types.ImageConfig):
try:
image_config.aspect_ratio = aspect_ratio
except Exception:
image_config = {"aspect_ratio": aspect_ratio}
else:
image_config = {"aspect_ratio": aspect_ratio}
if image_config: if image_config:
config_kwargs["image_config"] = image_config config_kwargs["image_config"] = self._coerce_image_config(image_config)
audio_config = params.pop("audio_config", None) audio_config = params.pop("audio_config", None)
if audio_config: if audio_config:
@ -598,6 +612,16 @@ class GeminiProvider(ModelProvider):
except Exception: except Exception:
return None return None
def _coerce_image_config(self, image_config: Any) -> Any:
if isinstance(image_config, genai_types.ImageConfig):
return image_config
if isinstance(image_config, dict):
try:
return genai_types.ImageConfig(**image_config)
except Exception:
return image_config
return image_config
def _build_tools(self, tool_specs: List[ToolSpec]) -> List[genai_types.Tool]: def _build_tools(self, tool_specs: List[ToolSpec]) -> List[genai_types.Tool]:
if not tool_specs: if not tool_specs:
return [] return []

15
runtime/node/executor/agent_executor.py
View File

@ -133,7 +133,7 @@ class AgentNodeExecutor(NodeExecutor):
else: else:
response_message = response_obj.message response_message = response_obj.message
self._persist_message_attachments(response_message) self._persist_message_attachments(response_message, node.id)
final_message: Message | str = response_message final_message: Message | str = response_message
@ -402,7 +402,7 @@ class AgentNodeExecutor(NodeExecutor):
if input_mode is AgentInputMode.MESSAGES: if input_mode is AgentInputMode.MESSAGES:
if isinstance(thinking_result, Message): if isinstance(thinking_result, Message):
self._persist_message_attachments(thinking_result) self._persist_message_attachments(thinking_result, node.id)
conversation.append(self._clone_with_source(thinking_result, node.id)) conversation.append(self._clone_with_source(thinking_result, node.id))
else: else:
self._append_user_message(conversation, thinking_result, node_id=node.id) self._append_user_message(conversation, thinking_result, node_id=node.id)
@ -828,7 +828,7 @@ class AgentNodeExecutor(NodeExecutor):
return custom_limit return custom_limit
return default_limit return default_limit
def _persist_message_attachments(self, message: Message) -> None: def _persist_message_attachments(self, message: Message, node_id: str) -> None:
"""Register attachments produced by model outputs to the attachment store.""" """Register attachments produced by model outputs to the attachment store."""
store = self.context.global_state.get("attachment_store") store = self.context.global_state.get("attachment_store")
if store is None: if store is None:
@ -838,11 +838,11 @@ class AgentNodeExecutor(NodeExecutor):
if not attachment: if not attachment:
continue continue
try: try:
self._persist_single_attachment(store, block) self._persist_single_attachment(store, block, node_id)
except Exception as exc: except Exception as exc:
raise RuntimeError(f"Failed to persist attachment '{attachment.name or attachment.attachment_id}': {exc}") from exc raise RuntimeError(f"Failed to persist attachment '{attachment.name or attachment.attachment_id}': {exc}") from exc
def _persist_single_attachment(self, store: Any, block: MessageBlock) -> None: def _persist_single_attachment(self, store: Any, block: MessageBlock, node_id: str) -> None:
attachment = block.attachment attachment = block.attachment
if attachment is None: if attachment is None:
return return
@ -859,8 +859,7 @@ class AgentNodeExecutor(NodeExecutor):
return return
workspace_root = self.context.global_state.get("python_workspace_root") workspace_root = self.context.global_state.get("python_workspace_root")
node_id = getattr(self, "_current_node_id", None) if workspace_root is None or not node_id:
if workspace_root is None or node_id is None:
raise RuntimeError("Workspace or node context missing for attachment persistence") raise RuntimeError("Workspace or node context missing for attachment persistence")
target_dir = workspace_root / "generated" / node_id target_dir = workspace_root / "generated" / node_id
@ -971,7 +970,7 @@ class AgentNodeExecutor(NodeExecutor):
if input_mode is AgentInputMode.MESSAGES: if input_mode is AgentInputMode.MESSAGES:
if isinstance(result, Message): if isinstance(result, Message):
self._persist_message_attachments(result) self._persist_message_attachments(result, node.id)
self._reset_conversation_with_user_result(conversation, result, node_id=node.id) self._reset_conversation_with_user_result(conversation, result, node_id=node.id)
else: else:
self._reset_conversation_with_user_result(conversation, result, node_id=node.id) self._reset_conversation_with_user_result(conversation, result, node_id=node.id)