mirror of
https://github.com/langgenius/dify.git
synced 2026-08-03 11:46:37 +08:00
refactor: replace bare dict with dict[str, Any] in response converter… (#35212)
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
9c90c1c455
commit
7e7b27fdec
@ -1,3 +1,5 @@
|
|||||||
|
from typing import Any
|
||||||
|
|
||||||
from flask import request
|
from flask import request
|
||||||
from flask_restx import Resource
|
from flask_restx import Resource
|
||||||
from pydantic import BaseModel, Field, field_validator
|
from pydantic import BaseModel, Field, field_validator
|
||||||
@ -40,7 +42,7 @@ class ActivatePayload(BaseModel):
|
|||||||
|
|
||||||
class ActivationCheckResponse(BaseModel):
|
class ActivationCheckResponse(BaseModel):
|
||||||
is_valid: bool = Field(description="Whether token is valid")
|
is_valid: bool = Field(description="Whether token is valid")
|
||||||
data: dict | None = Field(default=None, description="Activation data if valid")
|
data: dict[str, Any] | None = Field(default=None, description="Activation data if valid")
|
||||||
|
|
||||||
|
|
||||||
class ActivationResponse(BaseModel):
|
class ActivationResponse(BaseModel):
|
||||||
|
|||||||
@ -1026,7 +1026,7 @@ class DocumentMetadataApi(DocumentResource):
|
|||||||
|
|
||||||
if not isinstance(doc_metadata, dict):
|
if not isinstance(doc_metadata, dict):
|
||||||
raise ValueError("doc_metadata must be a dictionary.")
|
raise ValueError("doc_metadata must be a dictionary.")
|
||||||
metadata_schema: dict = cast(dict, DocumentService.DOCUMENT_METADATA_SCHEMA[doc_type])
|
metadata_schema: dict[str, Any] = cast(dict[str, Any], DocumentService.DOCUMENT_METADATA_SCHEMA[doc_type])
|
||||||
|
|
||||||
document.doc_metadata = {}
|
document.doc_metadata = {}
|
||||||
if doc_type == "others":
|
if doc_type == "others":
|
||||||
|
|||||||
@ -465,7 +465,7 @@ class ModelProviderModelDisableApi(Resource):
|
|||||||
class ParserValidate(BaseModel):
|
class ParserValidate(BaseModel):
|
||||||
model: str
|
model: str
|
||||||
model_type: ModelType
|
model_type: ModelType
|
||||||
credentials: dict
|
credentials: dict[str, Any]
|
||||||
|
|
||||||
|
|
||||||
console_ns.schema_model(
|
console_ns.schema_model(
|
||||||
|
|||||||
@ -57,7 +57,7 @@ class AdvancedChatAppGenerateResponseConverter(AppGenerateResponseConverter):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def convert_stream_full_response(
|
def convert_stream_full_response(
|
||||||
cls, stream_response: Generator[AppStreamResponse, None, None]
|
cls, stream_response: Generator[AppStreamResponse, None, None]
|
||||||
) -> Generator[dict | str, Any, None]:
|
) -> Generator[dict[str, Any] | str, Any, None]:
|
||||||
"""
|
"""
|
||||||
Convert stream full response.
|
Convert stream full response.
|
||||||
:param stream_response: stream response
|
:param stream_response: stream response
|
||||||
@ -88,7 +88,7 @@ class AdvancedChatAppGenerateResponseConverter(AppGenerateResponseConverter):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def convert_stream_simple_response(
|
def convert_stream_simple_response(
|
||||||
cls, stream_response: Generator[AppStreamResponse, None, None]
|
cls, stream_response: Generator[AppStreamResponse, None, None]
|
||||||
) -> Generator[dict | str, Any, None]:
|
) -> Generator[dict[str, Any] | str, Any, None]:
|
||||||
"""
|
"""
|
||||||
Convert stream simple response.
|
Convert stream simple response.
|
||||||
:param stream_response: stream response
|
:param stream_response: stream response
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
from collections.abc import Generator
|
from collections.abc import Generator
|
||||||
from typing import cast
|
from typing import Any, cast
|
||||||
|
|
||||||
from core.app.apps.base_app_generate_response_converter import AppGenerateResponseConverter
|
from core.app.apps.base_app_generate_response_converter import AppGenerateResponseConverter
|
||||||
from core.app.entities.task_entities import (
|
from core.app.entities.task_entities import (
|
||||||
@ -56,7 +56,7 @@ class AgentChatAppGenerateResponseConverter(AppGenerateResponseConverter):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def convert_stream_full_response(
|
def convert_stream_full_response(
|
||||||
cls, stream_response: Generator[AppStreamResponse, None, None]
|
cls, stream_response: Generator[AppStreamResponse, None, None]
|
||||||
) -> Generator[dict | str, None, None]:
|
) -> Generator[dict[str, Any] | str, None, None]:
|
||||||
"""
|
"""
|
||||||
Convert stream full response.
|
Convert stream full response.
|
||||||
:param stream_response: stream response
|
:param stream_response: stream response
|
||||||
@ -87,7 +87,7 @@ class AgentChatAppGenerateResponseConverter(AppGenerateResponseConverter):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def convert_stream_simple_response(
|
def convert_stream_simple_response(
|
||||||
cls, stream_response: Generator[AppStreamResponse, None, None]
|
cls, stream_response: Generator[AppStreamResponse, None, None]
|
||||||
) -> Generator[dict | str, None, None]:
|
) -> Generator[dict[str, Any] | str, None, None]:
|
||||||
"""
|
"""
|
||||||
Convert stream simple response.
|
Convert stream simple response.
|
||||||
:param stream_response: stream response
|
:param stream_response: stream response
|
||||||
|
|||||||
@ -24,7 +24,7 @@ class AppGenerateResponseConverter(ABC):
|
|||||||
return cls.convert_blocking_full_response(response)
|
return cls.convert_blocking_full_response(response)
|
||||||
else:
|
else:
|
||||||
|
|
||||||
def _generate_full_response() -> Generator[dict | str, Any, None]:
|
def _generate_full_response() -> Generator[dict[str, Any] | str, Any, None]:
|
||||||
yield from cls.convert_stream_full_response(response)
|
yield from cls.convert_stream_full_response(response)
|
||||||
|
|
||||||
return _generate_full_response()
|
return _generate_full_response()
|
||||||
@ -33,7 +33,7 @@ class AppGenerateResponseConverter(ABC):
|
|||||||
return cls.convert_blocking_simple_response(response)
|
return cls.convert_blocking_simple_response(response)
|
||||||
else:
|
else:
|
||||||
|
|
||||||
def _generate_simple_response() -> Generator[dict | str, Any, None]:
|
def _generate_simple_response() -> Generator[dict[str, Any] | str, Any, None]:
|
||||||
yield from cls.convert_stream_simple_response(response)
|
yield from cls.convert_stream_simple_response(response)
|
||||||
|
|
||||||
return _generate_simple_response()
|
return _generate_simple_response()
|
||||||
@ -52,14 +52,14 @@ class AppGenerateResponseConverter(ABC):
|
|||||||
@abstractmethod
|
@abstractmethod
|
||||||
def convert_stream_full_response(
|
def convert_stream_full_response(
|
||||||
cls, stream_response: Generator[AppStreamResponse, None, None]
|
cls, stream_response: Generator[AppStreamResponse, None, None]
|
||||||
) -> Generator[dict | str, None, None]:
|
) -> Generator[dict[str, Any] | str, None, None]:
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
def convert_stream_simple_response(
|
def convert_stream_simple_response(
|
||||||
cls, stream_response: Generator[AppStreamResponse, None, None]
|
cls, stream_response: Generator[AppStreamResponse, None, None]
|
||||||
) -> Generator[dict | str, None, None]:
|
) -> Generator[dict[str, Any] | str, None, None]:
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
from collections.abc import Generator
|
from collections.abc import Generator
|
||||||
from typing import cast
|
from typing import Any, cast
|
||||||
|
|
||||||
from core.app.apps.base_app_generate_response_converter import AppGenerateResponseConverter
|
from core.app.apps.base_app_generate_response_converter import AppGenerateResponseConverter
|
||||||
from core.app.entities.task_entities import (
|
from core.app.entities.task_entities import (
|
||||||
@ -56,7 +56,7 @@ class ChatAppGenerateResponseConverter(AppGenerateResponseConverter):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def convert_stream_full_response(
|
def convert_stream_full_response(
|
||||||
cls, stream_response: Generator[AppStreamResponse, None, None]
|
cls, stream_response: Generator[AppStreamResponse, None, None]
|
||||||
) -> Generator[dict | str, None, None]:
|
) -> Generator[dict[str, Any] | str, None, None]:
|
||||||
"""
|
"""
|
||||||
Convert stream full response.
|
Convert stream full response.
|
||||||
:param stream_response: stream response
|
:param stream_response: stream response
|
||||||
@ -87,7 +87,7 @@ class ChatAppGenerateResponseConverter(AppGenerateResponseConverter):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def convert_stream_simple_response(
|
def convert_stream_simple_response(
|
||||||
cls, stream_response: Generator[AppStreamResponse, None, None]
|
cls, stream_response: Generator[AppStreamResponse, None, None]
|
||||||
) -> Generator[dict | str, None, None]:
|
) -> Generator[dict[str, Any] | str, None, None]:
|
||||||
"""
|
"""
|
||||||
Convert stream simple response.
|
Convert stream simple response.
|
||||||
:param stream_response: stream response
|
:param stream_response: stream response
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
from collections.abc import Generator
|
from collections.abc import Generator
|
||||||
from typing import cast
|
from typing import Any, cast
|
||||||
|
|
||||||
from core.app.apps.base_app_generate_response_converter import AppGenerateResponseConverter
|
from core.app.apps.base_app_generate_response_converter import AppGenerateResponseConverter
|
||||||
from core.app.entities.task_entities import (
|
from core.app.entities.task_entities import (
|
||||||
@ -55,7 +55,7 @@ class CompletionAppGenerateResponseConverter(AppGenerateResponseConverter):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def convert_stream_full_response(
|
def convert_stream_full_response(
|
||||||
cls, stream_response: Generator[AppStreamResponse, None, None]
|
cls, stream_response: Generator[AppStreamResponse, None, None]
|
||||||
) -> Generator[dict | str, None, None]:
|
) -> Generator[dict[str, Any] | str, None, None]:
|
||||||
"""
|
"""
|
||||||
Convert stream full response.
|
Convert stream full response.
|
||||||
:param stream_response: stream response
|
:param stream_response: stream response
|
||||||
@ -85,7 +85,7 @@ class CompletionAppGenerateResponseConverter(AppGenerateResponseConverter):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def convert_stream_simple_response(
|
def convert_stream_simple_response(
|
||||||
cls, stream_response: Generator[AppStreamResponse, None, None]
|
cls, stream_response: Generator[AppStreamResponse, None, None]
|
||||||
) -> Generator[dict | str, None, None]:
|
) -> Generator[dict[str, Any] | str, None, None]:
|
||||||
"""
|
"""
|
||||||
Convert stream simple response.
|
Convert stream simple response.
|
||||||
:param stream_response: stream response
|
:param stream_response: stream response
|
||||||
|
|||||||
@ -37,7 +37,7 @@ class WorkflowAppGenerateResponseConverter(AppGenerateResponseConverter):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def convert_stream_full_response(
|
def convert_stream_full_response(
|
||||||
cls, stream_response: Generator[AppStreamResponse, None, None]
|
cls, stream_response: Generator[AppStreamResponse, None, None]
|
||||||
) -> Generator[dict | str, None, None]:
|
) -> Generator[dict[str, Any] | str, None, None]:
|
||||||
"""
|
"""
|
||||||
Convert stream full response.
|
Convert stream full response.
|
||||||
:param stream_response: stream response
|
:param stream_response: stream response
|
||||||
@ -66,7 +66,7 @@ class WorkflowAppGenerateResponseConverter(AppGenerateResponseConverter):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def convert_stream_simple_response(
|
def convert_stream_simple_response(
|
||||||
cls, stream_response: Generator[AppStreamResponse, None, None]
|
cls, stream_response: Generator[AppStreamResponse, None, None]
|
||||||
) -> Generator[dict | str, None, None]:
|
) -> Generator[dict[str, Any] | str, None, None]:
|
||||||
"""
|
"""
|
||||||
Convert stream simple response.
|
Convert stream simple response.
|
||||||
:param stream_response: stream response
|
:param stream_response: stream response
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
from collections.abc import Generator
|
from collections.abc import Generator
|
||||||
from typing import cast
|
from typing import Any, cast
|
||||||
|
|
||||||
from core.app.apps.base_app_generate_response_converter import AppGenerateResponseConverter
|
from core.app.apps.base_app_generate_response_converter import AppGenerateResponseConverter
|
||||||
from core.app.entities.task_entities import (
|
from core.app.entities.task_entities import (
|
||||||
@ -37,7 +37,7 @@ class WorkflowAppGenerateResponseConverter(AppGenerateResponseConverter):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def convert_stream_full_response(
|
def convert_stream_full_response(
|
||||||
cls, stream_response: Generator[AppStreamResponse, None, None]
|
cls, stream_response: Generator[AppStreamResponse, None, None]
|
||||||
) -> Generator[dict | str, None, None]:
|
) -> Generator[dict[str, Any] | str, None, None]:
|
||||||
"""
|
"""
|
||||||
Convert stream full response.
|
Convert stream full response.
|
||||||
:param stream_response: stream response
|
:param stream_response: stream response
|
||||||
@ -66,7 +66,7 @@ class WorkflowAppGenerateResponseConverter(AppGenerateResponseConverter):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def convert_stream_simple_response(
|
def convert_stream_simple_response(
|
||||||
cls, stream_response: Generator[AppStreamResponse, None, None]
|
cls, stream_response: Generator[AppStreamResponse, None, None]
|
||||||
) -> Generator[dict | str, None, None]:
|
) -> Generator[dict[str, Any] | str, None, None]:
|
||||||
"""
|
"""
|
||||||
Convert stream simple response.
|
Convert stream simple response.
|
||||||
:param stream_response: stream response
|
:param stream_response: stream response
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
import tempfile
|
import tempfile
|
||||||
from binascii import hexlify, unhexlify
|
from binascii import hexlify, unhexlify
|
||||||
from collections.abc import Generator
|
from collections.abc import Generator
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
from graphon.model_runtime.entities.llm_entities import (
|
from graphon.model_runtime.entities.llm_entities import (
|
||||||
LLMResult,
|
LLMResult,
|
||||||
@ -226,7 +227,7 @@ class PluginModelBackwardsInvocation(BaseBackwardsInvocation):
|
|||||||
# invoke model
|
# invoke model
|
||||||
response = model_instance.invoke_tts(content_text=payload.content_text, voice=payload.voice)
|
response = model_instance.invoke_tts(content_text=payload.content_text, voice=payload.voice)
|
||||||
|
|
||||||
def handle() -> Generator[dict, None, None]:
|
def handle() -> Generator[dict[str, Any], None, None]:
|
||||||
for chunk in response:
|
for chunk in response:
|
||||||
yield {"result": hexlify(chunk).decode("utf-8")}
|
yield {"result": hexlify(chunk).decode("utf-8")}
|
||||||
|
|
||||||
|
|||||||
@ -329,7 +329,7 @@ class EnterpriseMetricHandler:
|
|||||||
return
|
return
|
||||||
|
|
||||||
include_content = exporter.include_content
|
include_content = exporter.include_content
|
||||||
attrs: dict = {
|
attrs: dict[str, Any] = {
|
||||||
"dify.message.id": payload.get("message_id"),
|
"dify.message.id": payload.get("message_id"),
|
||||||
"dify.tenant_id": envelope.tenant_id,
|
"dify.tenant_id": envelope.tenant_id,
|
||||||
"dify.event.id": envelope.event_id,
|
"dify.event.id": envelope.event_id,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user