From e8cc048901ab9eabe8841c5cd6bd56950405d9e6 Mon Sep 17 00:00:00 2001 From: Junyan Qin Date: Fri, 22 Nov 2024 23:29:12 +0800 Subject: [PATCH] deps: bump pydantic to v2 --- pkg/command/entities.py | 2 +- pkg/core/entities.py | 2 +- pkg/pipeline/cntfilter/entities.py | 2 +- pkg/pipeline/entities.py | 2 +- pkg/pipeline/longtext/strategies/forward.py | 2 +- pkg/pipeline/resprule/entities.py | 2 +- pkg/pipeline/stagemgr.py | 2 -- pkg/platform/sources/qqbotpy.py | 2 -- pkg/platform/types/base.py | 4 ++-- pkg/platform/types/entities.py | 2 +- pkg/platform/types/events.py | 2 +- pkg/platform/types/message.py | 3 +-- pkg/plugin/context.py | 2 +- pkg/plugin/events.py | 2 +- pkg/provider/entities.py | 2 +- pkg/provider/modelmgr/entities.py | 2 +- pkg/provider/modelmgr/token.py | 2 -- pkg/provider/sysprompt/entities.py | 2 +- pkg/provider/tools/entities.py | 2 +- pkg/utils/announce.py | 2 +- pkg/utils/logcache.py | 2 -- requirements.txt | 2 +- 22 files changed, 19 insertions(+), 28 deletions(-) diff --git a/pkg/command/entities.py b/pkg/command/entities.py index 463dfe386..538766bf8 100644 --- a/pkg/command/entities.py +++ b/pkg/command/entities.py @@ -2,7 +2,7 @@ from __future__ import annotations import typing -import pydantic +import pydantic.v1 as pydantic from ..core import app, entities as core_entities from . import errors, operator diff --git a/pkg/core/entities.py b/pkg/core/entities.py index 464384be4..5156d8ca7 100644 --- a/pkg/core/entities.py +++ b/pkg/core/entities.py @@ -5,7 +5,7 @@ import typing import datetime import asyncio -import pydantic +import pydantic.v1 as pydantic from ..provider import entities as llm_entities from ..provider.modelmgr import entities diff --git a/pkg/pipeline/cntfilter/entities.py b/pkg/pipeline/cntfilter/entities.py index af60a5947..b4bc0f7e4 100644 --- a/pkg/pipeline/cntfilter/entities.py +++ b/pkg/pipeline/cntfilter/entities.py @@ -2,7 +2,7 @@ import typing import enum -import pydantic +import pydantic.v1 as pydantic from ...provider import entities as llm_entities diff --git a/pkg/pipeline/entities.py b/pkg/pipeline/entities.py index cbeb3d0ed..ffcc46548 100644 --- a/pkg/pipeline/entities.py +++ b/pkg/pipeline/entities.py @@ -3,7 +3,7 @@ from __future__ import annotations import enum import typing -import pydantic +import pydantic.v1 as pydantic from ..platform.types import message as platform_message from ..core import entities diff --git a/pkg/pipeline/longtext/strategies/forward.py b/pkg/pipeline/longtext/strategies/forward.py index c39c92089..c001b6d85 100644 --- a/pkg/pipeline/longtext/strategies/forward.py +++ b/pkg/pipeline/longtext/strategies/forward.py @@ -2,7 +2,7 @@ from __future__ import annotations import typing -import pydantic +import pydantic.v1 as pydantic from .. import strategy as strategy_model from ....core import entities as core_entities diff --git a/pkg/pipeline/resprule/entities.py b/pkg/pipeline/resprule/entities.py index 22927154c..a334e843f 100644 --- a/pkg/pipeline/resprule/entities.py +++ b/pkg/pipeline/resprule/entities.py @@ -1,4 +1,4 @@ -import pydantic +import pydantic.v1 as pydantic from ...platform.types import message as platform_message diff --git a/pkg/pipeline/stagemgr.py b/pkg/pipeline/stagemgr.py index fe3b4256a..2bd685d63 100644 --- a/pkg/pipeline/stagemgr.py +++ b/pkg/pipeline/stagemgr.py @@ -1,7 +1,5 @@ from __future__ import annotations -import pydantic - from ..core import app from . import stage from .resprule import resprule diff --git a/pkg/platform/sources/qqbotpy.py b/pkg/platform/sources/qqbotpy.py index b10be34bd..3a4e681f1 100644 --- a/pkg/platform/sources/qqbotpy.py +++ b/pkg/platform/sources/qqbotpy.py @@ -9,8 +9,6 @@ import traceback import botpy import botpy.message as botpy_message import botpy.types.message as botpy_message_type -import pydantic -import pydantic.networks from .. import adapter as adapter_model from ...pipeline.longtext.strategies import forward diff --git a/pkg/platform/types/base.py b/pkg/platform/types/base.py index d3c0be497..ce87d36c2 100644 --- a/pkg/platform/types/base.py +++ b/pkg/platform/types/base.py @@ -1,8 +1,8 @@ from typing import Dict, List, Type -import pydantic.main as pdm -from pydantic import BaseModel +import pydantic.v1.main as pdm +from pydantic.v1 import BaseModel class PlatformMetaclass(pdm.ModelMetaclass): diff --git a/pkg/platform/types/entities.py b/pkg/platform/types/entities.py index 8077bd150..a9aa32a2a 100644 --- a/pkg/platform/types/entities.py +++ b/pkg/platform/types/entities.py @@ -7,7 +7,7 @@ from datetime import datetime from enum import Enum import typing -import pydantic +import pydantic.v1 as pydantic class Entity(pydantic.BaseModel): diff --git a/pkg/platform/types/events.py b/pkg/platform/types/events.py index 1b008cf44..25bbcf867 100644 --- a/pkg/platform/types/events.py +++ b/pkg/platform/types/events.py @@ -6,7 +6,7 @@ from datetime import datetime from enum import Enum import typing -import pydantic +import pydantic.v1 as pydantic from . import entities as platform_entities from . import message as platform_message diff --git a/pkg/platform/types/message.py b/pkg/platform/types/message.py index 149c19e75..9bd33be73 100644 --- a/pkg/platform/types/message.py +++ b/pkg/platform/types/message.py @@ -5,8 +5,7 @@ from enum import Enum from pathlib import Path import typing -import pydantic -import pydantic.main +import pydantic.v1 as pydantic from . import entities as platform_entities from .base import PlatformBaseModel, PlatformIndexedMetaclass, PlatformIndexedModel diff --git a/pkg/plugin/context.py b/pkg/plugin/context.py index e3d04aa47..65abc8622 100644 --- a/pkg/plugin/context.py +++ b/pkg/plugin/context.py @@ -2,7 +2,7 @@ from __future__ import annotations import typing import abc -import pydantic +import pydantic.v1 as pydantic import enum from . import events diff --git a/pkg/plugin/events.py b/pkg/plugin/events.py index 013dd1135..f1aff459c 100644 --- a/pkg/plugin/events.py +++ b/pkg/plugin/events.py @@ -2,7 +2,7 @@ from __future__ import annotations import typing -import pydantic +import pydantic.v1 as pydantic from ..core import entities as core_entities from ..provider import entities as llm_entities diff --git a/pkg/provider/entities.py b/pkg/provider/entities.py index 803613a38..a1f5df8db 100644 --- a/pkg/provider/entities.py +++ b/pkg/provider/entities.py @@ -2,7 +2,7 @@ from __future__ import annotations import typing import enum -import pydantic +import pydantic.v1 as pydantic from ..platform.types import message as platform_message diff --git a/pkg/provider/modelmgr/entities.py b/pkg/provider/modelmgr/entities.py index 91d1d6e91..cf8568945 100644 --- a/pkg/provider/modelmgr/entities.py +++ b/pkg/provider/modelmgr/entities.py @@ -2,7 +2,7 @@ from __future__ import annotations import typing -import pydantic +import pydantic.v1 as pydantic from . import requester from . import token diff --git a/pkg/provider/modelmgr/token.py b/pkg/provider/modelmgr/token.py index b9ec7e0d9..f6f9436da 100644 --- a/pkg/provider/modelmgr/token.py +++ b/pkg/provider/modelmgr/token.py @@ -2,8 +2,6 @@ from __future__ import annotations import typing -import pydantic - class TokenManager(): """鉴权 Token 管理器 diff --git a/pkg/provider/sysprompt/entities.py b/pkg/provider/sysprompt/entities.py index 326ea787b..5442e809a 100644 --- a/pkg/provider/sysprompt/entities.py +++ b/pkg/provider/sysprompt/entities.py @@ -1,7 +1,7 @@ from __future__ import annotations import typing -import pydantic +import pydantic.v1 as pydantic from ...provider import entities diff --git a/pkg/provider/tools/entities.py b/pkg/provider/tools/entities.py index 8f09ab210..746ffe925 100644 --- a/pkg/provider/tools/entities.py +++ b/pkg/provider/tools/entities.py @@ -4,7 +4,7 @@ import abc import typing import asyncio -import pydantic +import pydantic.v1 as pydantic from ...core import entities as core_entities diff --git a/pkg/utils/announce.py b/pkg/utils/announce.py index 0b431f94f..d3297c29e 100644 --- a/pkg/utils/announce.py +++ b/pkg/utils/announce.py @@ -6,7 +6,7 @@ import os import base64 import logging -import pydantic +import pydantic.v1 as pydantic import requests from ..core import app diff --git a/pkg/utils/logcache.py b/pkg/utils/logcache.py index 2b8151c28..d3206e9be 100644 --- a/pkg/utils/logcache.py +++ b/pkg/utils/logcache.py @@ -1,7 +1,5 @@ from __future__ import annotations -import pydantic - LOG_PAGE_SIZE = 20 MAX_CACHED_PAGES = 10 diff --git a/requirements.txt b/requirements.txt index 632232eda..e0d5a1e90 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ Pillow tiktoken PyYaml aiohttp -pydantic<2.0 +pydantic>2.0 websockets urllib3 psutil