2026-03-20 17:18:59 +08:00
|
|
|
"""Patched ChatOpenAI adapter for MiniMax reasoning output.
|
|
|
|
|
|
|
|
|
|
MiniMax's OpenAI-compatible chat completions API can return structured
|
|
|
|
|
``reasoning_details`` when ``extra_body.reasoning_split=true`` is enabled.
|
|
|
|
|
``langchain_openai.ChatOpenAI`` currently ignores that field, so DeerFlow's
|
|
|
|
|
frontend never receives reasoning content in the shape it expects.
|
|
|
|
|
|
|
|
|
|
This adapter preserves ``reasoning_split`` in the request payload and maps the
|
|
|
|
|
provider-specific reasoning field into ``additional_kwargs.reasoning_content``,
|
|
|
|
|
which DeerFlow already understands.
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
|
|
|
|
import re
|
|
|
|
|
from collections.abc import Mapping
|
|
|
|
|
from typing import Any
|
|
|
|
|
|
|
|
|
|
from langchain_core.language_models import LanguageModelInput
|
|
|
|
|
from langchain_core.messages import AIMessage, AIMessageChunk
|
|
|
|
|
from langchain_core.outputs import ChatGeneration, ChatGenerationChunk, ChatResult
|
|
|
|
|
from langchain_openai import ChatOpenAI
|
|
|
|
|
from langchain_openai.chat_models.base import (
|
|
|
|
|
_convert_delta_to_message_chunk,
|
|
|
|
|
_create_usage_metadata,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
_THINK_TAG_RE = re.compile(r"<think>\s*(.*?)\s*</think>", re.DOTALL)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _extract_reasoning_text(
|
|
|
|
|
reasoning_details: Any,
|
|
|
|
|
*,
|
|
|
|
|
strip_parts: bool = True,
|
|
|
|
|
) -> str | None:
|
|
|
|
|
if not isinstance(reasoning_details, list):
|
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
parts: list[str] = []
|
|
|
|
|
for item in reasoning_details:
|
|
|
|
|
if not isinstance(item, Mapping):
|
|
|
|
|
continue
|
|
|
|
|
text = item.get("text")
|
|
|
|
|
if isinstance(text, str):
|
|
|
|
|
normalized = text.strip() if strip_parts else text
|
|
|
|
|
if normalized.strip():
|
|
|
|
|
parts.append(normalized)
|
|
|
|
|
|
|
|
|
|
return "\n\n".join(parts) if parts else None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _strip_inline_think_tags(content: str) -> tuple[str, str | None]:
|
|
|
|
|
reasoning_parts: list[str] = []
|
|
|
|
|
|
|
|
|
|
def _replace(match: re.Match[str]) -> str:
|
|
|
|
|
reasoning = match.group(1).strip()
|
|
|
|
|
if reasoning:
|
|
|
|
|
reasoning_parts.append(reasoning)
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
cleaned = _THINK_TAG_RE.sub(_replace, content).strip()
|
|
|
|
|
reasoning = "\n\n".join(reasoning_parts) if reasoning_parts else None
|
|
|
|
|
return cleaned, reasoning
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _merge_reasoning(*values: str | None) -> str | None:
|
|
|
|
|
merged: list[str] = []
|
|
|
|
|
for value in values:
|
|
|
|
|
if not value:
|
|
|
|
|
continue
|
|
|
|
|
normalized = value.strip()
|
|
|
|
|
if normalized and normalized not in merged:
|
|
|
|
|
merged.append(normalized)
|
|
|
|
|
return "\n\n".join(merged) if merged else None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _with_reasoning_content(
|
|
|
|
|
message: AIMessage | AIMessageChunk,
|
|
|
|
|
reasoning: str | None,
|
|
|
|
|
*,
|
|
|
|
|
preserve_whitespace: bool = False,
|
|
|
|
|
):
|
|
|
|
|
if not reasoning:
|
|
|
|
|
return message
|
|
|
|
|
|
|
|
|
|
additional_kwargs = dict(message.additional_kwargs)
|
|
|
|
|
if preserve_whitespace:
|
|
|
|
|
existing = additional_kwargs.get("reasoning_content")
|
feat(harness): integration ACP agent tool (#1344)
* refactor: extract shared utils to break harness→app cross-layer imports
Move _validate_skill_frontmatter to src/skills/validation.py and
CONVERTIBLE_EXTENSIONS + convert_file_to_markdown to src/utils/file_conversion.py.
This eliminates the two reverse dependencies from client.py (harness layer)
into gateway/routers/ (app layer), preparing for the harness/app package split.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* refactor: split backend/src into harness (deerflow.*) and app (app.*)
Physically split the monolithic backend/src/ package into two layers:
- **Harness** (`packages/harness/deerflow/`): publishable agent framework
package with import prefix `deerflow.*`. Contains agents, sandbox, tools,
models, MCP, skills, config, and all core infrastructure.
- **App** (`app/`): unpublished application code with import prefix `app.*`.
Contains gateway (FastAPI REST API) and channels (IM integrations).
Key changes:
- Move 13 harness modules to packages/harness/deerflow/ via git mv
- Move gateway + channels to app/ via git mv
- Rename all imports: src.* → deerflow.* (harness) / app.* (app layer)
- Set up uv workspace with deerflow-harness as workspace member
- Update langgraph.json, config.example.yaml, all scripts, Docker files
- Add build-system (hatchling) to harness pyproject.toml
- Add PYTHONPATH=. to gateway startup commands for app.* resolution
- Update ruff.toml with known-first-party for import sorting
- Update all documentation to reflect new directory structure
Boundary rule enforced: harness code never imports from app.
All 429 tests pass. Lint clean.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* chore: add harness→app boundary check test and update docs
Add test_harness_boundary.py that scans all Python files in
packages/harness/deerflow/ and fails if any `from app.*` or
`import app.*` statement is found. This enforces the architectural
rule that the harness layer never depends on the app layer.
Update CLAUDE.md to document the harness/app split architecture,
import conventions, and the boundary enforcement test.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* feat: add config versioning with auto-upgrade on startup
When config.example.yaml schema changes, developers' local config.yaml
files can silently become outdated. This adds a config_version field and
auto-upgrade mechanism so breaking changes (like src.* → deerflow.*
renames) are applied automatically before services start.
- Add config_version: 1 to config.example.yaml
- Add startup version check warning in AppConfig.from_file()
- Add scripts/config-upgrade.sh with migration registry for value replacements
- Add `make config-upgrade` target
- Auto-run config-upgrade in serve.sh and start-daemon.sh before starting services
- Add config error hints in service failure messages
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix comments
* fix: update src.* import in test_sandbox_tools_security to deerflow.*
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix: handle empty config and search parent dirs for config.example.yaml
Address Copilot review comments on PR #1131:
- Guard against yaml.safe_load() returning None for empty config files
- Search parent directories for config.example.yaml instead of only
looking next to config.yaml, fixing detection in common setups
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix: correct skills root path depth and config_version type coercion
- loader.py: fix get_skills_root_path() to use 5 parent levels (was 3)
after harness split, file lives at packages/harness/deerflow/skills/
so parent×3 resolved to backend/packages/harness/ instead of backend/
- app_config.py: coerce config_version to int() before comparison in
_check_config_version() to prevent TypeError when YAML stores value
as string (e.g. config_version: "1")
- tests: add regression tests for both fixes
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* fix: update test imports from src.* to deerflow.*/app.* after harness refactor
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* feat(harness): add tool-first ACP agent invocation (#37)
* feat(harness): add tool-first ACP agent invocation
* build(harness): make ACP dependency required
* fix(harness): address ACP review feedback
* feat(harness): decouple ACP agent workspace from thread data
ACP agents (codex, claude-code) previously used per-thread workspace
directories, causing path resolution complexity and coupling task
execution to DeerFlow's internal thread data layout. This change:
- Replace _resolve_cwd() with a fixed _get_work_dir() that always uses
{base_dir}/acp-workspace/, eliminating virtual path translation and
thread_id lookups
- Introduce /mnt/acp-workspace virtual path for lead agent read-only
access to ACP agent output files (same pattern as /mnt/skills)
- Add security guards: read-only validation, path traversal prevention,
command path allowlisting, and output masking for acp-workspace
- Update system prompt and tool description to guide LLM: send
self-contained tasks to ACP agents, copy results via /mnt/acp-workspace
- Add 11 new security tests for ACP workspace path handling
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* refactor(prompt): inject ACP section only when ACP agents are configured
The ACP agent guidance in the system prompt is now conditionally built
by _build_acp_section(), which checks get_acp_agents() and returns an
empty string when no ACP agents are configured. This avoids polluting
the prompt with irrelevant instructions for users who don't use ACP.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix lint
* fix(harness): address Copilot review comments on sandbox path handling and ACP tool
- local_sandbox: fix path-segment boundary bug in _resolve_path (== or startswith +"/")
and add lookahead in _resolve_paths_in_command regex to prevent /mnt/skills matching
inside /mnt/skills-extra
- local_sandbox_provider: replace print() with logger.warning(..., exc_info=True)
- invoke_acp_agent_tool: guard getattr(option, "optionId") with None default + continue;
move full prompt from INFO to DEBUG level (truncated to 200 chars)
- sandbox/tools: fix _get_acp_workspace_host_path docstring to match implementation;
remove misleading "read-only" language from validate_local_bash_command_paths
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* fix(acp): thread-isolated workspaces, permission guardrail, and ContextVar registry
P1.1 – ACP workspace thread isolation
- Add `Paths.acp_workspace_dir(thread_id)` for per-thread paths
- `_get_work_dir(thread_id)` in invoke_acp_agent_tool now uses
`{base_dir}/threads/{thread_id}/acp-workspace/`; falls back to
global workspace when thread_id is absent or invalid
- `_invoke` extracts thread_id from `RunnableConfig` via
`Annotated[RunnableConfig, InjectedToolArg]`
- `sandbox/tools.py`: `_get_acp_workspace_host_path(thread_id)`,
`_resolve_acp_workspace_path(path, thread_id)`, and all callers
(`replace_virtual_paths_in_command`, `mask_local_paths_in_output`,
`ls_tool`, `read_file_tool`) now resolve ACP paths per-thread
P1.2 – ACP permission guardrail
- New `auto_approve_permissions: bool = False` field in `ACPAgentConfig`
- `_build_permission_response(options, *, auto_approve: bool)` now
defaults to deny; only approves when `auto_approve=True`
- Document field in `config.example.yaml`
P2 – Deferred tool registry race condition
- Replace module-level `_registry` global with `contextvars.ContextVar`
- Each asyncio request context gets its own registry; worker threads
inherit the context automatically via `loop.run_in_executor`
- Expose `get_deferred_registry` / `set_deferred_registry` /
`reset_deferred_registry` helpers
Tests: 831 pass (57 for affected modules, 3 new tests)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* fix(sandbox): mount /mnt/acp-workspace in docker sandbox container
The AioSandboxProvider was not mounting the ACP workspace into the
sandbox container, so /mnt/acp-workspace was inaccessible when the lead
agent tried to read ACP results in docker mode.
Changes:
- `ensure_thread_dirs`: also create `acp-workspace/` (chmod 0o777) so
the directory exists before the sandbox container starts — required
for Docker volume mounts
- `_get_thread_mounts`: add read-only `/mnt/acp-workspace` mount using
the per-thread host path (`host_paths.acp_workspace_dir(thread_id)`)
- Update stale CLAUDE.md description (was "fixed global workspace")
Tests: `test_aio_sandbox_provider.py` (4 new tests)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* fix(lint): remove unused imports in test_aio_sandbox_provider
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix config
---------
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-26 14:20:18 +08:00
|
|
|
additional_kwargs["reasoning_content"] = f"{existing}{reasoning}" if isinstance(existing, str) else reasoning
|
2026-03-20 17:18:59 +08:00
|
|
|
else:
|
|
|
|
|
additional_kwargs["reasoning_content"] = _merge_reasoning(
|
|
|
|
|
additional_kwargs.get("reasoning_content"),
|
|
|
|
|
reasoning,
|
|
|
|
|
)
|
|
|
|
|
return message.model_copy(update={"additional_kwargs": additional_kwargs})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class PatchedChatMiniMax(ChatOpenAI):
|
|
|
|
|
"""ChatOpenAI adapter that preserves MiniMax reasoning output."""
|
|
|
|
|
|
|
|
|
|
def _get_request_payload(
|
|
|
|
|
self,
|
|
|
|
|
input_: LanguageModelInput,
|
|
|
|
|
*,
|
|
|
|
|
stop: list[str] | None = None,
|
|
|
|
|
**kwargs: Any,
|
|
|
|
|
) -> dict:
|
|
|
|
|
payload = super()._get_request_payload(input_, stop=stop, **kwargs)
|
|
|
|
|
extra_body = payload.get("extra_body")
|
|
|
|
|
if isinstance(extra_body, dict):
|
|
|
|
|
payload["extra_body"] = {
|
|
|
|
|
**extra_body,
|
|
|
|
|
"reasoning_split": True,
|
|
|
|
|
}
|
|
|
|
|
else:
|
|
|
|
|
payload["extra_body"] = {"reasoning_split": True}
|
|
|
|
|
return payload
|
|
|
|
|
|
|
|
|
|
def _convert_chunk_to_generation_chunk(
|
|
|
|
|
self,
|
|
|
|
|
chunk: dict,
|
|
|
|
|
default_chunk_class: type,
|
|
|
|
|
base_generation_info: dict | None,
|
|
|
|
|
) -> ChatGenerationChunk | None:
|
|
|
|
|
if chunk.get("type") == "content.delta":
|
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
token_usage = chunk.get("usage")
|
|
|
|
|
choices = chunk.get("choices", []) or chunk.get("chunk", {}).get("choices", [])
|
feat(harness): integration ACP agent tool (#1344)
* refactor: extract shared utils to break harness→app cross-layer imports
Move _validate_skill_frontmatter to src/skills/validation.py and
CONVERTIBLE_EXTENSIONS + convert_file_to_markdown to src/utils/file_conversion.py.
This eliminates the two reverse dependencies from client.py (harness layer)
into gateway/routers/ (app layer), preparing for the harness/app package split.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* refactor: split backend/src into harness (deerflow.*) and app (app.*)
Physically split the monolithic backend/src/ package into two layers:
- **Harness** (`packages/harness/deerflow/`): publishable agent framework
package with import prefix `deerflow.*`. Contains agents, sandbox, tools,
models, MCP, skills, config, and all core infrastructure.
- **App** (`app/`): unpublished application code with import prefix `app.*`.
Contains gateway (FastAPI REST API) and channels (IM integrations).
Key changes:
- Move 13 harness modules to packages/harness/deerflow/ via git mv
- Move gateway + channels to app/ via git mv
- Rename all imports: src.* → deerflow.* (harness) / app.* (app layer)
- Set up uv workspace with deerflow-harness as workspace member
- Update langgraph.json, config.example.yaml, all scripts, Docker files
- Add build-system (hatchling) to harness pyproject.toml
- Add PYTHONPATH=. to gateway startup commands for app.* resolution
- Update ruff.toml with known-first-party for import sorting
- Update all documentation to reflect new directory structure
Boundary rule enforced: harness code never imports from app.
All 429 tests pass. Lint clean.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* chore: add harness→app boundary check test and update docs
Add test_harness_boundary.py that scans all Python files in
packages/harness/deerflow/ and fails if any `from app.*` or
`import app.*` statement is found. This enforces the architectural
rule that the harness layer never depends on the app layer.
Update CLAUDE.md to document the harness/app split architecture,
import conventions, and the boundary enforcement test.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* feat: add config versioning with auto-upgrade on startup
When config.example.yaml schema changes, developers' local config.yaml
files can silently become outdated. This adds a config_version field and
auto-upgrade mechanism so breaking changes (like src.* → deerflow.*
renames) are applied automatically before services start.
- Add config_version: 1 to config.example.yaml
- Add startup version check warning in AppConfig.from_file()
- Add scripts/config-upgrade.sh with migration registry for value replacements
- Add `make config-upgrade` target
- Auto-run config-upgrade in serve.sh and start-daemon.sh before starting services
- Add config error hints in service failure messages
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix comments
* fix: update src.* import in test_sandbox_tools_security to deerflow.*
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix: handle empty config and search parent dirs for config.example.yaml
Address Copilot review comments on PR #1131:
- Guard against yaml.safe_load() returning None for empty config files
- Search parent directories for config.example.yaml instead of only
looking next to config.yaml, fixing detection in common setups
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix: correct skills root path depth and config_version type coercion
- loader.py: fix get_skills_root_path() to use 5 parent levels (was 3)
after harness split, file lives at packages/harness/deerflow/skills/
so parent×3 resolved to backend/packages/harness/ instead of backend/
- app_config.py: coerce config_version to int() before comparison in
_check_config_version() to prevent TypeError when YAML stores value
as string (e.g. config_version: "1")
- tests: add regression tests for both fixes
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* fix: update test imports from src.* to deerflow.*/app.* after harness refactor
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* feat(harness): add tool-first ACP agent invocation (#37)
* feat(harness): add tool-first ACP agent invocation
* build(harness): make ACP dependency required
* fix(harness): address ACP review feedback
* feat(harness): decouple ACP agent workspace from thread data
ACP agents (codex, claude-code) previously used per-thread workspace
directories, causing path resolution complexity and coupling task
execution to DeerFlow's internal thread data layout. This change:
- Replace _resolve_cwd() with a fixed _get_work_dir() that always uses
{base_dir}/acp-workspace/, eliminating virtual path translation and
thread_id lookups
- Introduce /mnt/acp-workspace virtual path for lead agent read-only
access to ACP agent output files (same pattern as /mnt/skills)
- Add security guards: read-only validation, path traversal prevention,
command path allowlisting, and output masking for acp-workspace
- Update system prompt and tool description to guide LLM: send
self-contained tasks to ACP agents, copy results via /mnt/acp-workspace
- Add 11 new security tests for ACP workspace path handling
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* refactor(prompt): inject ACP section only when ACP agents are configured
The ACP agent guidance in the system prompt is now conditionally built
by _build_acp_section(), which checks get_acp_agents() and returns an
empty string when no ACP agents are configured. This avoids polluting
the prompt with irrelevant instructions for users who don't use ACP.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix lint
* fix(harness): address Copilot review comments on sandbox path handling and ACP tool
- local_sandbox: fix path-segment boundary bug in _resolve_path (== or startswith +"/")
and add lookahead in _resolve_paths_in_command regex to prevent /mnt/skills matching
inside /mnt/skills-extra
- local_sandbox_provider: replace print() with logger.warning(..., exc_info=True)
- invoke_acp_agent_tool: guard getattr(option, "optionId") with None default + continue;
move full prompt from INFO to DEBUG level (truncated to 200 chars)
- sandbox/tools: fix _get_acp_workspace_host_path docstring to match implementation;
remove misleading "read-only" language from validate_local_bash_command_paths
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* fix(acp): thread-isolated workspaces, permission guardrail, and ContextVar registry
P1.1 – ACP workspace thread isolation
- Add `Paths.acp_workspace_dir(thread_id)` for per-thread paths
- `_get_work_dir(thread_id)` in invoke_acp_agent_tool now uses
`{base_dir}/threads/{thread_id}/acp-workspace/`; falls back to
global workspace when thread_id is absent or invalid
- `_invoke` extracts thread_id from `RunnableConfig` via
`Annotated[RunnableConfig, InjectedToolArg]`
- `sandbox/tools.py`: `_get_acp_workspace_host_path(thread_id)`,
`_resolve_acp_workspace_path(path, thread_id)`, and all callers
(`replace_virtual_paths_in_command`, `mask_local_paths_in_output`,
`ls_tool`, `read_file_tool`) now resolve ACP paths per-thread
P1.2 – ACP permission guardrail
- New `auto_approve_permissions: bool = False` field in `ACPAgentConfig`
- `_build_permission_response(options, *, auto_approve: bool)` now
defaults to deny; only approves when `auto_approve=True`
- Document field in `config.example.yaml`
P2 – Deferred tool registry race condition
- Replace module-level `_registry` global with `contextvars.ContextVar`
- Each asyncio request context gets its own registry; worker threads
inherit the context automatically via `loop.run_in_executor`
- Expose `get_deferred_registry` / `set_deferred_registry` /
`reset_deferred_registry` helpers
Tests: 831 pass (57 for affected modules, 3 new tests)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* fix(sandbox): mount /mnt/acp-workspace in docker sandbox container
The AioSandboxProvider was not mounting the ACP workspace into the
sandbox container, so /mnt/acp-workspace was inaccessible when the lead
agent tried to read ACP results in docker mode.
Changes:
- `ensure_thread_dirs`: also create `acp-workspace/` (chmod 0o777) so
the directory exists before the sandbox container starts — required
for Docker volume mounts
- `_get_thread_mounts`: add read-only `/mnt/acp-workspace` mount using
the per-thread host path (`host_paths.acp_workspace_dir(thread_id)`)
- Update stale CLAUDE.md description (was "fixed global workspace")
Tests: `test_aio_sandbox_provider.py` (4 new tests)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* fix(lint): remove unused imports in test_aio_sandbox_provider
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix config
---------
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-26 14:20:18 +08:00
|
|
|
usage_metadata = _create_usage_metadata(token_usage, chunk.get("service_tier")) if token_usage else None
|
2026-03-20 17:18:59 +08:00
|
|
|
|
|
|
|
|
if len(choices) == 0:
|
|
|
|
|
generation_chunk = ChatGenerationChunk(
|
|
|
|
|
message=default_chunk_class(content="", usage_metadata=usage_metadata),
|
|
|
|
|
generation_info=base_generation_info,
|
|
|
|
|
)
|
|
|
|
|
if self.output_version == "v1":
|
|
|
|
|
generation_chunk.message.content = []
|
|
|
|
|
generation_chunk.message.response_metadata["output_version"] = "v1"
|
|
|
|
|
return generation_chunk
|
|
|
|
|
|
|
|
|
|
choice = choices[0]
|
|
|
|
|
delta = choice.get("delta")
|
|
|
|
|
if delta is None:
|
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
message_chunk = _convert_delta_to_message_chunk(delta, default_chunk_class)
|
|
|
|
|
generation_info = {**base_generation_info} if base_generation_info else {}
|
|
|
|
|
|
|
|
|
|
if finish_reason := choice.get("finish_reason"):
|
|
|
|
|
generation_info["finish_reason"] = finish_reason
|
|
|
|
|
if model_name := chunk.get("model"):
|
|
|
|
|
generation_info["model_name"] = model_name
|
|
|
|
|
if system_fingerprint := chunk.get("system_fingerprint"):
|
|
|
|
|
generation_info["system_fingerprint"] = system_fingerprint
|
|
|
|
|
if service_tier := chunk.get("service_tier"):
|
|
|
|
|
generation_info["service_tier"] = service_tier
|
|
|
|
|
|
|
|
|
|
logprobs = choice.get("logprobs")
|
|
|
|
|
if logprobs:
|
|
|
|
|
generation_info["logprobs"] = logprobs
|
|
|
|
|
|
|
|
|
|
reasoning = _extract_reasoning_text(
|
|
|
|
|
delta.get("reasoning_details"),
|
|
|
|
|
strip_parts=False,
|
|
|
|
|
)
|
|
|
|
|
if isinstance(message_chunk, AIMessageChunk):
|
|
|
|
|
if usage_metadata:
|
|
|
|
|
message_chunk.usage_metadata = usage_metadata
|
|
|
|
|
if reasoning:
|
|
|
|
|
message_chunk = _with_reasoning_content(
|
|
|
|
|
message_chunk,
|
|
|
|
|
reasoning,
|
|
|
|
|
preserve_whitespace=True,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
message_chunk.response_metadata["model_provider"] = "openai"
|
|
|
|
|
return ChatGenerationChunk(
|
|
|
|
|
message=message_chunk,
|
|
|
|
|
generation_info=generation_info or None,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
def _create_chat_result(
|
|
|
|
|
self,
|
|
|
|
|
response: dict | Any,
|
|
|
|
|
generation_info: dict | None = None,
|
|
|
|
|
) -> ChatResult:
|
|
|
|
|
result = super()._create_chat_result(response, generation_info)
|
|
|
|
|
response_dict = response if isinstance(response, dict) else response.model_dump()
|
|
|
|
|
choices = response_dict.get("choices", [])
|
|
|
|
|
|
|
|
|
|
generations: list[ChatGeneration] = []
|
|
|
|
|
for index, generation in enumerate(result.generations):
|
|
|
|
|
choice = choices[index] if index < len(choices) else {}
|
|
|
|
|
message = generation.message
|
|
|
|
|
if isinstance(message, AIMessage):
|
|
|
|
|
content = message.content if isinstance(message.content, str) else None
|
|
|
|
|
cleaned_content = content
|
|
|
|
|
inline_reasoning = None
|
|
|
|
|
if isinstance(content, str):
|
|
|
|
|
cleaned_content, inline_reasoning = _strip_inline_think_tags(content)
|
|
|
|
|
|
|
|
|
|
choice_message = choice.get("message", {}) if isinstance(choice, Mapping) else {}
|
|
|
|
|
split_reasoning = _extract_reasoning_text(choice_message.get("reasoning_details"))
|
|
|
|
|
merged_reasoning = _merge_reasoning(split_reasoning, inline_reasoning)
|
|
|
|
|
|
|
|
|
|
updated_message = message
|
|
|
|
|
if cleaned_content is not None and cleaned_content != message.content:
|
|
|
|
|
updated_message = updated_message.model_copy(update={"content": cleaned_content})
|
|
|
|
|
if merged_reasoning:
|
|
|
|
|
updated_message = _with_reasoning_content(updated_message, merged_reasoning)
|
|
|
|
|
|
|
|
|
|
generation = ChatGeneration(
|
|
|
|
|
message=updated_message,
|
|
|
|
|
generation_info=generation.generation_info,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
generations.append(generation)
|
|
|
|
|
|
|
|
|
|
return ChatResult(generations=generations, llm_output=result.llm_output)
|