From 963b6f628ad609d1f018c31de0e9da465de0c85b Mon Sep 17 00:00:00 2001 From: Yongtao Huang <99629139+hyongtao-db@users.noreply.github.com> Date: Tue, 18 Mar 2025 10:57:52 +0800 Subject: [PATCH] Chore: PromptMessage is not an abstract base class (#15965) --- api/core/model_runtime/docs/en_US/interfaces.md | 2 +- api/core/model_runtime/docs/zh_Hans/interfaces.md | 2 +- api/core/model_runtime/entities/__init__.py | 2 -- api/core/model_runtime/entities/message_entities.py | 3 +-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/api/core/model_runtime/docs/en_US/interfaces.md b/api/core/model_runtime/docs/en_US/interfaces.md index 1fb20e5b04..3410109cf1 100644 --- a/api/core/model_runtime/docs/en_US/interfaces.md +++ b/api/core/model_runtime/docs/en_US/interfaces.md @@ -493,7 +493,7 @@ If inputting a combination of text and images, the images need to be constructed The base class for all Role message bodies, used only for parameter declaration and cannot be initialized. ```python -class PromptMessage(ABC, BaseModel): +class PromptMessage(BaseModel): """ Model class for prompt message. """ diff --git a/api/core/model_runtime/docs/zh_Hans/interfaces.md b/api/core/model_runtime/docs/zh_Hans/interfaces.md index 6022c1cbeb..f86068ac99 100644 --- a/api/core/model_runtime/docs/zh_Hans/interfaces.md +++ b/api/core/model_runtime/docs/zh_Hans/interfaces.md @@ -533,7 +533,7 @@ class ImagePromptMessageContent(PromptMessageContent): 所有 Role 消息体的基类,仅作为参数声明用,不可初始化。 ```python -class PromptMessage(ABC, BaseModel): +class PromptMessage(BaseModel): """ Model class for prompt message. """ diff --git a/api/core/model_runtime/entities/__init__.py b/api/core/model_runtime/entities/__init__.py index 4746ddedcf..a24e437d48 100644 --- a/api/core/model_runtime/entities/__init__.py +++ b/api/core/model_runtime/entities/__init__.py @@ -31,11 +31,9 @@ __all__ = [ "ModelPropertyKey", "MultiModalPromptMessageContent", "PromptMessage", - "PromptMessage", "PromptMessageContent", "PromptMessageContentType", "PromptMessageRole", - "PromptMessageRole", "PromptMessageTool", "SystemPromptMessage", "TextPromptMessageContent", diff --git a/api/core/model_runtime/entities/message_entities.py b/api/core/model_runtime/entities/message_entities.py index 2f682ceef5..977678b893 100644 --- a/api/core/model_runtime/entities/message_entities.py +++ b/api/core/model_runtime/entities/message_entities.py @@ -1,4 +1,3 @@ -from abc import ABC from collections.abc import Sequence from enum import Enum, StrEnum from typing import Optional @@ -119,7 +118,7 @@ class DocumentPromptMessageContent(MultiModalPromptMessageContent): type: PromptMessageContentType = PromptMessageContentType.DOCUMENT -class PromptMessage(ABC, BaseModel): +class PromptMessage(BaseModel): """ Model class for prompt message. """