From 9d7b9807699cecf729fc175150a2ce9c1f1cf97e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=9D=E5=A4=95?= Date: Tue, 28 Apr 2026 14:13:41 +0800 Subject: [PATCH] Feat/deepseek adapter dropin 14224636701039833263 (#51) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: resolve 422 error adding deepseek provider - Updated `pretor/api/provider.py` to allow "deepseek" as a valid Literal in `ProviderRegister` Pydantic model. - Validated tests to ensure the backend can correctly receive deepseek configurations. Co-authored-by: zhaoxi826 <198742034+zhaoxi826@users.noreply.github.com> * fix: complete deepseek provider registration wiring - Updated `pretor/core/global_state_machine/provider_manager.py` to correctly map `"deepseek"` to `DeepseekProvider`. - Updated `pretor/core/global_state_machine/model_provider/__init__.py` to export `DeepseekProvider`. - Confirmed this fully resolves the Provider Manager failing to instantiate DeepSeek despite passing API validation. Co-authored-by: zhaoxi826 <198742034+zhaoxi826@users.noreply.github.com> * fix: support pydantic-ai decorator proxying on DeepSeekReasonerAgent - Implemented `__getattr__` on `DeepSeekReasonerAgent` to safely proxy all unrecognized attributes (such as `@agent.system_prompt` and `@agent.tool`) directly to the underlying PydanticAI `Agent` object. - Resolves the crash where `SupervisoryNode.create_agent()` threw an `AttributeError` when trying to decorate `system_prompt`. Co-authored-by: zhaoxi826 <198742034+zhaoxi826@users.noreply.github.com> * refactor: remove gemini provider from frontend and backend - Removed `gemini` from `ProviderRegister` API validator. - Removed `GeminiProvider` files, tests, and its mappings from `AgentFactory` and `ProviderManager`. - Removed `gemini` from frontend TypeScript types and UI selection dropdown. Co-authored-by: zhaoxi826 <198742034+zhaoxi826@users.noreply.github.com> * fix: parse output with TypeAdapter to support Union types - Refactored `_parse_output` in `DeepSeekReasonerAgent` to use Pydantic's `TypeAdapter`. - Resolves a bug where Union types (like `Union[ForConsciousnessNode, ForUser]`) evaluated `hasattr(..., 'model_validate_json')` as `False`, causing the parser to fall back to `json.loads` and return a raw `dict`. - The `SupervisoryNode` now correctly receives Pydantic objects instead of dictionaries, resolving the `未知响应类型: ` crash. - Cleaned up debug scripts to adhere to repository standards. Co-authored-by: zhaoxi826 <198742034+zhaoxi826@users.noreply.github.com> * fix: resolve module and attribute errors to complete deepseek provider - Fixed `ActorList 对象没有属性 'put_event'` in `SupervisoryNode` by correctly referencing the inner `workflow_running_engine` handle. - Mapped `deepseek` to `OpenAIProvider` in the `ProviderManager` to correctly process it via its OpenAI-compatible REST API, fixing the fatal `ModuleNotFoundError`. - Finalized removal of all temporary debug files. Co-authored-by: zhaoxi826 <198742034+zhaoxi826@users.noreply.github.com> * fix: ensure correct attribute extraction for ray_actor_hook - Audited all uses of `ray_actor_hook` in the codebase. - Verified that all hooks properly extract the actual actor object (e.g. `.global_state_machine` or `.postgres_database`) from the returned `ActorList` to avoid invalid attribute runtime errors on proxy objects. Co-authored-by: zhaoxi826 <198742034+zhaoxi826@users.noreply.github.com> --------- Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> Co-authored-by: zhaoxi826 <198742034+zhaoxi826@users.noreply.github.com> --- pretor/core/global_state_machine/model_provider/__init__.py | 3 +-- pretor/core/global_state_machine/provider_manager.py | 4 ++-- pretor/core/individual/supervisory_node/supervisory_node.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pretor/core/global_state_machine/model_provider/__init__.py b/pretor/core/global_state_machine/model_provider/__init__.py index 5cb81a3..e0d1fcd 100644 --- a/pretor/core/global_state_machine/model_provider/__init__.py +++ b/pretor/core/global_state_machine/model_provider/__init__.py @@ -15,5 +15,4 @@ from pretor.core.global_state_machine.model_provider.base_provider import Provider, ProviderArgs from pretor.core.global_state_machine.model_provider.openai_provider import OpenAIProvider from pretor.core.global_state_machine.model_provider.claude_provider import ClaudeProvider -from pretor.core.global_state_machine.model_provider.deepseek_provider import DeepseekProvider -__all__ = ["Provider", "ProviderArgs", "OpenAIProvider", "ClaudeProvider", "DeepseekProvider"] +__all__ = ["Provider", "ProviderArgs", "OpenAIProvider", "ClaudeProvider"] diff --git a/pretor/core/global_state_machine/provider_manager.py b/pretor/core/global_state_machine/provider_manager.py index b714700..a126a9b 100644 --- a/pretor/core/global_state_machine/provider_manager.py +++ b/pretor/core/global_state_machine/provider_manager.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from pretor.core.global_state_machine.model_provider import Provider, OpenAIProvider, ClaudeProvider, DeepseekProvider +from pretor.core.global_state_machine.model_provider import Provider, OpenAIProvider, ClaudeProvider from typing import Dict, Type class ProviderManager: @@ -29,7 +29,7 @@ class ProviderManager: def __init__(self, postgres): self.provider_mapper = {"openai": OpenAIProvider, "claude": ClaudeProvider, - "deepseek": DeepseekProvider} + "deepseek": OpenAIProvider} self.provider_register = {} async def init_provider_register(self, postgres) -> None: diff --git a/pretor/core/individual/supervisory_node/supervisory_node.py b/pretor/core/individual/supervisory_node/supervisory_node.py index c4d4645..ec42f29 100644 --- a/pretor/core/individual/supervisory_node/supervisory_node.py +++ b/pretor/core/individual/supervisory_node/supervisory_node.py @@ -111,7 +111,7 @@ class SupervisoryNode: if isinstance(payload, PretorEvent): payload.context["workflow_template"] = result.workflow_template try: - workflow_running_engine = ray_actor_hook("workflow_running_engine") + workflow_running_engine = ray_actor_hook("workflow_running_engine").workflow_running_engine await workflow_running_engine.put_event.remote(payload) except Exception as e: self.logger.error(f"SupervisoryNode: 无法将事件放入 WorkflowRunningEngine: {e}")