jyapayne/dify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve: mordernizing validation by migrating pydantic from 1.x to 2.x (#4592)

Browse source
This commit is contained in:
Bowen Liang 2024-06-14 01:05:37 +08:00 • committed by GitHub
commit f976740b57
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
87 changed files with 697 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/core/moderation/api/api.py
View file

@ -51,7 +51,7 @@ class ApiModeration(Moderation):
query=query
)
result = self._get_config_by_requestor(APIBasedExtensionPoint.APP_MODERATION_INPUT, params.dict())
result = self._get_config_by_requestor(APIBasedExtensionPoint.APP_MODERATION_INPUT, params.model_dump())
return ModerationInputsResult(**result)
return ModerationInputsResult(flagged=flagged, action=ModerationAction.DIRECT_OUTPUT, preset_response=preset_response)
@ -66,7 +66,7 @@ class ApiModeration(Moderation):
text=text
)
result = self._get_config_by_requestor(APIBasedExtensionPoint.APP_MODERATION_OUTPUT, params.dict())
result = self._get_config_by_requestor(APIBasedExtensionPoint.APP_MODERATION_OUTPUT, params.model_dump())
return ModerationOutputsResult(**result)
return ModerationOutputsResult(flagged=flagged, action=ModerationAction.DIRECT_OUTPUT, preset_response=preset_response)

6
api/core/moderation/output_moderation.py
View file

@ -4,7 +4,7 @@ import time
from typing import Any, Optional
from flask import Flask, current_app
from pydantic import BaseModel
from pydantic import BaseModel, ConfigDict
from core.app.apps.base_app_queue_manager import AppQueueManager, PublishFrom
from core.app.entities.queue_entities import QueueMessageReplaceEvent
@ -33,9 +33,7 @@ class OutputModeration(BaseModel):
buffer: str = ''
is_final_chunk: bool = False
final_output: Optional[str] = None
class Config:
arbitrary_types_allowed = True
model_config = ConfigDict(arbitrary_types_allowed=True)
def should_direct_output(self):
return self.final_output is not None