Merge branch 'main' into 3-23-lazy-load

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

api/README.md

@@ -42,7 +42,7 @@ The scripts resolve paths relative to their location, so you can run them from a
 
 1. Set up your application by visiting `http://localhost:3000`.
 
-1. Optional: start the worker service (async tasks, runs from `api`).
+1. Start the worker service (async and scheduler tasks, runs from `api`).
 
    ```bash
    ./dev/start-worker
@@ -54,87 +54,6 @@ The scripts resolve paths relative to their location, so you can run them from a
    ./dev/start-beat
    ```
 
-### Manual commands
-
-<details>
-<summary>Show manual setup and run steps</summary>
-
-These commands assume you start from the repository root.
-
-1. Start the docker-compose stack.
-
-   The backend requires middleware, including PostgreSQL, Redis, and Weaviate, which can be started together using `docker-compose`.
-
-   ```bash
-   cp docker/middleware.env.example docker/middleware.env
-   # Use mysql or another vector database profile if you are not using postgres/weaviate.
-   docker compose -f docker/docker-compose.middleware.yaml --profile postgresql --profile weaviate -p dify up -d
-   ```
-
-1. Copy env files.
-
-   ```bash
-   cp api/.env.example api/.env
-   cp web/.env.example web/.env.local
-   ```
-
-1. Install UV if needed.
-
-   ```bash
-   pip install uv
-   # Or on macOS
-   brew install uv
-   ```
-
-1. Install API dependencies.
-
-   ```bash
-   cd api
-   uv sync --group dev
-   ```
-
-1. Install web dependencies.
-
-   ```bash
-   cd web
-   pnpm install
-   cd ..
-   ```
-
-1. Start backend (runs migrations first, in a new terminal).
-
-   ```bash
-   cd api
-   uv run flask db upgrade
-   uv run flask run --host 0.0.0.0 --port=5001 --debug
-   ```
-
-1. Start Dify [web](../web) service (in a new terminal).
-
-   ```bash
-   cd web
-   pnpm dev:inspect
-   ```
-
-1. Set up your application by visiting `http://localhost:3000`.
-
-1. Optional: start the worker service (async tasks, in a new terminal).
-
-   ```bash
-   cd api
-   # Note: enterprise_telemetry queue is only used in Enterprise Edition
-   uv run celery -A app.celery worker -P threads -c 2 --loglevel INFO -Q dataset,priority_dataset,priority_pipeline,pipeline,mail,ops_trace,app_deletion,plugin,workflow_storage,conversation,workflow,schedule_poller,schedule_executor,triggered_workflow_dispatcher,trigger_refresh_executor,retention,enterprise_telemetry
-   ```
-
-1. Optional: start Celery Beat (scheduled tasks, in a new terminal).
-
-   ```bash
-   cd api
-   uv run celery -A app.celery beat
-   ```
-
-</details>
-
 ### Environment notes
 
 > [!IMPORTANT]

api/app_factory.py

@@ -143,7 +143,6 @@ def initialize_extensions(app: DifyApp):
         ext_commands,
         ext_compress,
         ext_database,
-        ext_enterprise_telemetry,
         ext_fastopenapi,
         ext_forward_refs,
         ext_hosting_provider,
@@ -194,7 +193,6 @@ def initialize_extensions(app: DifyApp):
         ext_commands,
         ext_fastopenapi,
         ext_otel,
-        ext_enterprise_telemetry,
         ext_request_logging,
         ext_session_factory,
     ]

api/configs/app_config.py

@@ -8,7 +8,7 @@ from pydantic_settings import BaseSettings, PydanticBaseSettingsSource, Settings
 from libs.file_utils import search_file_upwards
 
 from .deploy import DeploymentConfig
-from .enterprise import EnterpriseFeatureConfig, EnterpriseTelemetryConfig
+from .enterprise import EnterpriseFeatureConfig
 from .extra import ExtraServiceConfig
 from .feature import FeatureConfig
 from .middleware import MiddlewareConfig
@@ -73,8 +73,6 @@ class DifyConfig(
     # Enterprise feature configs
     # **Before using, please contact business@dify.ai by email to inquire about licensing matters.**
     EnterpriseFeatureConfig,
-    # Enterprise telemetry configs
-    EnterpriseTelemetryConfig,
 ):
     model_config = SettingsConfigDict(
         # read from dotenv format config file

api/configs/enterprise/__init__.py

@@ -22,49 +22,3 @@ class EnterpriseFeatureConfig(BaseSettings):
     ENTERPRISE_REQUEST_TIMEOUT: int = Field(
         ge=1, description="Maximum timeout in seconds for enterprise requests", default=5
     )
-
-
-class EnterpriseTelemetryConfig(BaseSettings):
-    """
-    Configuration for enterprise telemetry.
-    """
-
-    ENTERPRISE_TELEMETRY_ENABLED: bool = Field(
-        description="Enable enterprise telemetry collection (also requires ENTERPRISE_ENABLED=true).",
-        default=False,
-    )
-
-    ENTERPRISE_OTLP_ENDPOINT: str = Field(
-        description="Enterprise OTEL collector endpoint.",
-        default="",
-    )
-
-    ENTERPRISE_OTLP_HEADERS: str = Field(
-        description="Auth headers for OTLP export (key=value,key2=value2).",
-        default="",
-    )
-
-    ENTERPRISE_OTLP_PROTOCOL: str = Field(
-        description="OTLP protocol: 'http' or 'grpc' (default: http).",
-        default="http",
-    )
-
-    ENTERPRISE_OTLP_API_KEY: str = Field(
-        description="Bearer token for enterprise OTLP export authentication.",
-        default="",
-    )
-
-    ENTERPRISE_INCLUDE_CONTENT: bool = Field(
-        description="Include input/output content in traces (privacy toggle).",
-        default=True,
-    )
-
-    ENTERPRISE_SERVICE_NAME: str = Field(
-        description="Service name for OTEL resource.",
-        default="dify",
-    )
-
-    ENTERPRISE_OTEL_SAMPLING_RATE: float = Field(
-        description="Sampling rate for enterprise traces (0.0 to 1.0, default 1.0 = 100%).",
-        default=1.0,
-    )

api/core/app/apps/workflow/app_generator.py

@@ -159,12 +159,9 @@ class WorkflowAppGenerator(BaseAppGenerator):
 
         inputs: Mapping[str, Any] = args["inputs"]
 
-        extras: dict[str, Any] = {
+        extras = {
             **extract_external_trace_id_from_args(args),
         }
-        parent_trace_context = args.get("_parent_trace_context")
-        if parent_trace_context:
-            extras["parent_trace_context"] = parent_trace_context
         workflow_run_id = str(workflow_run_id or uuid.uuid4())
         # FIXME (Yeuoly): we need to remove the SKIP_PREPARE_USER_INPUTS_KEY from the args
         # trigger shouldn't prepare user inputs

api/core/llm_generator/entities.py

@@ -9,7 +9,6 @@ class RuleGeneratePayload(BaseModel):
     instruction: str = Field(..., description="Rule generation instruction")
     model_config_data: ModelConfig = Field(..., alias="model_config", description="Model configuration")
     no_variable: bool = Field(default=False, description="Whether to exclude variables")
-    app_id: str | None = Field(default=None, description="App ID for prompt generation tracing")
 
 
 class RuleCodeGeneratePayload(RuleGeneratePayload):
@@ -19,4 +18,3 @@ class RuleCodeGeneratePayload(RuleGeneratePayload):
 class RuleStructuredOutputPayload(BaseModel):
     instruction: str = Field(..., description="Structured output generation instruction")
     model_config_data: ModelConfig = Field(..., alias="model_config", description="Model configuration")
-    app_id: str | None = Field(default=None, description="App ID for prompt generation tracing")

api/core/ops/entities/trace_entity.py

@@ -9,8 +9,8 @@ from pydantic import BaseModel, ConfigDict, field_serializer, field_validator
 class BaseTraceInfo(BaseModel):
     message_id: str | None = None
     message_data: Any | None = None
-    inputs: Union[str, dict[str, Any], list[Any]] | None = None
-    outputs: Union[str, dict[str, Any], list[Any]] | None = None
+    inputs: Union[str, dict[str, Any], list] | None = None
+    outputs: Union[str, dict[str, Any], list] | None = None
     start_time: datetime | None = None
     end_time: datetime | None = None
     metadata: dict[str, Any]
@@ -18,7 +18,7 @@ class BaseTraceInfo(BaseModel):
 
     @field_validator("inputs", "outputs")
     @classmethod
-    def ensure_type(cls, v: str | dict[str, Any] | list[Any] | None) -> str | dict[str, Any] | list[Any] | None:
+    def ensure_type(cls, v):
         if v is None:
             return None
         if isinstance(v, str | dict | list):
@@ -27,48 +27,6 @@ class BaseTraceInfo(BaseModel):
 
     model_config = ConfigDict(protected_namespaces=())
 
-    @property
-    def resolved_trace_id(self) -> str | None:
-        """Get trace_id with intelligent fallback.
-
-        Priority:
-        1. External trace_id (from X-Trace-Id header)
-        2. workflow_run_id (if this trace type has it)
-        3. message_id (as final fallback)
-        """
-        if self.trace_id:
-            return self.trace_id
-
-        # Try workflow_run_id (only exists on workflow-related traces)
-        workflow_run_id = getattr(self, "workflow_run_id", None)
-        if workflow_run_id:
-            return workflow_run_id
-
-        # Final fallback to message_id
-        return str(self.message_id) if self.message_id else None
-
-    @property
-    def resolved_parent_context(self) -> tuple[str | None, str | None]:
-        """Resolve cross-workflow parent linking from metadata.
-
-        Extracts typed parent IDs from the untyped ``parent_trace_context``
-        metadata dict (set by tool_node when invoking nested workflows).
-
-        Returns:
-            (trace_correlation_override, parent_span_id_source) where
-            trace_correlation_override is the outer workflow_run_id and
-            parent_span_id_source is the outer node_execution_id.
-        """
-        parent_ctx = self.metadata.get("parent_trace_context")
-        if not isinstance(parent_ctx, dict):
-            return None, None
-        trace_override = parent_ctx.get("parent_workflow_run_id")
-        parent_span = parent_ctx.get("parent_node_execution_id")
-        return (
-            trace_override if isinstance(trace_override, str) else None,
-            parent_span if isinstance(parent_span, str) else None,
-        )
-
     @field_serializer("start_time", "end_time")
     def serialize_datetime(self, dt: datetime | None) -> str | None:
         if dt is None:
@@ -90,10 +48,7 @@ class WorkflowTraceInfo(BaseTraceInfo):
     workflow_run_version: str
     error: str | None = None
     total_tokens: int
-    prompt_tokens: int | None = None
-    completion_tokens: int | None = None
     file_list: list[str]
-    invoked_by: str | None = None
     query: str
     metadata: dict[str, Any]
 
@@ -104,7 +59,7 @@ class MessageTraceInfo(BaseTraceInfo):
     answer_tokens: int
     total_tokens: int
     error: str | None = None
-    file_list: Union[str, dict[str, Any], list[Any]] | None = None
+    file_list: Union[str, dict[str, Any], list] | None = None
     message_file_data: Any | None = None
     conversation_mode: str
     gen_ai_server_time_to_first_token: float | None = None
@@ -151,7 +106,7 @@ class ToolTraceInfo(BaseTraceInfo):
     tool_config: dict[str, Any]
     time_cost: Union[int, float]
     tool_parameters: dict[str, Any]
-    file_url: Union[str, None, list[str]] = None
+    file_url: Union[str, None, list] = None
 
 
 class GenerateNameTraceInfo(BaseTraceInfo):
@@ -159,79 +114,6 @@ class GenerateNameTraceInfo(BaseTraceInfo):
     tenant_id: str
 
 
-class PromptGenerationTraceInfo(BaseTraceInfo):
-    """Trace information for prompt generation operations (rule-generate, code-generate, etc.)."""
-
-    tenant_id: str
-    user_id: str
-    app_id: str | None = None
-
-    operation_type: str
-    instruction: str
-
-    prompt_tokens: int
-    completion_tokens: int
-    total_tokens: int
-
-    model_provider: str
-    model_name: str
-
-    latency: float
-
-    total_price: float | None = None
-    currency: str | None = None
-
-    error: str | None = None
-
-    model_config = ConfigDict(protected_namespaces=())
-
-
-class WorkflowNodeTraceInfo(BaseTraceInfo):
-    workflow_id: str
-    workflow_run_id: str
-    tenant_id: str
-    node_execution_id: str
-    node_id: str
-    node_type: str
-    title: str
-
-    status: str
-    error: str | None = None
-    elapsed_time: float
-
-    index: int
-    predecessor_node_id: str | None = None
-
-    total_tokens: int = 0
-    total_price: float = 0.0
-    currency: str | None = None
-
-    model_provider: str | None = None
-    model_name: str | None = None
-    prompt_tokens: int | None = None
-    completion_tokens: int | None = None
-
-    tool_name: str | None = None
-
-    iteration_id: str | None = None
-    iteration_index: int | None = None
-    loop_id: str | None = None
-    loop_index: int | None = None
-    parallel_id: str | None = None
-
-    node_inputs: Mapping[str, Any] | None = None
-    node_outputs: Mapping[str, Any] | None = None
-    process_data: Mapping[str, Any] | None = None
-
-    invoked_by: str | None = None
-
-    model_config = ConfigDict(protected_namespaces=())
-
-
-class DraftNodeExecutionTrace(WorkflowNodeTraceInfo):
-    pass
-
-
 class TaskData(BaseModel):
     app_id: str
     trace_info_type: str
@@ -246,31 +128,11 @@ trace_info_info_map = {
     "DatasetRetrievalTraceInfo": DatasetRetrievalTraceInfo,
     "ToolTraceInfo": ToolTraceInfo,
     "GenerateNameTraceInfo": GenerateNameTraceInfo,
-    "PromptGenerationTraceInfo": PromptGenerationTraceInfo,
-    "WorkflowNodeTraceInfo": WorkflowNodeTraceInfo,
-    "DraftNodeExecutionTrace": DraftNodeExecutionTrace,
 }
 
 
-class OperationType(StrEnum):
-    """Operation type for token metric labels.
-
-    Used as a metric attribute on ``dify.tokens.input`` / ``dify.tokens.output``
-    counters so consumers can break down token usage by operation.
-    """
-
-    WORKFLOW = "workflow"
-    NODE_EXECUTION = "node_execution"
-    MESSAGE = "message"
-    RULE_GENERATE = "rule_generate"
-    CODE_GENERATE = "code_generate"
-    STRUCTURED_OUTPUT = "structured_output"
-    INSTRUCTION_MODIFY = "instruction_modify"
-
-
 class TraceTaskName(StrEnum):
     CONVERSATION_TRACE = "conversation"
-    DRAFT_NODE_EXECUTION_TRACE = "draft_node_execution"
     WORKFLOW_TRACE = "workflow"
     MESSAGE_TRACE = "message"
     MODERATION_TRACE = "moderation"
@@ -278,6 +140,4 @@ class TraceTaskName(StrEnum):
     DATASET_RETRIEVAL_TRACE = "dataset_retrieval"
     TOOL_TRACE = "tool"
     GENERATE_NAME_TRACE = "generate_conversation_name"
-    PROMPT_GENERATION_TRACE = "prompt_generation"
-    NODE_EXECUTION_TRACE = "node_execution"
     DATASOURCE_TRACE = "datasource"

api/core/ops/ops_trace_manager.py

@@ -15,32 +15,22 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
 
 from core.helper.encrypter import batch_decrypt_token, encrypt_token, obfuscated_token
-from core.ops.entities.config_entity import (
-    OPS_FILE_PATH,
-    TracingProviderEnum,
-)
+from core.ops.entities.config_entity import OPS_FILE_PATH, TracingProviderEnum
 from core.ops.entities.trace_entity import (
     DatasetRetrievalTraceInfo,
-    DraftNodeExecutionTrace,
     GenerateNameTraceInfo,
     MessageTraceInfo,
     ModerationTraceInfo,
-    PromptGenerationTraceInfo,
     SuggestedQuestionTraceInfo,
     TaskData,
     ToolTraceInfo,
     TraceTaskName,
-    WorkflowNodeTraceInfo,
     WorkflowTraceInfo,
 )
 from core.ops.utils import get_message_data
-from extensions.ext_database import db
 from extensions.ext_storage import storage
-from models.account import Tenant
-from models.dataset import Dataset
+from models.engine import db
 from models.model import App, AppModelConfig, Conversation, Message, MessageFile, TraceAppConfig
-from models.provider import Provider, ProviderCredential, ProviderModel, ProviderModelCredential, ProviderType
-from models.tools import ApiToolProvider, BuiltinToolProvider, MCPToolProvider, WorkflowToolProvider
 from models.workflow import WorkflowAppLog
 from tasks.ops_trace_task import process_trace_tasks
 
@@ -50,142 +40,9 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
-def _lookup_app_and_workspace_names(app_id: str | None, tenant_id: str | None) -> tuple[str, str]:
-    """Return (app_name, workspace_name) for the given IDs. Falls back to empty strings."""
-    app_name = ""
-    workspace_name = ""
-    if not app_id and not tenant_id:
-        return app_name, workspace_name
-    with Session(db.engine) as session:
-        if app_id:
-            name = session.scalar(select(App.name).where(App.id == app_id))
-            if name:
-                app_name = name
-        if tenant_id:
-            name = session.scalar(select(Tenant.name).where(Tenant.id == tenant_id))
-            if name:
-                workspace_name = name
-    return app_name, workspace_name
-
-
-_PROVIDER_TYPE_TO_MODEL: dict[str, type] = {
-    "builtin": BuiltinToolProvider,
-    "plugin": BuiltinToolProvider,
-    "api": ApiToolProvider,
-    "workflow": WorkflowToolProvider,
-    "mcp": MCPToolProvider,
-}
-
-
-def _lookup_credential_name(credential_id: str | None, provider_type: str | None) -> str:
-    if not credential_id:
-        return ""
-    model_cls = _PROVIDER_TYPE_TO_MODEL.get(provider_type or "")
-    if not model_cls:
-        return ""
-    with Session(db.engine) as session:
-        name = session.scalar(select(model_cls.name).where(model_cls.id == credential_id))  # type: ignore[attr-defined]
-        return str(name) if name else ""
-
-
-def _lookup_llm_credential_info(
-    tenant_id: str | None, provider: str | None, model: str | None, model_type: str | None = "llm"
-) -> tuple[str | None, str]:
-    """
-    Lookup LLM credential ID and name for the given provider and model.
-    Returns (credential_id, credential_name).
-
-    Handles async timing issues gracefully - if credential is deleted between lookups,
-    returns the ID but empty name rather than failing.
-    """
-    if not tenant_id or not provider:
-        return None, ""
-
-    try:
-        with Session(db.engine) as session:
-            # Try to find provider-level or model-level configuration
-            provider_record = session.scalar(
-                select(Provider).where(
-                    Provider.tenant_id == tenant_id,
-                    Provider.provider_name == provider,
-                    Provider.provider_type == ProviderType.CUSTOM,
-                )
-            )
-
-            if not provider_record:
-                return None, ""
-
-            # Check if there's a model-specific config
-            credential_id = None
-            credential_name = ""
-            is_model_level = False
-
-            if model:
-                # Try model-level first
-                model_record = session.scalar(
-                    select(ProviderModel).where(
-                        ProviderModel.tenant_id == tenant_id,
-                        ProviderModel.provider_name == provider,
-                        ProviderModel.model_name == model,
-                        ProviderModel.model_type == model_type,
-                    )
-                )
-
-                if model_record and model_record.credential_id:
-                    credential_id = model_record.credential_id
-                    is_model_level = True
-
-            if not credential_id and provider_record.credential_id:
-                # Fall back to provider-level credential
-                credential_id = provider_record.credential_id
-                is_model_level = False
-
-            # Lookup credential_name if we have credential_id
-            if credential_id:
-                try:
-                    if is_model_level:
-                        # Query ProviderModelCredential
-                        cred_name = session.scalar(
-                            select(ProviderModelCredential.credential_name).where(
-                                ProviderModelCredential.id == credential_id
-                            )
-                        )
-                    else:
-                        # Query ProviderCredential
-                        cred_name = session.scalar(
-                            select(ProviderCredential.credential_name).where(ProviderCredential.id == credential_id)
-                        )
-
-                    if cred_name:
-                        credential_name = str(cred_name)
-                except Exception as e:
-                    # Credential might have been deleted between lookups (async timing)
-                    # Return ID but empty name rather than failing
-                    logger.warning(
-                        "Failed to lookup credential name for credential_id=%s (provider=%s, model=%s): %s",
-                        credential_id,
-                        provider,
-                        model,
-                        str(e),
-                    )
-
-            return credential_id, credential_name
-    except Exception as e:
-        # Database query failed or other unexpected error
-        # Return empty rather than propagating error to telemetry emission
-        logger.warning(
-            "Failed to lookup LLM credential info for tenant_id=%s, provider=%s, model=%s: %s",
-            tenant_id,
-            provider,
-            model,
-            str(e),
-        )
-        return None, ""
-
-
 class OpsTraceProviderConfigMap(collections.UserDict[str, dict[str, Any]]):
-    def __getitem__(self, provider: str) -> dict[str, Any]:
-        match provider:
+    def __getitem__(self, key: str) -> dict[str, Any]:
+        match key:
             case TracingProviderEnum.LANGFUSE:
                 from core.ops.entities.config_entity import LangfuseConfig
                 from core.ops.langfuse_trace.langfuse_trace import LangFuseDataTrace
@@ -292,7 +149,7 @@ class OpsTraceProviderConfigMap(collections.UserDict[str, dict[str, Any]]):
                 }
 
             case _:
-                raise KeyError(f"Unsupported tracing provider: {provider}")
+                raise KeyError(f"Unsupported tracing provider: {key}")
 
 
 provider_config_map = OpsTraceProviderConfigMap()
@@ -457,10 +314,6 @@ class OpsTraceManager:
         if app_id is None:
             return None
 
-        # Handle storage_id format (tenant-{uuid}) - not a real app_id
-        if isinstance(app_id, str) and app_id.startswith("tenant-"):
-            return None
-
         app: App | None = db.session.query(App).where(App.id == app_id).first()
 
         if app is None:
@@ -613,6 +466,8 @@ class TraceTask:
 
     @classmethod
     def _get_workflow_run_repo(cls):
+        from repositories.factory import DifyAPIRepositoryFactory
+
         if cls._workflow_run_repo is None:
             with cls._repo_lock:
                 if cls._workflow_run_repo is None:
@@ -623,56 +478,6 @@ class TraceTask:
                     cls._workflow_run_repo = DifyAPIRepositoryFactory.create_api_workflow_run_repository(session_maker)
         return cls._workflow_run_repo
 
-    @classmethod
-    def _get_user_id_from_metadata(cls, metadata: dict[str, Any]) -> str:
-        """Extract user ID from metadata, prioritizing end_user over account.
-
-        Returns the actual user ID (end_user or account) who invoked the workflow,
-        regardless of invoke_from context.
-        """
-        # Priority 1: End user (external users via API/WebApp)
-        if user_id := metadata.get("from_end_user_id"):
-            return f"end_user:{user_id}"
-
-        # Priority 2: Account user (internal users via console/debugger)
-        if user_id := metadata.get("from_account_id"):
-            return f"account:{user_id}"
-
-        # Priority 3: User (internal users via console/debugger)
-        if user_id := metadata.get("user_id"):
-            return f"user:{user_id}"
-
-        return "anonymous"
-
-    @classmethod
-    def _calculate_workflow_token_split(cls, workflow_run_id: str, tenant_id: str) -> tuple[int, int]:
-        from dify_graph.enums import WorkflowNodeExecutionMetadataKey
-        from models.workflow import WorkflowNodeExecutionModel
-
-        with Session(db.engine) as session:
-            node_executions = session.scalars(
-                select(WorkflowNodeExecutionModel).where(
-                    WorkflowNodeExecutionModel.tenant_id == tenant_id,
-                    WorkflowNodeExecutionModel.workflow_run_id == workflow_run_id,
-                )
-            ).all()
-
-            total_prompt = 0
-            total_completion = 0
-
-            for node_exec in node_executions:
-                metadata = node_exec.execution_metadata_dict
-
-                prompt = metadata.get(WorkflowNodeExecutionMetadataKey.PROMPT_TOKENS)
-                if prompt is not None:
-                    total_prompt += prompt
-
-                completion = metadata.get(WorkflowNodeExecutionMetadataKey.COMPLETION_TOKENS)
-                if completion is not None:
-                    total_completion += completion
-
-            return (total_prompt, total_completion)
-
     def __init__(
         self,
         trace_type: Any,
@@ -693,8 +498,6 @@ class TraceTask:
         self.app_id = None
         self.trace_id = None
         self.kwargs = kwargs
-        if user_id is not None and "user_id" not in self.kwargs:
-            self.kwargs["user_id"] = user_id
         external_trace_id = kwargs.get("external_trace_id")
         if external_trace_id:
             self.trace_id = external_trace_id
@@ -708,7 +511,7 @@ class TraceTask:
             TraceTaskName.WORKFLOW_TRACE: lambda: self.workflow_trace(
                 workflow_run_id=self.workflow_run_id, conversation_id=self.conversation_id, user_id=self.user_id
             ),
-            TraceTaskName.MESSAGE_TRACE: lambda: self.message_trace(message_id=self.message_id, **self.kwargs),
+            TraceTaskName.MESSAGE_TRACE: lambda: self.message_trace(message_id=self.message_id),
             TraceTaskName.MODERATION_TRACE: lambda: self.moderation_trace(
                 message_id=self.message_id, timer=self.timer, **self.kwargs
             ),
@@ -724,9 +527,6 @@ class TraceTask:
             TraceTaskName.GENERATE_NAME_TRACE: lambda: self.generate_name_trace(
                 conversation_id=self.conversation_id, timer=self.timer, **self.kwargs
             ),
-            TraceTaskName.PROMPT_GENERATION_TRACE: lambda: self.prompt_generation_trace(**self.kwargs),
-            TraceTaskName.NODE_EXECUTION_TRACE: lambda: self.node_execution_trace(**self.kwargs),
-            TraceTaskName.DRAFT_NODE_EXECUTION_TRACE: lambda: self.draft_node_execution_trace(**self.kwargs),
         }
 
         return preprocess_map.get(self.trace_type, lambda: None)()
@@ -762,10 +562,6 @@ class TraceTask:
 
         total_tokens = workflow_run.total_tokens
 
-        prompt_tokens, completion_tokens = self._calculate_workflow_token_split(
-            workflow_run_id=workflow_run_id, tenant_id=tenant_id
-        )
-
         file_list = workflow_run_inputs.get("sys.file") or []
         query = workflow_run_inputs.get("query") or workflow_run_inputs.get("sys.query") or ""
 
@@ -786,14 +582,7 @@ class TraceTask:
                 )
                 message_id = session.scalar(message_data_stmt)
 
-        from core.telemetry.gateway import is_enterprise_telemetry_enabled
-
-        if is_enterprise_telemetry_enabled():
-            app_name, workspace_name = _lookup_app_and_workspace_names(workflow_run.app_id, tenant_id)
-        else:
-            app_name, workspace_name = "", ""
-
-        metadata: dict[str, Any] = {
+        metadata = {
             "workflow_id": workflow_id,
             "conversation_id": conversation_id,
             "workflow_run_id": workflow_run_id,
@@ -806,14 +595,8 @@ class TraceTask:
             "triggered_from": workflow_run.triggered_from,
             "user_id": user_id,
             "app_id": workflow_run.app_id,
-            "app_name": app_name,
-            "workspace_name": workspace_name,
         }
 
-        parent_trace_context = self.kwargs.get("parent_trace_context")
-        if parent_trace_context:
-            metadata["parent_trace_context"] = parent_trace_context
-
         workflow_trace_info = WorkflowTraceInfo(
             trace_id=self.trace_id,
             workflow_data=workflow_run.to_dict(),
@@ -828,8 +611,6 @@ class TraceTask:
             workflow_run_version=workflow_run_version,
             error=error,
             total_tokens=total_tokens,
-            prompt_tokens=prompt_tokens,
-            completion_tokens=completion_tokens,
             file_list=file_list,
             query=query,
             metadata=metadata,
@@ -837,11 +618,10 @@ class TraceTask:
             message_id=message_id,
             start_time=workflow_run.created_at,
             end_time=workflow_run.finished_at,
-            invoked_by=self._get_user_id_from_metadata(metadata),
         )
         return workflow_trace_info
 
-    def message_trace(self, message_id: str | None, **kwargs):
+    def message_trace(self, message_id: str | None):
         if not message_id:
             return {}
         message_data = get_message_data(message_id)
@@ -864,19 +644,6 @@ class TraceTask:
 
         streaming_metrics = self._extract_streaming_metrics(message_data)
 
-        tenant_id = ""
-        with Session(db.engine) as session:
-            tid = session.scalar(select(App.tenant_id).where(App.id == message_data.app_id))
-            if tid:
-                tenant_id = str(tid)
-
-        from core.telemetry.gateway import is_enterprise_telemetry_enabled
-
-        if is_enterprise_telemetry_enabled():
-            app_name, workspace_name = _lookup_app_and_workspace_names(message_data.app_id, tenant_id)
-        else:
-            app_name, workspace_name = "", ""
-
         metadata = {
             "conversation_id": message_data.conversation_id,
             "ls_provider": message_data.model_provider,
@@ -888,14 +655,7 @@ class TraceTask:
             "workflow_run_id": message_data.workflow_run_id,
             "from_source": message_data.from_source,
             "message_id": message_id,
-            "tenant_id": tenant_id,
-            "app_id": message_data.app_id,
-            "user_id": message_data.from_end_user_id or message_data.from_account_id,
-            "app_name": app_name,
-            "workspace_name": workspace_name,
         }
-        if node_execution_id := kwargs.get("node_execution_id"):
-            metadata["node_execution_id"] = node_execution_id
 
         message_tokens = message_data.message_tokens
 
@@ -912,9 +672,7 @@ class TraceTask:
             outputs=message_data.answer,
             file_list=file_list,
             start_time=created_at,
-            end_time=message_data.updated_at
-            if message_data.updated_at and message_data.updated_at > created_at
-            else created_at + timedelta(seconds=message_data.provider_response_latency),
+            end_time=created_at + timedelta(seconds=message_data.provider_response_latency),
             metadata=metadata,
             message_file_data=message_file_data,
             conversation_mode=conversation_mode,
@@ -939,8 +697,6 @@ class TraceTask:
             "preset_response": moderation_result.preset_response,
             "query": moderation_result.query,
         }
-        if node_execution_id := kwargs.get("node_execution_id"):
-            metadata["node_execution_id"] = node_execution_id
 
         # get workflow_app_log_id
         workflow_app_log_id = None
@@ -982,8 +738,6 @@ class TraceTask:
             "workflow_run_id": message_data.workflow_run_id,
             "from_source": message_data.from_source,
         }
-        if node_execution_id := kwargs.get("node_execution_id"):
-            metadata["node_execution_id"] = node_execution_id
 
         # get workflow_app_log_id
         workflow_app_log_id = None
@@ -1023,52 +777,6 @@ class TraceTask:
         if not message_data:
             return {}
 
-        tenant_id = ""
-        with Session(db.engine) as session:
-            tid = session.scalar(select(App.tenant_id).where(App.id == message_data.app_id))
-            if tid:
-                tenant_id = str(tid)
-
-        from core.telemetry.gateway import is_enterprise_telemetry_enabled
-
-        if is_enterprise_telemetry_enabled():
-            app_name, workspace_name = _lookup_app_and_workspace_names(message_data.app_id, tenant_id)
-        else:
-            app_name, workspace_name = "", ""
-
-        doc_list = [doc.model_dump() for doc in documents] if documents else []
-        dataset_ids: set[str] = set()
-        for doc in doc_list:
-            doc_meta = doc.get("metadata") or {}
-            did = doc_meta.get("dataset_id")
-            if did:
-                dataset_ids.add(did)
-
-        embedding_models: dict[str, dict[str, str]] = {}
-        if dataset_ids:
-            with Session(db.engine) as session:
-                rows = session.execute(
-                    select(Dataset.id, Dataset.embedding_model, Dataset.embedding_model_provider).where(
-                        Dataset.id.in_(list(dataset_ids))
-                    )
-                ).all()
-                for row in rows:
-                    embedding_models[str(row[0])] = {
-                        "embedding_model": row[1] or "",
-                        "embedding_model_provider": row[2] or "",
-                    }
-
-        # Extract rerank model info from retrieval_model kwargs
-        rerank_model_provider = ""
-        rerank_model_name = ""
-        if "retrieval_model" in kwargs:
-            retrieval_model = kwargs["retrieval_model"]
-            if isinstance(retrieval_model, dict):
-                reranking_model = retrieval_model.get("reranking_model")
-                if isinstance(reranking_model, dict):
-                    rerank_model_provider = reranking_model.get("reranking_provider_name", "")
-                    rerank_model_name = reranking_model.get("reranking_model_name", "")
-
         metadata = {
             "message_id": message_id,
             "ls_provider": message_data.model_provider,
@@ -1079,23 +787,13 @@ class TraceTask:
             "agent_based": message_data.agent_based,
             "workflow_run_id": message_data.workflow_run_id,
             "from_source": message_data.from_source,
-            "tenant_id": tenant_id,
-            "app_id": message_data.app_id,
-            "user_id": message_data.from_end_user_id or message_data.from_account_id,
-            "app_name": app_name,
-            "workspace_name": workspace_name,
-            "embedding_models": embedding_models,
-            "rerank_model_provider": rerank_model_provider,
-            "rerank_model_name": rerank_model_name,
         }
-        if node_execution_id := kwargs.get("node_execution_id"):
-            metadata["node_execution_id"] = node_execution_id
 
         dataset_retrieval_trace_info = DatasetRetrievalTraceInfo(
             trace_id=self.trace_id,
             message_id=message_id,
             inputs=message_data.query or message_data.inputs,
-            documents=doc_list,
+            documents=[doc.model_dump() for doc in documents] if documents else [],
             start_time=timer.get("start"),
             end_time=timer.get("end"),
             metadata=metadata,
@@ -1138,10 +836,6 @@ class TraceTask:
             "error": error,
             "tool_parameters": tool_parameters,
         }
-        if message_data.workflow_run_id:
-            metadata["workflow_run_id"] = message_data.workflow_run_id
-        if node_execution_id := kwargs.get("node_execution_id"):
-            metadata["node_execution_id"] = node_execution_id
 
         file_url = ""
         message_file_data = db.session.query(MessageFile).filter_by(message_id=message_id).first()
@@ -1196,8 +890,6 @@ class TraceTask:
             "conversation_id": conversation_id,
             "tenant_id": tenant_id,
         }
-        if node_execution_id := kwargs.get("node_execution_id"):
-            metadata["node_execution_id"] = node_execution_id
 
         generate_name_trace_info = GenerateNameTraceInfo(
             trace_id=self.trace_id,
@@ -1212,182 +904,6 @@ class TraceTask:
 
         return generate_name_trace_info
 
-    def prompt_generation_trace(self, **kwargs) -> PromptGenerationTraceInfo | dict:
-        tenant_id = kwargs.get("tenant_id", "")
-        user_id = kwargs.get("user_id", "")
-        app_id = kwargs.get("app_id")
-        operation_type = kwargs.get("operation_type", "")
-        instruction = kwargs.get("instruction", "")
-        generated_output = kwargs.get("generated_output", "")
-
-        prompt_tokens = kwargs.get("prompt_tokens", 0)
-        completion_tokens = kwargs.get("completion_tokens", 0)
-        total_tokens = kwargs.get("total_tokens", 0)
-
-        model_provider = kwargs.get("model_provider", "")
-        model_name = kwargs.get("model_name", "")
-
-        latency = kwargs.get("latency", 0.0)
-
-        timer = kwargs.get("timer")
-        start_time = timer.get("start") if timer else None
-        end_time = timer.get("end") if timer else None
-
-        total_price = kwargs.get("total_price")
-        currency = kwargs.get("currency")
-
-        error = kwargs.get("error")
-
-        app_name = None
-        workspace_name = None
-        if app_id:
-            app_name, workspace_name = _lookup_app_and_workspace_names(app_id, tenant_id)
-
-        metadata = {
-            "tenant_id": tenant_id,
-            "user_id": user_id,
-            "app_id": app_id or "",
-            "app_name": app_name,
-            "workspace_name": workspace_name,
-            "operation_type": operation_type,
-            "model_provider": model_provider,
-            "model_name": model_name,
-        }
-        if node_execution_id := kwargs.get("node_execution_id"):
-            metadata["node_execution_id"] = node_execution_id
-
-        return PromptGenerationTraceInfo(
-            trace_id=self.trace_id,
-            inputs=instruction,
-            outputs=generated_output,
-            start_time=start_time,
-            end_time=end_time,
-            metadata=metadata,
-            tenant_id=tenant_id,
-            user_id=user_id,
-            app_id=app_id,
-            operation_type=operation_type,
-            instruction=instruction,
-            prompt_tokens=prompt_tokens,
-            completion_tokens=completion_tokens,
-            total_tokens=total_tokens,
-            model_provider=model_provider,
-            model_name=model_name,
-            latency=latency,
-            total_price=total_price,
-            currency=currency,
-            error=error,
-        )
-
-    def node_execution_trace(self, **kwargs) -> WorkflowNodeTraceInfo | dict:
-        node_data: dict = kwargs.get("node_execution_data", {})
-        if not node_data:
-            return {}
-
-        from core.telemetry.gateway import is_enterprise_telemetry_enabled
-
-        if is_enterprise_telemetry_enabled():
-            app_name, workspace_name = _lookup_app_and_workspace_names(
-                node_data.get("app_id"), node_data.get("tenant_id")
-            )
-        else:
-            app_name, workspace_name = "", ""
-
-        # Try tool credential lookup first
-        credential_id = node_data.get("credential_id")
-        if is_enterprise_telemetry_enabled():
-            credential_name = _lookup_credential_name(credential_id, node_data.get("credential_provider_type"))
-            # If no credential_id found (e.g., LLM nodes), try LLM credential lookup
-            if not credential_id:
-                llm_cred_id, llm_cred_name = _lookup_llm_credential_info(
-                    tenant_id=node_data.get("tenant_id"),
-                    provider=node_data.get("model_provider"),
-                    model=node_data.get("model_name"),
-                    model_type="llm",
-                )
-                if llm_cred_id:
-                    credential_id = llm_cred_id
-                    credential_name = llm_cred_name
-        else:
-            credential_name = ""
-        metadata: dict[str, Any] = {
-            "tenant_id": node_data.get("tenant_id"),
-            "app_id": node_data.get("app_id"),
-            "app_name": app_name,
-            "workspace_name": workspace_name,
-            "user_id": node_data.get("user_id"),
-            "invoke_from": node_data.get("invoke_from"),
-            "credential_id": credential_id,
-            "credential_name": credential_name,
-            "dataset_ids": node_data.get("dataset_ids"),
-            "dataset_names": node_data.get("dataset_names"),
-            "plugin_name": node_data.get("plugin_name"),
-        }
-
-        parent_trace_context = node_data.get("parent_trace_context")
-        if parent_trace_context:
-            metadata["parent_trace_context"] = parent_trace_context
-
-        message_id: str | None = None
-        conversation_id = node_data.get("conversation_id")
-        workflow_execution_id = node_data.get("workflow_execution_id")
-        if conversation_id and workflow_execution_id and not parent_trace_context:
-            with Session(db.engine) as session:
-                msg_id = session.scalar(
-                    select(Message.id).where(
-                        Message.conversation_id == conversation_id,
-                        Message.workflow_run_id == workflow_execution_id,
-                    )
-                )
-                if msg_id:
-                    message_id = str(msg_id)
-                    metadata["message_id"] = message_id
-            if conversation_id:
-                metadata["conversation_id"] = conversation_id
-
-        return WorkflowNodeTraceInfo(
-            trace_id=self.trace_id,
-            message_id=message_id,
-            start_time=node_data.get("created_at"),
-            end_time=node_data.get("finished_at"),
-            metadata=metadata,
-            workflow_id=node_data.get("workflow_id", ""),
-            workflow_run_id=node_data.get("workflow_execution_id", ""),
-            tenant_id=node_data.get("tenant_id", ""),
-            node_execution_id=node_data.get("node_execution_id", ""),
-            node_id=node_data.get("node_id", ""),
-            node_type=node_data.get("node_type", ""),
-            title=node_data.get("title", ""),
-            status=node_data.get("status", ""),
-            error=node_data.get("error"),
-            elapsed_time=node_data.get("elapsed_time", 0.0),
-            index=node_data.get("index", 0),
-            predecessor_node_id=node_data.get("predecessor_node_id"),
-            total_tokens=node_data.get("total_tokens", 0),
-            total_price=node_data.get("total_price", 0.0),
-            currency=node_data.get("currency"),
-            model_provider=node_data.get("model_provider"),
-            model_name=node_data.get("model_name"),
-            prompt_tokens=node_data.get("prompt_tokens"),
-            completion_tokens=node_data.get("completion_tokens"),
-            tool_name=node_data.get("tool_name"),
-            iteration_id=node_data.get("iteration_id"),
-            iteration_index=node_data.get("iteration_index"),
-            loop_id=node_data.get("loop_id"),
-            loop_index=node_data.get("loop_index"),
-            parallel_id=node_data.get("parallel_id"),
-            node_inputs=node_data.get("node_inputs"),
-            node_outputs=node_data.get("node_outputs"),
-            process_data=node_data.get("process_data"),
-            invoked_by=self._get_user_id_from_metadata(metadata),
-        )
-
-    def draft_node_execution_trace(self, **kwargs) -> DraftNodeExecutionTrace | dict:
-        node_trace = self.node_execution_trace(**kwargs)
-        if not isinstance(node_trace, WorkflowNodeTraceInfo):
-            return node_trace
-        return DraftNodeExecutionTrace(**node_trace.model_dump())
-
     def _extract_streaming_metrics(self, message_data) -> dict:
         if not message_data.message_metadata:
             return {}
@@ -1421,17 +937,13 @@ class TraceQueueManager:
         self.user_id = user_id
         self.trace_instance = OpsTraceManager.get_ops_trace_instance(app_id)
         self.flask_app = current_app._get_current_object()  # type: ignore
-
-        from core.telemetry.gateway import is_enterprise_telemetry_enabled
-
-        self._enterprise_telemetry_enabled = is_enterprise_telemetry_enabled()
         if trace_manager_timer is None:
             self.start_timer()
 
     def add_trace_task(self, trace_task: TraceTask):
         global trace_manager_timer, trace_manager_queue
         try:
-            if self._enterprise_telemetry_enabled or self.trace_instance:
+            if self.trace_instance:
                 trace_task.app_id = self.app_id
                 trace_manager_queue.put(trace_task)
         except Exception:
@@ -1467,27 +979,20 @@ class TraceQueueManager:
     def send_to_celery(self, tasks: list[TraceTask]):
         with self.flask_app.app_context():
             for task in tasks:
-                storage_id = task.app_id
-                if storage_id is None:
-                    tenant_id = task.kwargs.get("tenant_id")
-                    if tenant_id:
-                        storage_id = f"tenant-{tenant_id}"
-                    else:
-                        logger.warning("Skipping trace without app_id or tenant_id, trace_type: %s", task.trace_type)
-                        continue
-
+                if task.app_id is None:
+                    continue
                 file_id = uuid4().hex
                 trace_info = task.execute()
 
                 task_data = TaskData(
-                    app_id=storage_id,
+                    app_id=task.app_id,
                     trace_info_type=type(trace_info).__name__,
                     trace_info=trace_info.model_dump() if trace_info else None,
                 )
-                file_path = f"{OPS_FILE_PATH}{storage_id}/{file_id}.json"
+                file_path = f"{OPS_FILE_PATH}{task.app_id}/{file_id}.json"
                 storage.save(file_path, task_data.model_dump_json().encode("utf-8"))
                 file_info = {
                     "file_id": file_id,
-                    "app_id": storage_id,
+                    "app_id": task.app_id,
                 }
                 process_trace_tasks.delay(file_info)  # type: ignore

api/core/telemetry/__init__.py

@@ -1,43 +0,0 @@
-"""Telemetry facade.
-
-Thin public API for emitting telemetry events.  All routing logic
-lives in ``core.telemetry.gateway`` which is shared by both CE and EE.
-"""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from core.ops.entities.trace_entity import TraceTaskName
-from core.telemetry.events import TelemetryContext, TelemetryEvent
-from core.telemetry.gateway import emit as gateway_emit
-from core.telemetry.gateway import get_trace_task_to_case
-
-if TYPE_CHECKING:
-    from core.ops.ops_trace_manager import TraceQueueManager
-
-
-def emit(event: TelemetryEvent, trace_manager: TraceQueueManager | None = None) -> None:
-    """Emit a telemetry event.
-
-    Translates the ``TelemetryEvent`` (keyed by ``TraceTaskName``) into a
-    ``TelemetryCase`` and delegates to ``core.telemetry.gateway.emit()``.
-    """
-    case = get_trace_task_to_case().get(event.name)
-    if case is None:
-        return
-
-    context: dict[str, object] = {
-        "tenant_id": event.context.tenant_id,
-        "user_id": event.context.user_id,
-        "app_id": event.context.app_id,
-    }
-    gateway_emit(case, context, event.payload, trace_manager)
-
-
-__all__ = [
-    "TelemetryContext",
-    "TelemetryEvent",
-    "TraceTaskName",
-    "emit",
-]

api/core/telemetry/events.py

@@ -1,21 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any
-
-if TYPE_CHECKING:
-    from core.ops.entities.trace_entity import TraceTaskName
-
-
-@dataclass(frozen=True)
-class TelemetryContext:
-    tenant_id: str | None = None
-    user_id: str | None = None
-    app_id: str | None = None
-
-
-@dataclass(frozen=True)
-class TelemetryEvent:
-    name: TraceTaskName
-    context: TelemetryContext
-    payload: dict[str, Any]

api/core/telemetry/gateway.py

@@ -1,239 +0,0 @@
-"""Telemetry gateway — single routing layer for all editions.
-
-Maps ``TelemetryCase`` → ``CaseRoute`` and dispatches events to either
-the CE/EE trace pipeline (``TraceQueueManager``) or the enterprise-only
-metric/log Celery queue.
-
-This module lives in ``core/`` so both CE and EE share one routing table
-and one ``emit()`` entry point.  No separate enterprise gateway module is
-needed — enterprise-specific dispatch (Celery task, payload offloading)
-is handled here behind lazy imports that no-op in CE.
-"""
-
-from __future__ import annotations
-
-import json
-import logging
-import uuid
-from typing import TYPE_CHECKING, Any
-
-from core.ops.entities.trace_entity import TraceTaskName
-from enterprise.telemetry.contracts import SignalType
-from extensions.ext_storage import storage
-
-if TYPE_CHECKING:
-    from core.ops.ops_trace_manager import TraceQueueManager
-    from enterprise.telemetry.contracts import TelemetryCase
-
-logger = logging.getLogger(__name__)
-
-PAYLOAD_SIZE_THRESHOLD_BYTES = 1 * 1024 * 1024
-
-# ---------------------------------------------------------------------------
-# Routing table — authoritative mapping for all editions
-# ---------------------------------------------------------------------------
-
-_case_to_trace_task: dict | None = None
-_case_routing: dict | None = None
-
-
-def _get_case_to_trace_task() -> dict:
-    global _case_to_trace_task
-    if _case_to_trace_task is None:
-        from enterprise.telemetry.contracts import TelemetryCase
-
-        _case_to_trace_task = {
-            TelemetryCase.WORKFLOW_RUN: TraceTaskName.WORKFLOW_TRACE,
-            TelemetryCase.MESSAGE_RUN: TraceTaskName.MESSAGE_TRACE,
-            TelemetryCase.NODE_EXECUTION: TraceTaskName.NODE_EXECUTION_TRACE,
-            TelemetryCase.DRAFT_NODE_EXECUTION: TraceTaskName.DRAFT_NODE_EXECUTION_TRACE,
-            TelemetryCase.PROMPT_GENERATION: TraceTaskName.PROMPT_GENERATION_TRACE,
-            TelemetryCase.TOOL_EXECUTION: TraceTaskName.TOOL_TRACE,
-            TelemetryCase.MODERATION_CHECK: TraceTaskName.MODERATION_TRACE,
-            TelemetryCase.SUGGESTED_QUESTION: TraceTaskName.SUGGESTED_QUESTION_TRACE,
-            TelemetryCase.DATASET_RETRIEVAL: TraceTaskName.DATASET_RETRIEVAL_TRACE,
-            TelemetryCase.GENERATE_NAME: TraceTaskName.GENERATE_NAME_TRACE,
-        }
-    return _case_to_trace_task
-
-
-def get_trace_task_to_case() -> dict:
-    """Return TraceTaskName → TelemetryCase (inverse of _get_case_to_trace_task)."""
-    return {v: k for k, v in _get_case_to_trace_task().items()}
-
-
-def _get_case_routing() -> dict:
-    global _case_routing
-    if _case_routing is None:
-        from enterprise.telemetry.contracts import CaseRoute, SignalType, TelemetryCase
-
-        _case_routing = {
-            # TRACE — CE-eligible (flow in both CE and EE)
-            TelemetryCase.WORKFLOW_RUN: CaseRoute(signal_type=SignalType.TRACE, ce_eligible=True),
-            TelemetryCase.MESSAGE_RUN: CaseRoute(signal_type=SignalType.TRACE, ce_eligible=True),
-            TelemetryCase.TOOL_EXECUTION: CaseRoute(signal_type=SignalType.TRACE, ce_eligible=True),
-            TelemetryCase.MODERATION_CHECK: CaseRoute(signal_type=SignalType.TRACE, ce_eligible=True),
-            TelemetryCase.SUGGESTED_QUESTION: CaseRoute(signal_type=SignalType.TRACE, ce_eligible=True),
-            TelemetryCase.DATASET_RETRIEVAL: CaseRoute(signal_type=SignalType.TRACE, ce_eligible=True),
-            TelemetryCase.GENERATE_NAME: CaseRoute(signal_type=SignalType.TRACE, ce_eligible=True),
-            # TRACE — enterprise-only
-            TelemetryCase.NODE_EXECUTION: CaseRoute(signal_type=SignalType.TRACE, ce_eligible=False),
-            TelemetryCase.DRAFT_NODE_EXECUTION: CaseRoute(signal_type=SignalType.TRACE, ce_eligible=False),
-            TelemetryCase.PROMPT_GENERATION: CaseRoute(signal_type=SignalType.TRACE, ce_eligible=False),
-            # METRIC_LOG — enterprise-only (signal-driven, not trace)
-            TelemetryCase.APP_CREATED: CaseRoute(signal_type=SignalType.METRIC_LOG, ce_eligible=False),
-            TelemetryCase.APP_UPDATED: CaseRoute(signal_type=SignalType.METRIC_LOG, ce_eligible=False),
-            TelemetryCase.APP_DELETED: CaseRoute(signal_type=SignalType.METRIC_LOG, ce_eligible=False),
-            TelemetryCase.FEEDBACK_CREATED: CaseRoute(signal_type=SignalType.METRIC_LOG, ce_eligible=False),
-        }
-    return _case_routing
-
-
-def __getattr__(name: str) -> dict:
-    """Lazy module-level access to routing tables."""
-    if name == "CASE_ROUTING":
-        return _get_case_routing()
-    if name == "CASE_TO_TRACE_TASK":
-        return _get_case_to_trace_task()
-    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
-
-
-# ---------------------------------------------------------------------------
-# Helpers
-# ---------------------------------------------------------------------------
-
-
-def is_enterprise_telemetry_enabled() -> bool:
-    try:
-        from enterprise.telemetry.exporter import is_enterprise_telemetry_enabled
-
-        return is_enterprise_telemetry_enabled()
-    except Exception:
-        return False
-
-
-def _handle_payload_sizing(
-    payload: dict[str, Any],
-    tenant_id: str,
-    event_id: str,
-) -> tuple[dict[str, Any], str | None]:
-    """Inline or offload payload based on size.
-
-    Returns ``(payload_for_envelope, storage_key | None)``.  Payloads
-    exceeding ``PAYLOAD_SIZE_THRESHOLD_BYTES`` are written to object
-    storage and replaced with an empty dict in the envelope.
-    """
-    try:
-        payload_json = json.dumps(payload)
-        payload_size = len(payload_json.encode("utf-8"))
-    except (TypeError, ValueError):
-        logger.warning("Failed to serialize payload for sizing: event_id=%s", event_id)
-        return payload, None
-
-    if payload_size <= PAYLOAD_SIZE_THRESHOLD_BYTES:
-        return payload, None
-
-    storage_key = f"telemetry/{tenant_id}/{event_id}.json"
-    try:
-        storage.save(storage_key, payload_json.encode("utf-8"))
-        logger.debug("Stored large payload to storage: key=%s, size=%d", storage_key, payload_size)
-        return {}, storage_key
-    except Exception:
-        logger.warning("Failed to store large payload, inlining instead: event_id=%s", event_id, exc_info=True)
-        return payload, None
-
-
-# ---------------------------------------------------------------------------
-# Public API
-# ---------------------------------------------------------------------------
-
-
-def emit(
-    case: TelemetryCase,
-    context: dict[str, Any],
-    payload: dict[str, Any],
-    trace_manager: TraceQueueManager | None = None,
-) -> None:
-    """Route a telemetry event to the correct pipeline.
-
-    TRACE events are enqueued into ``TraceQueueManager`` (works in both CE
-    and EE).  Enterprise-only traces are silently dropped when EE is
-    disabled.
-
-    METRIC_LOG events are dispatched to the enterprise Celery queue;
-    silently dropped when enterprise telemetry is unavailable.
-    """
-    route = _get_case_routing().get(case)
-    if route is None:
-        logger.warning("Unknown telemetry case: %s, dropping event", case)
-        return
-
-    if not route.ce_eligible and not is_enterprise_telemetry_enabled():
-        logger.debug("Dropping EE-only event: case=%s (EE disabled)", case)
-        return
-
-    if route.signal_type == SignalType.TRACE:
-        _emit_trace(case, context, payload, trace_manager)
-    else:
-        _emit_metric_log(case, context, payload)
-
-
-def _emit_trace(
-    case: TelemetryCase,
-    context: dict[str, Any],
-    payload: dict[str, Any],
-    trace_manager: TraceQueueManager | None,
-) -> None:
-    from core.ops.ops_trace_manager import TraceQueueManager as LocalTraceQueueManager
-    from core.ops.ops_trace_manager import TraceTask
-
-    trace_task_name = _get_case_to_trace_task().get(case)
-    if trace_task_name is None:
-        logger.warning("No TraceTaskName mapping for case: %s", case)
-        return
-
-    queue_manager = trace_manager or LocalTraceQueueManager(
-        app_id=context.get("app_id"),
-        user_id=context.get("user_id"),
-    )
-    queue_manager.add_trace_task(TraceTask(trace_task_name, user_id=context.get("user_id"), **payload))
-    logger.debug("Enqueued trace task: case=%s, app_id=%s", case, context.get("app_id"))
-
-
-def _emit_metric_log(
-    case: TelemetryCase,
-    context: dict[str, Any],
-    payload: dict[str, Any],
-) -> None:
-    """Build envelope and dispatch to enterprise Celery queue.
-
-    No-ops when the enterprise telemetry task is not importable (CE mode).
-    """
-    try:
-        from tasks.enterprise_telemetry_task import process_enterprise_telemetry
-    except ImportError:
-        logger.debug("Enterprise metric/log dispatch unavailable, dropping: case=%s", case)
-        return
-
-    tenant_id = context.get("tenant_id") or ""
-    event_id = str(uuid.uuid4())
-
-    payload_for_envelope, payload_ref = _handle_payload_sizing(payload, tenant_id, event_id)
-
-    from enterprise.telemetry.contracts import TelemetryEnvelope
-
-    envelope = TelemetryEnvelope(
-        case=case,
-        tenant_id=tenant_id,
-        event_id=event_id,
-        payload=payload_for_envelope,
-        metadata={"payload_ref": payload_ref} if payload_ref else None,
-    )
-
-    process_enterprise_telemetry.delay(envelope.model_dump_json())
-    logger.debug(
-        "Enqueued metric/log event: case=%s, tenant_id=%s, event_id=%s",
-        case,
-        tenant_id,
-        event_id,
-    )

api/dify_graph/enums.py

@@ -251,8 +251,6 @@ class WorkflowNodeExecutionMetadataKey(StrEnum):
     """
 
     TOTAL_TOKENS = "total_tokens"
-    PROMPT_TOKENS = "prompt_tokens"
-    COMPLETION_TOKENS = "completion_tokens"
     TOTAL_PRICE = "total_price"
     CURRENCY = "currency"
     TOOL_INFO = "tool_info"

api/dify_graph/nodes/tool/tool_node.py

@@ -81,9 +81,7 @@ class ToolNode(Node[ToolNodeData]):
         tool_info = {
             "provider_type": self.node_data.provider_type.value,
             "provider_id": self.node_data.provider_id,
-            "tool_name": self.node_data.tool_name,
             "plugin_unique_identifier": self.node_data.plugin_unique_identifier,
-            "credential_id": self.node_data.credential_id,
         }
 
         # get tool runtime

api/enterprise/telemetry/DATA_DICTIONARY.md

@@ -1,525 +0,0 @@
-# Dify Enterprise Telemetry Data Dictionary
-
-Quick reference for all telemetry signals emitted by Dify Enterprise. For configuration and architecture details, see [README.md](./README.md).
-
-## Resource Attributes
-
-Attached to every signal (Span, Metric, Log).
-
-| Attribute | Type | Example |
-|-----------|------|---------|
-| `service.name` | string | `dify` |
-| `host.name` | string | `dify-api-7f8b` |
-
-## Traces (Spans)
-
-### `dify.workflow.run`
-
-| Attribute | Type | Description |
-|-----------|------|-------------|
-| `dify.trace_id` | string | Business trace ID (Workflow Run ID) |
-| `dify.tenant_id` | string | Tenant identifier |
-| `dify.app_id` | string | Application identifier |
-| `dify.workflow.id` | string | Workflow definition ID |
-| `dify.workflow.run_id` | string | Unique ID for this run |
-| `dify.workflow.status` | string | `succeeded`, `failed`, `stopped`, etc. |
-| `dify.workflow.error` | string | Error message if failed |
-| `dify.workflow.elapsed_time` | float | Total execution time (seconds) |
-| `dify.invoke_from` | string | `api`, `webapp`, `debug` |
-| `dify.conversation.id` | string | Conversation ID (optional) |
-| `dify.message.id` | string | Message ID (optional) |
-| `dify.invoked_by` | string | User ID who triggered the run |
-| `gen_ai.usage.total_tokens` | int | Total tokens across all nodes (optional) |
-| `gen_ai.user.id` | string | End-user identifier (optional) |
-| `dify.parent.trace_id` | string | Parent workflow trace ID (optional) |
-| `dify.parent.workflow.run_id` | string | Parent workflow run ID (optional) |
-| `dify.parent.node.execution_id` | string | Parent node execution ID (optional) |
-| `dify.parent.app.id` | string | Parent app ID (optional) |
-
-### `dify.node.execution`
-
-| Attribute | Type | Description |
-|-----------|------|-------------|
-| `dify.trace_id` | string | Business trace ID |
-| `dify.tenant_id` | string | Tenant identifier |
-| `dify.app_id` | string | Application identifier |
-| `dify.workflow.id` | string | Workflow definition ID |
-| `dify.workflow.run_id` | string | Workflow Run ID |
-| `dify.message.id` | string | Message ID (optional) |
-| `dify.conversation.id` | string | Conversation ID (optional) |
-| `dify.node.execution_id` | string | Unique node execution ID |
-| `dify.node.id` | string | Node ID in workflow graph |
-| `dify.node.type` | string | Node type (see appendix) |
-| `dify.node.title` | string | Display title |
-| `dify.node.status` | string | `succeeded`, `failed` |
-| `dify.node.error` | string | Error message if failed |
-| `dify.node.elapsed_time` | float | Execution time (seconds) |
-| `dify.node.index` | int | Execution order index |
-| `dify.node.predecessor_node_id` | string | Triggering node ID |
-| `dify.node.iteration_id` | string | Iteration ID (optional) |
-| `dify.node.loop_id` | string | Loop ID (optional) |
-| `dify.node.parallel_id` | string | Parallel branch ID (optional) |
-| `dify.node.invoked_by` | string | User ID who triggered execution |
-| `gen_ai.usage.input_tokens` | int | Prompt tokens (LLM nodes only) |
-| `gen_ai.usage.output_tokens` | int | Completion tokens (LLM nodes only) |
-| `gen_ai.usage.total_tokens` | int | Total tokens (LLM nodes only) |
-| `gen_ai.request.model` | string | LLM model name (LLM nodes only) |
-| `gen_ai.provider.name` | string | LLM provider name (LLM nodes only) |
-| `gen_ai.user.id` | string | End-user identifier (optional) |
-
-### `dify.node.execution.draft`
-
-Same attributes as `dify.node.execution`. Emitted during Preview/Debug runs.
-
-## Counters
-
-All counters are cumulative and emitted at 100% accuracy.
-
-### Token Counters
-
-| Metric | Unit | Description |
-|--------|------|-------------|
-| `dify.tokens.total` | `{token}` | Total tokens consumed |
-| `dify.tokens.input` | `{token}` | Input (prompt) tokens |
-| `dify.tokens.output` | `{token}` | Output (completion) tokens |
-
-**Labels:**
-
-- `tenant_id`, `app_id`, `operation_type`, `model_provider`, `model_name`, `node_type` (if node_execution)
-
-⚠️ **Warning:** `dify.tokens.total` at workflow level includes all node tokens. Filter by `operation_type` to avoid double-counting.
-
-#### Token Hierarchy & Query Patterns
-
-Token metrics are emitted at multiple layers. Understanding the hierarchy prevents double-counting:
-
-```
-App-level total
-├── workflow          ← sum of all node_execution tokens (DO NOT add both)
-│   └── node_execution ← per-node breakdown
-├── message           ← independent (non-workflow chat apps only)
-├── rule_generate     ← independent helper LLM call
-├── code_generate     ← independent helper LLM call
-├── structured_output ← independent helper LLM call
-└── instruction_modify← independent helper LLM call
-```
-
-**Key rule:** `workflow` tokens already include all `node_execution` tokens. Never sum both.
-
-**Available labels on token metrics:** `tenant_id`, `app_id`, `operation_type`, `model_provider`, `model_name`, `node_type`.
-App name is only available on span attributes (`dify.app.name`), not metric labels — use `app_id` for metric queries.
-
-**Common queries** (PromQL):
-
-```promql
-# ── Totals ──────────────────────────────────────────────────
-# App-level total (exclude node_execution to avoid double-counting)
-sum by (app_id) (dify_tokens_total{operation_type!="node_execution"})
-
-# Single app total
-sum (dify_tokens_total{app_id="<app_id>", operation_type!="node_execution"})
-
-# Per-tenant totals
-sum by (tenant_id) (dify_tokens_total{operation_type!="node_execution"})
-
-# ── Drill-down ──────────────────────────────────────────────
-# Workflow-level tokens for an app
-sum (dify_tokens_total{app_id="<app_id>", operation_type="workflow"})
-
-# Node-level breakdown within an app
-sum by (node_type) (dify_tokens_total{app_id="<app_id>", operation_type="node_execution"})
-
-# Model breakdown for an app
-sum by (model_provider, model_name) (dify_tokens_total{app_id="<app_id>"})
-
-# Input vs output per model
-sum by (model_name) (dify_tokens_input_total{app_id="<app_id>"})
-sum by (model_name) (dify_tokens_output_total{app_id="<app_id>"})
-
-# ── Rates ───────────────────────────────────────────────────
-# Token consumption rate (per hour)
-sum(rate(dify_tokens_total{operation_type!="node_execution"}[1h]))
-
-# Per-app consumption rate
-sum by (app_id) (rate(dify_tokens_total{operation_type!="node_execution"}[1h]))
-```
-
-**Finding `app_id` from app name** (trace query — Tempo / Jaeger):
-
-```
-{ resource.dify.app.name = "My Chatbot" } | select(resource.dify.app.id)
-```
-
-### Request Counters
-
-| Metric | Unit | Description |
-|--------|------|-------------|
-| `dify.requests.total` | `{request}` | Total operations count |
-
-**Labels by type:**
-
-| `type` | Additional Labels |
-|--------|-------------------|
-| `workflow` | `tenant_id`, `app_id`, `status`, `invoke_from` |
-| `node` | `tenant_id`, `app_id`, `node_type`, `model_provider`, `model_name`, `status` |
-| `draft_node` | `tenant_id`, `app_id`, `node_type`, `model_provider`, `model_name`, `status` |
-| `message` | `tenant_id`, `app_id`, `model_provider`, `model_name`, `status`, `invoke_from` |
-| `tool` | `tenant_id`, `app_id`, `tool_name` |
-| `moderation` | `tenant_id`, `app_id` |
-| `suggested_question` | `tenant_id`, `app_id`, `model_provider`, `model_name` |
-| `dataset_retrieval` | `tenant_id`, `app_id` |
-| `generate_name` | `tenant_id`, `app_id` |
-| `prompt_generation` | `tenant_id`, `app_id`, `operation_type`, `model_provider`, `model_name`, `status` |
-
-### Error Counters
-
-| Metric | Unit | Description |
-|--------|------|-------------|
-| `dify.errors.total` | `{error}` | Total failed operations |
-
-**Labels by type:**
-
-| `type` | Additional Labels |
-|--------|-------------------|
-| `workflow` | `tenant_id`, `app_id` |
-| `node` | `tenant_id`, `app_id`, `node_type`, `model_provider`, `model_name` |
-| `draft_node` | `tenant_id`, `app_id`, `node_type`, `model_provider`, `model_name` |
-| `message` | `tenant_id`, `app_id`, `model_provider`, `model_name` |
-| `tool` | `tenant_id`, `app_id`, `tool_name` |
-| `prompt_generation` | `tenant_id`, `app_id`, `operation_type`, `model_provider`, `model_name` |
-
-### Other Counters
-
-| Metric | Unit | Labels |
-|--------|------|--------|
-| `dify.feedback.total` | `{feedback}` | `tenant_id`, `app_id`, `rating` |
-| `dify.dataset.retrievals.total` | `{retrieval}` | `tenant_id`, `app_id`, `dataset_id`, `embedding_model_provider`, `embedding_model`, `rerank_model_provider`, `rerank_model` |
-| `dify.app.created.total` | `{app}` | `tenant_id`, `app_id`, `mode` |
-| `dify.app.updated.total` | `{app}` | `tenant_id`, `app_id` |
-| `dify.app.deleted.total` | `{app}` | `tenant_id`, `app_id` |
-
-## Histograms
-
-| Metric | Unit | Labels |
-|--------|------|--------|
-| `dify.workflow.duration` | `s` | `tenant_id`, `app_id`, `status` |
-| `dify.node.duration` | `s` | `tenant_id`, `app_id`, `node_type`, `model_provider`, `model_name`, `plugin_name` |
-| `dify.message.duration` | `s` | `tenant_id`, `app_id`, `model_provider`, `model_name` |
-| `dify.message.time_to_first_token` | `s` | `tenant_id`, `app_id`, `model_provider`, `model_name` |
-| `dify.tool.duration` | `s` | `tenant_id`, `app_id`, `tool_name` |
-| `dify.prompt_generation.duration` | `s` | `tenant_id`, `app_id`, `operation_type`, `model_provider`, `model_name` |
-
-## Structured Logs
-
-### Span Companion Logs
-
-Logs that accompany spans. Signal type: `span_detail`
-
-#### `dify.workflow.run` Companion Log
-
-**Common attributes:** All span attributes (see Traces section) plus:
-
-| Additional Attribute | Type | Always Present | Description |
-|---------------------|------|----------------|-------------|
-| `dify.app.name` | string | No | Application display name |
-| `dify.workspace.name` | string | No | Workspace display name |
-| `dify.workflow.version` | string | Yes | Workflow definition version |
-| `dify.workflow.inputs` | string/JSON | Yes | Input parameters (content-gated) |
-| `dify.workflow.outputs` | string/JSON | Yes | Output results (content-gated) |
-| `dify.workflow.query` | string | No | User query text (content-gated) |
-
-**Event attributes:**
-
-- `dify.event.name`: `"dify.workflow.run"`
-- `dify.event.signal`: `"span_detail"`
-- `trace_id`, `span_id`, `tenant_id`, `user_id`
-
-#### `dify.node.execution` and `dify.node.execution.draft` Companion Logs
-
-**Common attributes:** All span attributes (see Traces section) plus:
-
-| Additional Attribute | Type | Always Present | Description |
-|---------------------|------|----------------|-------------|
-| `dify.app.name` | string | No | Application display name |
-| `dify.workspace.name` | string | No | Workspace display name |
-| `dify.invoke_from` | string | No | Invocation source |
-| `gen_ai.tool.name` | string | No | Tool name (tool nodes only) |
-| `dify.node.total_price` | float | No | Cost (LLM nodes only) |
-| `dify.node.currency` | string | No | Currency code (LLM nodes only) |
-| `dify.node.iteration_index` | int | No | Iteration index (iteration nodes) |
-| `dify.node.loop_index` | int | No | Loop index (loop nodes) |
-| `dify.plugin.name` | string | No | Plugin name (tool/knowledge nodes) |
-| `dify.credential.name` | string | No | Credential name (plugin nodes) |
-| `dify.credential.id` | string | No | Credential ID (plugin nodes) |
-| `dify.dataset.ids` | JSON array | No | Dataset IDs (knowledge nodes) |
-| `dify.dataset.names` | JSON array | No | Dataset names (knowledge nodes) |
-| `dify.node.inputs` | string/JSON | Yes | Node inputs (content-gated) |
-| `dify.node.outputs` | string/JSON | Yes | Node outputs (content-gated) |
-| `dify.node.process_data` | string/JSON | No | Processing data (content-gated) |
-
-**Event attributes:**
-
-- `dify.event.name`: `"dify.node.execution"` or `"dify.node.execution.draft"`
-- `dify.event.signal`: `"span_detail"`
-- `trace_id`, `span_id`, `tenant_id`, `user_id`
-
-### Standalone Logs
-
-Logs without structural spans. Signal type: `metric_only`
-
-#### `dify.message.run`
-
-| Attribute | Type | Description |
-|-----------|------|-------------|
-| `dify.event.name` | string | `"dify.message.run"` |
-| `dify.event.signal` | string | `"metric_only"` |
-| `trace_id` | string | OTEL trace ID (32-char hex) |
-| `span_id` | string | OTEL span ID (16-char hex) |
-| `tenant_id` | string | Tenant identifier |
-| `user_id` | string | User identifier (optional) |
-| `dify.app_id` | string | Application identifier |
-| `dify.message.id` | string | Message identifier |
-| `dify.conversation.id` | string | Conversation ID (optional) |
-| `dify.workflow.run_id` | string | Workflow run ID (optional) |
-| `dify.invoke_from` | string | `service-api`, `web-app`, `debugger`, `explore` |
-| `gen_ai.provider.name` | string | LLM provider |
-| `gen_ai.request.model` | string | LLM model |
-| `gen_ai.usage.input_tokens` | int | Input tokens |
-| `gen_ai.usage.output_tokens` | int | Output tokens |
-| `gen_ai.usage.total_tokens` | int | Total tokens |
-| `dify.message.status` | string | `succeeded`, `failed` |
-| `dify.message.error` | string | Error message (if failed) |
-| `dify.message.duration` | float | Duration (seconds) |
-| `dify.message.time_to_first_token` | float | TTFT (seconds) |
-| `dify.message.inputs` | string/JSON | Inputs (content-gated) |
-| `dify.message.outputs` | string/JSON | Outputs (content-gated) |
-
-#### `dify.tool.execution`
-
-| Attribute | Type | Description |
-|-----------|------|-------------|
-| `dify.event.name` | string | `"dify.tool.execution"` |
-| `dify.event.signal` | string | `"metric_only"` |
-| `trace_id` | string | OTEL trace ID |
-| `span_id` | string | OTEL span ID |
-| `tenant_id` | string | Tenant identifier |
-| `dify.app_id` | string | Application identifier |
-| `dify.message.id` | string | Message identifier |
-| `dify.tool.name` | string | Tool name |
-| `dify.tool.duration` | float | Duration (seconds) |
-| `dify.tool.status` | string | `succeeded`, `failed` |
-| `dify.tool.error` | string | Error message (if failed) |
-| `dify.tool.inputs` | string/JSON | Inputs (content-gated) |
-| `dify.tool.outputs` | string/JSON | Outputs (content-gated) |
-| `dify.tool.parameters` | string/JSON | Parameters (content-gated) |
-| `dify.tool.config` | string/JSON | Configuration (content-gated) |
-
-#### `dify.moderation.check`
-
-| Attribute | Type | Description |
-|-----------|------|-------------|
-| `dify.event.name` | string | `"dify.moderation.check"` |
-| `dify.event.signal` | string | `"metric_only"` |
-| `trace_id` | string | OTEL trace ID |
-| `span_id` | string | OTEL span ID |
-| `tenant_id` | string | Tenant identifier |
-| `dify.app_id` | string | Application identifier |
-| `dify.message.id` | string | Message identifier |
-| `dify.moderation.type` | string | `input`, `output` |
-| `dify.moderation.action` | string | `pass`, `block`, `flag` |
-| `dify.moderation.flagged` | boolean | Whether flagged |
-| `dify.moderation.categories` | JSON array | Flagged categories |
-| `dify.moderation.query` | string | Content (content-gated) |
-
-#### `dify.suggested_question.generation`
-
-| Attribute | Type | Description |
-|-----------|------|-------------|
-| `dify.event.name` | string | `"dify.suggested_question.generation"` |
-| `dify.event.signal` | string | `"metric_only"` |
-| `trace_id` | string | OTEL trace ID |
-| `span_id` | string | OTEL span ID |
-| `tenant_id` | string | Tenant identifier |
-| `dify.app_id` | string | Application identifier |
-| `dify.message.id` | string | Message identifier |
-| `dify.suggested_question.count` | int | Number of questions |
-| `dify.suggested_question.duration` | float | Duration (seconds) |
-| `dify.suggested_question.status` | string | `succeeded`, `failed` |
-| `dify.suggested_question.error` | string | Error message (if failed) |
-| `dify.suggested_question.questions` | JSON array | Questions (content-gated) |
-
-#### `dify.dataset.retrieval`
-
-| Attribute | Type | Description |
-|-----------|------|-------------|
-| `dify.event.name` | string | `"dify.dataset.retrieval"` |
-| `dify.event.signal` | string | `"metric_only"` |
-| `trace_id` | string | OTEL trace ID |
-| `span_id` | string | OTEL span ID |
-| `tenant_id` | string | Tenant identifier |
-| `dify.app_id` | string | Application identifier |
-| `dify.message.id` | string | Message identifier |
-| `dify.dataset.id` | string | Dataset identifier |
-| `dify.dataset.name` | string | Dataset name |
-| `dify.dataset.embedding_providers` | JSON array | Embedding model providers (one per dataset) |
-| `dify.dataset.embedding_models` | JSON array | Embedding models (one per dataset) |
-| `dify.retrieval.rerank_provider` | string | Rerank model provider |
-| `dify.retrieval.rerank_model` | string | Rerank model name |
-| `dify.retrieval.query` | string | Search query (content-gated) |
-| `dify.retrieval.document_count` | int | Documents retrieved |
-| `dify.retrieval.duration` | float | Duration (seconds) |
-| `dify.retrieval.status` | string | `succeeded`, `failed` |
-| `dify.retrieval.error` | string | Error message (if failed) |
-| `dify.dataset.documents` | JSON array | Documents (content-gated) |
-
-#### `dify.generate_name.execution`
-
-| Attribute | Type | Description |
-|-----------|------|-------------|
-| `dify.event.name` | string | `"dify.generate_name.execution"` |
-| `dify.event.signal` | string | `"metric_only"` |
-| `trace_id` | string | OTEL trace ID |
-| `span_id` | string | OTEL span ID |
-| `tenant_id` | string | Tenant identifier |
-| `dify.app_id` | string | Application identifier |
-| `dify.conversation.id` | string | Conversation identifier |
-| `dify.generate_name.duration` | float | Duration (seconds) |
-| `dify.generate_name.status` | string | `succeeded`, `failed` |
-| `dify.generate_name.error` | string | Error message (if failed) |
-| `dify.generate_name.inputs` | string/JSON | Inputs (content-gated) |
-| `dify.generate_name.outputs` | string | Generated name (content-gated) |
-
-#### `dify.prompt_generation.execution`
-
-| Attribute | Type | Description |
-|-----------|------|-------------|
-| `dify.event.name` | string | `"dify.prompt_generation.execution"` |
-| `dify.event.signal` | string | `"metric_only"` |
-| `trace_id` | string | OTEL trace ID |
-| `span_id` | string | OTEL span ID |
-| `tenant_id` | string | Tenant identifier |
-| `dify.app_id` | string | Application identifier |
-| `dify.prompt_generation.operation_type` | string | Operation type (see appendix) |
-| `gen_ai.provider.name` | string | LLM provider |
-| `gen_ai.request.model` | string | LLM model |
-| `gen_ai.usage.input_tokens` | int | Input tokens |
-| `gen_ai.usage.output_tokens` | int | Output tokens |
-| `gen_ai.usage.total_tokens` | int | Total tokens |
-| `dify.prompt_generation.duration` | float | Duration (seconds) |
-| `dify.prompt_generation.status` | string | `succeeded`, `failed` |
-| `dify.prompt_generation.error` | string | Error message (if failed) |
-| `dify.prompt_generation.instruction` | string | Instruction (content-gated) |
-| `dify.prompt_generation.output` | string/JSON | Output (content-gated) |
-
-#### `dify.app.created`
-
-| Attribute | Type | Description |
-|-----------|------|-------------|
-| `dify.event.name` | string | `"dify.app.created"` |
-| `dify.event.signal` | string | `"metric_only"` |
-| `tenant_id` | string | Tenant identifier |
-| `dify.app_id` | string | Application identifier |
-| `dify.app.mode` | string | `chat`, `completion`, `agent-chat`, `workflow` |
-| `dify.app.created_at` | string | Timestamp (ISO 8601) |
-
-#### `dify.app.updated`
-
-| Attribute | Type | Description |
-|-----------|------|-------------|
-| `dify.event.name` | string | `"dify.app.updated"` |
-| `dify.event.signal` | string | `"metric_only"` |
-| `tenant_id` | string | Tenant identifier |
-| `dify.app_id` | string | Application identifier |
-| `dify.app.updated_at` | string | Timestamp (ISO 8601) |
-
-#### `dify.app.deleted`
-
-| Attribute | Type | Description |
-|-----------|------|-------------|
-| `dify.event.name` | string | `"dify.app.deleted"` |
-| `dify.event.signal` | string | `"metric_only"` |
-| `tenant_id` | string | Tenant identifier |
-| `dify.app_id` | string | Application identifier |
-| `dify.app.deleted_at` | string | Timestamp (ISO 8601) |
-
-#### `dify.feedback.created`
-
-| Attribute | Type | Description |
-|-----------|------|-------------|
-| `dify.event.name` | string | `"dify.feedback.created"` |
-| `dify.event.signal` | string | `"metric_only"` |
-| `trace_id` | string | OTEL trace ID |
-| `span_id` | string | OTEL span ID |
-| `tenant_id` | string | Tenant identifier |
-| `dify.app_id` | string | Application identifier |
-| `dify.message.id` | string | Message identifier |
-| `dify.feedback.rating` | string | `like`, `dislike`, `null` |
-| `dify.feedback.content` | string | Feedback text (content-gated) |
-| `dify.feedback.created_at` | string | Timestamp (ISO 8601) |
-
-#### `dify.telemetry.rehydration_failed`
-
-Diagnostic event for telemetry system health monitoring.
-
-| Attribute | Type | Description |
-|-----------|------|-------------|
-| `dify.event.name` | string | `"dify.telemetry.rehydration_failed"` |
-| `dify.event.signal` | string | `"metric_only"` |
-| `tenant_id` | string | Tenant identifier |
-| `dify.telemetry.error` | string | Error message |
-| `dify.telemetry.payload_type` | string | Payload type (see appendix) |
-| `dify.telemetry.correlation_id` | string | Correlation ID |
-
-## Content-Gated Attributes
-
-When `ENTERPRISE_INCLUDE_CONTENT=false`, these attributes are replaced with reference strings (`ref:{id_type}={uuid}`).
-
-| Attribute | Signal |
-|-----------|--------|
-| `dify.workflow.inputs` | `dify.workflow.run` |
-| `dify.workflow.outputs` | `dify.workflow.run` |
-| `dify.workflow.query` | `dify.workflow.run` |
-| `dify.node.inputs` | `dify.node.execution` |
-| `dify.node.outputs` | `dify.node.execution` |
-| `dify.node.process_data` | `dify.node.execution` |
-| `dify.message.inputs` | `dify.message.run` |
-| `dify.message.outputs` | `dify.message.run` |
-| `dify.tool.inputs` | `dify.tool.execution` |
-| `dify.tool.outputs` | `dify.tool.execution` |
-| `dify.tool.parameters` | `dify.tool.execution` |
-| `dify.tool.config` | `dify.tool.execution` |
-| `dify.moderation.query` | `dify.moderation.check` |
-| `dify.suggested_question.questions` | `dify.suggested_question.generation` |
-| `dify.retrieval.query` | `dify.dataset.retrieval` |
-| `dify.dataset.documents` | `dify.dataset.retrieval` |
-| `dify.generate_name.inputs` | `dify.generate_name.execution` |
-| `dify.generate_name.outputs` | `dify.generate_name.execution` |
-| `dify.prompt_generation.instruction` | `dify.prompt_generation.execution` |
-| `dify.prompt_generation.output` | `dify.prompt_generation.execution` |
-| `dify.feedback.content` | `dify.feedback.created` |
-
-## Appendix
-
-### Operation Types
-
-- `workflow`, `node_execution`, `message`, `rule_generate`, `code_generate`, `structured_output`, `instruction_modify`
-
-### Node Types
-
-- `start`, `end`, `answer`, `llm`, `knowledge-retrieval`, `knowledge-index`, `if-else`, `code`, `template-transform`, `question-classifier`, `http-request`, `tool`, `datasource`, `variable-aggregator`, `loop`, `iteration`, `parameter-extractor`, `assigner`, `document-extractor`, `list-operator`, `agent`, `trigger-webhook`, `trigger-schedule`, `trigger-plugin`, `human-input`
-
-### Workflow Statuses
-
-- `running`, `succeeded`, `failed`, `stopped`, `partial-succeeded`, `paused`
-
-### Payload Types
-
-- `workflow`, `node`, `message`, `tool`, `moderation`, `suggested_question`, `dataset_retrieval`, `generate_name`, `prompt_generation`, `app`, `feedback`
-
-### Null Value Behavior
-
-**Spans:** Attributes with `null` values are omitted.
-
-**Logs:** Attributes with `null` values appear as `null` in JSON.
-
-**Content-Gated:** Replaced with reference strings, not set to `null`.

api/enterprise/telemetry/README.md

@@ -1,121 +0,0 @@
-# Dify Enterprise Telemetry
-
-This document provides an overview of the Dify Enterprise OpenTelemetry (OTEL) exporter and how to configure it for integration with observability stacks like Prometheus, Grafana, Jaeger, or Honeycomb.
-
-## Overview
-
-Dify Enterprise uses a "slim span + rich companion log" architecture to provide high-fidelity observability without overwhelming trace storage.
-
-- **Traces (Spans)**: Capture the structure, identity, and timing of high-level operations (Workflows and Nodes).
-- **Structured Logs**: Provide deep context (inputs, outputs, metadata) for every event, correlated to spans via `trace_id` and `span_id`.
-- **Metrics**: Provide 100% accurate counters and histograms for usage, performance, and error tracking.
-
-### Signal Architecture
-
-```mermaid
-graph TD
-    A[Workflow Run] -->|Span| B(dify.workflow.run)
-    A -->|Log| C(dify.workflow.run detail)
-    B ---|trace_id| C
-    
-    D[Node Execution] -->|Span| E(dify.node.execution)
-    D -->|Log| F(dify.node.execution detail)
-    E ---|span_id| F
-    
-    G[Message/Tool/etc] -->|Log| H(dify.* event)
-    G -->|Metric| I(dify.* counter/histogram)
-```
-
-## Configuration
-
-The Enterprise OTEL exporter is configured via environment variables.
-
-| Variable | Description | Default |
-|----------|-------------|---------|
-| `ENTERPRISE_ENABLED` | Master switch for all enterprise features. | `false` |
-| `ENTERPRISE_TELEMETRY_ENABLED` | Master switch for enterprise telemetry. | `false` |
-| `ENTERPRISE_OTLP_ENDPOINT` | OTLP collector endpoint (e.g., `http://otel-collector:4318`). | - |
-| `ENTERPRISE_OTLP_HEADERS` | Custom headers for OTLP requests (e.g., `x-scope-orgid=tenant1`). | - |
-| `ENTERPRISE_OTLP_PROTOCOL` | OTLP transport protocol (`http` or `grpc`). | `http` |
-| `ENTERPRISE_OTLP_API_KEY` | Bearer token for authentication. | - |
-| `ENTERPRISE_INCLUDE_CONTENT` | Whether to include sensitive content (inputs/outputs) in logs. | `true` |
-| `ENTERPRISE_SERVICE_NAME` | Service name reported to OTEL. | `dify` |
-| `ENTERPRISE_OTEL_SAMPLING_RATE` | Sampling rate for traces (0.0 to 1.0). Metrics are always 100%. | `1.0` |
-
-## Correlation Model
-
-Dify uses deterministic ID generation to ensure signals are correlated across different services and asynchronous tasks.
-
-### ID Generation Rules
-
-- `trace_id`: Derived from the correlation ID (workflow_run_id or node_execution_id for drafts) using `int(UUID(correlation_id))`
-- `span_id`: Derived from the source ID using the lower 64 bits of `UUID(source_id)`
-
-### Scenario A: Simple Workflow
-
-A single workflow run with multiple nodes. All spans and logs share the same `trace_id` (derived from `workflow_run_id`).
-
-```
-trace_id = UUID(workflow_run_id)
-├── [root span] dify.workflow.run (span_id = hash(workflow_run_id))
-│   ├── [child] dify.node.execution - "Start" (span_id = hash(node_exec_id_1))
-│   ├── [child] dify.node.execution - "LLM" (span_id = hash(node_exec_id_2))
-│   └── [child] dify.node.execution - "End" (span_id = hash(node_exec_id_3))
-```
-
-### Scenario B: Nested Sub-Workflow
-
-A workflow calling another workflow via a Tool or Sub-workflow node. The child workflow's spans are linked to the parent via `parent_span_id`. Both workflows share the same trace_id.
-
-```
-trace_id = UUID(outer_workflow_run_id)     ← shared across both workflows
-├── [root] dify.workflow.run (outer) (span_id = hash(outer_workflow_run_id))
-│   ├── dify.node.execution - "Start Node"
-│   ├── dify.node.execution - "Tool Node" (triggers sub-workflow)
-│   │   └── [child] dify.workflow.run (inner) (span_id = hash(inner_workflow_run_id))
-│   │       ├── dify.node.execution - "Inner Start"
-│   │       └── dify.node.execution - "Inner End"
-│   └── dify.node.execution - "End Node"
-```
-
-**Key attributes for nested workflows:**
-
-- Inner workflow's `dify.parent.trace_id` = outer `workflow_run_id`
-- Inner workflow's `dify.parent.node.execution_id` = tool node's `execution_id`
-- Inner workflow's `dify.parent.workflow.run_id` = outer `workflow_run_id`
-- Inner workflow's `dify.parent.app.id` = outer `app_id`
-
-### Scenario C: Draft Node Execution
-
-A single node run in isolation (debugger/preview mode). It creates its own trace where the node span is the root.
-
-```
-trace_id = UUID(node_execution_id)   ← own trace, NOT part of any workflow
-└── dify.node.execution.draft (span_id = hash(node_execution_id))
-```
-
-**Key difference:** Draft executions use `node_execution_id` as the correlation_id, so they are NOT children of any workflow trace.
-
-## Content Gating
-
-When `ENTERPRISE_INCLUDE_CONTENT` is set to `false`, sensitive content attributes (inputs, outputs, queries) are replaced with reference strings (e.g., `ref:workflow_run_id=...`) to prevent data leakage to the OTEL collector.
-
-**Reference String Format:**
-
-```
-ref:{id_type}={uuid}
-```
-
-**Examples:**
-
-```
-ref:workflow_run_id=550e8400-e29b-41d4-a716-446655440000
-ref:node_execution_id=660e8400-e29b-41d4-a716-446655440001
-ref:message_id=770e8400-e29b-41d4-a716-446655440002
-```
-
-To retrieve actual content when gating is enabled, query the Dify database using the provided UUID.
-
-## Reference
-
-For a complete list of telemetry signals, attributes, and data structures, see [DATA_DICTIONARY.md](./DATA_DICTIONARY.md).

api/enterprise/telemetry/contracts.py

@@ -1,73 +0,0 @@
-"""Telemetry gateway contracts and data structures.
-
-This module defines the envelope format for telemetry events and the routing
-configuration that determines how each event type is processed.
-"""
-
-from __future__ import annotations
-
-from enum import StrEnum
-from typing import Any
-
-from pydantic import BaseModel, ConfigDict
-
-
-class TelemetryCase(StrEnum):
-    """Enumeration of all known telemetry event cases."""
-
-    WORKFLOW_RUN = "workflow_run"
-    NODE_EXECUTION = "node_execution"
-    DRAFT_NODE_EXECUTION = "draft_node_execution"
-    MESSAGE_RUN = "message_run"
-    TOOL_EXECUTION = "tool_execution"
-    MODERATION_CHECK = "moderation_check"
-    SUGGESTED_QUESTION = "suggested_question"
-    DATASET_RETRIEVAL = "dataset_retrieval"
-    GENERATE_NAME = "generate_name"
-    PROMPT_GENERATION = "prompt_generation"
-    APP_CREATED = "app_created"
-    APP_UPDATED = "app_updated"
-    APP_DELETED = "app_deleted"
-    FEEDBACK_CREATED = "feedback_created"
-
-
-class SignalType(StrEnum):
-    """Signal routing type for telemetry cases."""
-
-    TRACE = "trace"
-    METRIC_LOG = "metric_log"
-
-
-class CaseRoute(BaseModel):
-    """Routing configuration for a telemetry case.
-
-    Attributes:
-        signal_type: The type of signal (trace or metric_log).
-        ce_eligible: Whether this case is eligible for community edition tracing.
-    """
-
-    signal_type: SignalType
-    ce_eligible: bool
-
-
-class TelemetryEnvelope(BaseModel):
-    """Envelope for telemetry events.
-
-    Attributes:
-        case: The telemetry case type.
-        tenant_id: The tenant identifier.
-        event_id: Unique event identifier for deduplication.
-        payload: The main event payload (inline for small payloads,
-            empty when offloaded to storage via ``payload_ref``).
-        metadata: Optional metadata dictionary.  When the gateway
-            offloads a large payload to object storage, this contains
-            ``{"payload_ref": "<storage_key>"}``.
-    """
-
-    model_config = ConfigDict(extra="forbid", use_enum_values=False)
-
-    case: TelemetryCase
-    tenant_id: str
-    event_id: str
-    payload: dict[str, Any]
-    metadata: dict[str, Any] | None = None

api/enterprise/telemetry/draft_trace.py

@@ -1,77 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Mapping
-from typing import Any
-
-from core.telemetry import TelemetryContext, TelemetryEvent, TraceTaskName
-from core.telemetry import emit as telemetry_emit
-from dify_graph.enums import WorkflowNodeExecutionMetadataKey
-from models.workflow import WorkflowNodeExecutionModel
-
-
-def enqueue_draft_node_execution_trace(
-    *,
-    execution: WorkflowNodeExecutionModel,
-    outputs: Mapping[str, Any] | None,
-    workflow_execution_id: str | None,
-    user_id: str,
-) -> None:
-    node_data = _build_node_execution_data(
-        execution=execution,
-        outputs=outputs,
-        workflow_execution_id=workflow_execution_id,
-    )
-    telemetry_emit(
-        TelemetryEvent(
-            name=TraceTaskName.DRAFT_NODE_EXECUTION_TRACE,
-            context=TelemetryContext(
-                tenant_id=execution.tenant_id,
-                user_id=user_id,
-                app_id=execution.app_id,
-            ),
-            payload={"node_execution_data": node_data},
-        )
-    )
-
-
-def _build_node_execution_data(
-    *,
-    execution: WorkflowNodeExecutionModel,
-    outputs: Mapping[str, Any] | None,
-    workflow_execution_id: str | None,
-) -> dict[str, Any]:
-    metadata = execution.execution_metadata_dict
-    node_outputs = outputs if outputs is not None else execution.outputs_dict
-    execution_id = workflow_execution_id or execution.workflow_run_id or execution.id
-
-    return {
-        "workflow_id": execution.workflow_id,
-        "workflow_execution_id": execution_id,
-        "tenant_id": execution.tenant_id,
-        "app_id": execution.app_id,
-        "node_execution_id": execution.id,
-        "node_id": execution.node_id,
-        "node_type": execution.node_type,
-        "title": execution.title,
-        "status": execution.status,
-        "error": execution.error,
-        "elapsed_time": execution.elapsed_time,
-        "index": execution.index,
-        "predecessor_node_id": execution.predecessor_node_id,
-        "created_at": execution.created_at,
-        "finished_at": execution.finished_at,
-        "total_tokens": metadata.get(WorkflowNodeExecutionMetadataKey.TOTAL_TOKENS, 0),
-        "total_price": metadata.get(WorkflowNodeExecutionMetadataKey.TOTAL_PRICE, 0.0),
-        "currency": metadata.get(WorkflowNodeExecutionMetadataKey.CURRENCY),
-        "tool_name": (metadata.get(WorkflowNodeExecutionMetadataKey.TOOL_INFO) or {}).get("tool_name")
-        if isinstance(metadata.get(WorkflowNodeExecutionMetadataKey.TOOL_INFO), dict)
-        else None,
-        "iteration_id": metadata.get(WorkflowNodeExecutionMetadataKey.ITERATION_ID),
-        "iteration_index": metadata.get(WorkflowNodeExecutionMetadataKey.ITERATION_INDEX),
-        "loop_id": metadata.get(WorkflowNodeExecutionMetadataKey.LOOP_ID),
-        "loop_index": metadata.get(WorkflowNodeExecutionMetadataKey.LOOP_INDEX),
-        "parallel_id": metadata.get(WorkflowNodeExecutionMetadataKey.PARALLEL_ID),
-        "node_inputs": execution.inputs_dict,
-        "node_outputs": node_outputs,
-        "process_data": execution.process_data_dict,
-    }

api/enterprise/telemetry/enterprise_trace.py

@@ -1,938 +0,0 @@
-"""Enterprise trace handler — duck-typed, NOT a BaseTraceInstance subclass.
-
-Invoked directly in the Celery task, not through OpsTraceManager dispatch.
-Only requires a matching ``trace(trace_info)`` method signature.
-
-Signal strategy:
-- **Traces (spans)**: workflow run, node execution, draft node execution only.
-- **Metrics + structured logs**: all other event types.
-
-Token metric labels (unified structure):
-All token metrics (dify.tokens.input, dify.tokens.output, dify.tokens.total) use the
-same label set for consistent filtering and aggregation:
-- tenant_id: Tenant identifier
-- app_id: Application identifier
-- operation_type: Source of token usage (workflow | node_execution | message | rule_generate | etc.)
-- model_provider: LLM provider name (empty string if not applicable)
-- model_name: LLM model name (empty string if not applicable)
-- node_type: Workflow node type (empty string if not node_execution)
-
-This unified structure allows filtering by operation_type to separate:
-- Workflow-level aggregates (operation_type=workflow)
-- Individual node executions (operation_type=node_execution)
-- Direct message calls (operation_type=message)
-- Prompt generation operations (operation_type=rule_generate, code_generate, etc.)
-
-Without this, tokens are double-counted when querying totals (workflow totals include
-node totals, since workflow.total_tokens is the sum of all node tokens).
-"""
-
-from __future__ import annotations
-
-import json
-import logging
-from typing import Any, cast
-
-from opentelemetry.util.types import AttributeValue
-
-from core.ops.entities.trace_entity import (
-    BaseTraceInfo,
-    DatasetRetrievalTraceInfo,
-    DraftNodeExecutionTrace,
-    GenerateNameTraceInfo,
-    MessageTraceInfo,
-    ModerationTraceInfo,
-    OperationType,
-    PromptGenerationTraceInfo,
-    SuggestedQuestionTraceInfo,
-    ToolTraceInfo,
-    WorkflowNodeTraceInfo,
-    WorkflowTraceInfo,
-)
-from enterprise.telemetry.entities import (
-    EnterpriseTelemetryCounter,
-    EnterpriseTelemetryEvent,
-    EnterpriseTelemetryHistogram,
-    EnterpriseTelemetrySpan,
-    TokenMetricLabels,
-)
-from enterprise.telemetry.telemetry_log import emit_metric_only_event, emit_telemetry_log
-
-logger = logging.getLogger(__name__)
-
-
-class EnterpriseOtelTrace:
-    """Duck-typed enterprise trace handler.
-
-    ``*_trace`` methods emit spans (workflow/node only) or structured logs
-    (all other events), plus metrics at 100 % accuracy.
-    """
-
-    def __init__(self) -> None:
-        from extensions.ext_enterprise_telemetry import get_enterprise_exporter
-
-        exporter = get_enterprise_exporter()
-        if exporter is None:
-            raise RuntimeError("EnterpriseOtelTrace instantiated but exporter is not initialized")
-        self._exporter = exporter
-
-    def trace(self, trace_info: BaseTraceInfo) -> None:
-        if isinstance(trace_info, WorkflowTraceInfo):
-            self._workflow_trace(trace_info)
-        elif isinstance(trace_info, MessageTraceInfo):
-            self._message_trace(trace_info)
-        elif isinstance(trace_info, ToolTraceInfo):
-            self._tool_trace(trace_info)
-        elif isinstance(trace_info, DraftNodeExecutionTrace):
-            self._draft_node_execution_trace(trace_info)
-        elif isinstance(trace_info, WorkflowNodeTraceInfo):
-            self._node_execution_trace(trace_info)
-        elif isinstance(trace_info, ModerationTraceInfo):
-            self._moderation_trace(trace_info)
-        elif isinstance(trace_info, SuggestedQuestionTraceInfo):
-            self._suggested_question_trace(trace_info)
-        elif isinstance(trace_info, DatasetRetrievalTraceInfo):
-            self._dataset_retrieval_trace(trace_info)
-        elif isinstance(trace_info, GenerateNameTraceInfo):
-            self._generate_name_trace(trace_info)
-        elif isinstance(trace_info, PromptGenerationTraceInfo):
-            self._prompt_generation_trace(trace_info)
-
-    def _common_attrs(self, trace_info: BaseTraceInfo) -> dict[str, Any]:
-        metadata = self._metadata(trace_info)
-        tenant_id, app_id, user_id = self._context_ids(trace_info, metadata)
-        return {
-            "dify.trace_id": trace_info.resolved_trace_id,
-            "dify.tenant_id": tenant_id,
-            "dify.app_id": app_id,
-            "dify.app.name": metadata.get("app_name"),
-            "dify.workspace.name": metadata.get("workspace_name"),
-            "gen_ai.user.id": user_id,
-            "dify.message.id": trace_info.message_id,
-        }
-
-    def _metadata(self, trace_info: BaseTraceInfo) -> dict[str, Any]:
-        return trace_info.metadata
-
-    def _context_ids(
-        self,
-        trace_info: BaseTraceInfo,
-        metadata: dict[str, Any],
-    ) -> tuple[str | None, str | None, str | None]:
-        tenant_id = getattr(trace_info, "tenant_id", None) or metadata.get("tenant_id")
-        app_id = getattr(trace_info, "app_id", None) or metadata.get("app_id")
-        user_id = getattr(trace_info, "user_id", None) or metadata.get("user_id")
-        return tenant_id, app_id, user_id
-
-    def _labels(self, **values: AttributeValue) -> dict[str, AttributeValue]:
-        return dict(values)
-
-    def _safe_payload_value(self, value: Any) -> str | dict[str, Any] | list[object] | None:
-        if isinstance(value, str):
-            return value
-        if isinstance(value, dict):
-            return cast(dict[str, Any], value)
-        if isinstance(value, list):
-            items: list[object] = []
-            for item in cast(list[object], value):
-                items.append(item)
-            return items
-        return None
-
-    def _content_or_ref(self, value: Any, ref: str) -> Any:
-        if self._exporter.include_content:
-            return self._maybe_json(value)
-        return ref
-
-    def _maybe_json(self, value: Any) -> str | None:
-        if value is None:
-            return None
-        if isinstance(value, str):
-            return value
-        try:
-            return json.dumps(value, default=str)
-        except (TypeError, ValueError):
-            return str(value)
-
-    # ------------------------------------------------------------------
-    # SPAN-emitting handlers (workflow, node execution, draft node)
-    # ------------------------------------------------------------------
-
-    def _workflow_trace(self, info: WorkflowTraceInfo) -> None:
-        metadata = self._metadata(info)
-        tenant_id, app_id, user_id = self._context_ids(info, metadata)
-        # -- Span attrs: identity + structure + status + timing + gen_ai scalars --
-        span_attrs: dict[str, Any] = {
-            "dify.trace_id": info.resolved_trace_id,
-            "dify.tenant_id": tenant_id,
-            "dify.app_id": app_id,
-            "dify.workflow.id": info.workflow_id,
-            "dify.workflow.run_id": info.workflow_run_id,
-            "dify.workflow.status": info.workflow_run_status,
-            "dify.workflow.error": info.error,
-            "dify.workflow.elapsed_time": info.workflow_run_elapsed_time,
-            "dify.invoke_from": metadata.get("triggered_from"),
-            "dify.conversation.id": info.conversation_id,
-            "dify.message.id": info.message_id,
-            "dify.invoked_by": info.invoked_by,
-            "gen_ai.usage.total_tokens": info.total_tokens,
-            "gen_ai.user.id": user_id,
-        }
-
-        trace_correlation_override, parent_span_id_source = info.resolved_parent_context
-
-        parent_ctx = metadata.get("parent_trace_context")
-        if isinstance(parent_ctx, dict):
-            parent_ctx_dict = cast(dict[str, Any], parent_ctx)
-            span_attrs["dify.parent.trace_id"] = parent_ctx_dict.get("trace_id")
-            span_attrs["dify.parent.node.execution_id"] = parent_ctx_dict.get("parent_node_execution_id")
-            span_attrs["dify.parent.workflow.run_id"] = parent_ctx_dict.get("parent_workflow_run_id")
-            span_attrs["dify.parent.app.id"] = parent_ctx_dict.get("parent_app_id")
-
-        self._exporter.export_span(
-            EnterpriseTelemetrySpan.WORKFLOW_RUN,
-            span_attrs,
-            correlation_id=info.workflow_run_id,
-            span_id_source=info.workflow_run_id,
-            start_time=info.start_time,
-            end_time=info.end_time,
-            trace_correlation_override=trace_correlation_override,
-            parent_span_id_source=parent_span_id_source,
-        )
-
-        # -- Companion log: ALL attrs (span + detail) for full picture --
-        log_attrs: dict[str, Any] = {**span_attrs}
-        log_attrs.update(
-            {
-                "dify.app.name": metadata.get("app_name"),
-                "dify.workspace.name": metadata.get("workspace_name"),
-                "gen_ai.user.id": user_id,
-                "gen_ai.usage.total_tokens": info.total_tokens,
-                "dify.workflow.version": info.workflow_run_version,
-            }
-        )
-
-        ref = f"ref:workflow_run_id={info.workflow_run_id}"
-        log_attrs["dify.workflow.inputs"] = self._content_or_ref(info.workflow_run_inputs, ref)
-        log_attrs["dify.workflow.outputs"] = self._content_or_ref(info.workflow_run_outputs, ref)
-        log_attrs["dify.workflow.query"] = self._content_or_ref(info.query, ref)
-
-        emit_telemetry_log(
-            event_name=EnterpriseTelemetryEvent.WORKFLOW_RUN,
-            attributes=log_attrs,
-            signal="span_detail",
-            trace_id_source=info.workflow_run_id,
-            span_id_source=info.workflow_run_id,
-            tenant_id=tenant_id,
-            user_id=user_id,
-        )
-
-        # -- Metrics --
-        labels = self._labels(
-            tenant_id=tenant_id or "",
-            app_id=app_id or "",
-        )
-        token_labels = TokenMetricLabels(
-            tenant_id=tenant_id or "",
-            app_id=app_id or "",
-            operation_type=OperationType.WORKFLOW,
-            model_provider="",
-            model_name="",
-            node_type="",
-        ).to_dict()
-        self._exporter.increment_counter(EnterpriseTelemetryCounter.TOKENS, info.total_tokens, token_labels)
-        if info.prompt_tokens is not None and info.prompt_tokens > 0:
-            self._exporter.increment_counter(EnterpriseTelemetryCounter.INPUT_TOKENS, info.prompt_tokens, token_labels)
-        if info.completion_tokens is not None and info.completion_tokens > 0:
-            self._exporter.increment_counter(
-                EnterpriseTelemetryCounter.OUTPUT_TOKENS, info.completion_tokens, token_labels
-            )
-        invoke_from = metadata.get("triggered_from", "")
-        self._exporter.increment_counter(
-            EnterpriseTelemetryCounter.REQUESTS,
-            1,
-            self._labels(
-                **labels,
-                type="workflow",
-                status=info.workflow_run_status,
-                invoke_from=invoke_from,
-            ),
-        )
-        # Prefer wall-clock timestamps over the elapsed_time field: elapsed_time defaults
-        # to 0 in the DB and can be stale if the Celery write races with the trace task.
-        # start_time = workflow_run.created_at, end_time = workflow_run.finished_at.
-        if info.start_time and info.end_time:
-            workflow_duration = (info.end_time - info.start_time).total_seconds()
-        elif info.workflow_run_elapsed_time:
-            workflow_duration = float(info.workflow_run_elapsed_time)
-        else:
-            workflow_duration = 0.0
-        self._exporter.record_histogram(
-            EnterpriseTelemetryHistogram.WORKFLOW_DURATION,
-            workflow_duration,
-            self._labels(
-                **labels,
-                status=info.workflow_run_status,
-            ),
-        )
-
-        if info.error:
-            self._exporter.increment_counter(
-                EnterpriseTelemetryCounter.ERRORS,
-                1,
-                self._labels(
-                    **labels,
-                    type="workflow",
-                ),
-            )
-
-    def _node_execution_trace(self, info: WorkflowNodeTraceInfo) -> None:
-        self._emit_node_execution_trace(info, EnterpriseTelemetrySpan.NODE_EXECUTION, "node")
-
-    def _draft_node_execution_trace(self, info: DraftNodeExecutionTrace) -> None:
-        self._emit_node_execution_trace(
-            info,
-            EnterpriseTelemetrySpan.DRAFT_NODE_EXECUTION,
-            "draft_node",
-            correlation_id_override=info.node_execution_id,
-            trace_correlation_override_param=info.workflow_run_id,
-        )
-
-    def _emit_node_execution_trace(
-        self,
-        info: WorkflowNodeTraceInfo,
-        span_name: EnterpriseTelemetrySpan,
-        request_type: str,
-        correlation_id_override: str | None = None,
-        trace_correlation_override_param: str | None = None,
-    ) -> None:
-        metadata = self._metadata(info)
-        tenant_id, app_id, user_id = self._context_ids(info, metadata)
-        # -- Span attrs: identity + structure + status + timing + gen_ai scalars --
-        span_attrs: dict[str, Any] = {
-            "dify.trace_id": info.resolved_trace_id,
-            "dify.tenant_id": tenant_id,
-            "dify.app_id": app_id,
-            "dify.workflow.id": info.workflow_id,
-            "dify.workflow.run_id": info.workflow_run_id,
-            "dify.message.id": info.message_id,
-            "dify.conversation.id": metadata.get("conversation_id"),
-            "dify.node.execution_id": info.node_execution_id,
-            "dify.node.id": info.node_id,
-            "dify.node.type": info.node_type,
-            "dify.node.title": info.title,
-            "dify.node.status": info.status,
-            "dify.node.error": info.error,
-            "dify.node.elapsed_time": info.elapsed_time,
-            "dify.node.index": info.index,
-            "dify.node.predecessor_node_id": info.predecessor_node_id,
-            "dify.node.iteration_id": info.iteration_id,
-            "dify.node.loop_id": info.loop_id,
-            "dify.node.parallel_id": info.parallel_id,
-            "dify.node.invoked_by": info.invoked_by,
-            "gen_ai.usage.input_tokens": info.prompt_tokens,
-            "gen_ai.usage.output_tokens": info.completion_tokens,
-            "gen_ai.usage.total_tokens": info.total_tokens,
-            "gen_ai.request.model": info.model_name,
-            "gen_ai.provider.name": info.model_provider,
-            "gen_ai.user.id": user_id,
-        }
-
-        resolved_override, _ = info.resolved_parent_context
-        trace_correlation_override = trace_correlation_override_param or resolved_override
-
-        effective_correlation_id = correlation_id_override or info.workflow_run_id
-        self._exporter.export_span(
-            span_name,
-            span_attrs,
-            correlation_id=effective_correlation_id,
-            span_id_source=info.node_execution_id,
-            start_time=info.start_time,
-            end_time=info.end_time,
-            trace_correlation_override=trace_correlation_override,
-        )
-
-        # -- Companion log: ALL attrs (span + detail) --
-        log_attrs: dict[str, Any] = {**span_attrs}
-        log_attrs.update(
-            {
-                "dify.app.name": metadata.get("app_name"),
-                "dify.workspace.name": metadata.get("workspace_name"),
-                "dify.invoke_from": metadata.get("invoke_from"),
-                "gen_ai.user.id": user_id,
-                "gen_ai.usage.total_tokens": info.total_tokens,
-                "dify.node.total_price": info.total_price,
-                "dify.node.currency": info.currency,
-                "gen_ai.provider.name": info.model_provider,
-                "gen_ai.request.model": info.model_name,
-                "gen_ai.tool.name": info.tool_name,
-                "dify.node.iteration_index": info.iteration_index,
-                "dify.node.loop_index": info.loop_index,
-                "dify.plugin.name": metadata.get("plugin_name"),
-                "dify.credential.name": metadata.get("credential_name"),
-                "dify.credential.id": metadata.get("credential_id"),
-                "dify.dataset.ids": self._maybe_json(metadata.get("dataset_ids")),
-                "dify.dataset.names": self._maybe_json(metadata.get("dataset_names")),
-            }
-        )
-
-        ref = f"ref:node_execution_id={info.node_execution_id}"
-        log_attrs["dify.node.inputs"] = self._content_or_ref(info.node_inputs, ref)
-        log_attrs["dify.node.outputs"] = self._content_or_ref(info.node_outputs, ref)
-        log_attrs["dify.node.process_data"] = self._content_or_ref(info.process_data, ref)
-
-        emit_telemetry_log(
-            event_name=span_name.value,
-            attributes=log_attrs,
-            signal="span_detail",
-            trace_id_source=info.workflow_run_id,
-            span_id_source=info.node_execution_id,
-            tenant_id=tenant_id,
-            user_id=user_id,
-        )
-
-        # -- Metrics --
-        labels = self._labels(
-            tenant_id=tenant_id or "",
-            app_id=app_id or "",
-            node_type=info.node_type,
-            model_provider=info.model_provider or "",
-        )
-        if info.total_tokens:
-            token_labels = TokenMetricLabels(
-                tenant_id=tenant_id or "",
-                app_id=app_id or "",
-                operation_type=OperationType.NODE_EXECUTION,
-                model_provider=info.model_provider or "",
-                model_name=info.model_name or "",
-                node_type=info.node_type,
-            ).to_dict()
-            self._exporter.increment_counter(EnterpriseTelemetryCounter.TOKENS, info.total_tokens, token_labels)
-            if info.prompt_tokens is not None and info.prompt_tokens > 0:
-                self._exporter.increment_counter(
-                    EnterpriseTelemetryCounter.INPUT_TOKENS, info.prompt_tokens, token_labels
-                )
-            if info.completion_tokens is not None and info.completion_tokens > 0:
-                self._exporter.increment_counter(
-                    EnterpriseTelemetryCounter.OUTPUT_TOKENS, info.completion_tokens, token_labels
-                )
-        self._exporter.increment_counter(
-            EnterpriseTelemetryCounter.REQUESTS,
-            1,
-            self._labels(
-                **labels,
-                type=request_type,
-                status=info.status,
-                model_name=info.model_name or "",
-            ),
-        )
-        duration_labels = dict(labels)
-        duration_labels["model_name"] = info.model_name or ""
-        plugin_name = metadata.get("plugin_name")
-        if plugin_name and info.node_type in {"tool", "knowledge-retrieval"}:
-            duration_labels["plugin_name"] = plugin_name
-        self._exporter.record_histogram(EnterpriseTelemetryHistogram.NODE_DURATION, info.elapsed_time, duration_labels)
-
-        if info.error:
-            self._exporter.increment_counter(
-                EnterpriseTelemetryCounter.ERRORS,
-                1,
-                self._labels(
-                    **labels,
-                    type=request_type,
-                    model_name=info.model_name or "",
-                ),
-            )
-
-    # ------------------------------------------------------------------
-    # METRIC-ONLY handlers (structured log + counters/histograms)
-    # ------------------------------------------------------------------
-
-    def _message_trace(self, info: MessageTraceInfo) -> None:
-        metadata = self._metadata(info)
-        tenant_id, app_id, user_id = self._context_ids(info, metadata)
-        attrs = self._common_attrs(info)
-        attrs.update(
-            {
-                "dify.invoke_from": metadata.get("from_source"),
-                "dify.conversation.id": metadata.get("conversation_id"),
-                "dify.conversation.mode": info.conversation_mode,
-                "gen_ai.provider.name": metadata.get("ls_provider"),
-                "gen_ai.request.model": metadata.get("ls_model_name"),
-                "gen_ai.usage.input_tokens": info.message_tokens,
-                "gen_ai.usage.output_tokens": info.answer_tokens,
-                "gen_ai.usage.total_tokens": info.total_tokens,
-                "dify.message.status": metadata.get("status"),
-                "dify.message.error": info.error,
-                "dify.message.from_source": metadata.get("from_source"),
-                "dify.message.from_end_user_id": metadata.get("from_end_user_id"),
-                "dify.message.from_account_id": metadata.get("from_account_id"),
-                "dify.streaming": info.is_streaming_request,
-                "dify.message.time_to_first_token": info.gen_ai_server_time_to_first_token,
-                "dify.message.streaming_duration": info.llm_streaming_time_to_generate,
-                "dify.workflow.run_id": metadata.get("workflow_run_id"),
-            }
-        )
-        node_execution_id = metadata.get("node_execution_id")
-        if node_execution_id:
-            attrs["dify.node.execution_id"] = node_execution_id
-
-        ref = f"ref:message_id={info.message_id}"
-        inputs = self._safe_payload_value(info.inputs)
-        outputs = self._safe_payload_value(info.outputs)
-        attrs["dify.message.inputs"] = self._content_or_ref(inputs, ref)
-        attrs["dify.message.outputs"] = self._content_or_ref(outputs, ref)
-
-        emit_metric_only_event(
-            event_name=EnterpriseTelemetryEvent.MESSAGE_RUN,
-            attributes=attrs,
-            trace_id_source=metadata.get("workflow_run_id") or (str(info.message_id) if info.message_id else None),
-            span_id_source=node_execution_id,
-            tenant_id=tenant_id,
-            user_id=user_id,
-        )
-
-        labels = self._labels(
-            tenant_id=tenant_id or "",
-            app_id=app_id or "",
-            model_provider=metadata.get("ls_provider") or "",
-            model_name=metadata.get("ls_model_name") or "",
-        )
-        token_labels = TokenMetricLabels(
-            tenant_id=tenant_id or "",
-            app_id=app_id or "",
-            operation_type=OperationType.MESSAGE,
-            model_provider=metadata.get("ls_provider") or "",
-            model_name=metadata.get("ls_model_name") or "",
-            node_type="",
-        ).to_dict()
-        self._exporter.increment_counter(EnterpriseTelemetryCounter.TOKENS, info.total_tokens, token_labels)
-        if info.message_tokens > 0:
-            self._exporter.increment_counter(EnterpriseTelemetryCounter.INPUT_TOKENS, info.message_tokens, token_labels)
-        if info.answer_tokens > 0:
-            self._exporter.increment_counter(EnterpriseTelemetryCounter.OUTPUT_TOKENS, info.answer_tokens, token_labels)
-        invoke_from = metadata.get("from_source", "")
-        self._exporter.increment_counter(
-            EnterpriseTelemetryCounter.REQUESTS,
-            1,
-            self._labels(
-                **labels,
-                type="message",
-                status=metadata.get("status", ""),
-                invoke_from=invoke_from,
-            ),
-        )
-
-        if info.start_time and info.end_time:
-            duration = (info.end_time - info.start_time).total_seconds()
-            self._exporter.record_histogram(EnterpriseTelemetryHistogram.MESSAGE_DURATION, duration, labels)
-
-        if info.gen_ai_server_time_to_first_token is not None:
-            self._exporter.record_histogram(
-                EnterpriseTelemetryHistogram.MESSAGE_TTFT, info.gen_ai_server_time_to_first_token, labels
-            )
-
-        if info.error:
-            self._exporter.increment_counter(
-                EnterpriseTelemetryCounter.ERRORS,
-                1,
-                self._labels(
-                    **labels,
-                    type="message",
-                ),
-            )
-
-    def _tool_trace(self, info: ToolTraceInfo) -> None:
-        metadata = self._metadata(info)
-        tenant_id, app_id, user_id = self._context_ids(info, metadata)
-        attrs = self._common_attrs(info)
-        attrs.update(
-            {
-                "gen_ai.tool.name": info.tool_name,
-                "dify.tool.time_cost": info.time_cost,
-                "dify.tool.error": info.error,
-                "dify.workflow.run_id": metadata.get("workflow_run_id"),
-            }
-        )
-        node_execution_id = metadata.get("node_execution_id")
-        if node_execution_id:
-            attrs["dify.node.execution_id"] = node_execution_id
-
-        ref = f"ref:message_id={info.message_id}"
-        attrs["dify.tool.inputs"] = self._content_or_ref(info.tool_inputs, ref)
-        attrs["dify.tool.outputs"] = self._content_or_ref(info.tool_outputs, ref)
-        attrs["dify.tool.parameters"] = self._content_or_ref(info.tool_parameters, ref)
-        attrs["dify.tool.config"] = self._content_or_ref(info.tool_config, ref)
-
-        emit_metric_only_event(
-            event_name=EnterpriseTelemetryEvent.TOOL_EXECUTION,
-            attributes=attrs,
-            trace_id_source=info.resolved_trace_id,
-            span_id_source=node_execution_id,
-            tenant_id=tenant_id,
-            user_id=user_id,
-        )
-
-        labels = self._labels(
-            tenant_id=tenant_id or "",
-            app_id=app_id or "",
-            tool_name=info.tool_name,
-        )
-        self._exporter.increment_counter(
-            EnterpriseTelemetryCounter.REQUESTS,
-            1,
-            self._labels(
-                **labels,
-                type="tool",
-            ),
-        )
-        self._exporter.record_histogram(EnterpriseTelemetryHistogram.TOOL_DURATION, float(info.time_cost), labels)
-
-        if info.error:
-            self._exporter.increment_counter(
-                EnterpriseTelemetryCounter.ERRORS,
-                1,
-                self._labels(
-                    **labels,
-                    type="tool",
-                ),
-            )
-
-    def _moderation_trace(self, info: ModerationTraceInfo) -> None:
-        metadata = self._metadata(info)
-        tenant_id, app_id, user_id = self._context_ids(info, metadata)
-        attrs = self._common_attrs(info)
-        attrs.update(
-            {
-                "dify.moderation.flagged": info.flagged,
-                "dify.moderation.action": info.action,
-                "dify.moderation.preset_response": info.preset_response,
-                "dify.workflow.run_id": metadata.get("workflow_run_id"),
-            }
-        )
-        node_execution_id = metadata.get("node_execution_id")
-        if node_execution_id:
-            attrs["dify.node.execution_id"] = node_execution_id
-
-        attrs["dify.moderation.query"] = self._content_or_ref(
-            info.query,
-            f"ref:message_id={info.message_id}",
-        )
-
-        emit_metric_only_event(
-            event_name=EnterpriseTelemetryEvent.MODERATION_CHECK,
-            attributes=attrs,
-            trace_id_source=info.resolved_trace_id,
-            span_id_source=node_execution_id,
-            tenant_id=tenant_id,
-            user_id=user_id,
-        )
-
-        labels = self._labels(
-            tenant_id=tenant_id or "",
-            app_id=app_id or "",
-        )
-        self._exporter.increment_counter(
-            EnterpriseTelemetryCounter.REQUESTS,
-            1,
-            self._labels(
-                **labels,
-                type="moderation",
-            ),
-        )
-
-    def _suggested_question_trace(self, info: SuggestedQuestionTraceInfo) -> None:
-        metadata = self._metadata(info)
-        tenant_id, app_id, user_id = self._context_ids(info, metadata)
-        attrs = self._common_attrs(info)
-        attrs.update(
-            {
-                "gen_ai.usage.total_tokens": info.total_tokens,
-                "dify.suggested_question.status": info.status,
-                "dify.suggested_question.error": info.error,
-                "gen_ai.provider.name": info.model_provider,
-                "gen_ai.request.model": info.model_id,
-                "dify.suggested_question.count": len(info.suggested_question),
-                "dify.workflow.run_id": metadata.get("workflow_run_id"),
-            }
-        )
-        node_execution_id = metadata.get("node_execution_id")
-        if node_execution_id:
-            attrs["dify.node.execution_id"] = node_execution_id
-
-        attrs["dify.suggested_question.questions"] = self._content_or_ref(
-            info.suggested_question,
-            f"ref:message_id={info.message_id}",
-        )
-
-        emit_metric_only_event(
-            event_name=EnterpriseTelemetryEvent.SUGGESTED_QUESTION_GENERATION,
-            attributes=attrs,
-            trace_id_source=info.resolved_trace_id,
-            span_id_source=node_execution_id,
-            tenant_id=tenant_id,
-            user_id=user_id,
-        )
-
-        labels = self._labels(
-            tenant_id=tenant_id or "",
-            app_id=app_id or "",
-        )
-        self._exporter.increment_counter(
-            EnterpriseTelemetryCounter.REQUESTS,
-            1,
-            self._labels(
-                **labels,
-                type="suggested_question",
-                model_provider=info.model_provider or "",
-                model_name=info.model_id or "",
-            ),
-        )
-
-    def _dataset_retrieval_trace(self, info: DatasetRetrievalTraceInfo) -> None:
-        metadata = self._metadata(info)
-        tenant_id, app_id, user_id = self._context_ids(info, metadata)
-        attrs = self._common_attrs(info)
-        attrs["dify.dataset.error"] = info.error
-        attrs["dify.workflow.run_id"] = metadata.get("workflow_run_id")
-        node_execution_id = metadata.get("node_execution_id")
-        if node_execution_id:
-            attrs["dify.node.execution_id"] = node_execution_id
-
-        docs: list[dict[str, Any]] = []
-        documents_any: Any = info.documents
-        documents_list: list[Any] = cast(list[Any], documents_any) if isinstance(documents_any, list) else []
-        for entry in documents_list:
-            if isinstance(entry, dict):
-                entry_dict: dict[str, Any] = cast(dict[str, Any], entry)
-                docs.append(entry_dict)
-        dataset_ids: list[str] = []
-        dataset_names: list[str] = []
-        structured_docs: list[dict[str, Any]] = []
-        for doc in docs:
-            meta_raw = doc.get("metadata")
-            meta: dict[str, Any] = cast(dict[str, Any], meta_raw) if isinstance(meta_raw, dict) else {}
-            did = meta.get("dataset_id")
-            dname = meta.get("dataset_name")
-            if did and did not in dataset_ids:
-                dataset_ids.append(did)
-            if dname and dname not in dataset_names:
-                dataset_names.append(dname)
-            structured_docs.append(
-                {
-                    "dataset_id": did,
-                    "document_id": meta.get("document_id"),
-                    "segment_id": meta.get("segment_id"),
-                    "score": meta.get("score"),
-                }
-            )
-
-        attrs["dify.dataset.ids"] = self._maybe_json(dataset_ids)
-        attrs["dify.dataset.names"] = self._maybe_json(dataset_names)
-        attrs["dify.retrieval.document_count"] = len(docs)
-
-        embedding_models_raw: Any = metadata.get("embedding_models")
-        embedding_models: dict[str, Any] = (
-            cast(dict[str, Any], embedding_models_raw) if isinstance(embedding_models_raw, dict) else {}
-        )
-        if embedding_models:
-            providers: list[str] = []
-            models: list[str] = []
-            for ds_info in embedding_models.values():
-                if isinstance(ds_info, dict):
-                    ds_info_dict: dict[str, Any] = cast(dict[str, Any], ds_info)
-                    p = ds_info_dict.get("embedding_model_provider", "")
-                    m = ds_info_dict.get("embedding_model", "")
-                    if p and p not in providers:
-                        providers.append(p)
-                    if m and m not in models:
-                        models.append(m)
-            attrs["dify.dataset.embedding_providers"] = self._maybe_json(providers)
-            attrs["dify.dataset.embedding_models"] = self._maybe_json(models)
-
-        # Add rerank model to logs
-        rerank_provider = metadata.get("rerank_model_provider", "")
-        rerank_model = metadata.get("rerank_model_name", "")
-        if rerank_provider or rerank_model:
-            attrs["dify.retrieval.rerank_provider"] = rerank_provider
-            attrs["dify.retrieval.rerank_model"] = rerank_model
-
-        ref = f"ref:message_id={info.message_id}"
-        retrieval_inputs = self._safe_payload_value(info.inputs)
-        attrs["dify.retrieval.query"] = self._content_or_ref(retrieval_inputs, ref)
-        attrs["dify.dataset.documents"] = self._content_or_ref(structured_docs, ref)
-
-        emit_metric_only_event(
-            event_name=EnterpriseTelemetryEvent.DATASET_RETRIEVAL,
-            attributes=attrs,
-            trace_id_source=metadata.get("workflow_run_id") or (str(info.message_id) if info.message_id else None),
-            span_id_source=node_execution_id or (str(info.message_id) if info.message_id else None),
-            tenant_id=tenant_id,
-            user_id=user_id,
-        )
-
-        labels = self._labels(
-            tenant_id=tenant_id or "",
-            app_id=app_id or "",
-        )
-        self._exporter.increment_counter(
-            EnterpriseTelemetryCounter.REQUESTS,
-            1,
-            self._labels(
-                **labels,
-                type="dataset_retrieval",
-            ),
-        )
-
-        for did in dataset_ids:
-            # Get embedding model for this specific dataset
-            ds_embedding_info = embedding_models.get(did, {})
-            embedding_provider = ds_embedding_info.get("embedding_model_provider", "")
-            embedding_model = ds_embedding_info.get("embedding_model", "")
-
-            # Get rerank model (same for all datasets in this retrieval)
-            rerank_provider = metadata.get("rerank_model_provider", "")
-            rerank_model = metadata.get("rerank_model_name", "")
-
-            self._exporter.increment_counter(
-                EnterpriseTelemetryCounter.DATASET_RETRIEVALS,
-                1,
-                self._labels(
-                    **labels,
-                    dataset_id=did,
-                    embedding_model_provider=embedding_provider,
-                    embedding_model=embedding_model,
-                    rerank_model_provider=rerank_provider,
-                    rerank_model=rerank_model,
-                ),
-            )
-
-    def _generate_name_trace(self, info: GenerateNameTraceInfo) -> None:
-        metadata = self._metadata(info)
-        tenant_id, app_id, user_id = self._context_ids(info, metadata)
-        attrs = self._common_attrs(info)
-        attrs["dify.conversation.id"] = info.conversation_id
-        node_execution_id = metadata.get("node_execution_id")
-        if node_execution_id:
-            attrs["dify.node.execution_id"] = node_execution_id
-
-        ref = f"ref:conversation_id={info.conversation_id}"
-        inputs = self._safe_payload_value(info.inputs)
-        outputs = self._safe_payload_value(info.outputs)
-        attrs["dify.generate_name.inputs"] = self._content_or_ref(inputs, ref)
-        attrs["dify.generate_name.outputs"] = self._content_or_ref(outputs, ref)
-
-        emit_metric_only_event(
-            event_name=EnterpriseTelemetryEvent.GENERATE_NAME_EXECUTION,
-            attributes=attrs,
-            trace_id_source=info.resolved_trace_id,
-            span_id_source=node_execution_id,
-            tenant_id=tenant_id,
-            user_id=user_id,
-        )
-
-        labels = self._labels(
-            tenant_id=tenant_id or "",
-            app_id=app_id or "",
-        )
-        self._exporter.increment_counter(
-            EnterpriseTelemetryCounter.REQUESTS,
-            1,
-            self._labels(
-                **labels,
-                type="generate_name",
-            ),
-        )
-
-    def _prompt_generation_trace(self, info: PromptGenerationTraceInfo) -> None:
-        metadata = self._metadata(info)
-        tenant_id, app_id, user_id = self._context_ids(info, metadata)
-        attrs = {
-            "dify.trace_id": info.resolved_trace_id,
-            "dify.tenant_id": tenant_id,
-            "dify.user.id": user_id,
-            "dify.app.id": app_id or "",
-            "dify.app.name": metadata.get("app_name"),
-            "dify.workspace.name": metadata.get("workspace_name"),
-            "dify.operation.type": info.operation_type,
-            "gen_ai.provider.name": info.model_provider,
-            "gen_ai.request.model": info.model_name,
-            "gen_ai.usage.input_tokens": info.prompt_tokens,
-            "gen_ai.usage.output_tokens": info.completion_tokens,
-            "gen_ai.usage.total_tokens": info.total_tokens,
-            "dify.prompt_generation.latency": info.latency,
-            "dify.prompt_generation.error": info.error,
-        }
-        node_execution_id = metadata.get("node_execution_id")
-        if node_execution_id:
-            attrs["dify.node.execution_id"] = node_execution_id
-
-        if info.total_price is not None:
-            attrs["dify.prompt_generation.total_price"] = info.total_price
-            attrs["dify.prompt_generation.currency"] = info.currency
-
-        ref = f"ref:trace_id={info.trace_id}"
-        outputs = self._safe_payload_value(info.outputs)
-        attrs["dify.prompt_generation.instruction"] = self._content_or_ref(info.instruction, ref)
-        attrs["dify.prompt_generation.output"] = self._content_or_ref(outputs, ref)
-
-        emit_metric_only_event(
-            event_name=EnterpriseTelemetryEvent.PROMPT_GENERATION_EXECUTION,
-            attributes=attrs,
-            trace_id_source=info.resolved_trace_id,
-            span_id_source=node_execution_id,
-            tenant_id=tenant_id,
-            user_id=user_id,
-        )
-
-        token_labels = TokenMetricLabels(
-            tenant_id=tenant_id or "",
-            app_id=app_id or "",
-            operation_type=info.operation_type,
-            model_provider=info.model_provider,
-            model_name=info.model_name,
-            node_type="",
-        ).to_dict()
-
-        labels = self._labels(
-            tenant_id=tenant_id or "",
-            app_id=app_id or "",
-            operation_type=info.operation_type,
-            model_provider=info.model_provider,
-            model_name=info.model_name,
-        )
-
-        self._exporter.increment_counter(EnterpriseTelemetryCounter.TOKENS, info.total_tokens, token_labels)
-        if info.prompt_tokens > 0:
-            self._exporter.increment_counter(EnterpriseTelemetryCounter.INPUT_TOKENS, info.prompt_tokens, token_labels)
-        if info.completion_tokens > 0:
-            self._exporter.increment_counter(
-                EnterpriseTelemetryCounter.OUTPUT_TOKENS, info.completion_tokens, token_labels
-            )
-
-        status = "failed" if info.error else "success"
-        self._exporter.increment_counter(
-            EnterpriseTelemetryCounter.REQUESTS,
-            1,
-            self._labels(
-                **labels,
-                type="prompt_generation",
-                status=status,
-            ),
-        )
-
-        self._exporter.record_histogram(
-            EnterpriseTelemetryHistogram.PROMPT_GENERATION_DURATION,
-            info.latency,
-            labels,
-        )
-
-        if info.error:
-            self._exporter.increment_counter(
-                EnterpriseTelemetryCounter.ERRORS,
-                1,
-                self._labels(
-                    **labels,
-                    type="prompt_generation",
-                ),
-            )

api/enterprise/telemetry/entities/__init__.py

@@ -1,121 +0,0 @@
-from enum import StrEnum
-from typing import cast
-
-from opentelemetry.util.types import AttributeValue
-from pydantic import BaseModel, ConfigDict
-
-
-class EnterpriseTelemetrySpan(StrEnum):
-    WORKFLOW_RUN = "dify.workflow.run"
-    NODE_EXECUTION = "dify.node.execution"
-    DRAFT_NODE_EXECUTION = "dify.node.execution.draft"
-
-
-class EnterpriseTelemetryEvent(StrEnum):
-    """Event names for enterprise telemetry logs."""
-
-    APP_CREATED = "dify.app.created"
-    APP_UPDATED = "dify.app.updated"
-    APP_DELETED = "dify.app.deleted"
-    FEEDBACK_CREATED = "dify.feedback.created"
-    WORKFLOW_RUN = "dify.workflow.run"
-    MESSAGE_RUN = "dify.message.run"
-    TOOL_EXECUTION = "dify.tool.execution"
-    MODERATION_CHECK = "dify.moderation.check"
-    SUGGESTED_QUESTION_GENERATION = "dify.suggested_question.generation"
-    DATASET_RETRIEVAL = "dify.dataset.retrieval"
-    GENERATE_NAME_EXECUTION = "dify.generate_name.execution"
-    PROMPT_GENERATION_EXECUTION = "dify.prompt_generation.execution"
-    REHYDRATION_FAILED = "dify.telemetry.rehydration_failed"
-
-
-class EnterpriseTelemetryCounter(StrEnum):
-    TOKENS = "tokens"
-    INPUT_TOKENS = "input_tokens"
-    OUTPUT_TOKENS = "output_tokens"
-    REQUESTS = "requests"
-    ERRORS = "errors"
-    FEEDBACK = "feedback"
-    DATASET_RETRIEVALS = "dataset_retrievals"
-    APP_CREATED = "app_created"
-    APP_UPDATED = "app_updated"
-    APP_DELETED = "app_deleted"
-
-
-class EnterpriseTelemetryHistogram(StrEnum):
-    WORKFLOW_DURATION = "workflow_duration"
-    NODE_DURATION = "node_duration"
-    MESSAGE_DURATION = "message_duration"
-    MESSAGE_TTFT = "message_ttft"
-    TOOL_DURATION = "tool_duration"
-    PROMPT_GENERATION_DURATION = "prompt_generation_duration"
-
-
-class TokenMetricLabels(BaseModel):
-    """Unified label structure for all dify.token.* metrics.
-
-    All token counters (dify.tokens.input, dify.tokens.output, dify.tokens.total) MUST
-    use this exact label set to ensure consistent filtering and aggregation across
-    different operation types.
-
-    Attributes:
-        tenant_id: Tenant identifier.
-        app_id: Application identifier.
-        operation_type: Source of token usage (workflow | node_execution | message |
-            rule_generate | code_generate | structured_output | instruction_modify).
-        model_provider: LLM provider name. Empty string if not applicable (e.g., workflow-level).
-        model_name: LLM model name. Empty string if not applicable (e.g., workflow-level).
-        node_type: Workflow node type. Empty string unless operation_type=node_execution.
-
-    Usage:
-        labels = TokenMetricLabels(
-            tenant_id="tenant-123",
-            app_id="app-456",
-            operation_type=OperationType.WORKFLOW,
-            model_provider="",
-            model_name="",
-            node_type="",
-        )
-        exporter.increment_counter(
-            EnterpriseTelemetryCounter.INPUT_TOKENS,
-            100,
-            labels.to_dict()
-        )
-
-    Design rationale:
-        Without this unified structure, tokens get double-counted when querying totals
-        because workflow.total_tokens is already the sum of all node tokens. The
-        operation_type label allows filtering to separate workflow-level aggregates from
-        node-level detail, while keeping the same label cardinality for consistent queries.
-    """
-
-    tenant_id: str
-    app_id: str
-    operation_type: str
-    model_provider: str
-    model_name: str
-    node_type: str
-
-    model_config = ConfigDict(extra="forbid", frozen=True)
-
-    def to_dict(self) -> dict[str, AttributeValue]:
-        return cast(
-            dict[str, AttributeValue],
-            {
-                "tenant_id": self.tenant_id,
-                "app_id": self.app_id,
-                "operation_type": self.operation_type,
-                "model_provider": self.model_provider,
-                "model_name": self.model_name,
-                "node_type": self.node_type,
-            },
-        )
-
-
-__all__ = [
-    "EnterpriseTelemetryCounter",
-    "EnterpriseTelemetryEvent",
-    "EnterpriseTelemetryHistogram",
-    "EnterpriseTelemetrySpan",
-    "TokenMetricLabels",
-]

api/enterprise/telemetry/event_handlers.py

@@ -1,99 +0,0 @@
-"""Blinker signal handlers for enterprise telemetry.
-
-Registered at import time via ``@signal.connect`` decorators.
-Import must happen during ``ext_enterprise_telemetry.init_app()`` to
-ensure handlers fire.  Each handler delegates to ``core.telemetry.gateway``
-which handles routing, EE-gating, and dispatch.
-
-All handlers are best-effort: exceptions are caught and logged so that
-telemetry failures never break user-facing operations.
-"""
-
-from __future__ import annotations
-
-import logging
-
-from events.app_event import app_was_created, app_was_deleted, app_was_updated
-from events.feedback_event import feedback_was_created
-
-logger = logging.getLogger(__name__)
-
-__all__ = [
-    "_handle_app_created",
-    "_handle_app_deleted",
-    "_handle_app_updated",
-    "_handle_feedback_created",
-]
-
-
-@app_was_created.connect
-def _handle_app_created(sender: object, **kwargs: object) -> None:
-    try:
-        from core.telemetry.gateway import emit as gateway_emit
-        from enterprise.telemetry.contracts import TelemetryCase
-
-        gateway_emit(
-            case=TelemetryCase.APP_CREATED,
-            context={"tenant_id": str(getattr(sender, "tenant_id", "") or "")},
-            payload={
-                "app_id": getattr(sender, "id", None),
-                "mode": getattr(sender, "mode", None),
-            },
-        )
-    except Exception:
-        logger.warning("Failed to emit app_created telemetry", exc_info=True)
-
-
-@app_was_deleted.connect
-def _handle_app_deleted(sender: object, **kwargs: object) -> None:
-    try:
-        from core.telemetry.gateway import emit as gateway_emit
-        from enterprise.telemetry.contracts import TelemetryCase
-
-        gateway_emit(
-            case=TelemetryCase.APP_DELETED,
-            context={"tenant_id": str(getattr(sender, "tenant_id", "") or "")},
-            payload={"app_id": getattr(sender, "id", None)},
-        )
-    except Exception:
-        logger.warning("Failed to emit app_deleted telemetry", exc_info=True)
-
-
-@app_was_updated.connect
-def _handle_app_updated(sender: object, **kwargs: object) -> None:
-    try:
-        from core.telemetry.gateway import emit as gateway_emit
-        from enterprise.telemetry.contracts import TelemetryCase
-
-        gateway_emit(
-            case=TelemetryCase.APP_UPDATED,
-            context={"tenant_id": str(getattr(sender, "tenant_id", "") or "")},
-            payload={"app_id": getattr(sender, "id", None)},
-        )
-    except Exception:
-        logger.warning("Failed to emit app_updated telemetry", exc_info=True)
-
-
-@feedback_was_created.connect
-def _handle_feedback_created(sender: object, **kwargs: object) -> None:
-    try:
-        from core.telemetry.gateway import emit as gateway_emit
-        from enterprise.telemetry.contracts import TelemetryCase
-
-        tenant_id = str(kwargs.get("tenant_id", "") or "")
-        gateway_emit(
-            case=TelemetryCase.FEEDBACK_CREATED,
-            context={"tenant_id": tenant_id},
-            payload={
-                "message_id": getattr(sender, "message_id", None),
-                "app_id": getattr(sender, "app_id", None),
-                "conversation_id": getattr(sender, "conversation_id", None),
-                "from_end_user_id": getattr(sender, "from_end_user_id", None),
-                "from_account_id": getattr(sender, "from_account_id", None),
-                "rating": getattr(sender, "rating", None),
-                "from_source": getattr(sender, "from_source", None),
-                "content": getattr(sender, "content", None),
-            },
-        )
-    except Exception:
-        logger.warning("Failed to emit feedback_created telemetry", exc_info=True)

api/enterprise/telemetry/exporter.py

@@ -1,289 +0,0 @@
-"""Enterprise OTEL exporter — shared by EnterpriseOtelTrace, event handlers, and direct instrumentation.
-
-Uses dedicated TracerProvider and MeterProvider instances (configurable sampling,
-independent from ext_otel.py infrastructure).
-
-Initialized once during Flask extension init (single-threaded via ext_enterprise_telemetry.py).
-Accessed via ``ext_enterprise_telemetry.get_enterprise_exporter()`` from any thread/process.
-"""
-
-import logging
-import socket
-import uuid
-from datetime import UTC, datetime
-from typing import Any, cast
-
-from opentelemetry import trace
-from opentelemetry.context import Context
-from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import OTLPMetricExporter as GRPCMetricExporter
-from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter as GRPCSpanExporter
-from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter as HTTPMetricExporter
-from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter as HTTPSpanExporter
-from opentelemetry.sdk.metrics import MeterProvider
-from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
-from opentelemetry.sdk.resources import Resource
-from opentelemetry.sdk.trace import TracerProvider
-from opentelemetry.sdk.trace.export import BatchSpanProcessor
-from opentelemetry.sdk.trace.sampling import ParentBasedTraceIdRatio
-from opentelemetry.semconv.resource import ResourceAttributes
-from opentelemetry.trace import SpanContext, TraceFlags
-from opentelemetry.util.types import Attributes, AttributeValue
-
-from configs import dify_config
-from enterprise.telemetry.entities import EnterpriseTelemetryCounter, EnterpriseTelemetryHistogram
-from enterprise.telemetry.id_generator import (
-    CorrelationIdGenerator,
-    compute_deterministic_span_id,
-    set_correlation_id,
-    set_span_id_source,
-)
-
-logger = logging.getLogger(__name__)
-
-
-def is_enterprise_telemetry_enabled() -> bool:
-    return bool(dify_config.ENTERPRISE_ENABLED and dify_config.ENTERPRISE_TELEMETRY_ENABLED)
-
-
-def _parse_otlp_headers(raw: str) -> dict[str, str]:
-    """Parse ``key=value,key2=value2`` into a dict."""
-    if not raw:
-        return {}
-    headers: dict[str, str] = {}
-    for pair in raw.split(","):
-        if "=" not in pair:
-            continue
-        k, v = pair.split("=", 1)
-        headers[k.strip().lower()] = v.strip()
-    return headers
-
-
-def _datetime_to_ns(dt: datetime) -> int:
-    """Convert a datetime to nanoseconds since epoch (OTEL convention)."""
-    # Ensure we always interpret naive datetimes as UTC instead of local time.
-    if dt.tzinfo is None:
-        dt = dt.replace(tzinfo=UTC)
-    else:
-        dt = dt.astimezone(UTC)
-    return int(dt.timestamp() * 1_000_000_000)
-
-
-class _ExporterFactory:
-    def __init__(self, protocol: str, endpoint: str, headers: dict[str, str], insecure: bool):
-        self._protocol = protocol
-        self._endpoint = endpoint
-        self._headers = headers
-        self._grpc_headers = tuple(headers.items()) if headers else None
-        self._http_headers = headers or None
-        self._insecure = insecure
-
-    def create_trace_exporter(self) -> HTTPSpanExporter | GRPCSpanExporter:
-        if self._protocol == "grpc":
-            return GRPCSpanExporter(
-                endpoint=self._endpoint or None,
-                headers=self._grpc_headers,
-                insecure=self._insecure,
-            )
-        trace_endpoint = f"{self._endpoint}/v1/traces" if self._endpoint else ""
-        return HTTPSpanExporter(endpoint=trace_endpoint or None, headers=self._http_headers)
-
-    def create_metric_exporter(self) -> HTTPMetricExporter | GRPCMetricExporter:
-        if self._protocol == "grpc":
-            return GRPCMetricExporter(
-                endpoint=self._endpoint or None,
-                headers=self._grpc_headers,
-                insecure=self._insecure,
-            )
-        metric_endpoint = f"{self._endpoint}/v1/metrics" if self._endpoint else ""
-        return HTTPMetricExporter(endpoint=metric_endpoint or None, headers=self._http_headers)
-
-
-class EnterpriseExporter:
-    """Shared OTEL exporter for all enterprise telemetry.
-
-    ``export_span`` creates spans with optional real timestamps, deterministic
-    span/trace IDs, and cross-workflow parent linking.
-    ``increment_counter`` / ``record_histogram`` emit OTEL metrics at 100% accuracy.
-    """
-
-    def __init__(self, config: object) -> None:
-        endpoint: str = getattr(config, "ENTERPRISE_OTLP_ENDPOINT", "")
-        headers_raw: str = getattr(config, "ENTERPRISE_OTLP_HEADERS", "")
-        protocol: str = (getattr(config, "ENTERPRISE_OTLP_PROTOCOL", "http") or "http").lower()
-        service_name: str = getattr(config, "ENTERPRISE_SERVICE_NAME", "dify")
-        sampling_rate: float = getattr(config, "ENTERPRISE_OTEL_SAMPLING_RATE", 1.0)
-        self.include_content: bool = getattr(config, "ENTERPRISE_INCLUDE_CONTENT", True)
-        api_key: str = getattr(config, "ENTERPRISE_OTLP_API_KEY", "")
-
-        # Auto-detect TLS: https:// uses secure, everything else is insecure
-        insecure = not endpoint.startswith("https://")
-
-        resource = Resource(
-            attributes={
-                ResourceAttributes.SERVICE_NAME: service_name,
-                ResourceAttributes.HOST_NAME: socket.gethostname(),
-            }
-        )
-        sampler = ParentBasedTraceIdRatio(sampling_rate)
-        id_generator = CorrelationIdGenerator()
-        self._tracer_provider = TracerProvider(resource=resource, sampler=sampler, id_generator=id_generator)
-
-        headers = _parse_otlp_headers(headers_raw)
-        if api_key:
-            if "authorization" in headers:
-                logger.warning(
-                    "ENTERPRISE_OTLP_API_KEY is set but ENTERPRISE_OTLP_HEADERS also contains "
-                    "'authorization'; the API key will take precedence."
-                )
-            headers["authorization"] = f"Bearer {api_key}"
-        factory = _ExporterFactory(protocol, endpoint, headers, insecure=insecure)
-
-        trace_exporter = factory.create_trace_exporter()
-        self._tracer_provider.add_span_processor(BatchSpanProcessor(trace_exporter))
-        self._tracer = self._tracer_provider.get_tracer("dify.enterprise")
-
-        metric_exporter = factory.create_metric_exporter()
-        self._meter_provider = MeterProvider(
-            resource=resource,
-            metric_readers=[PeriodicExportingMetricReader(metric_exporter)],
-        )
-        meter = self._meter_provider.get_meter("dify.enterprise")
-        self._counters = {
-            EnterpriseTelemetryCounter.TOKENS: meter.create_counter("dify.tokens.total", unit="{token}"),
-            EnterpriseTelemetryCounter.INPUT_TOKENS: meter.create_counter("dify.tokens.input", unit="{token}"),
-            EnterpriseTelemetryCounter.OUTPUT_TOKENS: meter.create_counter("dify.tokens.output", unit="{token}"),
-            EnterpriseTelemetryCounter.REQUESTS: meter.create_counter("dify.requests.total", unit="{request}"),
-            EnterpriseTelemetryCounter.ERRORS: meter.create_counter("dify.errors.total", unit="{error}"),
-            EnterpriseTelemetryCounter.FEEDBACK: meter.create_counter("dify.feedback.total", unit="{feedback}"),
-            EnterpriseTelemetryCounter.DATASET_RETRIEVALS: meter.create_counter(
-                "dify.dataset.retrievals.total", unit="{retrieval}"
-            ),
-            EnterpriseTelemetryCounter.APP_CREATED: meter.create_counter("dify.app.created.total", unit="{app}"),
-            EnterpriseTelemetryCounter.APP_UPDATED: meter.create_counter("dify.app.updated.total", unit="{app}"),
-            EnterpriseTelemetryCounter.APP_DELETED: meter.create_counter("dify.app.deleted.total", unit="{app}"),
-        }
-        self._histograms = {
-            EnterpriseTelemetryHistogram.WORKFLOW_DURATION: meter.create_histogram("dify.workflow.duration", unit="s"),
-            EnterpriseTelemetryHistogram.NODE_DURATION: meter.create_histogram("dify.node.duration", unit="s"),
-            EnterpriseTelemetryHistogram.MESSAGE_DURATION: meter.create_histogram("dify.message.duration", unit="s"),
-            EnterpriseTelemetryHistogram.MESSAGE_TTFT: meter.create_histogram(
-                "dify.message.time_to_first_token", unit="s"
-            ),
-            EnterpriseTelemetryHistogram.TOOL_DURATION: meter.create_histogram("dify.tool.duration", unit="s"),
-            EnterpriseTelemetryHistogram.PROMPT_GENERATION_DURATION: meter.create_histogram(
-                "dify.prompt_generation.duration", unit="s"
-            ),
-        }
-
-    def export_span(
-        self,
-        name: str,
-        attributes: dict[str, Any],
-        correlation_id: str | None = None,
-        span_id_source: str | None = None,
-        start_time: datetime | None = None,
-        end_time: datetime | None = None,
-        trace_correlation_override: str | None = None,
-        parent_span_id_source: str | None = None,
-    ) -> None:
-        """Export an OTEL span with optional deterministic IDs and real timestamps.
-
-        Args:
-            name: Span operation name.
-            attributes: Span attributes dict.
-            correlation_id: Source for trace_id derivation (groups spans in one trace).
-            span_id_source: Source for deterministic span_id (e.g. workflow_run_id or node_execution_id).
-            start_time: Real span start time. When None, uses current time.
-            end_time: Real span end time. When None, span ends immediately.
-            trace_correlation_override: Override trace_id source (for cross-workflow linking).
-                When set, trace_id is derived from this instead of ``correlation_id``.
-            parent_span_id_source: Override parent span_id source (for cross-workflow linking).
-                When set, parent span_id is derived from this value. When None and
-                ``correlation_id`` is set, parent is the workflow root span.
-        """
-        effective_trace_correlation = trace_correlation_override or correlation_id
-        set_correlation_id(effective_trace_correlation)
-        set_span_id_source(span_id_source)
-
-        try:
-            parent_context: Context | None = None
-            # A span is the "root" of its correlation group when span_id_source == correlation_id
-            # (i.e. a workflow root span).  All other spans are children.
-            if parent_span_id_source:
-                # Cross-workflow linking: parent is an explicit span (e.g. tool node in outer workflow)
-                parent_span_id = compute_deterministic_span_id(parent_span_id_source)
-                try:
-                    parent_trace_id = int(uuid.UUID(effective_trace_correlation)) if effective_trace_correlation else 0
-                except (ValueError, AttributeError):
-                    logger.warning(
-                        "Invalid trace correlation UUID for cross-workflow link: %s, span=%s",
-                        effective_trace_correlation,
-                        name,
-                    )
-                    parent_trace_id = 0
-                if parent_trace_id:
-                    parent_span_context = SpanContext(
-                        trace_id=parent_trace_id,
-                        span_id=parent_span_id,
-                        is_remote=True,
-                        trace_flags=TraceFlags(TraceFlags.SAMPLED),
-                    )
-                    parent_context = trace.set_span_in_context(trace.NonRecordingSpan(parent_span_context))
-            elif correlation_id and correlation_id != span_id_source:
-                # Child span: parent is the correlation-group root (workflow root span)
-                parent_span_id = compute_deterministic_span_id(correlation_id)
-                try:
-                    parent_trace_id = int(uuid.UUID(effective_trace_correlation or correlation_id))
-                except (ValueError, AttributeError):
-                    logger.warning(
-                        "Invalid trace correlation UUID for child span link: %s, span=%s",
-                        effective_trace_correlation or correlation_id,
-                        name,
-                    )
-                    parent_trace_id = 0
-                if parent_trace_id:
-                    parent_span_context = SpanContext(
-                        trace_id=parent_trace_id,
-                        span_id=parent_span_id,
-                        is_remote=True,
-                        trace_flags=TraceFlags(TraceFlags.SAMPLED),
-                    )
-                    parent_context = trace.set_span_in_context(trace.NonRecordingSpan(parent_span_context))
-
-            span_start_time = _datetime_to_ns(start_time) if start_time is not None else None
-            span_end_on_exit = end_time is None
-
-            with self._tracer.start_as_current_span(
-                name,
-                context=parent_context,
-                start_time=span_start_time,
-                end_on_exit=span_end_on_exit,
-            ) as span:
-                for key, value in attributes.items():
-                    if value is not None:
-                        span.set_attribute(key, value)
-                if end_time is not None:
-                    span.end(end_time=_datetime_to_ns(end_time))
-        except Exception:
-            logger.exception("Failed to export span %s", name)
-        finally:
-            set_correlation_id(None)
-            set_span_id_source(None)
-
-    def increment_counter(
-        self, name: EnterpriseTelemetryCounter, value: int, labels: dict[str, AttributeValue]
-    ) -> None:
-        counter = self._counters.get(name)
-        if counter:
-            counter.add(value, cast(Attributes, labels))
-
-    def record_histogram(
-        self, name: EnterpriseTelemetryHistogram, value: float, labels: dict[str, AttributeValue]
-    ) -> None:
-        histogram = self._histograms.get(name)
-        if histogram:
-            histogram.record(value, cast(Attributes, labels))
-
-    def shutdown(self) -> None:
-        self._tracer_provider.shutdown()
-        self._meter_provider.shutdown()

api/enterprise/telemetry/id_generator.py

@@ -1,75 +0,0 @@
-"""Custom OTEL ID Generator for correlation-based trace/span ID derivation.
-
-Uses contextvars for thread-safe correlation_id -> trace_id mapping.
-When a span_id_source is set, the span_id is derived deterministically
-from that value, enabling any span to reference another as parent
-without depending on span creation order.
-"""
-
-import random
-import uuid
-from contextvars import ContextVar
-
-from opentelemetry.sdk.trace.id_generator import IdGenerator
-
-_correlation_id_context: ContextVar[str | None] = ContextVar("correlation_id", default=None)
-_span_id_source_context: ContextVar[str | None] = ContextVar("span_id_source", default=None)
-
-
-def set_correlation_id(correlation_id: str | None) -> None:
-    _correlation_id_context.set(correlation_id)
-
-
-def get_correlation_id() -> str | None:
-    return _correlation_id_context.get()
-
-
-def set_span_id_source(source_id: str | None) -> None:
-    """Set the source for deterministic span_id generation.
-
-    When set, ``generate_span_id()`` derives the span_id from this value
-    (lower 64 bits of the UUID).  Pass the ``workflow_run_id`` for workflow
-    root spans or ``node_execution_id`` for node spans.
-    """
-    _span_id_source_context.set(source_id)
-
-
-def compute_deterministic_span_id(source_id: str) -> int:
-    """Derive a deterministic span_id from any UUID string.
-
-    Uses the lower 64 bits of the UUID, guaranteeing non-zero output
-    (OTEL requires span_id != 0).
-    """
-    span_id = uuid.UUID(source_id).int & ((1 << 64) - 1)
-    return span_id if span_id != 0 else 1
-
-
-class CorrelationIdGenerator(IdGenerator):
-    """ID generator that derives trace_id and optionally span_id from context.
-
-    - trace_id: always derived from correlation_id (groups all spans in one trace)
-    - span_id: derived from span_id_source when set (enables deterministic
-      parent-child linking), otherwise random
-    """
-
-    def generate_trace_id(self) -> int:
-        correlation_id = _correlation_id_context.get()
-        if correlation_id:
-            try:
-                return uuid.UUID(correlation_id).int
-            except (ValueError, AttributeError):
-                pass
-        return random.getrandbits(128)
-
-    def generate_span_id(self) -> int:
-        source = _span_id_source_context.get()
-        if source:
-            try:
-                return compute_deterministic_span_id(source)
-            except (ValueError, AttributeError):
-                pass
-
-        span_id = random.getrandbits(64)
-        while span_id == 0:
-            span_id = random.getrandbits(64)
-        return span_id

api/enterprise/telemetry/metric_handler.py

@@ -1,381 +0,0 @@
-"""Enterprise metric/log event handler.
-
-This module processes metric and log telemetry events after they've been
-dequeued from the enterprise_telemetry Celery queue. It handles case routing,
-idempotency checking, and payload rehydration.
-"""
-
-from __future__ import annotations
-
-import json
-import logging
-from typing import Any
-
-from enterprise.telemetry.contracts import TelemetryCase, TelemetryEnvelope
-from extensions.ext_redis import redis_client
-from extensions.ext_storage import storage
-
-logger = logging.getLogger(__name__)
-
-
-class EnterpriseMetricHandler:
-    """Handler for enterprise metric and log telemetry events.
-
-    Processes envelopes from the enterprise_telemetry queue, routing each
-    case to the appropriate handler method. Implements idempotency checking
-    and payload rehydration with fallback.
-    """
-
-    def _increment_diagnostic_counter(self, counter_name: str, labels: dict[str, str] | None = None) -> None:
-        """Increment a diagnostic counter for operational monitoring.
-
-        Args:
-            counter_name: Name of the counter (e.g., 'processed_total', 'deduped_total').
-            labels: Optional labels for the counter.
-        """
-        try:
-            from extensions.ext_enterprise_telemetry import get_enterprise_exporter
-
-            exporter = get_enterprise_exporter()
-            if not exporter:
-                return
-
-            full_counter_name = f"enterprise_telemetry.handler.{counter_name}"
-            logger.debug(
-                "Diagnostic counter: %s, labels=%s",
-                full_counter_name,
-                labels or {},
-            )
-        except Exception:
-            logger.debug("Failed to increment diagnostic counter: %s", counter_name, exc_info=True)
-
-    def handle(self, envelope: TelemetryEnvelope) -> None:
-        """Main entry point for processing telemetry envelopes.
-
-        Args:
-            envelope: The telemetry envelope to process.
-        """
-        # Check for duplicate events
-        if self._is_duplicate(envelope):
-            logger.debug(
-                "Skipping duplicate event: tenant_id=%s, event_id=%s",
-                envelope.tenant_id,
-                envelope.event_id,
-            )
-            self._increment_diagnostic_counter("deduped_total")
-            return
-
-        # Route to appropriate handler based on case
-        case = envelope.case
-        if case == TelemetryCase.APP_CREATED:
-            self._on_app_created(envelope)
-            self._increment_diagnostic_counter("processed_total", {"case": "app_created"})
-        elif case == TelemetryCase.APP_UPDATED:
-            self._on_app_updated(envelope)
-            self._increment_diagnostic_counter("processed_total", {"case": "app_updated"})
-        elif case == TelemetryCase.APP_DELETED:
-            self._on_app_deleted(envelope)
-            self._increment_diagnostic_counter("processed_total", {"case": "app_deleted"})
-        elif case == TelemetryCase.FEEDBACK_CREATED:
-            self._on_feedback_created(envelope)
-            self._increment_diagnostic_counter("processed_total", {"case": "feedback_created"})
-        elif case == TelemetryCase.MESSAGE_RUN:
-            self._on_message_run(envelope)
-            self._increment_diagnostic_counter("processed_total", {"case": "message_run"})
-        elif case == TelemetryCase.TOOL_EXECUTION:
-            self._on_tool_execution(envelope)
-            self._increment_diagnostic_counter("processed_total", {"case": "tool_execution"})
-        elif case == TelemetryCase.MODERATION_CHECK:
-            self._on_moderation_check(envelope)
-            self._increment_diagnostic_counter("processed_total", {"case": "moderation_check"})
-        elif case == TelemetryCase.SUGGESTED_QUESTION:
-            self._on_suggested_question(envelope)
-            self._increment_diagnostic_counter("processed_total", {"case": "suggested_question"})
-        elif case == TelemetryCase.DATASET_RETRIEVAL:
-            self._on_dataset_retrieval(envelope)
-            self._increment_diagnostic_counter("processed_total", {"case": "dataset_retrieval"})
-        elif case == TelemetryCase.GENERATE_NAME:
-            self._on_generate_name(envelope)
-            self._increment_diagnostic_counter("processed_total", {"case": "generate_name"})
-        elif case == TelemetryCase.PROMPT_GENERATION:
-            self._on_prompt_generation(envelope)
-            self._increment_diagnostic_counter("processed_total", {"case": "prompt_generation"})
-        else:
-            logger.warning(
-                "Unknown telemetry case: %s (tenant_id=%s, event_id=%s)",
-                case,
-                envelope.tenant_id,
-                envelope.event_id,
-            )
-
-    def _is_duplicate(self, envelope: TelemetryEnvelope) -> bool:
-        """Check if this event has already been processed.
-
-        Uses Redis with TTL for deduplication. Returns True if duplicate,
-        False if first time seeing this event.
-
-        Args:
-            envelope: The telemetry envelope to check.
-
-        Returns:
-            True if this event_id has been seen before, False otherwise.
-        """
-        dedup_key = f"telemetry:dedup:{envelope.tenant_id}:{envelope.event_id}"
-
-        try:
-            # Atomic set-if-not-exists with 1h TTL
-            # Returns True if key was set (first time), None if already exists (duplicate)
-            was_set = redis_client.set(dedup_key, b"1", nx=True, ex=3600)
-            return was_set is None
-        except Exception:
-            # Fail open: if Redis is unavailable, process the event
-            # (prefer occasional duplicate over lost data)
-            logger.warning(
-                "Redis unavailable for deduplication check, processing event anyway: %s",
-                envelope.event_id,
-                exc_info=True,
-            )
-            return False
-
-    def _rehydrate(self, envelope: TelemetryEnvelope) -> dict[str, Any]:
-        """Rehydrate payload from storage reference or inline data.
-
-        If the envelope payload is empty and metadata contains a
-        ``payload_ref``, the full payload is loaded from object storage
-        (where the gateway wrote it as JSON).  When both the inline
-        payload and storage resolution fail, a degraded-event marker
-        is emitted so the gap is observable.
-
-        Args:
-            envelope: The telemetry envelope containing payload data.
-
-        Returns:
-            The rehydrated payload dictionary, or ``{}`` on total failure.
-        """
-        payload = envelope.payload
-
-        # Resolve from object storage when the gateway offloaded a large payload.
-        if not payload and envelope.metadata:
-            payload_ref = envelope.metadata.get("payload_ref")
-            if payload_ref:
-                try:
-                    payload_bytes = storage.load(payload_ref)
-                    payload = json.loads(payload_bytes.decode("utf-8"))
-                    logger.debug("Loaded payload from storage: key=%s", payload_ref)
-                except Exception:
-                    logger.warning(
-                        "Failed to load payload from storage: key=%s, event_id=%s",
-                        payload_ref,
-                        envelope.event_id,
-                        exc_info=True,
-                    )
-
-        if not payload:
-            # Storage resolution failed or no data available — emit degraded event.
-            logger.error(
-                "Payload rehydration failed for event_id=%s, tenant_id=%s, case=%s",
-                envelope.event_id,
-                envelope.tenant_id,
-                envelope.case,
-            )
-            from enterprise.telemetry.entities import EnterpriseTelemetryEvent
-            from enterprise.telemetry.telemetry_log import emit_metric_only_event
-
-            emit_metric_only_event(
-                event_name=EnterpriseTelemetryEvent.REHYDRATION_FAILED,
-                attributes={
-                    "dify.tenant_id": envelope.tenant_id,
-                    "dify.event_id": envelope.event_id,
-                    "dify.case": envelope.case,
-                    "rehydration_failed": True,
-                },
-                tenant_id=envelope.tenant_id,
-            )
-            self._increment_diagnostic_counter("rehydration_failed_total")
-            return {}
-
-        return payload
-
-    # Stub methods for each metric/log case
-    # These will be implemented in later tasks with actual emission logic
-
-    def _on_app_created(self, envelope: TelemetryEnvelope) -> None:
-        """Handle app created event."""
-        from enterprise.telemetry.entities import EnterpriseTelemetryCounter, EnterpriseTelemetryEvent
-        from enterprise.telemetry.telemetry_log import emit_metric_only_event
-        from extensions.ext_enterprise_telemetry import get_enterprise_exporter
-
-        exporter = get_enterprise_exporter()
-        if not exporter:
-            logger.debug("No exporter available for APP_CREATED: event_id=%s", envelope.event_id)
-            return
-
-        payload = self._rehydrate(envelope)
-        if not payload:
-            return
-
-        attrs = {
-            "dify.app.id": payload.get("app_id"),
-            "dify.tenant_id": envelope.tenant_id,
-            "dify.event.id": envelope.event_id,
-            "dify.app.mode": payload.get("mode"),
-        }
-
-        emit_metric_only_event(
-            event_name=EnterpriseTelemetryEvent.APP_CREATED,
-            attributes=attrs,
-            tenant_id=envelope.tenant_id,
-        )
-        exporter.increment_counter(
-            EnterpriseTelemetryCounter.APP_CREATED,
-            1,
-            {
-                "tenant_id": envelope.tenant_id,
-                "app_id": str(payload.get("app_id", "")),
-                "mode": str(payload.get("mode", "")),
-            },
-        )
-
-    def _on_app_updated(self, envelope: TelemetryEnvelope) -> None:
-        """Handle app updated event."""
-        from enterprise.telemetry.entities import EnterpriseTelemetryCounter, EnterpriseTelemetryEvent
-        from enterprise.telemetry.telemetry_log import emit_metric_only_event
-        from extensions.ext_enterprise_telemetry import get_enterprise_exporter
-
-        exporter = get_enterprise_exporter()
-        if not exporter:
-            logger.debug("No exporter available for APP_UPDATED: event_id=%s", envelope.event_id)
-            return
-
-        payload = self._rehydrate(envelope)
-        if not payload:
-            return
-
-        attrs = {
-            "dify.app.id": payload.get("app_id"),
-            "dify.tenant_id": envelope.tenant_id,
-            "dify.event.id": envelope.event_id,
-        }
-
-        emit_metric_only_event(
-            event_name=EnterpriseTelemetryEvent.APP_UPDATED,
-            attributes=attrs,
-            tenant_id=envelope.tenant_id,
-        )
-        exporter.increment_counter(
-            EnterpriseTelemetryCounter.APP_UPDATED,
-            1,
-            {
-                "tenant_id": envelope.tenant_id,
-                "app_id": str(payload.get("app_id", "")),
-            },
-        )
-
-    def _on_app_deleted(self, envelope: TelemetryEnvelope) -> None:
-        """Handle app deleted event."""
-        from enterprise.telemetry.entities import EnterpriseTelemetryCounter, EnterpriseTelemetryEvent
-        from enterprise.telemetry.telemetry_log import emit_metric_only_event
-        from extensions.ext_enterprise_telemetry import get_enterprise_exporter
-
-        exporter = get_enterprise_exporter()
-        if not exporter:
-            logger.debug("No exporter available for APP_DELETED: event_id=%s", envelope.event_id)
-            return
-
-        payload = self._rehydrate(envelope)
-        if not payload:
-            return
-
-        attrs = {
-            "dify.app.id": payload.get("app_id"),
-            "dify.tenant_id": envelope.tenant_id,
-            "dify.event.id": envelope.event_id,
-        }
-
-        emit_metric_only_event(
-            event_name=EnterpriseTelemetryEvent.APP_DELETED,
-            attributes=attrs,
-            tenant_id=envelope.tenant_id,
-        )
-        exporter.increment_counter(
-            EnterpriseTelemetryCounter.APP_DELETED,
-            1,
-            {
-                "tenant_id": envelope.tenant_id,
-                "app_id": str(payload.get("app_id", "")),
-            },
-        )
-
-    def _on_feedback_created(self, envelope: TelemetryEnvelope) -> None:
-        """Handle feedback created event."""
-        from enterprise.telemetry.entities import EnterpriseTelemetryCounter, EnterpriseTelemetryEvent
-        from enterprise.telemetry.telemetry_log import emit_metric_only_event
-        from extensions.ext_enterprise_telemetry import get_enterprise_exporter
-
-        exporter = get_enterprise_exporter()
-        if not exporter:
-            logger.debug("No exporter available for FEEDBACK_CREATED: event_id=%s", envelope.event_id)
-            return
-
-        payload = self._rehydrate(envelope)
-        if not payload:
-            return
-
-        include_content = exporter.include_content
-        attrs: dict = {
-            "dify.message.id": payload.get("message_id"),
-            "dify.tenant_id": envelope.tenant_id,
-            "dify.event.id": envelope.event_id,
-            "dify.app_id": payload.get("app_id"),
-            "dify.conversation.id": payload.get("conversation_id"),
-            "gen_ai.user.id": payload.get("from_end_user_id") or payload.get("from_account_id"),
-            "dify.feedback.rating": payload.get("rating"),
-            "dify.feedback.from_source": payload.get("from_source"),
-        }
-        if include_content:
-            attrs["dify.feedback.content"] = payload.get("content")
-
-        user_id = payload.get("from_end_user_id") or payload.get("from_account_id")
-        emit_metric_only_event(
-            event_name=EnterpriseTelemetryEvent.FEEDBACK_CREATED,
-            attributes=attrs,
-            tenant_id=envelope.tenant_id,
-            user_id=str(user_id or ""),
-        )
-        exporter.increment_counter(
-            EnterpriseTelemetryCounter.FEEDBACK,
-            1,
-            {
-                "tenant_id": envelope.tenant_id,
-                "app_id": str(payload.get("app_id", "")),
-                "rating": str(payload.get("rating", "")),
-            },
-        )
-
-    def _on_message_run(self, envelope: TelemetryEnvelope) -> None:
-        """Handle message run event (stub)."""
-        logger.debug("Processing MESSAGE_RUN: event_id=%s", envelope.event_id)
-
-    def _on_tool_execution(self, envelope: TelemetryEnvelope) -> None:
-        """Handle tool execution event (stub)."""
-        logger.debug("Processing TOOL_EXECUTION: event_id=%s", envelope.event_id)
-
-    def _on_moderation_check(self, envelope: TelemetryEnvelope) -> None:
-        """Handle moderation check event (stub)."""
-        logger.debug("Processing MODERATION_CHECK: event_id=%s", envelope.event_id)
-
-    def _on_suggested_question(self, envelope: TelemetryEnvelope) -> None:
-        """Handle suggested question event (stub)."""
-        logger.debug("Processing SUGGESTED_QUESTION: event_id=%s", envelope.event_id)
-
-    def _on_dataset_retrieval(self, envelope: TelemetryEnvelope) -> None:
-        """Handle dataset retrieval event (stub)."""
-        logger.debug("Processing DATASET_RETRIEVAL: event_id=%s", envelope.event_id)
-
-    def _on_generate_name(self, envelope: TelemetryEnvelope) -> None:
-        """Handle generate name event (stub)."""
-        logger.debug("Processing GENERATE_NAME: event_id=%s", envelope.event_id)
-
-    def _on_prompt_generation(self, envelope: TelemetryEnvelope) -> None:
-        """Handle prompt generation event (stub)."""
-        logger.debug("Processing PROMPT_GENERATION: event_id=%s", envelope.event_id)

api/enterprise/telemetry/telemetry_log.py

@@ -1,122 +0,0 @@
-"""Structured-log emitter for enterprise telemetry events.
-
-Emits structured JSON log lines correlated with OTEL traces via trace_id.
-Picked up by ``StructuredJSONFormatter`` → stdout/Loki/Elastic.
-"""
-
-from __future__ import annotations
-
-import logging
-import uuid
-from functools import lru_cache
-from typing import TYPE_CHECKING, Any
-
-if TYPE_CHECKING:
-    from enterprise.telemetry.entities import EnterpriseTelemetryEvent
-
-logger = logging.getLogger("dify.telemetry")
-
-
-@lru_cache(maxsize=4096)
-def compute_trace_id_hex(uuid_str: str | None) -> str:
-    """Convert a business UUID string to a 32-hex OTEL-compatible trace_id.
-
-    Returns empty string when *uuid_str* is ``None`` or invalid.
-    """
-    if not uuid_str:
-        return ""
-    normalized = uuid_str.strip().lower()
-    if len(normalized) == 32 and all(ch in "0123456789abcdef" for ch in normalized):
-        return normalized
-    try:
-        return f"{uuid.UUID(normalized).int:032x}"
-    except (ValueError, AttributeError):
-        return ""
-
-
-@lru_cache(maxsize=4096)
-def compute_span_id_hex(uuid_str: str | None) -> str:
-    if not uuid_str:
-        return ""
-    normalized = uuid_str.strip().lower()
-    if len(normalized) == 16 and all(ch in "0123456789abcdef" for ch in normalized):
-        return normalized
-    try:
-        from enterprise.telemetry.id_generator import compute_deterministic_span_id
-
-        return f"{compute_deterministic_span_id(normalized):016x}"
-    except (ValueError, AttributeError):
-        return ""
-
-
-def emit_telemetry_log(
-    *,
-    event_name: str | EnterpriseTelemetryEvent,
-    attributes: dict[str, Any],
-    signal: str = "metric_only",
-    trace_id_source: str | None = None,
-    span_id_source: str | None = None,
-    tenant_id: str | None = None,
-    user_id: str | None = None,
-) -> None:
-    """Emit a structured log line for a telemetry event.
-
-    Parameters
-    ----------
-    event_name:
-        Canonical event name, e.g. ``"dify.workflow.run"``.
-    attributes:
-        All event-specific attributes (already built by the caller).
-    signal:
-        ``"metric_only"`` for events with no span, ``"span_detail"``
-        for detail logs accompanying a slim span.
-    trace_id_source:
-        A UUID string (e.g. ``workflow_run_id``) used to derive a 32-hex
-        trace_id for cross-signal correlation.
-    tenant_id:
-        Tenant identifier (for the ``IdentityContextFilter``).
-    user_id:
-        User identifier (for the ``IdentityContextFilter``).
-    """
-    if not logger.isEnabledFor(logging.INFO):
-        return
-    attrs = {
-        "dify.event.name": event_name,
-        "dify.event.signal": signal,
-        **attributes,
-    }
-
-    extra: dict[str, Any] = {"attributes": attrs}
-
-    trace_id_hex = compute_trace_id_hex(trace_id_source)
-    if trace_id_hex:
-        extra["trace_id"] = trace_id_hex
-    span_id_hex = compute_span_id_hex(span_id_source)
-    if span_id_hex:
-        extra["span_id"] = span_id_hex
-    if tenant_id:
-        extra["tenant_id"] = tenant_id
-    if user_id:
-        extra["user_id"] = user_id
-
-    logger.info("telemetry.%s", signal, extra=extra)
-
-
-def emit_metric_only_event(
-    *,
-    event_name: str | EnterpriseTelemetryEvent,
-    attributes: dict[str, Any],
-    trace_id_source: str | None = None,
-    span_id_source: str | None = None,
-    tenant_id: str | None = None,
-    user_id: str | None = None,
-) -> None:
-    emit_telemetry_log(
-        event_name=event_name,
-        attributes=attributes,
-        signal="metric_only",
-        trace_id_source=trace_id_source,
-        span_id_source=span_id_source,
-        tenant_id=tenant_id,
-        user_id=user_id,
-    )

api/enums/quota_type.py

@@ -1,6 +1,5 @@
 import logging
-import uuid
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from enum import StrEnum, auto
 
 logger = logging.getLogger(__name__)
@@ -9,85 +8,49 @@ logger = logging.getLogger(__name__)
 @dataclass
 class QuotaCharge:
     """
-    Result of a quota reservation (Reserve phase).
+    Result of a quota consumption operation.
 
-    Lifecycle:
-        charge = QuotaType.TRIGGER.consume(tenant_id)  # Reserve
-        try:
-            do_work()
-            charge.commit()   # Confirm consumption
-        except:
-            charge.refund()   # Release frozen quota
-
-    If neither commit() nor refund() is called, the billing system's
-    cleanup CronJob will auto-release the reservation within ~75 seconds.
+    Attributes:
+        success: Whether the quota charge succeeded
+        charge_id: UUID for refund, or None if failed/disabled
     """
 
     success: bool
-    charge_id: str | None  # reservation_id
+    charge_id: str | None
     _quota_type: "QuotaType"
-    _tenant_id: str | None = None
-    _feature_key: str | None = None
-    _amount: int = 0
-    _committed: bool = field(default=False, repr=False)
-
-    def commit(self, actual_amount: int | None = None) -> None:
-        """
-        Confirm the consumption with actual amount.
-
-        Args:
-            actual_amount: Actual amount consumed. Defaults to the reserved amount.
-                           If less than reserved, the difference is refunded automatically.
-        """
-        if self._committed or not self.charge_id:
-            return
-
-        try:
-            from services.billing_service import BillingService
-
-            amount = actual_amount if actual_amount is not None else self._amount
-            BillingService.quota_commit(
-                tenant_id=self._tenant_id,
-                feature_key=self._feature_key,
-                reservation_id=self.charge_id,
-                actual_amount=amount,
-            )
-            self._committed = True
-            logger.debug(
-                "Committed %s quota for tenant %s, reservation_id: %s, amount: %d",
-                self._quota_type.value, self._tenant_id, self.charge_id, amount,
-            )
-        except Exception:
-            logger.exception("Failed to commit quota, reservation_id: %s", self.charge_id)
 
     def refund(self) -> None:
         """
-        Release the reserved quota (cancel the charge).
-
-        Safe to call even if:
-        - charge failed or was disabled (charge_id is None)
-        - already committed (Release after Commit is a no-op)
-        - already refunded (idempotent)
+        Refund this quota charge.
 
+        Safe to call even if charge failed or was disabled.
         This method guarantees no exceptions will be raised.
         """
-        if not self.charge_id or not self._tenant_id or not self._feature_key:
-            return
-
-        self._quota_type.release(self.charge_id, self._tenant_id, self._feature_key)
+        if self.charge_id:
+            self._quota_type.refund(self.charge_id)
+            logger.info("Refunded quota for %s with charge_id: %s", self._quota_type.value, self.charge_id)
 
 
 class QuotaType(StrEnum):
     """
     Supported quota types for tenant feature usage.
+
+    Add additional types here whenever new billable features become available.
     """
 
+    # Trigger execution quota
     TRIGGER = auto()
+
+    # Workflow execution quota
     WORKFLOW = auto()
+
     UNLIMITED = auto()
 
     @property
     def billing_key(self) -> str:
+        """
+        Get the billing key for the feature.
+        """
         match self:
             case QuotaType.TRIGGER:
                 return "trigger_event"
@@ -98,45 +61,14 @@ class QuotaType(StrEnum):
 
     def consume(self, tenant_id: str, amount: int = 1) -> QuotaCharge:
         """
-        Consume quota using Reserve + immediate Commit.
-
-        This is the simple one-shot mode: Reserve freezes quota, then Commit
-        confirms it right away. The returned QuotaCharge supports .refund()
-        which calls Release (idempotent even after Commit).
-
-        For advanced two-phase usage (e.g. streaming), use reserve() directly
-        and call charge.commit() / charge.refund() manually.
+        Consume quota for the feature.
 
         Args:
             tenant_id: The tenant identifier
             amount: Amount to consume (default: 1)
 
         Returns:
-            QuotaCharge with reservation_id for potential refund
-
-        Raises:
-            QuotaExceededError: When quota is insufficient
-        """
-        charge = self.reserve(tenant_id, amount)
-        if charge.success and charge.charge_id:
-            charge.commit()
-        return charge
-
-    def reserve(self, tenant_id: str, amount: int = 1) -> QuotaCharge:
-        """
-        Reserve quota before task execution (Reserve phase only).
-
-        The caller MUST call charge.commit() after the task succeeds,
-        or charge.refund() if the task fails.
-
-        If neither is called, the reservation auto-expires in ~75 seconds.
-
-        Args:
-            tenant_id: The tenant identifier
-            amount: Amount to reserve (default: 1)
-
-        Returns:
-            QuotaCharge — call .commit() on success, .refund() on failure
+            QuotaCharge with success status and charge_id for refund
 
         Raises:
             QuotaExceededError: When quota is insufficient
@@ -149,52 +81,51 @@ class QuotaType(StrEnum):
             logger.debug("Billing disabled, allowing request for %s", tenant_id)
             return QuotaCharge(success=True, charge_id=None, _quota_type=self)
 
-        logger.info("Reserving %d %s quota for tenant %s", amount, self.value, tenant_id)
+        logger.info("Consuming %d %s quota for tenant %s", amount, self.value, tenant_id)
 
         if amount <= 0:
-            raise ValueError("Amount to reserve must be greater than 0")
-
-        request_id = str(uuid.uuid4())
-        feature_key = self.billing_key
+            raise ValueError("Amount to consume must be greater than 0")
 
         try:
-            reserve_resp = BillingService.quota_reserve(
-                tenant_id=tenant_id,
-                feature_key=feature_key,
-                request_id=request_id,
-                amount=amount,
-            )
+            response = BillingService.update_tenant_feature_plan_usage(tenant_id, self.billing_key, delta=amount)
 
-            reservation_id = reserve_resp.get("reservation_id")
-            if not reservation_id:
+            if response.get("result") != "success":
                 logger.warning(
-                    "Reserve returned no reservation_id for %s, feature %s, response: %s",
-                    tenant_id, self.value, reserve_resp,
+                    "Failed to consume quota for %s, feature %s details: %s",
+                    tenant_id,
+                    self.value,
+                    response.get("detail"),
                 )
                 raise QuotaExceededError(feature=self.value, tenant_id=tenant_id, required=amount)
 
+            charge_id = response.get("history_id")
             logger.debug(
-                "Reserved %d %s quota for tenant %s, reservation_id: %s",
-                amount, self.value, tenant_id, reservation_id,
-            )
-            return QuotaCharge(
-                success=True,
-                charge_id=reservation_id,
-                _quota_type=self,
-                _tenant_id=tenant_id,
-                _feature_key=feature_key,
-                _amount=amount,
+                "Successfully consumed %d %s quota for tenant %s, charge_id: %s",
+                amount,
+                self.value,
+                tenant_id,
+                charge_id,
             )
+            return QuotaCharge(success=True, charge_id=charge_id, _quota_type=self)
 
         except QuotaExceededError:
             raise
-        except ValueError:
-            raise
         except Exception:
-            logger.exception("Failed to reserve quota for %s, feature %s", tenant_id, self.value)
+            # fail-safe: allow request on billing errors
+            logger.exception("Failed to consume quota for %s, feature %s", tenant_id, self.value)
             return unlimited()
 
     def check(self, tenant_id: str, amount: int = 1) -> bool:
+        """
+        Check if tenant has sufficient quota without consuming.
+
+        Args:
+            tenant_id: The tenant identifier
+            amount: Amount to check (default: 1)
+
+        Returns:
+            True if quota is sufficient, False otherwise
+        """
         from configs import dify_config
 
         if not dify_config.BILLING_ENABLED:
@@ -208,11 +139,18 @@ class QuotaType(StrEnum):
             return remaining >= amount if remaining != -1 else True
         except Exception:
             logger.exception("Failed to check quota for %s, feature %s", tenant_id, self.value)
+            # fail-safe: allow request on billing errors
             return True
 
-    def release(self, reservation_id: str, tenant_id: str, feature_key: str) -> None:
+    def refund(self, charge_id: str) -> None:
         """
-        Release a reservation. Guarantees no exceptions.
+        Refund quota using charge_id from consume().
+
+        This method guarantees no exceptions will be raised.
+        All errors are logged but silently handled.
+
+        Args:
+            charge_id: The UUID returned from consume()
         """
         try:
             from configs import dify_config
@@ -221,36 +159,51 @@ class QuotaType(StrEnum):
             if not dify_config.BILLING_ENABLED:
                 return
 
-            if not reservation_id:
+            if not charge_id:
+                logger.warning("Cannot refund: charge_id is empty")
                 return
 
-            logger.info("Releasing %s quota, reservation_id: %s", self.value, reservation_id)
-            BillingService.quota_release(
-                tenant_id=tenant_id,
-                feature_key=feature_key,
-                reservation_id=reservation_id,
-            )
+            logger.info("Refunding %s quota with charge_id: %s", self.value, charge_id)
+
+            response = BillingService.refund_tenant_feature_plan_usage(charge_id)
+            if response.get("result") == "success":
+                logger.debug("Successfully refunded %s quota, charge_id: %s", self.value, charge_id)
+            else:
+                logger.warning("Refund failed for charge_id: %s", charge_id)
+
         except Exception:
-            logger.exception("Failed to release quota, reservation_id: %s", reservation_id)
+            # Catch ALL exceptions - refund must never fail
+            logger.exception("Failed to refund quota for charge_id: %s", charge_id)
+            # Don't raise - refund is best-effort and must be silent
 
     def get_remaining(self, tenant_id: str) -> int:
+        """
+        Get remaining quota for the tenant.
+
+        Args:
+            tenant_id: The tenant identifier
+
+        Returns:
+            Remaining quota amount
+        """
         from services.billing_service import BillingService
 
         try:
-            usage_info = BillingService.get_tenant_feature_plan_usage_info(tenant_id)
+            usage_info = BillingService.get_tenant_feature_plan_usage(tenant_id, self.billing_key)
+            # Assuming the API returns a dict with 'remaining' or 'limit' and 'used'
             if isinstance(usage_info, dict):
-                feature_info = usage_info.get(self.billing_key, {})
-                if isinstance(feature_info, dict):
-                    limit = feature_info.get("limit", 0)
-                    usage = feature_info.get("usage", 0)
-                    if limit == -1:
-                        return -1
-                    return max(0, limit - usage)
-            return 0
+                return usage_info.get("remaining", 0)
+            # If it returns a simple number, treat it as remaining
+            return int(usage_info) if usage_info else 0
         except Exception:
             logger.exception("Failed to get remaining quota for %s, feature %s", tenant_id, self.value)
             return -1
 
 
 def unlimited() -> QuotaCharge:
+    """
+    Return a quota charge for unlimited quota.
+
+    This is useful for features that are not subject to quota limits, such as the UNLIMITED quota type.
+    """
     return QuotaCharge(success=True, charge_id=None, _quota_type=QuotaType.UNLIMITED)

api/events/app_event.py

@@ -3,12 +3,6 @@ from blinker import signal
 # sender: app
 app_was_created = signal("app-was-created")
 
-# sender: app
-app_was_deleted = signal("app-was-deleted")
-
-# sender: app
-app_was_updated = signal("app-was-updated")
-
 # sender: app, kwargs: app_model_config
 app_model_config_was_updated = signal("app-model-config-was-updated")
 

api/events/feedback_event.py

@@ -1,4 +0,0 @@
-from blinker import signal
-
-# sender: MessageFeedback, kwargs: tenant_id
-feedback_was_created = signal("feedback-was-created")

api/extensions/ext_celery.py

@@ -204,8 +204,6 @@ def init_app(app: DifyApp) -> Celery:
             "schedule": timedelta(minutes=dify_config.API_TOKEN_LAST_USED_UPDATE_INTERVAL),
         }
 
-    if dify_config.ENTERPRISE_ENABLED and dify_config.ENTERPRISE_TELEMETRY_ENABLED:
-        imports.append("tasks.enterprise_telemetry_task")
     celery_app.conf.update(beat_schedule=beat_schedule, imports=imports)
 
     return celery_app

api/extensions/ext_enterprise_telemetry.py

@@ -1,50 +0,0 @@
-"""Flask extension for enterprise telemetry lifecycle management.
-
-Initializes the EnterpriseExporter singleton during ``create_app()``
-(single-threaded), registers blinker event handlers, and hooks atexit
-for graceful shutdown.
-
-Skipped entirely when ``ENTERPRISE_ENABLED`` and ``ENTERPRISE_TELEMETRY_ENABLED``
-are false (``is_enabled()`` gate).
-"""
-
-from __future__ import annotations
-
-import atexit
-import logging
-from typing import TYPE_CHECKING
-
-from configs import dify_config
-
-if TYPE_CHECKING:
-    from dify_app import DifyApp
-    from enterprise.telemetry.exporter import EnterpriseExporter
-
-logger = logging.getLogger(__name__)
-
-_exporter: EnterpriseExporter | None = None
-
-
-def is_enabled() -> bool:
-    return bool(dify_config.ENTERPRISE_ENABLED and dify_config.ENTERPRISE_TELEMETRY_ENABLED)
-
-
-def init_app(app: DifyApp) -> None:
-    global _exporter
-
-    if not is_enabled():
-        return
-
-    from enterprise.telemetry.exporter import EnterpriseExporter
-
-    _exporter = EnterpriseExporter(dify_config)
-    atexit.register(_exporter.shutdown)
-
-    # Import to trigger @signal.connect decorator registration
-    import enterprise.telemetry.event_handlers  # noqa: F401  # type: ignore[reportUnusedImport]
-
-    logger.info("Enterprise telemetry initialized")
-
-
-def get_enterprise_exporter() -> EnterpriseExporter | None:
-    return _exporter

api/extensions/ext_otel.py

@@ -78,24 +78,16 @@ def init_app(app: DifyApp):
     protocol = (dify_config.OTEL_EXPORTER_OTLP_PROTOCOL or "").lower()
     if dify_config.OTEL_EXPORTER_TYPE == "otlp":
         if protocol == "grpc":
-            # Auto-detect TLS: https:// uses secure, everything else is insecure
-            endpoint = dify_config.OTLP_BASE_ENDPOINT
-            insecure = not endpoint.startswith("https://")
-
             exporter = GRPCSpanExporter(
-                endpoint=endpoint,
+                endpoint=dify_config.OTLP_BASE_ENDPOINT,
                 # Header field names must consist of lowercase letters, check RFC7540
-                headers=(
-                    (("authorization", f"Bearer {dify_config.OTLP_API_KEY}"),) if dify_config.OTLP_API_KEY else None
-                ),
-                insecure=insecure,
+                headers=(("authorization", f"Bearer {dify_config.OTLP_API_KEY}"),),
+                insecure=True,
             )
             metric_exporter = GRPCMetricExporter(
-                endpoint=endpoint,
-                headers=(
-                    (("authorization", f"Bearer {dify_config.OTLP_API_KEY}"),) if dify_config.OTLP_API_KEY else None
-                ),
-                insecure=insecure,
+                endpoint=dify_config.OTLP_BASE_ENDPOINT,
+                headers=(("authorization", f"Bearer {dify_config.OTLP_API_KEY}"),),
+                insecure=True,
             )
         else:
             headers = {"Authorization": f"Bearer {dify_config.OTLP_API_KEY}"} if dify_config.OTLP_API_KEY else None

api/extensions/otel/parser/__init__.py

@@ -5,7 +5,7 @@ This module provides parsers that extract node-specific metadata and set
 OpenTelemetry span attributes according to semantic conventions.
 """
 
-from extensions.otel.parser.base import DefaultNodeOTelParser, NodeOTelParser, safe_json_dumps, should_include_content
+from extensions.otel.parser.base import DefaultNodeOTelParser, NodeOTelParser, safe_json_dumps
 from extensions.otel.parser.llm import LLMNodeOTelParser
 from extensions.otel.parser.retrieval import RetrievalNodeOTelParser
 from extensions.otel.parser.tool import ToolNodeOTelParser
@@ -17,5 +17,4 @@ __all__ = [
     "RetrievalNodeOTelParser",
     "ToolNodeOTelParser",
     "safe_json_dumps",
-    "should_include_content",
 ]

api/extensions/otel/parser/base.py

@@ -1,10 +1,5 @@
 """
 Base parser interface and utilities for OpenTelemetry node parsers.
-
-Content gating: ``should_include_content()`` controls whether content-bearing
-span attributes (inputs, outputs, prompts, completions, documents) are written.
-Gate is only active in EE (``ENTERPRISE_ENABLED=True``) when
-``ENTERPRISE_INCLUDE_CONTENT=False``; CE behaviour is unchanged.
 """
 
 import json
@@ -14,7 +9,6 @@ from opentelemetry.trace import Span
 from opentelemetry.trace.status import Status, StatusCode
 from pydantic import BaseModel
 
-from configs import dify_config
 from dify_graph.enums import BuiltinNodeTypes
 from dify_graph.file.models import File
 from dify_graph.graph_events import GraphNodeEventBase
@@ -23,17 +17,6 @@ from dify_graph.variables import Segment
 from extensions.otel.semconv.gen_ai import ChainAttributes, GenAIAttributes
 
 
-def should_include_content() -> bool:
-    """Return True if content should be written to spans.
-
-    CE (ENTERPRISE_ENABLED=False): always True — no behaviour change.
-    EE: follows ENTERPRISE_INCLUDE_CONTENT (default True).
-    """
-    if not dify_config.ENTERPRISE_ENABLED:
-        return True
-    return dify_config.ENTERPRISE_INCLUDE_CONTENT
-
-
 def safe_json_dumps(obj: Any, ensure_ascii: bool = False) -> str:
     """
     Safely serialize objects to JSON, handling non-serializable types.
@@ -118,11 +101,10 @@ class DefaultNodeOTelParser:
         # Extract inputs and outputs from result_event
         if result_event and result_event.node_run_result:
             node_run_result = result_event.node_run_result
-            if should_include_content():
-                if node_run_result.inputs:
-                    span.set_attribute(ChainAttributes.INPUT_VALUE, safe_json_dumps(node_run_result.inputs))
-                if node_run_result.outputs:
-                    span.set_attribute(ChainAttributes.OUTPUT_VALUE, safe_json_dumps(node_run_result.outputs))
+            if node_run_result.inputs:
+                span.set_attribute(ChainAttributes.INPUT_VALUE, safe_json_dumps(node_run_result.inputs))
+            if node_run_result.outputs:
+                span.set_attribute(ChainAttributes.OUTPUT_VALUE, safe_json_dumps(node_run_result.outputs))
 
         if error:
             span.record_exception(error)

api/extensions/otel/semconv/dify.py

@@ -21,15 +21,3 @@ class DifySpanAttributes:
 
     INVOKE_FROM = "dify.invoke_from"
     """Invocation source, e.g. SERVICE_API, WEB_APP, DEBUGGER."""
-
-    INVOKED_BY = "dify.invoked_by"
-    """Invoked by, e.g. end_user, account, user."""
-
-    USAGE_INPUT_TOKENS = "gen_ai.usage.input_tokens"
-    """Number of input tokens (prompt tokens) used."""
-
-    USAGE_OUTPUT_TOKENS = "gen_ai.usage.output_tokens"
-    """Number of output tokens (completion tokens) generated."""
-
-    USAGE_TOTAL_TOKENS = "gen_ai.usage.total_tokens"
-    """Total number of tokens used."""

api/models/execution_extra_content.py

@@ -66,8 +66,8 @@ class HumanInputContent(ExecutionExtraContent):
     form_id: Mapped[str] = mapped_column(StringUUID, nullable=True)
 
     @classmethod
-    def new(cls, form_id: str, message_id: str | None) -> "HumanInputContent":
-        return cls(form_id=form_id, message_id=message_id)
+    def new(cls, *, workflow_run_id: str, form_id: str, message_id: str | None) -> "HumanInputContent":
+        return cls(workflow_run_id=workflow_run_id, form_id=form_id, message_id=message_id)
 
     form: Mapped["HumanInputForm"] = relationship(
         "HumanInputForm",

api/pyproject.toml

@@ -203,7 +203,7 @@ tools = ["cloudscraper~=1.2.71", "nltk~=3.9.1"]
 # Required by vector store clients
 ############################################################
 vdb = [
-    "alibabacloud_gpdb20160503~=3.8.0",
+    "alibabacloud_gpdb20160503~=5.1.0",
     "alibabacloud_tea_openapi~=0.4.3",
     "chromadb==0.5.20",
     "clickhouse-connect~=0.14.1",

api/services/app_generate_service.py

@@ -106,7 +106,7 @@ class AppGenerateService:
         quota_charge = unlimited()
         if dify_config.BILLING_ENABLED:
             try:
-                quota_charge = QuotaType.WORKFLOW.reserve(app_model.tenant_id)
+                quota_charge = QuotaType.WORKFLOW.consume(app_model.tenant_id)
             except QuotaExceededError:
                 raise InvokeRateLimitError(f"Workflow execution quota limit reached for tenant {app_model.tenant_id}")
 
@@ -116,7 +116,6 @@ class AppGenerateService:
         request_id = RateLimit.gen_request_key()
         try:
             request_id = rate_limit.enter(request_id)
-            quota_charge.commit()
             if app_model.mode == AppMode.COMPLETION:
                 return rate_limit.generate(
                     CompletionAppGenerator.convert_to_event_stream(

api/services/async_workflow_service.py

@@ -13,7 +13,7 @@ from celery.result import AsyncResult
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-from enums.quota_type import QuotaType, unlimited
+from enums.quota_type import QuotaType
 from extensions.ext_database import db
 from models.account import Account
 from models.enums import CreatorUserRole, WorkflowTriggerStatus
@@ -131,10 +131,9 @@ class AsyncWorkflowService:
         trigger_log = trigger_log_repo.create(trigger_log)
         session.commit()
 
-        # 7. Reserve quota (commit after successful dispatch)
-        quota_charge = unlimited()
+        # 7. Check and consume quota
         try:
-            quota_charge = QuotaType.WORKFLOW.reserve(trigger_data.tenant_id)
+            QuotaType.WORKFLOW.consume(trigger_data.tenant_id)
         except QuotaExceededError as e:
             # Update trigger log status
             trigger_log.status = WorkflowTriggerStatus.RATE_LIMITED
@@ -154,18 +153,13 @@ class AsyncWorkflowService:
         # 9. Dispatch to appropriate queue
         task_data_dict = task_data.model_dump(mode="json")
 
-        try:
-            task: AsyncResult[Any] | None = None
-            if queue_name == QueuePriority.PROFESSIONAL:
-                task = execute_workflow_professional.delay(task_data_dict)
-            elif queue_name == QueuePriority.TEAM:
-                task = execute_workflow_team.delay(task_data_dict)
-            else:  # SANDBOX
-                task = execute_workflow_sandbox.delay(task_data_dict)
-            quota_charge.commit()
-        except Exception:
-            quota_charge.refund()
-            raise
+        task: AsyncResult[Any] | None = None
+        if queue_name == QueuePriority.PROFESSIONAL:
+            task = execute_workflow_professional.delay(task_data_dict)
+        elif queue_name == QueuePriority.TEAM:
+            task = execute_workflow_team.delay(task_data_dict)
+        else:  # SANDBOX
+            task = execute_workflow_sandbox.delay(task_data_dict)
 
         # 10. Update trigger log with task info
         trigger_log.status = WorkflowTriggerStatus.QUEUED

api/services/billing_service.py

@@ -47,60 +47,10 @@ class BillingService:
     @classmethod
     def get_tenant_feature_plan_usage_info(cls, tenant_id: str):
         params = {"tenant_id": tenant_id}
-        usage_info = cls._send_request("GET", "/quota/info", params=params)
+
+        usage_info = cls._send_request("GET", "/tenant-feature-usage/info", params=params)
         return usage_info
 
-    @classmethod
-    def quota_reserve(
-        cls, tenant_id: str, feature_key: str, request_id: str, amount: int = 1, meta: dict | None = None
-    ) -> dict:
-        """Reserve quota before task execution.
-
-        Returns:
-            {"reservation_id": "uuid", "available": int, "reserved": int}
-        """
-        payload = {
-            "tenant_id": tenant_id,
-            "feature_key": feature_key,
-            "request_id": request_id,
-            "amount": amount,
-        }
-        if meta:
-            payload["meta"] = meta
-        return cls._send_request("POST", "/quota/reserve", json=payload)
-
-    @classmethod
-    def quota_commit(
-        cls, tenant_id: str, feature_key: str, reservation_id: str, actual_amount: int, meta: dict | None = None
-    ) -> dict:
-        """Commit a reservation with actual consumption.
-
-        Returns:
-            {"available": int, "reserved": int, "refunded": int}
-        """
-        payload = {
-            "tenant_id": tenant_id,
-            "feature_key": feature_key,
-            "reservation_id": reservation_id,
-            "actual_amount": actual_amount,
-        }
-        if meta:
-            payload["meta"] = meta
-        return cls._send_request("POST", "/quota/commit", json=payload)
-
-    @classmethod
-    def quota_release(cls, tenant_id: str, feature_key: str, reservation_id: str) -> dict:
-        """Release a reservation (cancel, return frozen quota).
-
-        Returns:
-            {"available": int, "reserved": int, "released": int}
-        """
-        return cls._send_request("POST", "/quota/release", json={
-            "tenant_id": tenant_id,
-            "feature_key": feature_key,
-            "reservation_id": reservation_id,
-        })
-
     @classmethod
     def get_knowledge_rate_limit(cls, tenant_id: str):
         params = {"tenant_id": tenant_id}

api/services/trigger/webhook_service.py

@@ -779,9 +779,9 @@ class WebhookService:
                     user_id=None,
                 )
 
-                # reserve quota before triggering workflow execution
+                # consume quota before triggering workflow execution
                 try:
-                    quota_charge = QuotaType.TRIGGER.reserve(webhook_trigger.tenant_id)
+                    QuotaType.TRIGGER.consume(webhook_trigger.tenant_id)
                 except QuotaExceededError:
                     AppTriggerService.mark_tenant_triggers_rate_limited(webhook_trigger.tenant_id)
                     logger.info(
@@ -792,16 +792,11 @@ class WebhookService:
                     raise
 
                 # Trigger workflow execution asynchronously
-                try:
-                    AsyncWorkflowService.trigger_workflow_async(
-                        session,
-                        end_user,
-                        trigger_data,
-                    )
-                    quota_charge.commit()
-                except Exception:
-                    quota_charge.refund()
-                    raise
+                AsyncWorkflowService.trigger_workflow_async(
+                    session,
+                    end_user,
+                    trigger_data,
+                )
 
         except Exception:
             logger.exception("Failed to trigger workflow for webhook %s", webhook_trigger.webhook_id)

api/tasks/enterprise_telemetry_task.py

@@ -1,52 +0,0 @@
-"""Celery worker for enterprise metric/log telemetry events.
-
-This module defines the Celery task that processes telemetry envelopes
-from the enterprise_telemetry queue. It deserializes envelopes and
-dispatches them to the EnterpriseMetricHandler.
-"""
-
-import json
-import logging
-
-from celery import shared_task
-
-from enterprise.telemetry.contracts import TelemetryEnvelope
-from enterprise.telemetry.metric_handler import EnterpriseMetricHandler
-
-logger = logging.getLogger(__name__)
-
-
-@shared_task(queue="enterprise_telemetry")
-def process_enterprise_telemetry(envelope_json: str) -> None:
-    """Process enterprise metric/log telemetry envelope.
-
-    This task is enqueued by the TelemetryGateway for metric/log-only
-    events. It deserializes the envelope and dispatches to the handler.
-
-    Best-effort processing: logs errors but never raises, to avoid
-    failing user requests due to telemetry issues.
-
-    Args:
-        envelope_json: JSON-serialized TelemetryEnvelope.
-    """
-    try:
-        # Deserialize envelope
-        envelope_dict = json.loads(envelope_json)
-        envelope = TelemetryEnvelope.model_validate(envelope_dict)
-
-        # Process through handler
-        handler = EnterpriseMetricHandler()
-        handler.handle(envelope)
-
-        logger.debug(
-            "Successfully processed telemetry envelope: tenant_id=%s, event_id=%s, case=%s",
-            envelope.tenant_id,
-            envelope.event_id,
-            envelope.case,
-        )
-    except Exception:
-        # Best-effort: log and drop on error, never fail user request
-        logger.warning(
-            "Failed to process enterprise telemetry envelope, dropping event",
-            exc_info=True,
-        )

api/tasks/ops_trace_task.py

@@ -39,36 +39,17 @@ def process_trace_tasks(file_info):
         trace_info["documents"] = [Document.model_validate(doc) for doc in trace_info["documents"]]
 
     try:
-        trace_type = trace_info_info_map.get(trace_info_type)
-        if trace_type:
-            trace_info = trace_type(**trace_info)
-
-        from extensions.ext_enterprise_telemetry import is_enabled as is_ee_telemetry_enabled
-
-        if is_ee_telemetry_enabled():
-            from enterprise.telemetry.enterprise_trace import EnterpriseOtelTrace
-
-            try:
-                EnterpriseOtelTrace().trace(trace_info)
-            except Exception:
-                logger.exception("Enterprise trace failed for app_id: %s", app_id)
-
         if trace_instance:
             with current_app.app_context():
+                trace_type = trace_info_info_map.get(trace_info_type)
+                if trace_type:
+                    trace_info = trace_type(**trace_info)
                 trace_instance.trace(trace_info)
-
         logger.info("Processing trace tasks success, app_id: %s", app_id)
     except Exception as e:
-        logger.exception("Processing trace tasks failed, app_id: %s", app_id)
+        logger.info("error:\n\n\n%s\n\n\n\n", e)
         failed_key = f"{OPS_TRACE_FAILED_KEY}_{app_id}"
         redis_client.incr(failed_key)
+        logger.info("Processing trace tasks failed, app_id: %s", app_id)
     finally:
-        try:
-            storage.delete(file_path)
-        except Exception as e:
-            logger.warning(
-                "Failed to delete trace file %s for app_id %s: %s",
-                file_path,
-                app_id,
-                e,
-            )
+        storage.delete(file_path)

api/tasks/trigger_processing_tasks.py

@@ -298,10 +298,10 @@ def dispatch_triggered_workflow(
                 icon_dark_filename=trigger_entity.identity.icon_dark or "",
             )
 
-            # reserve quota before invoking trigger
+            # consume quota before invoking trigger
             quota_charge = unlimited()
             try:
-                quota_charge = QuotaType.TRIGGER.reserve(subscription.tenant_id)
+                quota_charge = QuotaType.TRIGGER.consume(subscription.tenant_id)
             except QuotaExceededError:
                 AppTriggerService.mark_tenant_triggers_rate_limited(subscription.tenant_id)
                 logger.info(
@@ -387,7 +387,6 @@ def dispatch_triggered_workflow(
                     raise ValueError(f"End user not found for app {plugin_trigger.app_id}")
 
                 AsyncWorkflowService.trigger_workflow_async(session=session, user=end_user, trigger_data=trigger_data)
-                quota_charge.commit()
                 dispatched_count += 1
                 logger.info(
                     "Triggered workflow for app %s with trigger event %s",

api/tasks/workflow_schedule_tasks.py

@@ -43,7 +43,7 @@ def run_schedule_trigger(schedule_id: str) -> None:
 
         quota_charge = unlimited()
         try:
-            quota_charge = QuotaType.TRIGGER.reserve(schedule.tenant_id)
+            quota_charge = QuotaType.TRIGGER.consume(schedule.tenant_id)
         except QuotaExceededError:
             AppTriggerService.mark_tenant_triggers_rate_limited(schedule.tenant_id)
             logger.info("Tenant %s rate limited, skipping schedule trigger %s", schedule.tenant_id, schedule_id)
@@ -61,7 +61,6 @@ def run_schedule_trigger(schedule_id: str) -> None:
                     tenant_id=schedule.tenant_id,
                 ),
             )
-            quota_charge.commit()
             logger.info("Schedule %s triggered workflow: %s", schedule_id, response.workflow_trigger_log_id)
         except Exception as e:
             quota_charge.refund()

api/tests/test_containers_integration_tests/repositories/test_execution_extra_content_repository.py

@@ -1,27 +0,0 @@
-from __future__ import annotations
-
-from sqlalchemy.orm import sessionmaker
-
-from extensions.ext_database import db
-from repositories.sqlalchemy_execution_extra_content_repository import SQLAlchemyExecutionExtraContentRepository
-from tests.test_containers_integration_tests.helpers.execution_extra_content import (
-    create_human_input_message_fixture,
-)
-
-
-def test_get_by_message_ids_returns_human_input_content(db_session_with_containers):
-    fixture = create_human_input_message_fixture(db_session_with_containers)
-    repository = SQLAlchemyExecutionExtraContentRepository(
-        session_maker=sessionmaker(bind=db.engine, expire_on_commit=False)
-    )
-
-    results = repository.get_by_message_ids([fixture.message.id])
-
-    assert len(results) == 1
-    assert len(results[0]) == 1
-    content = results[0][0]
-    assert content.submitted is True
-    assert content.form_submission_data is not None
-    assert content.form_submission_data.action_id == fixture.action_id
-    assert content.form_submission_data.action_text == fixture.action_text
-    assert content.form_submission_data.rendered_content == fixture.form.rendered_content

api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py

@@ -0,0 +1,407 @@
+"""Integration tests for SQLAlchemyExecutionExtraContentRepository using Testcontainers.
+
+Part of #32454 — replaces the mock-based unit tests with real database interactions.
+"""
+
+from __future__ import annotations
+
+from collections.abc import Generator
+from dataclasses import dataclass
+from datetime import datetime, timedelta
+from decimal import Decimal
+from uuid import uuid4
+
+import pytest
+from sqlalchemy import Engine, delete, select
+from sqlalchemy.orm import Session, sessionmaker
+
+from dify_graph.nodes.human_input.entities import FormDefinition, UserAction
+from dify_graph.nodes.human_input.enums import HumanInputFormStatus
+from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
+from models.enums import ConversationFromSource, InvokeFrom
+from models.execution_extra_content import ExecutionExtraContent, HumanInputContent
+from models.human_input import (
+    ConsoleRecipientPayload,
+    HumanInputDelivery,
+    HumanInputForm,
+    HumanInputFormRecipient,
+    RecipientType,
+)
+from models.model import App, Conversation, Message
+from repositories.sqlalchemy_execution_extra_content_repository import SQLAlchemyExecutionExtraContentRepository
+
+
+@dataclass
+class _TestScope:
+    """Per-test data scope used to isolate DB rows.
+
+    IDs are populated after flushing the base entities to the database.
+    """
+
+    tenant_id: str = ""
+    app_id: str = ""
+    user_id: str = ""
+
+
+def _cleanup_scope_data(session: Session, scope: _TestScope) -> None:
+    """Remove test-created DB rows for a test scope."""
+    form_ids_subquery = select(HumanInputForm.id).where(
+        HumanInputForm.tenant_id == scope.tenant_id,
+    )
+    session.execute(delete(HumanInputFormRecipient).where(HumanInputFormRecipient.form_id.in_(form_ids_subquery)))
+    session.execute(delete(HumanInputDelivery).where(HumanInputDelivery.form_id.in_(form_ids_subquery)))
+    session.execute(
+        delete(ExecutionExtraContent).where(
+            ExecutionExtraContent.workflow_run_id.in_(
+                select(HumanInputForm.workflow_run_id).where(HumanInputForm.tenant_id == scope.tenant_id)
+            )
+        )
+    )
+    session.execute(delete(HumanInputForm).where(HumanInputForm.tenant_id == scope.tenant_id))
+    session.execute(delete(Message).where(Message.app_id == scope.app_id))
+    session.execute(delete(Conversation).where(Conversation.app_id == scope.app_id))
+    session.execute(delete(App).where(App.id == scope.app_id))
+    session.execute(delete(TenantAccountJoin).where(TenantAccountJoin.tenant_id == scope.tenant_id))
+    session.execute(delete(Account).where(Account.id == scope.user_id))
+    session.execute(delete(Tenant).where(Tenant.id == scope.tenant_id))
+    session.commit()
+
+
+def _seed_base_entities(session: Session, scope: _TestScope) -> None:
+    """Create the base tenant, account, and app needed by tests."""
+    tenant = Tenant(name="Test Tenant")
+    session.add(tenant)
+    session.flush()
+    scope.tenant_id = tenant.id
+
+    account = Account(
+        name="Test Account",
+        email=f"test_{uuid4()}@example.com",
+        password="hashed-password",
+        password_salt="salt",
+        interface_language="en-US",
+        timezone="UTC",
+    )
+    session.add(account)
+    session.flush()
+    scope.user_id = account.id
+
+    tenant_join = TenantAccountJoin(
+        tenant_id=scope.tenant_id,
+        account_id=scope.user_id,
+        role=TenantAccountRole.OWNER,
+        current=True,
+    )
+    session.add(tenant_join)
+
+    app = App(
+        tenant_id=scope.tenant_id,
+        name="Test App",
+        description="",
+        mode="chat",
+        icon_type="emoji",
+        icon="bot",
+        icon_background="#FFFFFF",
+        enable_site=False,
+        enable_api=True,
+        api_rpm=100,
+        api_rph=100,
+        is_demo=False,
+        is_public=False,
+        is_universal=False,
+        created_by=scope.user_id,
+        updated_by=scope.user_id,
+    )
+    session.add(app)
+    session.flush()
+    scope.app_id = app.id
+
+
+def _create_conversation(session: Session, scope: _TestScope) -> Conversation:
+    conversation = Conversation(
+        app_id=scope.app_id,
+        mode="chat",
+        name="Test Conversation",
+        summary="",
+        introduction="",
+        system_instruction="",
+        status="normal",
+        invoke_from=InvokeFrom.EXPLORE,
+        from_source=ConversationFromSource.CONSOLE,
+        from_account_id=scope.user_id,
+        from_end_user_id=None,
+    )
+    conversation.inputs = {}
+    session.add(conversation)
+    session.flush()
+    return conversation
+
+
+def _create_message(
+    session: Session,
+    scope: _TestScope,
+    conversation_id: str,
+    workflow_run_id: str,
+) -> Message:
+    message = Message(
+        app_id=scope.app_id,
+        conversation_id=conversation_id,
+        inputs={},
+        query="test query",
+        message={"messages": []},
+        answer="test answer",
+        message_tokens=50,
+        message_unit_price=Decimal("0.001"),
+        answer_tokens=80,
+        answer_unit_price=Decimal("0.001"),
+        provider_response_latency=0.5,
+        currency="USD",
+        from_source=ConversationFromSource.CONSOLE,
+        from_account_id=scope.user_id,
+        workflow_run_id=workflow_run_id,
+    )
+    session.add(message)
+    session.flush()
+    return message
+
+
+def _create_submitted_form(
+    session: Session,
+    scope: _TestScope,
+    *,
+    workflow_run_id: str,
+    action_id: str = "approve",
+    action_title: str = "Approve",
+    node_title: str = "Approval",
+) -> HumanInputForm:
+    expiration_time = datetime.utcnow() + timedelta(days=1)
+    form_definition = FormDefinition(
+        form_content="content",
+        inputs=[],
+        user_actions=[UserAction(id=action_id, title=action_title)],
+        rendered_content="rendered",
+        expiration_time=expiration_time,
+        node_title=node_title,
+        display_in_ui=True,
+    )
+    form = HumanInputForm(
+        tenant_id=scope.tenant_id,
+        app_id=scope.app_id,
+        workflow_run_id=workflow_run_id,
+        node_id="node-id",
+        form_definition=form_definition.model_dump_json(),
+        rendered_content=f"Rendered {action_title}",
+        status=HumanInputFormStatus.SUBMITTED,
+        expiration_time=expiration_time,
+        selected_action_id=action_id,
+    )
+    session.add(form)
+    session.flush()
+    return form
+
+
+def _create_waiting_form(
+    session: Session,
+    scope: _TestScope,
+    *,
+    workflow_run_id: str,
+    default_values: dict | None = None,
+) -> HumanInputForm:
+    expiration_time = datetime.utcnow() + timedelta(days=1)
+    form_definition = FormDefinition(
+        form_content="content",
+        inputs=[],
+        user_actions=[UserAction(id="approve", title="Approve")],
+        rendered_content="rendered",
+        expiration_time=expiration_time,
+        default_values=default_values or {"name": "John"},
+        node_title="Approval",
+        display_in_ui=True,
+    )
+    form = HumanInputForm(
+        tenant_id=scope.tenant_id,
+        app_id=scope.app_id,
+        workflow_run_id=workflow_run_id,
+        node_id="node-id",
+        form_definition=form_definition.model_dump_json(),
+        rendered_content="Rendered block",
+        status=HumanInputFormStatus.WAITING,
+        expiration_time=expiration_time,
+    )
+    session.add(form)
+    session.flush()
+    return form
+
+
+def _create_human_input_content(
+    session: Session,
+    *,
+    workflow_run_id: str,
+    message_id: str,
+    form_id: str,
+) -> HumanInputContent:
+    content = HumanInputContent.new(
+        workflow_run_id=workflow_run_id,
+        message_id=message_id,
+        form_id=form_id,
+    )
+    session.add(content)
+    return content
+
+
+def _create_recipient(
+    session: Session,
+    *,
+    form_id: str,
+    delivery_id: str,
+    recipient_type: RecipientType = RecipientType.CONSOLE,
+    access_token: str = "token-1",
+) -> HumanInputFormRecipient:
+    payload = ConsoleRecipientPayload(account_id=None)
+    recipient = HumanInputFormRecipient(
+        form_id=form_id,
+        delivery_id=delivery_id,
+        recipient_type=recipient_type,
+        recipient_payload=payload.model_dump_json(),
+        access_token=access_token,
+    )
+    session.add(recipient)
+    return recipient
+
+
+def _create_delivery(session: Session, *, form_id: str) -> HumanInputDelivery:
+    from dify_graph.nodes.human_input.enums import DeliveryMethodType
+    from models.human_input import ConsoleDeliveryPayload
+
+    delivery = HumanInputDelivery(
+        form_id=form_id,
+        delivery_method_type=DeliveryMethodType.WEBAPP,
+        channel_payload=ConsoleDeliveryPayload().model_dump_json(),
+    )
+    session.add(delivery)
+    session.flush()
+    return delivery
+
+
+@pytest.fixture
+def repository(db_session_with_containers: Session) -> SQLAlchemyExecutionExtraContentRepository:
+    """Build a repository backed by the testcontainers database engine."""
+    engine = db_session_with_containers.get_bind()
+    assert isinstance(engine, Engine)
+    return SQLAlchemyExecutionExtraContentRepository(sessionmaker(bind=engine, expire_on_commit=False))
+
+
+@pytest.fixture
+def test_scope(db_session_with_containers: Session) -> Generator[_TestScope]:
+    """Provide an isolated scope and clean related data after each test."""
+    scope = _TestScope()
+    _seed_base_entities(db_session_with_containers, scope)
+    db_session_with_containers.commit()
+    yield scope
+    _cleanup_scope_data(db_session_with_containers, scope)
+
+
+class TestGetByMessageIds:
+    """Tests for SQLAlchemyExecutionExtraContentRepository.get_by_message_ids."""
+
+    def test_groups_contents_by_message(
+        self,
+        db_session_with_containers: Session,
+        repository: SQLAlchemyExecutionExtraContentRepository,
+        test_scope: _TestScope,
+    ) -> None:
+        """Submitted forms are correctly mapped and grouped by message ID."""
+        workflow_run_id = str(uuid4())
+        conversation = _create_conversation(db_session_with_containers, test_scope)
+        msg1 = _create_message(db_session_with_containers, test_scope, conversation.id, workflow_run_id)
+        msg2 = _create_message(db_session_with_containers, test_scope, conversation.id, workflow_run_id)
+
+        form = _create_submitted_form(
+            db_session_with_containers,
+            test_scope,
+            workflow_run_id=workflow_run_id,
+            action_id="approve",
+            action_title="Approve",
+        )
+        _create_human_input_content(
+            db_session_with_containers,
+            workflow_run_id=workflow_run_id,
+            message_id=msg1.id,
+            form_id=form.id,
+        )
+        db_session_with_containers.commit()
+
+        result = repository.get_by_message_ids([msg1.id, msg2.id])
+
+        assert len(result) == 2
+        # msg1 has one submitted content
+        assert len(result[0]) == 1
+        content = result[0][0]
+        assert content.submitted is True
+        assert content.workflow_run_id == workflow_run_id
+        assert content.form_submission_data is not None
+        assert content.form_submission_data.action_id == "approve"
+        assert content.form_submission_data.action_text == "Approve"
+        assert content.form_submission_data.rendered_content == "Rendered Approve"
+        assert content.form_submission_data.node_id == "node-id"
+        assert content.form_submission_data.node_title == "Approval"
+        # msg2 has no content
+        assert result[1] == []
+
+    def test_returns_unsubmitted_form_definition(
+        self,
+        db_session_with_containers: Session,
+        repository: SQLAlchemyExecutionExtraContentRepository,
+        test_scope: _TestScope,
+    ) -> None:
+        """Waiting forms return full form_definition with resolved token and defaults."""
+        workflow_run_id = str(uuid4())
+        conversation = _create_conversation(db_session_with_containers, test_scope)
+        msg = _create_message(db_session_with_containers, test_scope, conversation.id, workflow_run_id)
+
+        form = _create_waiting_form(
+            db_session_with_containers,
+            test_scope,
+            workflow_run_id=workflow_run_id,
+            default_values={"name": "John"},
+        )
+        delivery = _create_delivery(db_session_with_containers, form_id=form.id)
+        _create_recipient(
+            db_session_with_containers,
+            form_id=form.id,
+            delivery_id=delivery.id,
+            access_token="token-1",
+        )
+        _create_human_input_content(
+            db_session_with_containers,
+            workflow_run_id=workflow_run_id,
+            message_id=msg.id,
+            form_id=form.id,
+        )
+        db_session_with_containers.commit()
+
+        result = repository.get_by_message_ids([msg.id])
+
+        assert len(result) == 1
+        assert len(result[0]) == 1
+        domain_content = result[0][0]
+        assert domain_content.submitted is False
+        assert domain_content.workflow_run_id == workflow_run_id
+        assert domain_content.form_definition is not None
+        form_def = domain_content.form_definition
+        assert form_def.form_id == form.id
+        assert form_def.node_id == "node-id"
+        assert form_def.node_title == "Approval"
+        assert form_def.form_content == "Rendered block"
+        assert form_def.display_in_ui is True
+        assert form_def.form_token == "token-1"
+        assert form_def.resolved_default_values == {"name": "John"}
+        assert form_def.expiration_time == int(form.expiration_time.timestamp())
+
+    def test_empty_message_ids_returns_empty_list(
+        self,
+        repository: SQLAlchemyExecutionExtraContentRepository,
+    ) -> None:
+        """Passing no message IDs returns an empty list without hitting the DB."""
+        result = repository.get_by_message_ids([])
+        assert result == []

api/tests/unit_tests/core/ops/test_ops_trace_manager.py

@@ -107,7 +107,6 @@ def make_message_data(**overrides):
         "agent_thoughts": [],
         "query": "sample-query",
         "inputs": "sample-input",
-        "app_id": "app-id",
     }
     base.update(overrides)
 
@@ -172,10 +171,10 @@ def configure_db_query(session, *, message_file=None, workflow_app_log=None):
 
 class DummySessionContext:
     scalar_values = []
-    _shared_index = 0
 
     def __init__(self, engine):
-        self._values = self.scalar_values
+        self._values = list(self.scalar_values)
+        self._index = 0
 
     def __enter__(self):
         return self
@@ -184,28 +183,12 @@ class DummySessionContext:
         return False
 
     def scalar(self, *args, **kwargs):
-        if DummySessionContext._shared_index >= len(self._values):
+        if self._index >= len(self._values):
             return None
-        value = self._values[DummySessionContext._shared_index]
-        DummySessionContext._shared_index += 1
+        value = self._values[self._index]
+        self._index += 1
         return value
 
-    def scalars(self, *args, **kwargs):
-        class ScalarsResult:
-            def __init__(self, context):
-                self._context = context
-
-            def all(self):
-                if DummySessionContext._shared_index >= len(self._context._values):
-                    return []
-                value = self._context._values[DummySessionContext._shared_index]
-                DummySessionContext._shared_index += 1
-                if isinstance(value, list):
-                    return value
-                return [value] if value is not None else []
-
-        return ScalarsResult(self)
-
 
 @pytest.fixture(autouse=True)
 def patch_provider_map(monkeypatch):
@@ -233,8 +216,6 @@ def patch_timer_and_current_app(monkeypatch):
 
 @pytest.fixture(autouse=True)
 def patch_sqlalchemy_session(monkeypatch):
-    DummySessionContext.scalar_values = []
-    DummySessionContext._shared_index = 0
     monkeypatch.setattr("core.ops.ops_trace_manager.Session", DummySessionContext)
 
 
@@ -472,7 +453,7 @@ def test_trace_task_message_trace(trace_task_message, mock_db):
 
 
 def test_trace_task_workflow_trace(workflow_repo_fixture, mock_db):
-    DummySessionContext.scalar_values = [[], "wf-app-log", "message-ref"]
+    DummySessionContext.scalar_values = ["wf-app-log", "message-ref"]
     execution = SimpleNamespace(id_="run-id")
     task = TraceTask(
         trace_type=TraceTaskName.WORKFLOW_TRACE, workflow_execution=execution, conversation_id="conv", user_id="user"

api/tests/unit_tests/core/ops/test_trace_queue_manager.py

@@ -1,200 +0,0 @@
-"""Unit tests for TraceQueueManager telemetry guard.
-
-This test suite verifies that TraceQueueManager correctly drops trace tasks
-when telemetry is disabled, proving Bug 1 from code review is a false positive.
-
-The guard logic moved from persistence.py to TraceQueueManager.add_trace_task()
-at line 1282 of ops_trace_manager.py:
-    if self._enterprise_telemetry_enabled or self.trace_instance:
-        trace_task.app_id = self.app_id
-        trace_manager_queue.put(trace_task)
-
-Tasks are only enqueued if EITHER:
-- Enterprise telemetry is enabled (_enterprise_telemetry_enabled=True), OR
-- A third-party trace instance (Langfuse, etc.) is configured
-
-When BOTH are false, tasks are silently dropped (correct behavior).
-"""
-
-import queue
-import sys
-import types
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-
-@pytest.fixture
-def trace_queue_manager_and_task(monkeypatch):
-    """Fixture to provide TraceQueueManager and TraceTask with delayed imports."""
-    module_name = "core.ops.ops_trace_manager"
-    if module_name not in sys.modules:
-        ops_stub = types.ModuleType(module_name)
-
-        class StubTraceTask:
-            def __init__(self, trace_type):
-                self.trace_type = trace_type
-                self.app_id = None
-
-        class StubTraceQueueManager:
-            def __init__(self, app_id=None):
-                self.app_id = app_id
-                from core.telemetry.gateway import is_enterprise_telemetry_enabled
-
-                self._enterprise_telemetry_enabled = is_enterprise_telemetry_enabled()
-                self.trace_instance = StubOpsTraceManager.get_ops_trace_instance(app_id)
-
-            def add_trace_task(self, trace_task):
-                if self._enterprise_telemetry_enabled or self.trace_instance:
-                    trace_task.app_id = self.app_id
-                    from core.ops.ops_trace_manager import trace_manager_queue
-
-                    trace_manager_queue.put(trace_task)
-
-        class StubOpsTraceManager:
-            @staticmethod
-            def get_ops_trace_instance(app_id):
-                return None
-
-        ops_stub.TraceQueueManager = StubTraceQueueManager
-        ops_stub.TraceTask = StubTraceTask
-        ops_stub.OpsTraceManager = StubOpsTraceManager
-        ops_stub.trace_manager_queue = MagicMock(spec=queue.Queue)
-        monkeypatch.setitem(sys.modules, module_name, ops_stub)
-
-    from core.ops.entities.trace_entity import TraceTaskName
-
-    ops_module = __import__(module_name, fromlist=["TraceQueueManager", "TraceTask"])
-    TraceQueueManager = ops_module.TraceQueueManager
-    TraceTask = ops_module.TraceTask
-
-    return TraceQueueManager, TraceTask, TraceTaskName
-
-
-class TestTraceQueueManagerTelemetryGuard:
-    """Test TraceQueueManager's telemetry guard in add_trace_task()."""
-
-    def test_task_not_enqueued_when_telemetry_disabled_and_no_trace_instance(self, trace_queue_manager_and_task):
-        """Verify task is NOT enqueued when telemetry disabled and no trace instance.
-
-        This is the core guard: when _enterprise_telemetry_enabled=False AND
-        trace_instance=None, the task should be silently dropped.
-        """
-        TraceQueueManager, TraceTask, TraceTaskName = trace_queue_manager_and_task
-
-        mock_queue = MagicMock(spec=queue.Queue)
-
-        trace_task = TraceTask(trace_type=TraceTaskName.WORKFLOW_TRACE)
-
-        with (
-            patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=False),
-            patch("core.ops.ops_trace_manager.OpsTraceManager.get_ops_trace_instance", return_value=None),
-            patch("core.ops.ops_trace_manager.trace_manager_queue", mock_queue),
-        ):
-            manager = TraceQueueManager(app_id="test-app-id")
-            manager.add_trace_task(trace_task)
-
-            mock_queue.put.assert_not_called()
-
-    def test_task_enqueued_when_telemetry_enabled(self, trace_queue_manager_and_task):
-        """Verify task IS enqueued when enterprise telemetry is enabled.
-
-        When _enterprise_telemetry_enabled=True, the task should be enqueued
-        regardless of trace_instance state.
-        """
-        TraceQueueManager, TraceTask, TraceTaskName = trace_queue_manager_and_task
-
-        mock_queue = MagicMock(spec=queue.Queue)
-
-        trace_task = TraceTask(trace_type=TraceTaskName.WORKFLOW_TRACE)
-
-        with (
-            patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True),
-            patch("core.ops.ops_trace_manager.OpsTraceManager.get_ops_trace_instance", return_value=None),
-            patch("core.ops.ops_trace_manager.trace_manager_queue", mock_queue),
-        ):
-            manager = TraceQueueManager(app_id="test-app-id")
-            manager.add_trace_task(trace_task)
-
-            mock_queue.put.assert_called_once()
-            called_task = mock_queue.put.call_args[0][0]
-            assert called_task.app_id == "test-app-id"
-
-    def test_task_enqueued_when_trace_instance_configured(self, trace_queue_manager_and_task):
-        """Verify task IS enqueued when third-party trace instance is configured.
-
-        When trace_instance is not None (e.g., Langfuse configured), the task
-        should be enqueued even if enterprise telemetry is disabled.
-        """
-        TraceQueueManager, TraceTask, TraceTaskName = trace_queue_manager_and_task
-
-        mock_queue = MagicMock(spec=queue.Queue)
-
-        mock_trace_instance = MagicMock()
-
-        trace_task = TraceTask(trace_type=TraceTaskName.WORKFLOW_TRACE)
-
-        with (
-            patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=False),
-            patch(
-                "core.ops.ops_trace_manager.OpsTraceManager.get_ops_trace_instance", return_value=mock_trace_instance
-            ),
-            patch("core.ops.ops_trace_manager.trace_manager_queue", mock_queue),
-        ):
-            manager = TraceQueueManager(app_id="test-app-id")
-            manager.add_trace_task(trace_task)
-
-            mock_queue.put.assert_called_once()
-            called_task = mock_queue.put.call_args[0][0]
-            assert called_task.app_id == "test-app-id"
-
-    def test_task_enqueued_when_both_telemetry_and_trace_instance_enabled(self, trace_queue_manager_and_task):
-        """Verify task IS enqueued when both telemetry and trace instance are enabled.
-
-        When both _enterprise_telemetry_enabled=True AND trace_instance is set,
-        the task should definitely be enqueued.
-        """
-        TraceQueueManager, TraceTask, TraceTaskName = trace_queue_manager_and_task
-
-        mock_queue = MagicMock(spec=queue.Queue)
-
-        mock_trace_instance = MagicMock()
-
-        trace_task = TraceTask(trace_type=TraceTaskName.WORKFLOW_TRACE)
-
-        with (
-            patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True),
-            patch(
-                "core.ops.ops_trace_manager.OpsTraceManager.get_ops_trace_instance", return_value=mock_trace_instance
-            ),
-            patch("core.ops.ops_trace_manager.trace_manager_queue", mock_queue),
-        ):
-            manager = TraceQueueManager(app_id="test-app-id")
-            manager.add_trace_task(trace_task)
-
-            mock_queue.put.assert_called_once()
-            called_task = mock_queue.put.call_args[0][0]
-            assert called_task.app_id == "test-app-id"
-
-    def test_app_id_set_before_enqueue(self, trace_queue_manager_and_task):
-        """Verify app_id is set on the task before enqueuing.
-
-        The guard logic sets trace_task.app_id = self.app_id before calling
-        trace_manager_queue.put(trace_task). This test verifies that behavior.
-        """
-        TraceQueueManager, TraceTask, TraceTaskName = trace_queue_manager_and_task
-
-        mock_queue = MagicMock(spec=queue.Queue)
-
-        trace_task = TraceTask(trace_type=TraceTaskName.WORKFLOW_TRACE)
-
-        with (
-            patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True),
-            patch("core.ops.ops_trace_manager.OpsTraceManager.get_ops_trace_instance", return_value=None),
-            patch("core.ops.ops_trace_manager.trace_manager_queue", mock_queue),
-        ):
-            manager = TraceQueueManager(app_id="expected-app-id")
-            manager.add_trace_task(trace_task)
-
-            called_task = mock_queue.put.call_args[0][0]
-            assert called_task.app_id == "expected-app-id"

api/tests/unit_tests/core/telemetry/test_facade.py

@@ -1,181 +0,0 @@
-"""Unit tests for core.telemetry.emit() routing and enterprise-only filtering."""
-
-from __future__ import annotations
-
-import queue
-import sys
-import types
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from core.ops.entities.trace_entity import TraceTaskName
-from core.telemetry.events import TelemetryContext, TelemetryEvent
-
-
-@pytest.fixture
-def telemetry_test_setup(monkeypatch):
-    module_name = "core.ops.ops_trace_manager"
-    ops_stub = types.ModuleType(module_name)
-
-    class StubTraceTask:
-        def __init__(self, trace_type, **kwargs):
-            self.trace_type = trace_type
-            self.app_id = None
-            self.kwargs = kwargs
-
-    class StubTraceQueueManager:
-        def __init__(self, app_id=None, user_id=None):
-            self.app_id = app_id
-            self.user_id = user_id
-            self.trace_instance = StubOpsTraceManager.get_ops_trace_instance(app_id)
-
-        def add_trace_task(self, trace_task):
-            trace_task.app_id = self.app_id
-            from core.ops.ops_trace_manager import trace_manager_queue
-
-            trace_manager_queue.put(trace_task)
-
-    class StubOpsTraceManager:
-        @staticmethod
-        def get_ops_trace_instance(app_id):
-            return None
-
-    ops_stub.TraceQueueManager = StubTraceQueueManager
-    ops_stub.TraceTask = StubTraceTask
-    ops_stub.OpsTraceManager = StubOpsTraceManager
-    ops_stub.trace_manager_queue = MagicMock(spec=queue.Queue)
-    monkeypatch.setitem(sys.modules, module_name, ops_stub)
-
-    from core.telemetry import emit
-
-    return emit, ops_stub.trace_manager_queue
-
-
-class TestTelemetryEmit:
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True)
-    def test_emit_enterprise_trace_creates_trace_task(self, mock_ee, telemetry_test_setup):
-        emit_fn, mock_queue = telemetry_test_setup
-
-        event = TelemetryEvent(
-            name=TraceTaskName.DRAFT_NODE_EXECUTION_TRACE,
-            context=TelemetryContext(
-                tenant_id="test-tenant",
-                user_id="test-user",
-                app_id="test-app",
-            ),
-            payload={"key": "value"},
-        )
-
-        emit_fn(event)
-
-        mock_queue.put.assert_called_once()
-        called_task = mock_queue.put.call_args[0][0]
-        assert called_task.trace_type == TraceTaskName.DRAFT_NODE_EXECUTION_TRACE
-
-    def test_emit_community_trace_enqueued(self, telemetry_test_setup):
-        emit_fn, mock_queue = telemetry_test_setup
-
-        event = TelemetryEvent(
-            name=TraceTaskName.WORKFLOW_TRACE,
-            context=TelemetryContext(
-                tenant_id="test-tenant",
-                user_id="test-user",
-                app_id="test-app",
-            ),
-            payload={},
-        )
-
-        emit_fn(event)
-
-        mock_queue.put.assert_called_once()
-
-    def test_emit_enterprise_only_trace_dropped_when_ee_disabled(self, telemetry_test_setup):
-        emit_fn, mock_queue = telemetry_test_setup
-
-        event = TelemetryEvent(
-            name=TraceTaskName.DRAFT_NODE_EXECUTION_TRACE,
-            context=TelemetryContext(
-                tenant_id="test-tenant",
-                user_id="test-user",
-                app_id="test-app",
-            ),
-            payload={},
-        )
-
-        emit_fn(event)
-
-        mock_queue.put.assert_not_called()
-
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True)
-    def test_emit_all_enterprise_only_traces_allowed_when_ee_enabled(self, mock_ee, telemetry_test_setup):
-        emit_fn, mock_queue = telemetry_test_setup
-
-        enterprise_only_traces = [
-            TraceTaskName.DRAFT_NODE_EXECUTION_TRACE,
-            TraceTaskName.NODE_EXECUTION_TRACE,
-            TraceTaskName.PROMPT_GENERATION_TRACE,
-        ]
-
-        for trace_name in enterprise_only_traces:
-            mock_queue.reset_mock()
-
-            event = TelemetryEvent(
-                name=trace_name,
-                context=TelemetryContext(
-                    tenant_id="test-tenant",
-                    user_id="test-user",
-                    app_id="test-app",
-                ),
-                payload={},
-            )
-
-            emit_fn(event)
-
-            mock_queue.put.assert_called_once()
-            called_task = mock_queue.put.call_args[0][0]
-            assert called_task.trace_type == trace_name
-
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True)
-    def test_emit_passes_name_directly_to_trace_task(self, mock_ee, telemetry_test_setup):
-        emit_fn, mock_queue = telemetry_test_setup
-
-        event = TelemetryEvent(
-            name=TraceTaskName.DRAFT_NODE_EXECUTION_TRACE,
-            context=TelemetryContext(
-                tenant_id="test-tenant",
-                user_id="test-user",
-                app_id="test-app",
-            ),
-            payload={"extra": "data"},
-        )
-
-        emit_fn(event)
-
-        mock_queue.put.assert_called_once()
-        called_task = mock_queue.put.call_args[0][0]
-        assert called_task.trace_type == TraceTaskName.DRAFT_NODE_EXECUTION_TRACE
-        assert isinstance(called_task.trace_type, TraceTaskName)
-
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True)
-    def test_emit_with_provided_trace_manager(self, mock_ee, telemetry_test_setup):
-        emit_fn, mock_queue = telemetry_test_setup
-
-        mock_trace_manager = MagicMock()
-        mock_trace_manager.add_trace_task = MagicMock()
-
-        event = TelemetryEvent(
-            name=TraceTaskName.NODE_EXECUTION_TRACE,
-            context=TelemetryContext(
-                tenant_id="test-tenant",
-                user_id="test-user",
-                app_id="test-app",
-            ),
-            payload={},
-        )
-
-        emit_fn(event, trace_manager=mock_trace_manager)
-
-        mock_trace_manager.add_trace_task.assert_called_once()
-        called_task = mock_trace_manager.add_trace_task.call_args[0][0]
-        assert called_task.trace_type == TraceTaskName.NODE_EXECUTION_TRACE

api/tests/unit_tests/core/telemetry/test_gateway_integration.py

@@ -1,225 +0,0 @@
-from __future__ import annotations
-
-import sys
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from core.telemetry.gateway import emit, is_enterprise_telemetry_enabled
-from enterprise.telemetry.contracts import TelemetryCase
-
-
-class TestTelemetryCoreExports:
-    def test_is_enterprise_telemetry_enabled_exported(self) -> None:
-        from core.telemetry.gateway import is_enterprise_telemetry_enabled as exported_func
-
-        assert callable(exported_func)
-
-
-@pytest.fixture
-def mock_ops_trace_manager():
-    mock_module = MagicMock()
-    mock_trace_task_class = MagicMock()
-    mock_trace_task_class.return_value = MagicMock()
-    mock_module.TraceTask = mock_trace_task_class
-    mock_module.TraceQueueManager = MagicMock()
-
-    mock_trace_entity = MagicMock()
-    mock_trace_task_name = MagicMock()
-    mock_trace_task_name.return_value = "workflow"
-    mock_trace_entity.TraceTaskName = mock_trace_task_name
-
-    with (
-        patch.dict(sys.modules, {"core.ops.ops_trace_manager": mock_module}),
-        patch.dict(sys.modules, {"core.ops.entities.trace_entity": mock_trace_entity}),
-    ):
-        yield mock_module, mock_trace_entity
-
-
-class TestGatewayIntegrationTraceRouting:
-    @pytest.fixture
-    def mock_trace_manager(self) -> MagicMock:
-        return MagicMock()
-
-    @pytest.mark.usefixtures("mock_ops_trace_manager")
-    def test_ce_eligible_trace_routed_to_trace_manager(
-        self,
-        mock_trace_manager: MagicMock,
-    ) -> None:
-        with patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True):
-            context = {"app_id": "app-123", "user_id": "user-456", "tenant_id": "tenant-789"}
-            payload = {"workflow_run_id": "run-abc"}
-
-            emit(TelemetryCase.WORKFLOW_RUN, context, payload, mock_trace_manager)
-
-            mock_trace_manager.add_trace_task.assert_called_once()
-
-    @pytest.mark.usefixtures("mock_ops_trace_manager")
-    def test_ce_eligible_trace_routed_when_ee_disabled(
-        self,
-        mock_trace_manager: MagicMock,
-    ) -> None:
-        with patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=False):
-            context = {"app_id": "app-123", "user_id": "user-456"}
-            payload = {"workflow_run_id": "run-abc"}
-
-            emit(TelemetryCase.WORKFLOW_RUN, context, payload, mock_trace_manager)
-
-            mock_trace_manager.add_trace_task.assert_called_once()
-
-    @pytest.mark.usefixtures("mock_ops_trace_manager")
-    def test_enterprise_only_trace_dropped_when_ee_disabled(
-        self,
-        mock_trace_manager: MagicMock,
-    ) -> None:
-        with patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=False):
-            context = {"app_id": "app-123", "user_id": "user-456"}
-            payload = {"node_id": "node-abc"}
-
-            emit(TelemetryCase.NODE_EXECUTION, context, payload, mock_trace_manager)
-
-            mock_trace_manager.add_trace_task.assert_not_called()
-
-    @pytest.mark.usefixtures("mock_ops_trace_manager")
-    def test_enterprise_only_trace_routed_when_ee_enabled(
-        self,
-        mock_trace_manager: MagicMock,
-    ) -> None:
-        with patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True):
-            context = {"app_id": "app-123", "user_id": "user-456"}
-            payload = {"node_id": "node-abc"}
-
-            emit(TelemetryCase.NODE_EXECUTION, context, payload, mock_trace_manager)
-
-            mock_trace_manager.add_trace_task.assert_called_once()
-
-
-class TestGatewayIntegrationMetricRouting:
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True)
-    def test_metric_case_routes_to_celery_task(
-        self,
-        mock_ee_enabled: MagicMock,
-    ) -> None:
-        from enterprise.telemetry.contracts import TelemetryEnvelope
-
-        with patch("tasks.enterprise_telemetry_task.process_enterprise_telemetry.delay") as mock_delay:
-            context = {"tenant_id": "tenant-123"}
-            payload = {"app_id": "app-abc", "name": "My App"}
-
-            emit(TelemetryCase.APP_CREATED, context, payload)
-
-            mock_delay.assert_called_once()
-            envelope_json = mock_delay.call_args[0][0]
-            envelope = TelemetryEnvelope.model_validate_json(envelope_json)
-            assert envelope.case == TelemetryCase.APP_CREATED
-            assert envelope.tenant_id == "tenant-123"
-            assert envelope.payload["app_id"] == "app-abc"
-
-    @pytest.mark.usefixtures("mock_ops_trace_manager")
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True)
-    def test_tool_execution_trace_routed(
-        self,
-        mock_ee_enabled: MagicMock,
-    ) -> None:
-        mock_trace_manager = MagicMock()
-        context = {"tenant_id": "tenant-123", "app_id": "app-123"}
-        payload = {"tool_name": "test_tool", "tool_inputs": {}, "tool_outputs": "result"}
-
-        emit(TelemetryCase.TOOL_EXECUTION, context, payload, mock_trace_manager)
-
-        mock_trace_manager.add_trace_task.assert_called_once()
-
-    @pytest.mark.usefixtures("mock_ops_trace_manager")
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True)
-    def test_moderation_check_trace_routed(
-        self,
-        mock_ee_enabled: MagicMock,
-    ) -> None:
-        mock_trace_manager = MagicMock()
-        context = {"tenant_id": "tenant-123", "app_id": "app-123"}
-        payload = {"message_id": "msg-123", "moderation_result": {"flagged": False}}
-
-        emit(TelemetryCase.MODERATION_CHECK, context, payload, mock_trace_manager)
-
-        mock_trace_manager.add_trace_task.assert_called_once()
-
-
-class TestGatewayIntegrationCEEligibility:
-    @pytest.fixture
-    def mock_trace_manager(self) -> MagicMock:
-        return MagicMock()
-
-    @pytest.mark.usefixtures("mock_ops_trace_manager")
-    def test_workflow_run_is_ce_eligible(
-        self,
-        mock_trace_manager: MagicMock,
-    ) -> None:
-        with patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=False):
-            context = {"app_id": "app-123", "user_id": "user-456"}
-            payload = {"workflow_run_id": "run-abc"}
-
-            emit(TelemetryCase.WORKFLOW_RUN, context, payload, mock_trace_manager)
-
-            mock_trace_manager.add_trace_task.assert_called_once()
-
-    @pytest.mark.usefixtures("mock_ops_trace_manager")
-    def test_message_run_is_ce_eligible(
-        self,
-        mock_trace_manager: MagicMock,
-    ) -> None:
-        with patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=False):
-            context = {"app_id": "app-123", "user_id": "user-456"}
-            payload = {"message_id": "msg-abc", "conversation_id": "conv-123"}
-
-            emit(TelemetryCase.MESSAGE_RUN, context, payload, mock_trace_manager)
-
-            mock_trace_manager.add_trace_task.assert_called_once()
-
-    @pytest.mark.usefixtures("mock_ops_trace_manager")
-    def test_node_execution_not_ce_eligible(
-        self,
-        mock_trace_manager: MagicMock,
-    ) -> None:
-        with patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=False):
-            context = {"app_id": "app-123", "user_id": "user-456"}
-            payload = {"node_id": "node-abc"}
-
-            emit(TelemetryCase.NODE_EXECUTION, context, payload, mock_trace_manager)
-
-            mock_trace_manager.add_trace_task.assert_not_called()
-
-    @pytest.mark.usefixtures("mock_ops_trace_manager")
-    def test_draft_node_execution_not_ce_eligible(
-        self,
-        mock_trace_manager: MagicMock,
-    ) -> None:
-        with patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=False):
-            context = {"app_id": "app-123", "user_id": "user-456"}
-            payload = {"node_execution_data": {}}
-
-            emit(TelemetryCase.DRAFT_NODE_EXECUTION, context, payload, mock_trace_manager)
-
-            mock_trace_manager.add_trace_task.assert_not_called()
-
-    @pytest.mark.usefixtures("mock_ops_trace_manager")
-    def test_prompt_generation_not_ce_eligible(
-        self,
-        mock_trace_manager: MagicMock,
-    ) -> None:
-        with patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=False):
-            context = {"app_id": "app-123", "user_id": "user-456", "tenant_id": "tenant-789"}
-            payload = {"operation_type": "generate", "instruction": "test"}
-
-            emit(TelemetryCase.PROMPT_GENERATION, context, payload, mock_trace_manager)
-
-            mock_trace_manager.add_trace_task.assert_not_called()
-
-
-class TestIsEnterpriseTelemetryEnabled:
-    def test_returns_false_when_exporter_import_fails(self) -> None:
-        with patch.dict(sys.modules, {"enterprise.telemetry.exporter": None}):
-            result = is_enterprise_telemetry_enabled()
-            assert result is False
-
-    def test_function_is_callable(self) -> None:
-        assert callable(is_enterprise_telemetry_enabled)

api/tests/unit_tests/enterprise/telemetry/test_contracts.py

@@ -1,230 +0,0 @@
-"""Unit tests for telemetry gateway contracts."""
-
-from __future__ import annotations
-
-import pytest
-from pydantic import ValidationError
-
-from core.telemetry.gateway import CASE_ROUTING
-from enterprise.telemetry.contracts import CaseRoute, SignalType, TelemetryCase, TelemetryEnvelope
-
-
-class TestTelemetryCase:
-    """Tests for TelemetryCase enum."""
-
-    def test_all_cases_defined(self) -> None:
-        """Verify all 14 telemetry cases are defined."""
-        expected_cases = {
-            "WORKFLOW_RUN",
-            "NODE_EXECUTION",
-            "DRAFT_NODE_EXECUTION",
-            "MESSAGE_RUN",
-            "TOOL_EXECUTION",
-            "MODERATION_CHECK",
-            "SUGGESTED_QUESTION",
-            "DATASET_RETRIEVAL",
-            "GENERATE_NAME",
-            "PROMPT_GENERATION",
-            "APP_CREATED",
-            "APP_UPDATED",
-            "APP_DELETED",
-            "FEEDBACK_CREATED",
-        }
-        actual_cases = {case.name for case in TelemetryCase}
-        assert actual_cases == expected_cases
-
-    def test_case_values(self) -> None:
-        """Verify case enum values are correct."""
-        assert TelemetryCase.WORKFLOW_RUN.value == "workflow_run"
-        assert TelemetryCase.NODE_EXECUTION.value == "node_execution"
-        assert TelemetryCase.DRAFT_NODE_EXECUTION.value == "draft_node_execution"
-        assert TelemetryCase.MESSAGE_RUN.value == "message_run"
-        assert TelemetryCase.TOOL_EXECUTION.value == "tool_execution"
-        assert TelemetryCase.MODERATION_CHECK.value == "moderation_check"
-        assert TelemetryCase.SUGGESTED_QUESTION.value == "suggested_question"
-        assert TelemetryCase.DATASET_RETRIEVAL.value == "dataset_retrieval"
-        assert TelemetryCase.GENERATE_NAME.value == "generate_name"
-        assert TelemetryCase.PROMPT_GENERATION.value == "prompt_generation"
-        assert TelemetryCase.APP_CREATED.value == "app_created"
-        assert TelemetryCase.APP_UPDATED.value == "app_updated"
-        assert TelemetryCase.APP_DELETED.value == "app_deleted"
-        assert TelemetryCase.FEEDBACK_CREATED.value == "feedback_created"
-
-
-class TestCaseRoute:
-    """Tests for CaseRoute model."""
-
-    def test_valid_trace_route(self) -> None:
-        """Verify valid trace route creation."""
-        route = CaseRoute(signal_type=SignalType.TRACE, ce_eligible=True)
-        assert route.signal_type == SignalType.TRACE
-        assert route.ce_eligible is True
-
-    def test_valid_metric_log_route(self) -> None:
-        """Verify valid metric_log route creation."""
-        route = CaseRoute(signal_type=SignalType.METRIC_LOG, ce_eligible=False)
-        assert route.signal_type == SignalType.METRIC_LOG
-        assert route.ce_eligible is False
-
-    def test_invalid_signal_type(self) -> None:
-        """Verify invalid signal_type is rejected."""
-        with pytest.raises(ValidationError):
-            CaseRoute(signal_type="invalid", ce_eligible=True)
-
-
-class TestTelemetryEnvelope:
-    """Tests for TelemetryEnvelope model."""
-
-    def test_valid_envelope_minimal(self) -> None:
-        """Verify valid minimal envelope creation."""
-        envelope = TelemetryEnvelope(
-            case=TelemetryCase.WORKFLOW_RUN,
-            tenant_id="tenant-123",
-            event_id="event-456",
-            payload={"key": "value"},
-        )
-        assert envelope.case == TelemetryCase.WORKFLOW_RUN
-        assert envelope.tenant_id == "tenant-123"
-        assert envelope.event_id == "event-456"
-        assert envelope.payload == {"key": "value"}
-        assert envelope.metadata is None
-
-    def test_valid_envelope_full(self) -> None:
-        """Verify valid envelope with all fields."""
-        metadata = {"payload_ref": "telemetry/tenant-789/event-012.json"}
-        envelope = TelemetryEnvelope(
-            case=TelemetryCase.MESSAGE_RUN,
-            tenant_id="tenant-789",
-            event_id="event-012",
-            payload={"message": "hello"},
-            metadata=metadata,
-        )
-        assert envelope.case == TelemetryCase.MESSAGE_RUN
-        assert envelope.tenant_id == "tenant-789"
-        assert envelope.event_id == "event-012"
-        assert envelope.payload == {"message": "hello"}
-        assert envelope.metadata == metadata
-
-    def test_missing_required_case(self) -> None:
-        """Verify missing case field is rejected."""
-        with pytest.raises(ValidationError):
-            TelemetryEnvelope(
-                tenant_id="tenant-123",
-                event_id="event-456",
-                payload={"key": "value"},
-            )
-
-    def test_missing_required_tenant_id(self) -> None:
-        """Verify missing tenant_id field is rejected."""
-        with pytest.raises(ValidationError):
-            TelemetryEnvelope(
-                case=TelemetryCase.WORKFLOW_RUN,
-                event_id="event-456",
-                payload={"key": "value"},
-            )
-
-    def test_missing_required_event_id(self) -> None:
-        """Verify missing event_id field is rejected."""
-        with pytest.raises(ValidationError):
-            TelemetryEnvelope(
-                case=TelemetryCase.WORKFLOW_RUN,
-                tenant_id="tenant-123",
-                payload={"key": "value"},
-            )
-
-    def test_missing_required_payload(self) -> None:
-        """Verify missing payload field is rejected."""
-        with pytest.raises(ValidationError):
-            TelemetryEnvelope(
-                case=TelemetryCase.WORKFLOW_RUN,
-                tenant_id="tenant-123",
-                event_id="event-456",
-            )
-
-    def test_metadata_none(self) -> None:
-        """Verify metadata can be None."""
-        envelope = TelemetryEnvelope(
-            case=TelemetryCase.WORKFLOW_RUN,
-            tenant_id="tenant-123",
-            event_id="event-456",
-            payload={"key": "value"},
-            metadata=None,
-        )
-        assert envelope.metadata is None
-
-
-class TestCaseRouting:
-    """Tests for CASE_ROUTING table."""
-
-    def test_all_cases_routed(self) -> None:
-        """Verify all 14 cases have routing entries."""
-        assert len(CASE_ROUTING) == 14
-        for case in TelemetryCase:
-            assert case in CASE_ROUTING
-
-    def test_trace_ce_eligible_cases(self) -> None:
-        """Verify trace cases with CE eligibility."""
-        ce_eligible_trace_cases = {
-            TelemetryCase.WORKFLOW_RUN,
-            TelemetryCase.MESSAGE_RUN,
-        }
-        for case in ce_eligible_trace_cases:
-            route = CASE_ROUTING[case]
-            assert route.signal_type == SignalType.TRACE
-            assert route.ce_eligible is True
-
-    def test_trace_enterprise_only_cases(self) -> None:
-        """Verify trace cases that are enterprise-only."""
-        enterprise_only_trace_cases = {
-            TelemetryCase.NODE_EXECUTION,
-            TelemetryCase.DRAFT_NODE_EXECUTION,
-            TelemetryCase.PROMPT_GENERATION,
-        }
-        for case in enterprise_only_trace_cases:
-            route = CASE_ROUTING[case]
-            assert route.signal_type == SignalType.TRACE
-            assert route.ce_eligible is False
-
-    def test_metric_log_cases(self) -> None:
-        """Verify metric/log-only cases."""
-        metric_log_cases = {
-            TelemetryCase.APP_CREATED,
-            TelemetryCase.APP_UPDATED,
-            TelemetryCase.APP_DELETED,
-            TelemetryCase.FEEDBACK_CREATED,
-        }
-        for case in metric_log_cases:
-            route = CASE_ROUTING[case]
-            assert route.signal_type == SignalType.METRIC_LOG
-            assert route.ce_eligible is False
-
-    def test_routing_table_completeness(self) -> None:
-        """Verify routing table covers all cases with correct types."""
-        trace_cases = {
-            TelemetryCase.WORKFLOW_RUN,
-            TelemetryCase.MESSAGE_RUN,
-            TelemetryCase.NODE_EXECUTION,
-            TelemetryCase.DRAFT_NODE_EXECUTION,
-            TelemetryCase.PROMPT_GENERATION,
-            TelemetryCase.TOOL_EXECUTION,
-            TelemetryCase.MODERATION_CHECK,
-            TelemetryCase.SUGGESTED_QUESTION,
-            TelemetryCase.DATASET_RETRIEVAL,
-            TelemetryCase.GENERATE_NAME,
-        }
-        metric_log_cases = {
-            TelemetryCase.APP_CREATED,
-            TelemetryCase.APP_UPDATED,
-            TelemetryCase.APP_DELETED,
-            TelemetryCase.FEEDBACK_CREATED,
-        }
-
-        all_cases = trace_cases | metric_log_cases
-        assert len(all_cases) == 14
-        assert all_cases == set(TelemetryCase)
-
-        for case in trace_cases:
-            assert CASE_ROUTING[case].signal_type == SignalType.TRACE
-
-        for case in metric_log_cases:
-            assert CASE_ROUTING[case].signal_type == SignalType.METRIC_LOG

api/tests/unit_tests/enterprise/telemetry/test_event_handlers.py

@@ -1,121 +0,0 @@
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from enterprise.telemetry import event_handlers
-from enterprise.telemetry.contracts import TelemetryCase
-
-
-@pytest.fixture
-def mock_gateway_emit():
-    with patch("core.telemetry.gateway.emit") as mock:
-        yield mock
-
-
-def test_handle_app_created_calls_task(mock_gateway_emit):
-    sender = MagicMock()
-    sender.id = "app-123"
-    sender.tenant_id = "tenant-456"
-    sender.mode = "chat"
-
-    event_handlers._handle_app_created(sender)
-
-    mock_gateway_emit.assert_called_once_with(
-        case=TelemetryCase.APP_CREATED,
-        context={"tenant_id": "tenant-456"},
-        payload={"app_id": "app-123", "mode": "chat"},
-    )
-
-
-def test_handle_app_created_no_exporter(mock_gateway_emit):
-    """Gateway handles exporter availability internally; handler always calls gateway."""
-    sender = MagicMock()
-    sender.id = "app-123"
-    sender.tenant_id = "tenant-456"
-
-    event_handlers._handle_app_created(sender)
-
-    mock_gateway_emit.assert_called_once()
-
-
-def test_handle_app_updated_calls_task(mock_gateway_emit):
-    sender = MagicMock()
-    sender.id = "app-123"
-    sender.tenant_id = "tenant-456"
-
-    event_handlers._handle_app_updated(sender)
-
-    mock_gateway_emit.assert_called_once_with(
-        case=TelemetryCase.APP_UPDATED,
-        context={"tenant_id": "tenant-456"},
-        payload={"app_id": "app-123"},
-    )
-
-
-def test_handle_app_deleted_calls_task(mock_gateway_emit):
-    sender = MagicMock()
-    sender.id = "app-123"
-    sender.tenant_id = "tenant-456"
-
-    event_handlers._handle_app_deleted(sender)
-
-    mock_gateway_emit.assert_called_once_with(
-        case=TelemetryCase.APP_DELETED,
-        context={"tenant_id": "tenant-456"},
-        payload={"app_id": "app-123"},
-    )
-
-
-def test_handle_feedback_created_calls_task(mock_gateway_emit):
-    sender = MagicMock()
-    sender.message_id = "msg-123"
-    sender.app_id = "app-456"
-    sender.conversation_id = "conv-789"
-    sender.from_end_user_id = "user-001"
-    sender.from_account_id = None
-    sender.rating = "like"
-    sender.from_source = "api"
-    sender.content = "Great response!"
-
-    event_handlers._handle_feedback_created(sender, tenant_id="tenant-456")
-
-    mock_gateway_emit.assert_called_once_with(
-        case=TelemetryCase.FEEDBACK_CREATED,
-        context={"tenant_id": "tenant-456"},
-        payload={
-            "message_id": "msg-123",
-            "app_id": "app-456",
-            "conversation_id": "conv-789",
-            "from_end_user_id": "user-001",
-            "from_account_id": None,
-            "rating": "like",
-            "from_source": "api",
-            "content": "Great response!",
-        },
-    )
-
-
-def test_handle_feedback_created_no_exporter(mock_gateway_emit):
-    """Gateway handles exporter availability internally; handler always calls gateway."""
-    sender = MagicMock()
-    sender.message_id = "msg-123"
-
-    event_handlers._handle_feedback_created(sender, tenant_id="tenant-456")
-
-    mock_gateway_emit.assert_called_once()
-
-
-def test_handlers_create_valid_envelopes(mock_gateway_emit):
-    """Verify handlers pass correct TelemetryCase and payload structure."""
-    sender = MagicMock()
-    sender.id = "app-123"
-    sender.tenant_id = "tenant-456"
-    sender.mode = "chat"
-
-    event_handlers._handle_app_created(sender)
-
-    call_kwargs = mock_gateway_emit.call_args[1]
-    assert call_kwargs["case"] == TelemetryCase.APP_CREATED
-    assert call_kwargs["context"]["tenant_id"] == "tenant-456"
-    assert call_kwargs["payload"]["app_id"] == "app-123"
-    assert call_kwargs["payload"]["mode"] == "chat"

api/tests/unit_tests/enterprise/telemetry/test_exporter.py

@@ -1,263 +0,0 @@
-"""Unit tests for EnterpriseExporter and _ExporterFactory."""
-
-from types import SimpleNamespace
-from unittest.mock import MagicMock, patch
-
-from configs.enterprise import EnterpriseTelemetryConfig
-from enterprise.telemetry.exporter import EnterpriseExporter
-
-
-def test_config_api_key_default_empty():
-    """Test that ENTERPRISE_OTLP_API_KEY defaults to empty string."""
-    config = EnterpriseTelemetryConfig()
-    assert config.ENTERPRISE_OTLP_API_KEY == ""
-
-
-@patch("enterprise.telemetry.exporter.GRPCSpanExporter")
-@patch("enterprise.telemetry.exporter.GRPCMetricExporter")
-def test_api_key_only_injects_bearer_header(mock_metric_exporter: MagicMock, mock_span_exporter: MagicMock) -> None:
-    """Test that API key alone injects Bearer authorization header."""
-    mock_config = SimpleNamespace(
-        ENTERPRISE_OTLP_ENDPOINT="https://collector.example.com",
-        ENTERPRISE_OTLP_HEADERS="",
-        ENTERPRISE_OTLP_PROTOCOL="grpc",
-        ENTERPRISE_SERVICE_NAME="dify",
-        ENTERPRISE_OTEL_SAMPLING_RATE=1.0,
-        ENTERPRISE_INCLUDE_CONTENT=True,
-        ENTERPRISE_OTLP_API_KEY="test-secret-key",
-    )
-
-    EnterpriseExporter(mock_config)
-
-    # Verify span exporter was called with Bearer header
-    assert mock_span_exporter.call_args is not None
-    headers = mock_span_exporter.call_args.kwargs.get("headers")
-    assert headers is not None
-    assert ("authorization", "Bearer test-secret-key") in headers
-
-
-@patch("enterprise.telemetry.exporter.GRPCSpanExporter")
-@patch("enterprise.telemetry.exporter.GRPCMetricExporter")
-def test_empty_api_key_no_auth_header(mock_metric_exporter: MagicMock, mock_span_exporter: MagicMock) -> None:
-    """Test that empty API key does not inject authorization header."""
-    mock_config = SimpleNamespace(
-        ENTERPRISE_OTLP_ENDPOINT="https://collector.example.com",
-        ENTERPRISE_OTLP_HEADERS="",
-        ENTERPRISE_OTLP_PROTOCOL="grpc",
-        ENTERPRISE_SERVICE_NAME="dify",
-        ENTERPRISE_OTEL_SAMPLING_RATE=1.0,
-        ENTERPRISE_INCLUDE_CONTENT=True,
-        ENTERPRISE_OTLP_API_KEY="",
-    )
-
-    EnterpriseExporter(mock_config)
-
-    # Verify span exporter was called without authorization header
-    assert mock_span_exporter.call_args is not None
-    headers = mock_span_exporter.call_args.kwargs.get("headers")
-    # Headers should be None or not contain authorization
-    if headers is not None:
-        assert not any(key == "authorization" for key, _ in headers)
-
-
-@patch("enterprise.telemetry.exporter.GRPCSpanExporter")
-@patch("enterprise.telemetry.exporter.GRPCMetricExporter")
-def test_api_key_and_custom_headers_merge(mock_metric_exporter: MagicMock, mock_span_exporter: MagicMock) -> None:
-    """Test that API key and custom headers are merged correctly."""
-    mock_config = SimpleNamespace(
-        ENTERPRISE_OTLP_ENDPOINT="https://collector.example.com",
-        ENTERPRISE_OTLP_HEADERS="x-custom=foo",
-        ENTERPRISE_OTLP_PROTOCOL="grpc",
-        ENTERPRISE_SERVICE_NAME="dify",
-        ENTERPRISE_OTEL_SAMPLING_RATE=1.0,
-        ENTERPRISE_INCLUDE_CONTENT=True,
-        ENTERPRISE_OTLP_API_KEY="test-key",
-    )
-
-    EnterpriseExporter(mock_config)
-
-    # Verify both headers are present
-    assert mock_span_exporter.call_args is not None
-    headers = mock_span_exporter.call_args.kwargs.get("headers")
-    assert headers is not None
-    assert ("authorization", "Bearer test-key") in headers
-    assert ("x-custom", "foo") in headers
-
-
-@patch("enterprise.telemetry.exporter.logger")
-@patch("enterprise.telemetry.exporter.GRPCSpanExporter")
-@patch("enterprise.telemetry.exporter.GRPCMetricExporter")
-def test_api_key_overrides_conflicting_header(
-    mock_metric_exporter: MagicMock, mock_span_exporter: MagicMock, mock_logger: MagicMock
-) -> None:
-    """Test that API key overrides conflicting authorization header and logs warning."""
-    mock_config = SimpleNamespace(
-        ENTERPRISE_OTLP_ENDPOINT="https://collector.example.com",
-        ENTERPRISE_OTLP_HEADERS="authorization=Basic old",
-        ENTERPRISE_OTLP_PROTOCOL="grpc",
-        ENTERPRISE_SERVICE_NAME="dify",
-        ENTERPRISE_OTEL_SAMPLING_RATE=1.0,
-        ENTERPRISE_INCLUDE_CONTENT=True,
-        ENTERPRISE_OTLP_API_KEY="test-key",
-    )
-
-    EnterpriseExporter(mock_config)
-
-    # Verify Bearer header takes precedence
-    assert mock_span_exporter.call_args is not None
-    headers = mock_span_exporter.call_args.kwargs.get("headers")
-    assert headers is not None
-    assert ("authorization", "Bearer test-key") in headers
-    # Verify old authorization header is not present
-    assert ("authorization", "Basic old") not in headers
-
-    # Verify warning was logged
-    mock_logger.warning.assert_called_once()
-    assert mock_logger.warning.call_args is not None
-    warning_message = mock_logger.warning.call_args[0][0]
-    assert "ENTERPRISE_OTLP_API_KEY is set" in warning_message
-    assert "authorization" in warning_message
-
-
-@patch("enterprise.telemetry.exporter.GRPCSpanExporter")
-@patch("enterprise.telemetry.exporter.GRPCMetricExporter")
-def test_https_endpoint_uses_secure_grpc(mock_metric_exporter: MagicMock, mock_span_exporter: MagicMock) -> None:
-    """Test that https:// endpoint enables TLS (insecure=False) for gRPC."""
-    mock_config = SimpleNamespace(
-        ENTERPRISE_OTLP_ENDPOINT="https://collector.example.com",
-        ENTERPRISE_OTLP_HEADERS="",
-        ENTERPRISE_OTLP_PROTOCOL="grpc",
-        ENTERPRISE_SERVICE_NAME="dify",
-        ENTERPRISE_OTEL_SAMPLING_RATE=1.0,
-        ENTERPRISE_INCLUDE_CONTENT=True,
-        ENTERPRISE_OTLP_API_KEY="test-key",
-    )
-
-    EnterpriseExporter(mock_config)
-
-    # Verify insecure=False for both exporters (https:// scheme)
-    assert mock_span_exporter.call_args is not None
-    assert mock_span_exporter.call_args.kwargs["insecure"] is False
-
-    assert mock_metric_exporter.call_args is not None
-    assert mock_metric_exporter.call_args.kwargs["insecure"] is False
-
-
-@patch("enterprise.telemetry.exporter.GRPCSpanExporter")
-@patch("enterprise.telemetry.exporter.GRPCMetricExporter")
-def test_http_endpoint_uses_insecure_grpc(mock_metric_exporter: MagicMock, mock_span_exporter: MagicMock) -> None:
-    """Test that http:// endpoint uses insecure gRPC (insecure=True)."""
-    mock_config = SimpleNamespace(
-        ENTERPRISE_OTLP_ENDPOINT="http://collector.example.com",
-        ENTERPRISE_OTLP_HEADERS="",
-        ENTERPRISE_OTLP_PROTOCOL="grpc",
-        ENTERPRISE_SERVICE_NAME="dify",
-        ENTERPRISE_OTEL_SAMPLING_RATE=1.0,
-        ENTERPRISE_INCLUDE_CONTENT=True,
-        ENTERPRISE_OTLP_API_KEY="",
-    )
-
-    EnterpriseExporter(mock_config)
-
-    # Verify insecure=True for both exporters (http:// scheme)
-    assert mock_span_exporter.call_args is not None
-    assert mock_span_exporter.call_args.kwargs["insecure"] is True
-
-    assert mock_metric_exporter.call_args is not None
-    assert mock_metric_exporter.call_args.kwargs["insecure"] is True
-
-
-@patch("enterprise.telemetry.exporter.HTTPSpanExporter")
-@patch("enterprise.telemetry.exporter.HTTPMetricExporter")
-def test_insecure_not_passed_to_http_exporters(mock_metric_exporter: MagicMock, mock_span_exporter: MagicMock) -> None:
-    """Test that insecure parameter is not passed to HTTP exporters."""
-    mock_config = SimpleNamespace(
-        ENTERPRISE_OTLP_ENDPOINT="http://collector.example.com",
-        ENTERPRISE_OTLP_HEADERS="",
-        ENTERPRISE_OTLP_PROTOCOL="http",
-        ENTERPRISE_SERVICE_NAME="dify",
-        ENTERPRISE_OTEL_SAMPLING_RATE=1.0,
-        ENTERPRISE_INCLUDE_CONTENT=True,
-        ENTERPRISE_OTLP_API_KEY="test-key",
-    )
-
-    EnterpriseExporter(mock_config)
-
-    # Verify insecure kwarg is NOT in HTTP exporter calls
-    assert mock_span_exporter.call_args is not None
-    assert "insecure" not in mock_span_exporter.call_args.kwargs
-
-    assert mock_metric_exporter.call_args is not None
-    assert "insecure" not in mock_metric_exporter.call_args.kwargs
-
-
-@patch("enterprise.telemetry.exporter.GRPCSpanExporter")
-@patch("enterprise.telemetry.exporter.GRPCMetricExporter")
-def test_api_key_with_special_chars_preserved(mock_metric_exporter: MagicMock, mock_span_exporter: MagicMock) -> None:
-    """Test that API key with special characters is preserved without mangling."""
-    special_key = "abc+def/ghi=jkl=="
-    mock_config = SimpleNamespace(
-        ENTERPRISE_OTLP_ENDPOINT="https://collector.example.com",
-        ENTERPRISE_OTLP_HEADERS="",
-        ENTERPRISE_OTLP_PROTOCOL="grpc",
-        ENTERPRISE_SERVICE_NAME="dify",
-        ENTERPRISE_OTEL_SAMPLING_RATE=1.0,
-        ENTERPRISE_INCLUDE_CONTENT=True,
-        ENTERPRISE_OTLP_API_KEY=special_key,
-    )
-
-    EnterpriseExporter(mock_config)
-
-    # Verify special characters are preserved in Bearer header
-    assert mock_span_exporter.call_args is not None
-    headers = mock_span_exporter.call_args.kwargs.get("headers")
-    assert headers is not None
-    assert ("authorization", f"Bearer {special_key}") in headers
-
-
-@patch("enterprise.telemetry.exporter.GRPCSpanExporter")
-@patch("enterprise.telemetry.exporter.GRPCMetricExporter")
-def test_no_scheme_localhost_uses_insecure(mock_metric_exporter: MagicMock, mock_span_exporter: MagicMock) -> None:
-    """Test that endpoint without scheme defaults to insecure for localhost."""
-    mock_config = SimpleNamespace(
-        ENTERPRISE_OTLP_ENDPOINT="localhost:4317",
-        ENTERPRISE_OTLP_HEADERS="",
-        ENTERPRISE_OTLP_PROTOCOL="grpc",
-        ENTERPRISE_SERVICE_NAME="dify",
-        ENTERPRISE_OTEL_SAMPLING_RATE=1.0,
-        ENTERPRISE_INCLUDE_CONTENT=True,
-        ENTERPRISE_OTLP_API_KEY="",
-    )
-
-    EnterpriseExporter(mock_config)
-
-    # Verify insecure=True for localhost without scheme
-    assert mock_span_exporter.call_args is not None
-    assert mock_span_exporter.call_args.kwargs["insecure"] is True
-
-    assert mock_metric_exporter.call_args is not None
-    assert mock_metric_exporter.call_args.kwargs["insecure"] is True
-
-
-@patch("enterprise.telemetry.exporter.GRPCSpanExporter")
-@patch("enterprise.telemetry.exporter.GRPCMetricExporter")
-def test_no_scheme_production_uses_insecure(mock_metric_exporter: MagicMock, mock_span_exporter: MagicMock) -> None:
-    """Test that endpoint without scheme defaults to insecure (not https://)."""
-    mock_config = SimpleNamespace(
-        ENTERPRISE_OTLP_ENDPOINT="collector.example.com:4317",
-        ENTERPRISE_OTLP_HEADERS="",
-        ENTERPRISE_OTLP_PROTOCOL="grpc",
-        ENTERPRISE_SERVICE_NAME="dify",
-        ENTERPRISE_OTEL_SAMPLING_RATE=1.0,
-        ENTERPRISE_INCLUDE_CONTENT=True,
-        ENTERPRISE_OTLP_API_KEY="",
-    )
-
-    EnterpriseExporter(mock_config)
-
-    # Verify insecure=True for any endpoint without https:// scheme
-    assert mock_span_exporter.call_args is not None
-    assert mock_span_exporter.call_args.kwargs["insecure"] is True
-
-    assert mock_metric_exporter.call_args is not None
-    assert mock_metric_exporter.call_args.kwargs["insecure"] is True

api/tests/unit_tests/enterprise/telemetry/test_gateway.py

@@ -1,272 +0,0 @@
-from __future__ import annotations
-
-import sys
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from core.ops.entities.trace_entity import TraceTaskName
-from core.telemetry.gateway import (
-    CASE_ROUTING,
-    CASE_TO_TRACE_TASK,
-    PAYLOAD_SIZE_THRESHOLD_BYTES,
-    emit,
-)
-from enterprise.telemetry.contracts import SignalType, TelemetryCase, TelemetryEnvelope
-
-
-class TestCaseRoutingTable:
-    def test_all_cases_have_routing(self) -> None:
-        for case in TelemetryCase:
-            assert case in CASE_ROUTING, f"Missing routing for {case}"
-
-    def test_trace_cases(self) -> None:
-        trace_cases = [
-            TelemetryCase.WORKFLOW_RUN,
-            TelemetryCase.MESSAGE_RUN,
-            TelemetryCase.NODE_EXECUTION,
-            TelemetryCase.DRAFT_NODE_EXECUTION,
-            TelemetryCase.PROMPT_GENERATION,
-        ]
-        for case in trace_cases:
-            assert CASE_ROUTING[case].signal_type is SignalType.TRACE, f"{case} should be trace"
-
-    def test_metric_log_cases(self) -> None:
-        metric_log_cases = [
-            TelemetryCase.APP_CREATED,
-            TelemetryCase.APP_UPDATED,
-            TelemetryCase.APP_DELETED,
-            TelemetryCase.FEEDBACK_CREATED,
-        ]
-        for case in metric_log_cases:
-            assert CASE_ROUTING[case].signal_type is SignalType.METRIC_LOG, f"{case} should be metric_log"
-
-    def test_ce_eligible_cases(self) -> None:
-        ce_eligible_cases = [
-            TelemetryCase.WORKFLOW_RUN,
-            TelemetryCase.MESSAGE_RUN,
-            TelemetryCase.TOOL_EXECUTION,
-            TelemetryCase.MODERATION_CHECK,
-            TelemetryCase.SUGGESTED_QUESTION,
-            TelemetryCase.DATASET_RETRIEVAL,
-            TelemetryCase.GENERATE_NAME,
-        ]
-        for case in ce_eligible_cases:
-            assert CASE_ROUTING[case].ce_eligible is True, f"{case} should be CE eligible"
-
-    def test_enterprise_only_cases(self) -> None:
-        enterprise_only_cases = [
-            TelemetryCase.NODE_EXECUTION,
-            TelemetryCase.DRAFT_NODE_EXECUTION,
-            TelemetryCase.PROMPT_GENERATION,
-        ]
-        for case in enterprise_only_cases:
-            assert CASE_ROUTING[case].ce_eligible is False, f"{case} should be enterprise-only"
-
-    def test_trace_cases_have_task_name_mapping(self) -> None:
-        trace_cases = [c for c in TelemetryCase if CASE_ROUTING[c].signal_type is SignalType.TRACE]
-        for case in trace_cases:
-            assert case in CASE_TO_TRACE_TASK, f"Missing TraceTaskName mapping for {case}"
-
-
-@pytest.fixture
-def mock_ops_trace_manager():
-    mock_module = MagicMock()
-    mock_trace_task_class = MagicMock()
-    mock_trace_task_class.return_value = MagicMock()
-    mock_module.TraceTask = mock_trace_task_class
-    mock_module.TraceQueueManager = MagicMock()
-
-    mock_trace_entity = MagicMock()
-    mock_trace_task_name = MagicMock()
-    mock_trace_task_name.return_value = "workflow"
-    mock_trace_entity.TraceTaskName = mock_trace_task_name
-
-    with (
-        patch.dict(sys.modules, {"core.ops.ops_trace_manager": mock_module}),
-        patch.dict(sys.modules, {"core.ops.entities.trace_entity": mock_trace_entity}),
-    ):
-        yield mock_module, mock_trace_entity
-
-
-class TestGatewayTraceRouting:
-    @pytest.fixture
-    def mock_trace_manager(self) -> MagicMock:
-        return MagicMock()
-
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True)
-    def test_trace_case_routes_to_trace_manager(
-        self,
-        mock_ee_enabled: MagicMock,
-        mock_trace_manager: MagicMock,
-        mock_ops_trace_manager: tuple[MagicMock, MagicMock],
-    ) -> None:
-        context = {"app_id": "app-123", "user_id": "user-456", "tenant_id": "tenant-789"}
-        payload = {"workflow_run_id": "run-abc"}
-
-        emit(TelemetryCase.WORKFLOW_RUN, context, payload, mock_trace_manager)
-
-        mock_trace_manager.add_trace_task.assert_called_once()
-
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=False)
-    def test_ce_eligible_trace_enqueued_when_ee_disabled(
-        self,
-        mock_ee_enabled: MagicMock,
-        mock_trace_manager: MagicMock,
-        mock_ops_trace_manager: tuple[MagicMock, MagicMock],
-    ) -> None:
-        context = {"app_id": "app-123", "user_id": "user-456"}
-        payload = {"workflow_run_id": "run-abc"}
-
-        emit(TelemetryCase.WORKFLOW_RUN, context, payload, mock_trace_manager)
-
-        mock_trace_manager.add_trace_task.assert_called_once()
-
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=False)
-    def test_enterprise_only_trace_dropped_when_ee_disabled(
-        self,
-        mock_ee_enabled: MagicMock,
-        mock_trace_manager: MagicMock,
-        mock_ops_trace_manager: tuple[MagicMock, MagicMock],
-    ) -> None:
-        context = {"app_id": "app-123", "user_id": "user-456"}
-        payload = {"node_id": "node-abc"}
-
-        emit(TelemetryCase.NODE_EXECUTION, context, payload, mock_trace_manager)
-
-        mock_trace_manager.add_trace_task.assert_not_called()
-
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True)
-    def test_enterprise_only_trace_enqueued_when_ee_enabled(
-        self,
-        mock_ee_enabled: MagicMock,
-        mock_trace_manager: MagicMock,
-        mock_ops_trace_manager: tuple[MagicMock, MagicMock],
-    ) -> None:
-        context = {"app_id": "app-123", "user_id": "user-456"}
-        payload = {"node_id": "node-abc"}
-
-        emit(TelemetryCase.NODE_EXECUTION, context, payload, mock_trace_manager)
-
-        mock_trace_manager.add_trace_task.assert_called_once()
-
-
-class TestGatewayMetricLogRouting:
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True)
-    @patch("tasks.enterprise_telemetry_task.process_enterprise_telemetry.delay")
-    def test_metric_case_routes_to_celery_task(
-        self,
-        mock_delay: MagicMock,
-        mock_ee_enabled: MagicMock,
-    ) -> None:
-        context = {"tenant_id": "tenant-123"}
-        payload = {"app_id": "app-abc", "name": "My App"}
-
-        emit(TelemetryCase.APP_CREATED, context, payload)
-
-        mock_delay.assert_called_once()
-        envelope_json = mock_delay.call_args[0][0]
-        envelope = TelemetryEnvelope.model_validate_json(envelope_json)
-        assert envelope.case == TelemetryCase.APP_CREATED
-        assert envelope.tenant_id == "tenant-123"
-        assert envelope.payload["app_id"] == "app-abc"
-
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True)
-    @patch("tasks.enterprise_telemetry_task.process_enterprise_telemetry.delay")
-    def test_envelope_has_unique_event_id(
-        self,
-        mock_delay: MagicMock,
-        mock_ee_enabled: MagicMock,
-    ) -> None:
-        context = {"tenant_id": "tenant-123"}
-        payload = {"app_id": "app-abc"}
-
-        emit(TelemetryCase.APP_CREATED, context, payload)
-        emit(TelemetryCase.APP_CREATED, context, payload)
-
-        assert mock_delay.call_count == 2
-        envelope1 = TelemetryEnvelope.model_validate_json(mock_delay.call_args_list[0][0][0])
-        envelope2 = TelemetryEnvelope.model_validate_json(mock_delay.call_args_list[1][0][0])
-        assert envelope1.event_id != envelope2.event_id
-
-
-class TestGatewayPayloadSizing:
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True)
-    @patch("tasks.enterprise_telemetry_task.process_enterprise_telemetry.delay")
-    def test_small_payload_inlined(
-        self,
-        mock_delay: MagicMock,
-        mock_ee_enabled: MagicMock,
-    ) -> None:
-        context = {"tenant_id": "tenant-123"}
-        payload = {"key": "small_value"}
-
-        emit(TelemetryCase.APP_CREATED, context, payload)
-
-        envelope_json = mock_delay.call_args[0][0]
-        envelope = TelemetryEnvelope.model_validate_json(envelope_json)
-        assert envelope.payload == payload
-        assert envelope.metadata is None
-
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True)
-    @patch("core.telemetry.gateway.storage")
-    @patch("tasks.enterprise_telemetry_task.process_enterprise_telemetry.delay")
-    def test_large_payload_stored(
-        self,
-        mock_delay: MagicMock,
-        mock_storage: MagicMock,
-        mock_ee_enabled: MagicMock,
-    ) -> None:
-        context = {"tenant_id": "tenant-123"}
-        large_value = "x" * (PAYLOAD_SIZE_THRESHOLD_BYTES + 1000)
-        payload = {"key": large_value}
-
-        emit(TelemetryCase.APP_CREATED, context, payload)
-
-        mock_storage.save.assert_called_once()
-        storage_key = mock_storage.save.call_args[0][0]
-        assert storage_key.startswith("telemetry/tenant-123/")
-
-        envelope_json = mock_delay.call_args[0][0]
-        envelope = TelemetryEnvelope.model_validate_json(envelope_json)
-        assert envelope.payload == {}
-        assert envelope.metadata is not None
-        assert envelope.metadata["payload_ref"] == storage_key
-
-    @patch("core.telemetry.gateway.is_enterprise_telemetry_enabled", return_value=True)
-    @patch("core.telemetry.gateway.storage")
-    @patch("tasks.enterprise_telemetry_task.process_enterprise_telemetry.delay")
-    def test_large_payload_fallback_on_storage_error(
-        self,
-        mock_delay: MagicMock,
-        mock_storage: MagicMock,
-        mock_ee_enabled: MagicMock,
-    ) -> None:
-        mock_storage.save.side_effect = Exception("Storage failure")
-        context = {"tenant_id": "tenant-123"}
-        large_value = "x" * (PAYLOAD_SIZE_THRESHOLD_BYTES + 1000)
-        payload = {"key": large_value}
-
-        emit(TelemetryCase.APP_CREATED, context, payload)
-
-        envelope_json = mock_delay.call_args[0][0]
-        envelope = TelemetryEnvelope.model_validate_json(envelope_json)
-        assert envelope.payload == payload
-        assert envelope.metadata is None
-
-
-class TestTraceTaskNameMapping:
-    def test_workflow_run_mapping(self) -> None:
-        assert CASE_TO_TRACE_TASK[TelemetryCase.WORKFLOW_RUN] is TraceTaskName.WORKFLOW_TRACE
-
-    def test_message_run_mapping(self) -> None:
-        assert CASE_TO_TRACE_TASK[TelemetryCase.MESSAGE_RUN] is TraceTaskName.MESSAGE_TRACE
-
-    def test_node_execution_mapping(self) -> None:
-        assert CASE_TO_TRACE_TASK[TelemetryCase.NODE_EXECUTION] is TraceTaskName.NODE_EXECUTION_TRACE
-
-    def test_draft_node_execution_mapping(self) -> None:
-        assert CASE_TO_TRACE_TASK[TelemetryCase.DRAFT_NODE_EXECUTION] is TraceTaskName.DRAFT_NODE_EXECUTION_TRACE
-
-    def test_prompt_generation_mapping(self) -> None:
-        assert CASE_TO_TRACE_TASK[TelemetryCase.PROMPT_GENERATION] is TraceTaskName.PROMPT_GENERATION_TRACE

api/tests/unit_tests/enterprise/telemetry/test_metric_handler.py

@@ -1,507 +0,0 @@
-"""Unit tests for EnterpriseMetricHandler."""
-
-import json
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from enterprise.telemetry.contracts import TelemetryCase, TelemetryEnvelope
-from enterprise.telemetry.metric_handler import EnterpriseMetricHandler
-
-
-@pytest.fixture
-def mock_redis():
-    with patch("enterprise.telemetry.metric_handler.redis_client") as mock:
-        yield mock
-
-
-@pytest.fixture
-def sample_envelope():
-    return TelemetryEnvelope(
-        case=TelemetryCase.APP_CREATED,
-        tenant_id="test-tenant",
-        event_id="test-event-123",
-        payload={"app_id": "app-123", "name": "Test App"},
-    )
-
-
-def test_dispatch_app_created(sample_envelope, mock_redis):
-    mock_redis.set.return_value = True
-
-    handler = EnterpriseMetricHandler()
-    with patch.object(handler, "_on_app_created") as mock_handler:
-        handler.handle(sample_envelope)
-        mock_handler.assert_called_once_with(sample_envelope)
-
-
-def test_dispatch_app_updated(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.APP_UPDATED,
-        tenant_id="test-tenant",
-        event_id="test-event-456",
-        payload={},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with patch.object(handler, "_on_app_updated") as mock_handler:
-        handler.handle(envelope)
-        mock_handler.assert_called_once_with(envelope)
-
-
-def test_dispatch_app_deleted(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.APP_DELETED,
-        tenant_id="test-tenant",
-        event_id="test-event-789",
-        payload={},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with patch.object(handler, "_on_app_deleted") as mock_handler:
-        handler.handle(envelope)
-        mock_handler.assert_called_once_with(envelope)
-
-
-def test_dispatch_feedback_created(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.FEEDBACK_CREATED,
-        tenant_id="test-tenant",
-        event_id="test-event-abc",
-        payload={},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with patch.object(handler, "_on_feedback_created") as mock_handler:
-        handler.handle(envelope)
-        mock_handler.assert_called_once_with(envelope)
-
-
-def test_dispatch_message_run(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.MESSAGE_RUN,
-        tenant_id="test-tenant",
-        event_id="test-event-msg",
-        payload={},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with patch.object(handler, "_on_message_run") as mock_handler:
-        handler.handle(envelope)
-        mock_handler.assert_called_once_with(envelope)
-
-
-def test_dispatch_tool_execution(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.TOOL_EXECUTION,
-        tenant_id="test-tenant",
-        event_id="test-event-tool",
-        payload={},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with patch.object(handler, "_on_tool_execution") as mock_handler:
-        handler.handle(envelope)
-        mock_handler.assert_called_once_with(envelope)
-
-
-def test_dispatch_moderation_check(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.MODERATION_CHECK,
-        tenant_id="test-tenant",
-        event_id="test-event-mod",
-        payload={},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with patch.object(handler, "_on_moderation_check") as mock_handler:
-        handler.handle(envelope)
-        mock_handler.assert_called_once_with(envelope)
-
-
-def test_dispatch_suggested_question(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.SUGGESTED_QUESTION,
-        tenant_id="test-tenant",
-        event_id="test-event-sq",
-        payload={},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with patch.object(handler, "_on_suggested_question") as mock_handler:
-        handler.handle(envelope)
-        mock_handler.assert_called_once_with(envelope)
-
-
-def test_dispatch_dataset_retrieval(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.DATASET_RETRIEVAL,
-        tenant_id="test-tenant",
-        event_id="test-event-ds",
-        payload={},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with patch.object(handler, "_on_dataset_retrieval") as mock_handler:
-        handler.handle(envelope)
-        mock_handler.assert_called_once_with(envelope)
-
-
-def test_dispatch_generate_name(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.GENERATE_NAME,
-        tenant_id="test-tenant",
-        event_id="test-event-gn",
-        payload={},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with patch.object(handler, "_on_generate_name") as mock_handler:
-        handler.handle(envelope)
-        mock_handler.assert_called_once_with(envelope)
-
-
-def test_dispatch_prompt_generation(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.PROMPT_GENERATION,
-        tenant_id="test-tenant",
-        event_id="test-event-pg",
-        payload={},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with patch.object(handler, "_on_prompt_generation") as mock_handler:
-        handler.handle(envelope)
-        mock_handler.assert_called_once_with(envelope)
-
-
-def test_all_known_cases_have_handlers(mock_redis):
-    mock_redis.set.return_value = True
-    handler = EnterpriseMetricHandler()
-
-    for case in TelemetryCase:
-        envelope = TelemetryEnvelope(
-            case=case,
-            tenant_id="test-tenant",
-            event_id=f"test-{case.value}",
-            payload={},
-        )
-        handler.handle(envelope)
-
-
-def test_idempotency_duplicate(sample_envelope, mock_redis):
-    mock_redis.set.return_value = None
-
-    handler = EnterpriseMetricHandler()
-    with patch.object(handler, "_on_app_created") as mock_handler:
-        handler.handle(sample_envelope)
-        mock_handler.assert_not_called()
-
-
-def test_idempotency_first_seen(sample_envelope, mock_redis):
-    mock_redis.set.return_value = True
-
-    handler = EnterpriseMetricHandler()
-    is_dup = handler._is_duplicate(sample_envelope)
-
-    assert is_dup is False
-    mock_redis.set.assert_called_once_with(
-        "telemetry:dedup:test-tenant:test-event-123",
-        b"1",
-        nx=True,
-        ex=3600,
-    )
-
-
-def test_idempotency_redis_failure_fails_open(sample_envelope, mock_redis, caplog):
-    mock_redis.set.side_effect = Exception("Redis unavailable")
-
-    handler = EnterpriseMetricHandler()
-    is_dup = handler._is_duplicate(sample_envelope)
-
-    assert is_dup is False
-    assert "Redis unavailable for deduplication check" in caplog.text
-
-
-def test_rehydration_uses_payload(sample_envelope):
-    handler = EnterpriseMetricHandler()
-    payload = handler._rehydrate(sample_envelope)
-
-    assert payload == {"app_id": "app-123", "name": "Test App"}
-
-
-def test_rehydration_from_storage():
-    """Verify _rehydrate loads payload from object storage via payload_ref."""
-    stored_data = {"app_id": "app-stored", "mode": "workflow"}
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.APP_CREATED,
-        tenant_id="test-tenant",
-        event_id="test-event-fb",
-        payload={},
-        metadata={"payload_ref": "telemetry/test-tenant/test-event-fb.json"},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with patch("enterprise.telemetry.metric_handler.storage") as mock_storage:
-        mock_storage.load.return_value = json.dumps(stored_data).encode("utf-8")
-        payload = handler._rehydrate(envelope)
-
-        assert payload == stored_data
-        mock_storage.load.assert_called_once_with("telemetry/test-tenant/test-event-fb.json")
-
-
-def test_rehydration_storage_failure_emits_degraded_event():
-    """Verify _rehydrate emits degraded event when storage load fails."""
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.APP_CREATED,
-        tenant_id="test-tenant",
-        event_id="test-event-fail",
-        payload={},
-        metadata={"payload_ref": "telemetry/test-tenant/test-event-fail.json"},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with (
-        patch("enterprise.telemetry.metric_handler.storage") as mock_storage,
-        patch("enterprise.telemetry.telemetry_log.emit_metric_only_event") as mock_emit,
-    ):
-        mock_storage.load.side_effect = Exception("Storage unavailable")
-        payload = handler._rehydrate(envelope)
-
-        from enterprise.telemetry.entities import EnterpriseTelemetryEvent
-
-        assert payload == {}
-        mock_emit.assert_called_once()
-        call_args = mock_emit.call_args
-        assert call_args[1]["event_name"] == EnterpriseTelemetryEvent.REHYDRATION_FAILED
-        assert call_args[1]["attributes"]["rehydration_failed"] is True
-
-
-def test_rehydration_emits_degraded_event_on_empty_payload():
-    """Verify _rehydrate emits degraded event when payload is empty and no ref exists."""
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.APP_CREATED,
-        tenant_id="test-tenant",
-        event_id="test-event-empty",
-        payload={},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with patch("enterprise.telemetry.telemetry_log.emit_metric_only_event") as mock_emit:
-        payload = handler._rehydrate(envelope)
-
-        from enterprise.telemetry.entities import EnterpriseTelemetryEvent
-
-        assert payload == {}
-        mock_emit.assert_called_once()
-        call_args = mock_emit.call_args
-        assert call_args[1]["event_name"] == EnterpriseTelemetryEvent.REHYDRATION_FAILED
-        assert call_args[1]["attributes"]["rehydration_failed"] is True
-
-
-def test_on_app_created_emits_correct_event(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.APP_CREATED,
-        tenant_id="tenant-123",
-        event_id="event-456",
-        payload={"app_id": "app-789", "mode": "chat"},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with (
-        patch("extensions.ext_enterprise_telemetry.get_enterprise_exporter") as mock_get_exporter,
-        patch("enterprise.telemetry.telemetry_log.emit_metric_only_event") as mock_emit,
-    ):
-        mock_exporter = MagicMock()
-        mock_get_exporter.return_value = mock_exporter
-
-        handler._on_app_created(envelope)
-
-        from enterprise.telemetry.entities import EnterpriseTelemetryEvent
-
-        mock_emit.assert_called_once_with(
-            event_name=EnterpriseTelemetryEvent.APP_CREATED,
-            attributes={
-                "dify.app.id": "app-789",
-                "dify.tenant_id": "tenant-123",
-                "dify.event.id": "event-456",
-                "dify.app.mode": "chat",
-            },
-            tenant_id="tenant-123",
-        )
-        from enterprise.telemetry.entities import EnterpriseTelemetryCounter
-
-        mock_exporter.increment_counter.assert_called_once()
-        call_args = mock_exporter.increment_counter.call_args
-        assert call_args[0][0] == EnterpriseTelemetryCounter.APP_CREATED
-        assert call_args[0][1] == 1
-        assert call_args[0][2]["tenant_id"] == "tenant-123"
-        assert call_args[0][2]["app_id"] == "app-789"
-        assert call_args[0][2]["mode"] == "chat"
-
-
-def test_on_app_updated_emits_correct_event(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.APP_UPDATED,
-        tenant_id="tenant-123",
-        event_id="event-456",
-        payload={"app_id": "app-789"},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with (
-        patch("extensions.ext_enterprise_telemetry.get_enterprise_exporter") as mock_get_exporter,
-        patch("enterprise.telemetry.telemetry_log.emit_metric_only_event") as mock_emit,
-    ):
-        mock_exporter = MagicMock()
-        mock_get_exporter.return_value = mock_exporter
-
-        handler._on_app_updated(envelope)
-
-        from enterprise.telemetry.entities import EnterpriseTelemetryEvent
-
-        mock_emit.assert_called_once_with(
-            event_name=EnterpriseTelemetryEvent.APP_UPDATED,
-            attributes={
-                "dify.app.id": "app-789",
-                "dify.tenant_id": "tenant-123",
-                "dify.event.id": "event-456",
-            },
-            tenant_id="tenant-123",
-        )
-        from enterprise.telemetry.entities import EnterpriseTelemetryCounter
-
-        mock_exporter.increment_counter.assert_called_once()
-        call_args = mock_exporter.increment_counter.call_args
-        assert call_args[0][0] == EnterpriseTelemetryCounter.APP_UPDATED
-        assert call_args[0][1] == 1
-        assert call_args[0][2]["tenant_id"] == "tenant-123"
-        assert call_args[0][2]["app_id"] == "app-789"
-
-
-def test_on_app_deleted_emits_correct_event(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.APP_DELETED,
-        tenant_id="tenant-123",
-        event_id="event-456",
-        payload={"app_id": "app-789"},
-    )
-
-    handler = EnterpriseMetricHandler()
-    with (
-        patch("extensions.ext_enterprise_telemetry.get_enterprise_exporter") as mock_get_exporter,
-        patch("enterprise.telemetry.telemetry_log.emit_metric_only_event") as mock_emit,
-    ):
-        mock_exporter = MagicMock()
-        mock_get_exporter.return_value = mock_exporter
-
-        handler._on_app_deleted(envelope)
-
-        from enterprise.telemetry.entities import EnterpriseTelemetryEvent
-
-        mock_emit.assert_called_once_with(
-            event_name=EnterpriseTelemetryEvent.APP_DELETED,
-            attributes={
-                "dify.app.id": "app-789",
-                "dify.tenant_id": "tenant-123",
-                "dify.event.id": "event-456",
-            },
-            tenant_id="tenant-123",
-        )
-        from enterprise.telemetry.entities import EnterpriseTelemetryCounter
-
-        mock_exporter.increment_counter.assert_called_once()
-        call_args = mock_exporter.increment_counter.call_args
-        assert call_args[0][0] == EnterpriseTelemetryCounter.APP_DELETED
-        assert call_args[0][1] == 1
-        assert call_args[0][2]["tenant_id"] == "tenant-123"
-        assert call_args[0][2]["app_id"] == "app-789"
-
-
-def test_on_feedback_created_emits_correct_event(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.FEEDBACK_CREATED,
-        tenant_id="tenant-123",
-        event_id="event-456",
-        payload={
-            "message_id": "msg-001",
-            "app_id": "app-789",
-            "conversation_id": "conv-123",
-            "from_end_user_id": "user-456",
-            "from_account_id": None,
-            "rating": "like",
-            "from_source": "api",
-            "content": "Great!",
-        },
-    )
-
-    handler = EnterpriseMetricHandler()
-    with (
-        patch("extensions.ext_enterprise_telemetry.get_enterprise_exporter") as mock_get_exporter,
-        patch("enterprise.telemetry.telemetry_log.emit_metric_only_event") as mock_emit,
-    ):
-        mock_exporter = MagicMock()
-        mock_exporter.include_content = True
-        mock_get_exporter.return_value = mock_exporter
-
-        handler._on_feedback_created(envelope)
-
-        mock_emit.assert_called_once()
-        call_args = mock_emit.call_args
-        assert call_args[1]["event_name"] == "dify.feedback.created"
-        assert call_args[1]["attributes"]["dify.message.id"] == "msg-001"
-        assert call_args[1]["attributes"]["dify.feedback.content"] == "Great!"
-        assert call_args[1]["tenant_id"] == "tenant-123"
-        assert call_args[1]["user_id"] == "user-456"
-
-        mock_exporter.increment_counter.assert_called_once()
-        counter_args = mock_exporter.increment_counter.call_args
-        assert counter_args[0][2]["app_id"] == "app-789"
-        assert counter_args[0][2]["rating"] == "like"
-
-
-def test_on_feedback_created_without_content(mock_redis):
-    mock_redis.set.return_value = True
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.FEEDBACK_CREATED,
-        tenant_id="tenant-123",
-        event_id="event-456",
-        payload={
-            "message_id": "msg-001",
-            "app_id": "app-789",
-            "conversation_id": "conv-123",
-            "from_end_user_id": "user-456",
-            "from_account_id": None,
-            "rating": "like",
-            "from_source": "api",
-            "content": "Great!",
-        },
-    )
-
-    handler = EnterpriseMetricHandler()
-    with (
-        patch("extensions.ext_enterprise_telemetry.get_enterprise_exporter") as mock_get_exporter,
-        patch("enterprise.telemetry.telemetry_log.emit_metric_only_event") as mock_emit,
-    ):
-        mock_exporter = MagicMock()
-        mock_exporter.include_content = False
-        mock_get_exporter.return_value = mock_exporter
-
-        handler._on_feedback_created(envelope)
-
-        mock_emit.assert_called_once()
-        call_args = mock_emit.call_args
-        assert "dify.feedback.content" not in call_args[1]["attributes"]

api/tests/unit_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py

@@ -1,180 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Sequence
-from dataclasses import dataclass
-from datetime import UTC, datetime, timedelta
-
-from core.entities.execution_extra_content import HumanInputContent as HumanInputContentDomain
-from core.entities.execution_extra_content import HumanInputFormSubmissionData
-from dify_graph.nodes.human_input.entities import (
-    FormDefinition,
-    UserAction,
-)
-from dify_graph.nodes.human_input.enums import HumanInputFormStatus
-from models.execution_extra_content import HumanInputContent as HumanInputContentModel
-from models.human_input import ConsoleRecipientPayload, HumanInputForm, HumanInputFormRecipient, RecipientType
-from repositories.sqlalchemy_execution_extra_content_repository import SQLAlchemyExecutionExtraContentRepository
-
-
-class _FakeScalarResult:
-    def __init__(self, values: Sequence[HumanInputContentModel]):
-        self._values = list(values)
-
-    def all(self) -> list[HumanInputContentModel]:
-        return list(self._values)
-
-
-class _FakeSession:
-    def __init__(self, values: Sequence[Sequence[object]]):
-        self._values = list(values)
-
-    def scalars(self, _stmt):
-        if not self._values:
-            return _FakeScalarResult([])
-        return _FakeScalarResult(self._values.pop(0))
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc, tb):
-        return False
-
-
-@dataclass
-class _FakeSessionMaker:
-    session: _FakeSession
-
-    def __call__(self) -> _FakeSession:
-        return self.session
-
-
-def _build_form(action_id: str, action_title: str, rendered_content: str) -> HumanInputForm:
-    expiration_time = datetime.now(UTC) + timedelta(days=1)
-    definition = FormDefinition(
-        form_content="content",
-        inputs=[],
-        user_actions=[UserAction(id=action_id, title=action_title)],
-        rendered_content="rendered",
-        expiration_time=expiration_time,
-        node_title="Approval",
-        display_in_ui=True,
-    )
-    form = HumanInputForm(
-        id=f"form-{action_id}",
-        tenant_id="tenant-id",
-        app_id="app-id",
-        workflow_run_id="workflow-run",
-        node_id="node-id",
-        form_definition=definition.model_dump_json(),
-        rendered_content=rendered_content,
-        status=HumanInputFormStatus.SUBMITTED,
-        expiration_time=expiration_time,
-    )
-    form.selected_action_id = action_id
-    return form
-
-
-def _build_content(message_id: str, action_id: str, action_title: str) -> HumanInputContentModel:
-    form = _build_form(
-        action_id=action_id,
-        action_title=action_title,
-        rendered_content=f"Rendered {action_title}",
-    )
-    content = HumanInputContentModel(
-        id=f"content-{message_id}",
-        form_id=form.id,
-        message_id=message_id,
-        workflow_run_id=form.workflow_run_id,
-    )
-    content.form = form
-    return content
-
-
-def test_get_by_message_ids_groups_contents_by_message() -> None:
-    message_ids = ["msg-1", "msg-2"]
-    contents = [_build_content("msg-1", "approve", "Approve")]
-    repository = SQLAlchemyExecutionExtraContentRepository(
-        session_maker=_FakeSessionMaker(session=_FakeSession(values=[contents, []]))
-    )
-
-    result = repository.get_by_message_ids(message_ids)
-
-    assert len(result) == 2
-    assert [content.model_dump(mode="json", exclude_none=True) for content in result[0]] == [
-        HumanInputContentDomain(
-            workflow_run_id="workflow-run",
-            submitted=True,
-            form_submission_data=HumanInputFormSubmissionData(
-                node_id="node-id",
-                node_title="Approval",
-                rendered_content="Rendered Approve",
-                action_id="approve",
-                action_text="Approve",
-            ),
-        ).model_dump(mode="json", exclude_none=True)
-    ]
-    assert result[1] == []
-
-
-def test_get_by_message_ids_returns_unsubmitted_form_definition() -> None:
-    expiration_time = datetime.now(UTC) + timedelta(days=1)
-    definition = FormDefinition(
-        form_content="content",
-        inputs=[],
-        user_actions=[UserAction(id="approve", title="Approve")],
-        rendered_content="rendered",
-        expiration_time=expiration_time,
-        default_values={"name": "John"},
-        node_title="Approval",
-        display_in_ui=True,
-    )
-    form = HumanInputForm(
-        id="form-1",
-        tenant_id="tenant-id",
-        app_id="app-id",
-        workflow_run_id="workflow-run",
-        node_id="node-id",
-        form_definition=definition.model_dump_json(),
-        rendered_content="Rendered block",
-        status=HumanInputFormStatus.WAITING,
-        expiration_time=expiration_time,
-    )
-    content = HumanInputContentModel(
-        id="content-msg-1",
-        form_id=form.id,
-        message_id="msg-1",
-        workflow_run_id=form.workflow_run_id,
-    )
-    content.form = form
-
-    recipient = HumanInputFormRecipient(
-        form_id=form.id,
-        delivery_id="delivery-1",
-        recipient_type=RecipientType.CONSOLE,
-        recipient_payload=ConsoleRecipientPayload(account_id=None).model_dump_json(),
-        access_token="token-1",
-    )
-
-    repository = SQLAlchemyExecutionExtraContentRepository(
-        session_maker=_FakeSessionMaker(session=_FakeSession(values=[[content], [recipient]]))
-    )
-
-    result = repository.get_by_message_ids(["msg-1"])
-
-    assert len(result) == 1
-    assert len(result[0]) == 1
-    domain_content = result[0][0]
-    assert domain_content.submitted is False
-    assert domain_content.workflow_run_id == "workflow-run"
-    assert domain_content.form_definition is not None
-    assert domain_content.form_definition.expiration_time == int(form.expiration_time.timestamp())
-    assert domain_content.form_definition is not None
-    form_definition = domain_content.form_definition
-    assert form_definition.form_id == "form-1"
-    assert form_definition.node_id == "node-id"
-    assert form_definition.node_title == "Approval"
-    assert form_definition.form_content == "Rendered block"
-    assert form_definition.display_in_ui is True
-    assert form_definition.form_token == "token-1"
-    assert form_definition.resolved_default_values == {"name": "John"}
-    assert form_definition.expiration_time == int(form.expiration_time.timestamp())

api/tests/unit_tests/tasks/test_enterprise_telemetry_task.py

@@ -1,69 +0,0 @@
-"""Unit tests for enterprise telemetry Celery task."""
-
-import json
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from enterprise.telemetry.contracts import TelemetryCase, TelemetryEnvelope
-from tasks.enterprise_telemetry_task import process_enterprise_telemetry
-
-
-@pytest.fixture
-def sample_envelope_json():
-    envelope = TelemetryEnvelope(
-        case=TelemetryCase.APP_CREATED,
-        tenant_id="test-tenant",
-        event_id="test-event-123",
-        payload={"app_id": "app-123"},
-    )
-    return envelope.model_dump_json()
-
-
-def test_process_enterprise_telemetry_success(sample_envelope_json):
-    with patch("tasks.enterprise_telemetry_task.EnterpriseMetricHandler") as mock_handler_class:
-        mock_handler = MagicMock()
-        mock_handler_class.return_value = mock_handler
-
-        process_enterprise_telemetry(sample_envelope_json)
-
-        mock_handler.handle.assert_called_once()
-        call_args = mock_handler.handle.call_args[0][0]
-        assert isinstance(call_args, TelemetryEnvelope)
-        assert call_args.case == TelemetryCase.APP_CREATED
-        assert call_args.tenant_id == "test-tenant"
-        assert call_args.event_id == "test-event-123"
-
-
-def test_process_enterprise_telemetry_invalid_json(caplog):
-    invalid_json = "not valid json"
-
-    process_enterprise_telemetry(invalid_json)
-
-    assert "Failed to process enterprise telemetry envelope" in caplog.text
-
-
-def test_process_enterprise_telemetry_handler_exception(sample_envelope_json, caplog):
-    with patch("tasks.enterprise_telemetry_task.EnterpriseMetricHandler") as mock_handler_class:
-        mock_handler = MagicMock()
-        mock_handler.handle.side_effect = Exception("Handler error")
-        mock_handler_class.return_value = mock_handler
-
-        process_enterprise_telemetry(sample_envelope_json)
-
-        assert "Failed to process enterprise telemetry envelope" in caplog.text
-
-
-def test_process_enterprise_telemetry_validation_error(caplog):
-    invalid_envelope = json.dumps(
-        {
-            "case": "INVALID_CASE",
-            "tenant_id": "test-tenant",
-            "event_id": "test-event",
-            "payload": {},
-        }
-    )
-
-    process_enterprise_telemetry(invalid_envelope)
-
-    assert "Failed to process enterprise telemetry envelope" in caplog.text

api/uv.lock

@@ -169,12 +169,6 @@ version = "1.0.0"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/a0/87/1d7019d23891897cb076b2f7e3c81ab3c2ba91de3bb067196f675d60d34c/alibabacloud-credentials-api-1.0.0.tar.gz", hash = "sha256:8c340038d904f0218d7214a8f4088c31912bfcf279af2cbc7d9be4897a97dd2f", size = 2330, upload-time = "2025-01-13T05:53:04.931Z" }
 
-[[package]]
-name = "alibabacloud-endpoint-util"
-version = "0.0.4"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/92/7d/8cc92a95c920e344835b005af6ea45a0db98763ad6ad19299d26892e6c8d/alibabacloud_endpoint_util-0.0.4.tar.gz", hash = "sha256:a593eb8ddd8168d5dc2216cd33111b144f9189fcd6e9ca20e48f358a739bbf90", size = 2813, upload-time = "2025-06-12T07:20:52.572Z" }
-
 [[package]]
 name = "alibabacloud-gateway-spi"
 version = "0.0.3"
@@ -186,69 +180,17 @@ sdist = { url = "https://files.pythonhosted.org/packages/ab/98/d7111245f17935bf7
 
 [[package]]
 name = "alibabacloud-gpdb20160503"
-version = "3.8.3"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "alibabacloud-endpoint-util" },
-    { name = "alibabacloud-openapi-util" },
-    { name = "alibabacloud-openplatform20191219" },
-    { name = "alibabacloud-oss-sdk" },
-    { name = "alibabacloud-oss-util" },
-    { name = "alibabacloud-tea-fileform" },
-    { name = "alibabacloud-tea-openapi" },
-    { name = "alibabacloud-tea-util" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/15/6a/cc72e744e95c8f37fa6a84e66ae0b9b57a13ee97a0ef03d94c7127c31d75/alibabacloud_gpdb20160503-3.8.3.tar.gz", hash = "sha256:4dfcc0d9cff5a921d529d76f4bf97e2ceb9dc2fa53f00ab055f08509423d8e30", size = 155092, upload-time = "2024-07-18T17:09:42.438Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/ab/36/bce41704b3bf59d607590ec73a42a254c5dea27c0f707aee11d20512a200/alibabacloud_gpdb20160503-3.8.3-py3-none-any.whl", hash = "sha256:06e1c46ce5e4e9d1bcae76e76e51034196c625799d06b2efec8d46a7df323fe8", size = 156097, upload-time = "2024-07-18T17:09:40.414Z" },
-]
-
-[[package]]
-name = "alibabacloud-openapi-util"
-version = "0.2.2"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "alibabacloud-tea-util" },
-    { name = "cryptography" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/f6/50/5f41ab550d7874c623f6e992758429802c4b52a6804db437017e5387de33/alibabacloud_openapi_util-0.2.2.tar.gz", hash = "sha256:ebbc3906f554cb4bf8f513e43e8a33e8b6a3d4a0ef13617a0e14c3dda8ef52a8", size = 7201, upload-time = "2023-10-23T07:44:18.523Z" }
-
-[[package]]
-name = "alibabacloud-openplatform20191219"
-version = "2.0.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "alibabacloud-endpoint-util" },
-    { name = "alibabacloud-openapi-util" },
-    { name = "alibabacloud-tea-openapi" },
-    { name = "alibabacloud-tea-util" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/4f/bf/f7fa2f3657ed352870f442434cb2f27b7f70dcd52a544a1f3998eeaf6d71/alibabacloud_openplatform20191219-2.0.0.tar.gz", hash = "sha256:e67f4c337b7542538746592c6a474bd4ae3a9edccdf62e11a32ca61fad3c9020", size = 5038, upload-time = "2022-09-21T06:16:10.683Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/94/e5/18c75213551eeca9db1f6b41ddcc0bd87b5b6508c75a67f05cd8671847b4/alibabacloud_openplatform20191219-2.0.0-py3-none-any.whl", hash = "sha256:873821c45bca72a6c6ec7a906c9cb21554c122e88893bbac3986934dab30dd36", size = 5204, upload-time = "2022-09-21T06:16:07.844Z" },
-]
-
-[[package]]
-name = "alibabacloud-oss-sdk"
-version = "0.1.1"
+version = "5.1.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "alibabacloud-credentials" },
-    { name = "alibabacloud-oss-util" },
-    { name = "alibabacloud-tea-fileform" },
-    { name = "alibabacloud-tea-util" },
-    { name = "alibabacloud-tea-xml" },
+    { name = "alibabacloud-tea-openapi" },
+    { name = "darabonba-core" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/7e/d1/f442dd026908fcf55340ca694bb1d027aa91e119e76ae2fbea62f2bde4f4/alibabacloud_oss_sdk-0.1.1.tar.gz", hash = "sha256:f51a368020d0964fcc0978f96736006f49f5ab6a4a4bf4f0b8549e2c659e7358", size = 46434, upload-time = "2025-04-22T12:40:41.717Z" }
-
-[[package]]
-name = "alibabacloud-oss-util"
-version = "0.0.6"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "alibabacloud-tea" },
+sdist = { url = "https://files.pythonhosted.org/packages/b3/36/69333c7fb7fb5267f338371b14fdd8dbdd503717c97bbc7a6419d155ab4c/alibabacloud_gpdb20160503-5.1.0.tar.gz", hash = "sha256:086ec6d5e39b64f54d0e44bb3fd4fde1a4822a53eb9f6ff7464dff7d19b07b63", size = 295641, upload-time = "2026-03-19T10:09:02.444Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/68/7f/a91a2f9ad97c92fa9a6981587ea0ff789240cea05b17b17b7c244e5bac64/alibabacloud_gpdb20160503-5.1.0-py3-none-any.whl", hash = "sha256:580e4579285a54c7f04570782e0f60423a1997568684187fe88e4110acfb640e", size = 848784, upload-time = "2026-03-19T10:09:00.72Z" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/02/7c/d7e812b9968247a302573daebcfef95d0f9a718f7b4bfcca8d3d83e266be/alibabacloud_oss_util-0.0.6.tar.gz", hash = "sha256:d3ecec36632434bd509a113e8cf327dc23e830ac8d9dd6949926f4e334c8b5d6", size = 10008, upload-time = "2021-04-28T09:25:04.056Z" }
 
 [[package]]
 name = "alibabacloud-tea"
@@ -260,15 +202,6 @@ dependencies = [
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/9a/7d/b22cb9a0d4f396ee0f3f9d7f26b76b9ed93d4101add7867a2c87ed2534f5/alibabacloud-tea-0.4.3.tar.gz", hash = "sha256:ec8053d0aa8d43ebe1deb632d5c5404339b39ec9a18a0707d57765838418504a", size = 8785, upload-time = "2025-03-24T07:34:42.958Z" }
 
-[[package]]
-name = "alibabacloud-tea-fileform"
-version = "0.0.5"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "alibabacloud-tea" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/22/8a/ef8ddf5ee0350984cad2749414b420369fe943e15e6d96b79be45367630e/alibabacloud_tea_fileform-0.0.5.tar.gz", hash = "sha256:fd00a8c9d85e785a7655059e9651f9e91784678881831f60589172387b968ee8", size = 3961, upload-time = "2021-04-28T09:22:54.56Z" }
-
 [[package]]
 name = "alibabacloud-tea-openapi"
 version = "0.4.3"
@@ -297,15 +230,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/72/9e/c394b4e2104766fb28a1e44e3ed36e4c7773b4d05c868e482be99d5635c9/alibabacloud_tea_util-0.3.14-py3-none-any.whl", hash = "sha256:10d3e5c340d8f7ec69dd27345eb2fc5a1dab07875742525edf07bbe86db93bfe", size = 6697, upload-time = "2025-11-19T06:01:07.355Z" },
 ]
 
-[[package]]
-name = "alibabacloud-tea-xml"
-version = "0.0.3"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "alibabacloud-tea" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/32/eb/5e82e419c3061823f3feae9b5681588762929dc4da0176667297c2784c1a/alibabacloud_tea_xml-0.0.3.tar.gz", hash = "sha256:979cb51fadf43de77f41c69fc69c12529728919f849723eb0cd24eb7b048a90c", size = 3466, upload-time = "2025-07-01T08:04:55.144Z" }
-
 [[package]]
 name = "aliyun-log-python-sdk"
 version = "0.9.37"
@@ -570,14 +494,14 @@ wheels = [
 
 [[package]]
 name = "basedpyright"
-version = "1.38.2"
+version = "1.38.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "nodejs-wheel-binaries" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/e4/a3/20aa7c4e83f2f614e0036300f3c352775dede0655c66814da16c37b661a9/basedpyright-1.38.2.tar.gz", hash = "sha256:b433b2b8ba745ed7520cdc79a29a03682f3fb00346d272ece5944e9e5e5daa92", size = 25277019, upload-time = "2026-02-26T11:18:43.594Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/0f/58/7abba2c743571a42b2548f07aee556ebc1e4d0bc2b277aeba1ee6c83b0af/basedpyright-1.38.3.tar.gz", hash = "sha256:9725419786afbfad8a9539527f162da02d462afad440b0412fdb3f3cdf179b90", size = 25277430, upload-time = "2026-03-17T13:10:41.526Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ac/12/736cab83626fea3fe65cdafb3ef3d2ee9480c56723f2fd33921537289a5e/basedpyright-1.38.2-py3-none-any.whl", hash = "sha256:153481d37fd19f9e3adedc8629d1d071b10c5f5e49321fb026b74444b7c70e24", size = 12312475, upload-time = "2026-02-26T11:18:40.373Z" },
+    { url = "https://files.pythonhosted.org/packages/2c/e3/3ebb5c23bd3abb5fc2053b8a06a889aa5c1cf8cff738c78cb6c1957e90cd/basedpyright-1.38.3-py3-none-any.whl", hash = "sha256:1f15c2e489c67d6c5e896c24b6a63251195c04223a55e4568b8f8e8ed49ca830", size = 12313363, upload-time = "2026-03-17T13:10:47.344Z" },
 ]
 
 [[package]]
@@ -720,16 +644,16 @@ wheels = [
 
 [[package]]
 name = "boto3-stubs"
-version = "1.42.68"
+version = "1.42.73"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "botocore-stubs" },
     { name = "types-s3transfer" },
     { name = "typing-extensions", marker = "python_full_version < '3.12'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/4c/8c/dd4b0c95ff008bed5a35ab411452ece121b355539d2a0b6dcd62a0c47be5/boto3_stubs-1.42.68.tar.gz", hash = "sha256:96ad1020735619483fb9b4da7a5e694b460bf2e18f84a34d5d175d0ffe8c4653", size = 101372, upload-time = "2026-03-13T19:49:54.867Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/b9/c3/fcc47102c63278af25ad57c93d97dc393f4dbc54c0117a29c78f2b96ec1e/boto3_stubs-1.42.73.tar.gz", hash = "sha256:36f625769b5505c4bc627f16244b98de9e10dae3ac36f1aa0f0ebe2f201dc138", size = 101373, upload-time = "2026-03-20T19:59:51.463Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/68/15/3ca5848917214a168134512a5b45f856a56e913659888947a052e02031b5/boto3_stubs-1.42.68-py3-none-any.whl", hash = "sha256:ed7f98334ef7b2377fa8532190e63dc2c6d1dc895e3d7cb3d6d1c83771b81bf6", size = 70011, upload-time = "2026-03-13T19:49:42.801Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/57/d570ba61a2a0c7fe0c8667e41269a0480293cb53e1786d6661a2bd827fc5/boto3_stubs-1.42.73-py3-none-any.whl", hash = "sha256:bd658429069d8215247fc3abc003220cd875c24ab6eda7b3405090408afaacdf", size = 70009, upload-time = "2026-03-20T19:59:43.786Z" },
 ]
 
 [package.optional-dependencies]
@@ -1290,41 +1214,41 @@ wheels = [
 
 [[package]]
 name = "coverage"
-version = "7.13.4"
+version = "7.13.5"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/24/56/95b7e30fa389756cb56630faa728da46a27b8c6eb46f9d557c68fff12b65/coverage-7.13.4.tar.gz", hash = "sha256:e5c8f6ed1e61a8b2dcdf31eb0b9bbf0130750ca79c1c49eb898e2ad86f5ccc91", size = 827239, upload-time = "2026-02-09T12:59:03.86Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/9d/e0/70553e3000e345daff267cec284ce4cbf3fc141b6da229ac52775b5428f1/coverage-7.13.5.tar.gz", hash = "sha256:c81f6515c4c40141f83f502b07bbfa5c240ba25bbe73da7b33f1e5b6120ff179", size = 915967, upload-time = "2026-03-17T10:33:18.341Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b4/ad/b59e5b451cf7172b8d1043dc0fa718f23aab379bc1521ee13d4bd9bfa960/coverage-7.13.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d490ba50c3f35dd7c17953c68f3270e7ccd1c6642e2d2afe2d8e720b98f5a053", size = 219278, upload-time = "2026-02-09T12:56:31.673Z" },
-    { url = "https://files.pythonhosted.org/packages/f1/17/0cb7ca3de72e5f4ef2ec2fa0089beafbcaaaead1844e8b8a63d35173d77d/coverage-7.13.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:19bc3c88078789f8ef36acb014d7241961dbf883fd2533d18cb1e7a5b4e28b11", size = 219783, upload-time = "2026-02-09T12:56:33.104Z" },
-    { url = "https://files.pythonhosted.org/packages/ab/63/325d8e5b11e0eaf6d0f6a44fad444ae58820929a9b0de943fa377fe73e85/coverage-7.13.4-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3998e5a32e62fdf410c0dbd3115df86297995d6e3429af80b8798aad894ca7aa", size = 250200, upload-time = "2026-02-09T12:56:34.474Z" },
-    { url = "https://files.pythonhosted.org/packages/76/53/c16972708cbb79f2942922571a687c52bd109a7bd51175aeb7558dff2236/coverage-7.13.4-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:8e264226ec98e01a8e1054314af91ee6cde0eacac4f465cc93b03dbe0bce2fd7", size = 252114, upload-time = "2026-02-09T12:56:35.749Z" },
-    { url = "https://files.pythonhosted.org/packages/eb/c2/7ab36d8b8cc412bec9ea2d07c83c48930eb4ba649634ba00cb7e4e0f9017/coverage-7.13.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a3aa4e7b9e416774b21797365b358a6e827ffadaaca81b69ee02946852449f00", size = 254220, upload-time = "2026-02-09T12:56:37.796Z" },
-    { url = "https://files.pythonhosted.org/packages/d6/4d/cf52c9a3322c89a0e6febdfbc83bb45c0ed3c64ad14081b9503adee702e7/coverage-7.13.4-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:71ca20079dd8f27fcf808817e281e90220475cd75115162218d0e27549f95fef", size = 256164, upload-time = "2026-02-09T12:56:39.016Z" },
-    { url = "https://files.pythonhosted.org/packages/78/e9/eb1dd17bd6de8289df3580e967e78294f352a5df8a57ff4671ee5fc3dcd0/coverage-7.13.4-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e2f25215f1a359ab17320b47bcdaca3e6e6356652e8256f2441e4ef972052903", size = 250325, upload-time = "2026-02-09T12:56:40.668Z" },
-    { url = "https://files.pythonhosted.org/packages/71/07/8c1542aa873728f72267c07278c5cc0ec91356daf974df21335ccdb46368/coverage-7.13.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d65b2d373032411e86960604dc4edac91fdfb5dca539461cf2cbe78327d1e64f", size = 251913, upload-time = "2026-02-09T12:56:41.97Z" },
-    { url = "https://files.pythonhosted.org/packages/74/d7/c62e2c5e4483a748e27868e4c32ad3daa9bdddbba58e1bc7a15e252baa74/coverage-7.13.4-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:94eb63f9b363180aff17de3e7c8760c3ba94664ea2695c52f10111244d16a299", size = 249974, upload-time = "2026-02-09T12:56:43.323Z" },
-    { url = "https://files.pythonhosted.org/packages/98/9f/4c5c015a6e98ced54efd0f5cf8d31b88e5504ecb6857585fc0161bb1e600/coverage-7.13.4-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:e856bf6616714c3a9fbc270ab54103f4e685ba236fa98c054e8f87f266c93505", size = 253741, upload-time = "2026-02-09T12:56:45.155Z" },
-    { url = "https://files.pythonhosted.org/packages/bd/59/0f4eef89b9f0fcd9633b5d350016f54126ab49426a70ff4c4e87446cabdc/coverage-7.13.4-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:65dfcbe305c3dfe658492df2d85259e0d79ead4177f9ae724b6fb245198f55d6", size = 249695, upload-time = "2026-02-09T12:56:46.636Z" },
-    { url = "https://files.pythonhosted.org/packages/b5/2c/b7476f938deb07166f3eb281a385c262675d688ff4659ad56c6c6b8e2e70/coverage-7.13.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b507778ae8a4c915436ed5c2e05b4a6cecfa70f734e19c22a005152a11c7b6a9", size = 250599, upload-time = "2026-02-09T12:56:48.13Z" },
-    { url = "https://files.pythonhosted.org/packages/b8/34/c3420709d9846ee3785b9f2831b4d94f276f38884032dca1457fa83f7476/coverage-7.13.4-cp311-cp311-win32.whl", hash = "sha256:784fc3cf8be001197b652d51d3fd259b1e2262888693a4636e18879f613a62a9", size = 221780, upload-time = "2026-02-09T12:56:50.479Z" },
-    { url = "https://files.pythonhosted.org/packages/61/08/3d9c8613079d2b11c185b865de9a4c1a68850cfda2b357fae365cf609f29/coverage-7.13.4-cp311-cp311-win_amd64.whl", hash = "sha256:2421d591f8ca05b308cf0092807308b2facbefe54af7c02ac22548b88b95c98f", size = 222715, upload-time = "2026-02-09T12:56:51.815Z" },
-    { url = "https://files.pythonhosted.org/packages/18/1a/54c3c80b2f056164cc0a6cdcb040733760c7c4be9d780fe655f356f433e4/coverage-7.13.4-cp311-cp311-win_arm64.whl", hash = "sha256:79e73a76b854d9c6088fe5d8b2ebe745f8681c55f7397c3c0a016192d681045f", size = 221385, upload-time = "2026-02-09T12:56:53.194Z" },
-    { url = "https://files.pythonhosted.org/packages/d1/81/4ce2fdd909c5a0ed1f6dedb88aa57ab79b6d1fbd9b588c1ac7ef45659566/coverage-7.13.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:02231499b08dabbe2b96612993e5fc34217cdae907a51b906ac7fca8027a4459", size = 219449, upload-time = "2026-02-09T12:56:54.889Z" },
-    { url = "https://files.pythonhosted.org/packages/5d/96/5238b1efc5922ddbdc9b0db9243152c09777804fb7c02ad1741eb18a11c0/coverage-7.13.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40aa8808140e55dc022b15d8aa7f651b6b3d68b365ea0398f1441e0b04d859c3", size = 219810, upload-time = "2026-02-09T12:56:56.33Z" },
-    { url = "https://files.pythonhosted.org/packages/78/72/2f372b726d433c9c35e56377cf1d513b4c16fe51841060d826b95caacec1/coverage-7.13.4-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:5b856a8ccf749480024ff3bd7310adaef57bf31fd17e1bfc404b7940b6986634", size = 251308, upload-time = "2026-02-09T12:56:57.858Z" },
-    { url = "https://files.pythonhosted.org/packages/5d/a0/2ea570925524ef4e00bb6c82649f5682a77fac5ab910a65c9284de422600/coverage-7.13.4-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2c048ea43875fbf8b45d476ad79f179809c590ec7b79e2035c662e7afa3192e3", size = 254052, upload-time = "2026-02-09T12:56:59.754Z" },
-    { url = "https://files.pythonhosted.org/packages/e8/ac/45dc2e19a1939098d783c846e130b8f862fbb50d09e0af663988f2f21973/coverage-7.13.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b7b38448866e83176e28086674fe7368ab8590e4610fb662b44e345b86d63ffa", size = 255165, upload-time = "2026-02-09T12:57:01.287Z" },
-    { url = "https://files.pythonhosted.org/packages/2d/4d/26d236ff35abc3b5e63540d3386e4c3b192168c1d96da5cb2f43c640970f/coverage-7.13.4-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:de6defc1c9badbf8b9e67ae90fd00519186d6ab64e5cc5f3d21359c2a9b2c1d3", size = 257432, upload-time = "2026-02-09T12:57:02.637Z" },
-    { url = "https://files.pythonhosted.org/packages/ec/55/14a966c757d1348b2e19caf699415a2a4c4f7feaa4bbc6326a51f5c7dd1b/coverage-7.13.4-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7eda778067ad7ffccd23ecffce537dface96212576a07924cbf0d8799d2ded5a", size = 251716, upload-time = "2026-02-09T12:57:04.056Z" },
-    { url = "https://files.pythonhosted.org/packages/77/33/50116647905837c66d28b2af1321b845d5f5d19be9655cb84d4a0ea806b4/coverage-7.13.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e87f6c587c3f34356c3759f0420693e35e7eb0e2e41e4c011cb6ec6ecbbf1db7", size = 253089, upload-time = "2026-02-09T12:57:05.503Z" },
-    { url = "https://files.pythonhosted.org/packages/c2/b4/8efb11a46e3665d92635a56e4f2d4529de6d33f2cb38afd47d779d15fc99/coverage-7.13.4-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:8248977c2e33aecb2ced42fef99f2d319e9904a36e55a8a68b69207fb7e43edc", size = 251232, upload-time = "2026-02-09T12:57:06.879Z" },
-    { url = "https://files.pythonhosted.org/packages/51/24/8cd73dd399b812cc76bb0ac260e671c4163093441847ffe058ac9fda1e32/coverage-7.13.4-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:25381386e80ae727608e662474db537d4df1ecd42379b5ba33c84633a2b36d47", size = 255299, upload-time = "2026-02-09T12:57:08.245Z" },
-    { url = "https://files.pythonhosted.org/packages/03/94/0a4b12f1d0e029ce1ccc1c800944a9984cbe7d678e470bb6d3c6bc38a0da/coverage-7.13.4-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:ee756f00726693e5ba94d6df2bdfd64d4852d23b09bb0bc700e3b30e6f333985", size = 250796, upload-time = "2026-02-09T12:57:10.142Z" },
-    { url = "https://files.pythonhosted.org/packages/73/44/6002fbf88f6698ca034360ce474c406be6d5a985b3fdb3401128031eef6b/coverage-7.13.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fdfc1e28e7c7cdce44985b3043bc13bbd9c747520f94a4d7164af8260b3d91f0", size = 252673, upload-time = "2026-02-09T12:57:12.197Z" },
-    { url = "https://files.pythonhosted.org/packages/de/c6/a0279f7c00e786be75a749a5674e6fa267bcbd8209cd10c9a450c655dfa7/coverage-7.13.4-cp312-cp312-win32.whl", hash = "sha256:01d4cbc3c283a17fc1e42d614a119f7f438eabb593391283adca8dc86eff1246", size = 221990, upload-time = "2026-02-09T12:57:14.085Z" },
-    { url = "https://files.pythonhosted.org/packages/77/4e/c0a25a425fcf5557d9abd18419c95b63922e897bc86c1f327f155ef234a9/coverage-7.13.4-cp312-cp312-win_amd64.whl", hash = "sha256:9401ebc7ef522f01d01d45532c68c5ac40fb27113019b6b7d8b208f6e9baa126", size = 222800, upload-time = "2026-02-09T12:57:15.944Z" },
-    { url = "https://files.pythonhosted.org/packages/47/ac/92da44ad9a6f4e3a7debd178949d6f3769bedca33830ce9b1dcdab589a37/coverage-7.13.4-cp312-cp312-win_arm64.whl", hash = "sha256:b1ec7b6b6e93255f952e27ab58fbc68dcc468844b16ecbee881aeb29b6ab4d8d", size = 221415, upload-time = "2026-02-09T12:57:17.497Z" },
-    { url = "https://files.pythonhosted.org/packages/0d/4a/331fe2caf6799d591109bb9c08083080f6de90a823695d412a935622abb2/coverage-7.13.4-py3-none-any.whl", hash = "sha256:1af1641e57cf7ba1bd67d677c9abdbcd6cc2ab7da3bca7fa1e2b7e50e65f2ad0", size = 211242, upload-time = "2026-02-09T12:59:02.032Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/37/d24c8f8220ff07b839b2c043ea4903a33b0f455abe673ae3c03bbdb7f212/coverage-7.13.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:66a80c616f80181f4d643b0f9e709d97bcea413ecd9631e1dedc7401c8e6695d", size = 219381, upload-time = "2026-03-17T10:30:14.68Z" },
+    { url = "https://files.pythonhosted.org/packages/35/8b/cd129b0ca4afe886a6ce9d183c44d8301acbd4ef248622e7c49a23145605/coverage-7.13.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:145ede53ccbafb297c1c9287f788d1bc3efd6c900da23bf6931b09eafc931587", size = 219880, upload-time = "2026-03-17T10:30:16.231Z" },
+    { url = "https://files.pythonhosted.org/packages/55/2f/e0e5b237bffdb5d6c530ce87cc1d413a5b7d7dfd60fb067ad6d254c35c76/coverage-7.13.5-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:0672854dc733c342fa3e957e0605256d2bf5934feeac328da9e0b5449634a642", size = 250303, upload-time = "2026-03-17T10:30:17.748Z" },
+    { url = "https://files.pythonhosted.org/packages/92/be/b1afb692be85b947f3401375851484496134c5554e67e822c35f28bf2fbc/coverage-7.13.5-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:ec10e2a42b41c923c2209b846126c6582db5e43a33157e9870ba9fb70dc7854b", size = 252218, upload-time = "2026-03-17T10:30:19.804Z" },
+    { url = "https://files.pythonhosted.org/packages/da/69/2f47bb6fa1b8d1e3e5d0c4be8ccb4313c63d742476a619418f85740d597b/coverage-7.13.5-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:be3d4bbad9d4b037791794ddeedd7d64a56f5933a2c1373e18e9e568b9141686", size = 254326, upload-time = "2026-03-17T10:30:21.321Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/d0/79db81da58965bd29dabc8f4ad2a2af70611a57cba9d1ec006f072f30a54/coverage-7.13.5-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:4d2afbc5cc54d286bfb54541aa50b64cdb07a718227168c87b9e2fb8f25e1743", size = 256267, upload-time = "2026-03-17T10:30:23.094Z" },
+    { url = "https://files.pythonhosted.org/packages/e5/32/d0d7cc8168f91ddab44c0ce4806b969df5f5fdfdbb568eaca2dbc2a04936/coverage-7.13.5-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:3ad050321264c49c2fa67bb599100456fc51d004b82534f379d16445da40fb75", size = 250430, upload-time = "2026-03-17T10:30:25.311Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/06/a055311d891ddbe231cd69fdd20ea4be6e3603ffebddf8704b8ca8e10a3c/coverage-7.13.5-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:7300c8a6d13335b29bb76d7651c66af6bd8658517c43499f110ddc6717bfc209", size = 252017, upload-time = "2026-03-17T10:30:27.284Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/f6/d0fd2d21e29a657b5f77a2fe7082e1568158340dceb941954f776dce1b7b/coverage-7.13.5-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:eb07647a5738b89baab047f14edd18ded523de60f3b30e75c2acc826f79c839a", size = 250080, upload-time = "2026-03-17T10:30:29.481Z" },
+    { url = "https://files.pythonhosted.org/packages/4e/ab/0d7fb2efc2e9a5eb7ddcc6e722f834a69b454b7e6e5888c3a8567ecffb31/coverage-7.13.5-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:9adb6688e3b53adffefd4a52d72cbd8b02602bfb8f74dcd862337182fd4d1a4e", size = 253843, upload-time = "2026-03-17T10:30:31.301Z" },
+    { url = "https://files.pythonhosted.org/packages/ba/6f/7467b917bbf5408610178f62a49c0ed4377bb16c1657f689cc61470da8ce/coverage-7.13.5-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:7c8d4bc913dd70b93488d6c496c77f3aff5ea99a07e36a18f865bca55adef8bd", size = 249802, upload-time = "2026-03-17T10:30:33.358Z" },
+    { url = "https://files.pythonhosted.org/packages/75/2c/1172fb689df92135f5bfbbd69fc83017a76d24ea2e2f3a1154007e2fb9f8/coverage-7.13.5-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:0e3c426ffc4cd952f54ee9ffbdd10345709ecc78a3ecfd796a57236bfad0b9b8", size = 250707, upload-time = "2026-03-17T10:30:35.2Z" },
+    { url = "https://files.pythonhosted.org/packages/67/21/9ac389377380a07884e3b48ba7a620fcd9dbfaf1d40565facdc6b36ec9ef/coverage-7.13.5-cp311-cp311-win32.whl", hash = "sha256:259b69bb83ad9894c4b25be2528139eecba9a82646ebdda2d9db1ba28424a6bf", size = 221880, upload-time = "2026-03-17T10:30:36.775Z" },
+    { url = "https://files.pythonhosted.org/packages/af/7f/4cd8a92531253f9d7c1bbecd9fa1b472907fb54446ca768c59b531248dc5/coverage-7.13.5-cp311-cp311-win_amd64.whl", hash = "sha256:258354455f4e86e3e9d0d17571d522e13b4e1e19bf0f8596bcf9476d61e7d8a9", size = 222816, upload-time = "2026-03-17T10:30:38.891Z" },
+    { url = "https://files.pythonhosted.org/packages/12/a6/1d3f6155fb0010ca68eba7fe48ca6c9da7385058b77a95848710ecf189b1/coverage-7.13.5-cp311-cp311-win_arm64.whl", hash = "sha256:bff95879c33ec8da99fc9b6fe345ddb5be6414b41d6d1ad1c8f188d26f36e028", size = 221483, upload-time = "2026-03-17T10:30:40.463Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/c3/a396306ba7db865bf96fc1fb3b7fd29bcbf3d829df642e77b13555163cd6/coverage-7.13.5-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:460cf0114c5016fa841214ff5564aa4864f11948da9440bc97e21ad1f4ba1e01", size = 219554, upload-time = "2026-03-17T10:30:42.208Z" },
+    { url = "https://files.pythonhosted.org/packages/a6/16/a68a19e5384e93f811dccc51034b1fd0b865841c390e3c931dcc4699e035/coverage-7.13.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0e223ce4b4ed47f065bfb123687686512e37629be25cc63728557ae7db261422", size = 219908, upload-time = "2026-03-17T10:30:43.906Z" },
+    { url = "https://files.pythonhosted.org/packages/29/72/20b917c6793af3a5ceb7fb9c50033f3ec7865f2911a1416b34a7cfa0813b/coverage-7.13.5-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:6e3370441f4513c6252bf042b9c36d22491142385049243253c7e48398a15a9f", size = 251419, upload-time = "2026-03-17T10:30:45.545Z" },
+    { url = "https://files.pythonhosted.org/packages/8c/49/cd14b789536ac6a4778c453c6a2338bc0a2fb60c5a5a41b4008328b9acc1/coverage-7.13.5-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:03ccc709a17a1de074fb1d11f217342fb0d2b1582ed544f554fc9fc3f07e95f5", size = 254159, upload-time = "2026-03-17T10:30:47.204Z" },
+    { url = "https://files.pythonhosted.org/packages/9d/00/7b0edcfe64e2ed4c0340dac14a52ad0f4c9bd0b8b5e531af7d55b703db7c/coverage-7.13.5-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3f4818d065964db3c1c66dc0fbdac5ac692ecbc875555e13374fdbe7eedb4376", size = 255270, upload-time = "2026-03-17T10:30:48.812Z" },
+    { url = "https://files.pythonhosted.org/packages/93/89/7ffc4ba0f5d0a55c1e84ea7cee39c9fc06af7b170513d83fbf3bbefce280/coverage-7.13.5-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:012d5319e66e9d5a218834642d6c35d265515a62f01157a45bcc036ecf947256", size = 257538, upload-time = "2026-03-17T10:30:50.77Z" },
+    { url = "https://files.pythonhosted.org/packages/81/bd/73ddf85f93f7e6fa83e77ccecb6162d9415c79007b4bc124008a4995e4a7/coverage-7.13.5-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:8dd02af98971bdb956363e4827d34425cb3df19ee550ef92855b0acb9c7ce51c", size = 251821, upload-time = "2026-03-17T10:30:52.5Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/81/278aff4e8dec4926a0bcb9486320752811f543a3ce5b602cc7a29978d073/coverage-7.13.5-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:f08fd75c50a760c7eb068ae823777268daaf16a80b918fa58eea888f8e3919f5", size = 253191, upload-time = "2026-03-17T10:30:54.543Z" },
+    { url = "https://files.pythonhosted.org/packages/70/ee/fe1621488e2e0a58d7e94c4800f0d96f79671553488d401a612bebae324b/coverage-7.13.5-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:843ea8643cf967d1ac7e8ecd4bb00c99135adf4816c0c0593fdcc47b597fcf09", size = 251337, upload-time = "2026-03-17T10:30:56.663Z" },
+    { url = "https://files.pythonhosted.org/packages/37/a6/f79fb37aa104b562207cc23cb5711ab6793608e246cae1e93f26b2236ed9/coverage-7.13.5-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:9d44d7aa963820b1b971dbecd90bfe5fe8f81cff79787eb6cca15750bd2f79b9", size = 255404, upload-time = "2026-03-17T10:30:58.427Z" },
+    { url = "https://files.pythonhosted.org/packages/75/f0/ed15262a58ec81ce457ceb717b7f78752a1713556b19081b76e90896e8d4/coverage-7.13.5-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:7132bed4bd7b836200c591410ae7d97bf7ae8be6fc87d160b2bd881df929e7bf", size = 250903, upload-time = "2026-03-17T10:31:00.093Z" },
+    { url = "https://files.pythonhosted.org/packages/0f/e9/9129958f20e7e9d4d56d51d42ccf708d15cac355ff4ac6e736e97a9393d2/coverage-7.13.5-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a698e363641b98843c517817db75373c83254781426e94ada3197cabbc2c919c", size = 252780, upload-time = "2026-03-17T10:31:01.916Z" },
+    { url = "https://files.pythonhosted.org/packages/a4/d7/0ad9b15812d81272db94379fe4c6df8fd17781cc7671fdfa30c76ba5ff7b/coverage-7.13.5-cp312-cp312-win32.whl", hash = "sha256:bdba0a6b8812e8c7df002d908a9a2ea3c36e92611b5708633c50869e6d922fdf", size = 222093, upload-time = "2026-03-17T10:31:03.642Z" },
+    { url = "https://files.pythonhosted.org/packages/29/3d/821a9a5799fac2556bcf0bd37a70d1d11fa9e49784b6d22e92e8b2f85f18/coverage-7.13.5-cp312-cp312-win_amd64.whl", hash = "sha256:d2c87e0c473a10bffe991502eac389220533024c8082ec1ce849f4218dded810", size = 222900, upload-time = "2026-03-17T10:31:05.651Z" },
+    { url = "https://files.pythonhosted.org/packages/d4/fa/2238c2ad08e35cf4f020ea721f717e09ec3152aea75d191a7faf3ef009a8/coverage-7.13.5-cp312-cp312-win_arm64.whl", hash = "sha256:bf69236a9a81bdca3bff53796237aab096cdbf8d78a66ad61e992d9dac7eb2de", size = 221515, upload-time = "2026-03-17T10:31:07.293Z" },
+    { url = "https://files.pythonhosted.org/packages/9e/ee/a4cf96b8ce1e566ed238f0659ac2d3f007ed1d14b181bcb684e19561a69a/coverage-7.13.5-py3-none-any.whl", hash = "sha256:34b02417cf070e173989b3db962f7ed56d2f644307b2cf9d5a0f258e13084a61", size = 211346, upload-time = "2026-03-17T10:33:15.691Z" },
 ]
 
 [package.optional-dependencies]
@@ -1912,7 +1836,7 @@ tools = [
     { name = "nltk", specifier = "~=3.9.1" },
 ]
 vdb = [
-    { name = "alibabacloud-gpdb20160503", specifier = "~=3.8.0" },
+    { name = "alibabacloud-gpdb20160503", specifier = "~=5.1.0" },
     { name = "alibabacloud-tea-openapi", specifier = "~=0.4.3" },
     { name = "chromadb", specifier = "==0.5.20" },
     { name = "clickhouse-connect", specifier = "~=0.14.1" },
@@ -6057,27 +5981,27 @@ wheels = [
 
 [[package]]
 name = "ruff"
-version = "0.15.6"
+version = "0.15.7"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/51/df/f8629c19c5318601d3121e230f74cbee7a3732339c52b21daa2b82ef9c7d/ruff-0.15.6.tar.gz", hash = "sha256:8394c7bb153a4e3811a4ecdacd4a8e6a4fa8097028119160dffecdcdf9b56ae4", size = 4597916, upload-time = "2026-03-12T23:05:47.51Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/a1/22/9e4f66ee588588dc6c9af6a994e12d26e19efbe874d1a909d09a6dac7a59/ruff-0.15.7.tar.gz", hash = "sha256:04f1ae61fc20fe0b148617c324d9d009b5f63412c0b16474f3d5f1a1a665f7ac", size = 4601277, upload-time = "2026-03-19T16:26:22.605Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/9e/2f/4e03a7e5ce99b517e98d3b4951f411de2b0fa8348d39cf446671adcce9a2/ruff-0.15.6-py3-none-linux_armv6l.whl", hash = "sha256:7c98c3b16407b2cf3d0f2b80c80187384bc92c6774d85fefa913ecd941256fff", size = 10508953, upload-time = "2026-03-12T23:05:17.246Z" },
-    { url = "https://files.pythonhosted.org/packages/70/60/55bcdc3e9f80bcf39edf0cd272da6fa511a3d94d5a0dd9e0adf76ceebdb4/ruff-0.15.6-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ee7dcfaad8b282a284df4aa6ddc2741b3f4a18b0555d626805555a820ea181c3", size = 10942257, upload-time = "2026-03-12T23:05:23.076Z" },
-    { url = "https://files.pythonhosted.org/packages/e7/f9/005c29bd1726c0f492bfa215e95154cf480574140cb5f867c797c18c790b/ruff-0.15.6-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3bd9967851a25f038fc8b9ae88a7fbd1b609f30349231dffaa37b6804923c4bb", size = 10322683, upload-time = "2026-03-12T23:05:33.738Z" },
-    { url = "https://files.pythonhosted.org/packages/5f/74/2f861f5fd7cbb2146bddb5501450300ce41562da36d21868c69b7a828169/ruff-0.15.6-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:13f4594b04e42cd24a41da653886b04d2ff87adbf57497ed4f728b0e8a4866f8", size = 10660986, upload-time = "2026-03-12T23:05:53.245Z" },
-    { url = "https://files.pythonhosted.org/packages/c1/a1/309f2364a424eccb763cdafc49df843c282609f47fe53aa83f38272389e0/ruff-0.15.6-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e2ed8aea2f3fe57886d3f00ea5b8aae5bf68d5e195f487f037a955ff9fbaac9e", size = 10332177, upload-time = "2026-03-12T23:05:56.145Z" },
-    { url = "https://files.pythonhosted.org/packages/30/41/7ebf1d32658b4bab20f8ac80972fb19cd4e2c6b78552be263a680edc55ac/ruff-0.15.6-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:70789d3e7830b848b548aae96766431c0dc01a6c78c13381f423bf7076c66d15", size = 11170783, upload-time = "2026-03-12T23:06:01.742Z" },
-    { url = "https://files.pythonhosted.org/packages/76/be/6d488f6adca047df82cd62c304638bcb00821c36bd4881cfca221561fdfc/ruff-0.15.6-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:542aaf1de3154cea088ced5a819ce872611256ffe2498e750bbae5247a8114e9", size = 12044201, upload-time = "2026-03-12T23:05:28.697Z" },
-    { url = "https://files.pythonhosted.org/packages/71/68/e6f125df4af7e6d0b498f8d373274794bc5156b324e8ab4bf5c1b4fc0ec7/ruff-0.15.6-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1c22e6f02c16cfac3888aa636e9eba857254d15bbacc9906c9689fdecb1953ab", size = 11421561, upload-time = "2026-03-12T23:05:31.236Z" },
-    { url = "https://files.pythonhosted.org/packages/f1/9f/f85ef5fd01a52e0b472b26dc1b4bd228b8f6f0435975442ffa4741278703/ruff-0.15.6-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:98893c4c0aadc8e448cfa315bd0cc343a5323d740fe5f28ef8a3f9e21b381f7e", size = 11310928, upload-time = "2026-03-12T23:05:45.288Z" },
-    { url = "https://files.pythonhosted.org/packages/8c/26/b75f8c421f5654304b89471ed384ae8c7f42b4dff58fa6ce1626d7f2b59a/ruff-0.15.6-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:70d263770d234912374493e8cc1e7385c5d49376e41dfa51c5c3453169dc581c", size = 11235186, upload-time = "2026-03-12T23:05:50.677Z" },
-    { url = "https://files.pythonhosted.org/packages/fc/d4/d5a6d065962ff7a68a86c9b4f5500f7d101a0792078de636526c0edd40da/ruff-0.15.6-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:55a1ad63c5a6e54b1f21b7514dfadc0c7fb40093fa22e95143cf3f64ebdcd512", size = 10635231, upload-time = "2026-03-12T23:05:37.044Z" },
-    { url = "https://files.pythonhosted.org/packages/d6/56/7c3acf3d50910375349016cf33de24be021532042afbed87942858992491/ruff-0.15.6-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:8dc473ba093c5ec238bb1e7429ee676dca24643c471e11fbaa8a857925b061c0", size = 10340357, upload-time = "2026-03-12T23:06:04.748Z" },
-    { url = "https://files.pythonhosted.org/packages/06/54/6faa39e9c1033ff6a3b6e76b5df536931cd30caf64988e112bbf91ef5ce5/ruff-0.15.6-py3-none-musllinux_1_2_i686.whl", hash = "sha256:85b042377c2a5561131767974617006f99f7e13c63c111b998f29fc1e58a4cfb", size = 10860583, upload-time = "2026-03-12T23:05:58.978Z" },
-    { url = "https://files.pythonhosted.org/packages/cb/1e/509a201b843b4dfb0b32acdedf68d951d3377988cae43949ba4c4133a96a/ruff-0.15.6-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:cef49e30bc5a86a6a92098a7fbf6e467a234d90b63305d6f3ec01225a9d092e0", size = 11410976, upload-time = "2026-03-12T23:05:39.955Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/25/3fc9114abf979a41673ce877c08016f8e660ad6cf508c3957f537d2e9fa9/ruff-0.15.6-py3-none-win32.whl", hash = "sha256:bbf67d39832404812a2d23020dda68fee7f18ce15654e96fb1d3ad21a5fe436c", size = 10616872, upload-time = "2026-03-12T23:05:42.451Z" },
-    { url = "https://files.pythonhosted.org/packages/89/7a/09ece68445ceac348df06e08bf75db72d0e8427765b96c9c0ffabc1be1d9/ruff-0.15.6-py3-none-win_amd64.whl", hash = "sha256:aee25bc84c2f1007ecb5037dff75cef00414fdf17c23f07dc13e577883dca406", size = 11787271, upload-time = "2026-03-12T23:05:20.168Z" },
-    { url = "https://files.pythonhosted.org/packages/7f/d0/578c47dd68152ddddddf31cd7fc67dc30b7cdf639a86275fda821b0d9d98/ruff-0.15.6-py3-none-win_arm64.whl", hash = "sha256:c34de3dd0b0ba203be50ae70f5910b17188556630e2178fd7d79fc030eb0d837", size = 11060497, upload-time = "2026-03-12T23:05:25.968Z" },
+    { url = "https://files.pythonhosted.org/packages/41/2f/0b08ced94412af091807b6119ca03755d651d3d93a242682bf020189db94/ruff-0.15.7-py3-none-linux_armv6l.whl", hash = "sha256:a81cc5b6910fb7dfc7c32d20652e50fa05963f6e13ead3c5915c41ac5d16668e", size = 10489037, upload-time = "2026-03-19T16:26:32.47Z" },
+    { url = "https://files.pythonhosted.org/packages/91/4a/82e0fa632e5c8b1eba5ee86ecd929e8ff327bbdbfb3c6ac5d81631bef605/ruff-0.15.7-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:722d165bd52403f3bdabc0ce9e41fc47070ac56d7a91b4e0d097b516a53a3477", size = 10955433, upload-time = "2026-03-19T16:27:00.205Z" },
+    { url = "https://files.pythonhosted.org/packages/ab/10/12586735d0ff42526ad78c049bf51d7428618c8b5c467e72508c694119df/ruff-0.15.7-py3-none-macosx_11_0_arm64.whl", hash = "sha256:7fbc2448094262552146cbe1b9643a92f66559d3761f1ad0656d4991491af49e", size = 10269302, upload-time = "2026-03-19T16:26:26.183Z" },
+    { url = "https://files.pythonhosted.org/packages/eb/5d/32b5c44ccf149a26623671df49cbfbd0a0ae511ff3df9d9d2426966a8d57/ruff-0.15.7-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b39329b60eba44156d138275323cc726bbfbddcec3063da57caa8a8b1d50adf", size = 10607625, upload-time = "2026-03-19T16:27:03.263Z" },
+    { url = "https://files.pythonhosted.org/packages/5d/f1/f0001cabe86173aaacb6eb9bb734aa0605f9a6aa6fa7d43cb49cbc4af9c9/ruff-0.15.7-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:87768c151808505f2bfc93ae44e5f9e7c8518943e5074f76ac21558ef5627c85", size = 10324743, upload-time = "2026-03-19T16:27:09.791Z" },
+    { url = "https://files.pythonhosted.org/packages/7a/87/b8a8f3d56b8d848008559e7c9d8bf367934d5367f6d932ba779456e2f73b/ruff-0.15.7-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fb0511670002c6c529ec66c0e30641c976c8963de26a113f3a30456b702468b0", size = 11138536, upload-time = "2026-03-19T16:27:06.101Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/f2/4fd0d05aab0c5934b2e1464784f85ba2eab9d54bffc53fb5430d1ed8b829/ruff-0.15.7-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e0d19644f801849229db8345180a71bee5407b429dd217f853ec515e968a6912", size = 11994292, upload-time = "2026-03-19T16:26:48.718Z" },
+    { url = "https://files.pythonhosted.org/packages/64/22/fc4483871e767e5e95d1622ad83dad5ebb830f762ed0420fde7dfa9d9b08/ruff-0.15.7-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4806d8e09ef5e84eb19ba833d0442f7e300b23fe3f0981cae159a248a10f0036", size = 11398981, upload-time = "2026-03-19T16:26:54.513Z" },
+    { url = "https://files.pythonhosted.org/packages/b0/99/66f0343176d5eab02c3f7fcd2de7a8e0dd7a41f0d982bee56cd1c24db62b/ruff-0.15.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dce0896488562f09a27b9c91b1f58a097457143931f3c4d519690dea54e624c5", size = 11242422, upload-time = "2026-03-19T16:26:29.277Z" },
+    { url = "https://files.pythonhosted.org/packages/5d/3a/a7060f145bfdcce4c987ea27788b30c60e2c81d6e9a65157ca8afe646328/ruff-0.15.7-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:1852ce241d2bc89e5dc823e03cff4ce73d816b5c6cdadd27dbfe7b03217d2a12", size = 11232158, upload-time = "2026-03-19T16:26:42.321Z" },
+    { url = "https://files.pythonhosted.org/packages/a7/53/90fbb9e08b29c048c403558d3cdd0adf2668b02ce9d50602452e187cd4af/ruff-0.15.7-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:5f3e4b221fb4bd293f79912fc5e93a9063ebd6d0dcbd528f91b89172a9b8436c", size = 10577861, upload-time = "2026-03-19T16:26:57.459Z" },
+    { url = "https://files.pythonhosted.org/packages/2f/aa/5f486226538fe4d0f0439e2da1716e1acf895e2a232b26f2459c55f8ddad/ruff-0.15.7-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b15e48602c9c1d9bdc504b472e90b90c97dc7d46c7028011ae67f3861ceba7b4", size = 10327310, upload-time = "2026-03-19T16:26:35.909Z" },
+    { url = "https://files.pythonhosted.org/packages/99/9e/271afdffb81fe7bfc8c43ba079e9d96238f674380099457a74ccb3863857/ruff-0.15.7-py3-none-musllinux_1_2_i686.whl", hash = "sha256:1b4705e0e85cedc74b0a23cf6a179dbb3df184cb227761979cc76c0440b5ab0d", size = 10840752, upload-time = "2026-03-19T16:26:45.723Z" },
+    { url = "https://files.pythonhosted.org/packages/bf/29/a4ae78394f76c7759953c47884eb44de271b03a66634148d9f7d11e721bd/ruff-0.15.7-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:112c1fa316a558bb34319282c1200a8bf0495f1b735aeb78bfcb2991e6087580", size = 11336961, upload-time = "2026-03-19T16:26:39.076Z" },
+    { url = "https://files.pythonhosted.org/packages/26/6b/8786ba5736562220d588a2f6653e6c17e90c59ced34a2d7b512ef8956103/ruff-0.15.7-py3-none-win32.whl", hash = "sha256:6d39e2d3505b082323352f733599f28169d12e891f7dd407f2d4f54b4c2886de", size = 10582538, upload-time = "2026-03-19T16:26:15.992Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/e9/346d4d3fffc6871125e877dae8d9a1966b254fbd92a50f8561078b88b099/ruff-0.15.7-py3-none-win_amd64.whl", hash = "sha256:4d53d712ddebcd7dace1bc395367aec12c057aacfe9adbb6d832302575f4d3a1", size = 11755839, upload-time = "2026-03-19T16:26:19.897Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/e8/726643a3ea68c727da31570bde48c7a10f1aa60eddd628d94078fec586ff/ruff-0.15.7-py3-none-win_arm64.whl", hash = "sha256:18e8d73f1c3fdf27931497972250340f92e8c861722161a9caeb89a58ead6ed2", size = 11023304, upload-time = "2026-03-19T16:26:51.669Z" },
 ]
 
 [[package]]
@@ -6116,14 +6040,14 @@ wheels = [
 
 [[package]]
 name = "scipy-stubs"
-version = "1.17.1.2"
+version = "1.17.1.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "optype", extra = ["numpy"] },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/c7/ab/43f681ffba42f363b7ed6b767fd215d1e26006578214ff8330586a11bf95/scipy_stubs-1.17.1.2.tar.gz", hash = "sha256:2ecadc8c87a3b61aaf7379d6d6b10f1038a829c53b9efe5b174fb97fc8b52237", size = 388354, upload-time = "2026-03-15T22:33:20.449Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/a7/59/59c6cc3f9970154b9ed6b1aff42a0185cdd60cef54adc0404b9e77972221/scipy_stubs-1.17.1.3.tar.gz", hash = "sha256:5eb87a8d23d726706259b012ebe76a4a96a9ae9e141fc59bf55fc8eac2ed9e0f", size = 392185, upload-time = "2026-03-22T22:11:58.34Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/8c/0b/ec4fe720c1202d9df729a3e9d9b7e4d2da9f6e7f28bd2877b7d0769f4f75/scipy_stubs-1.17.1.2-py3-none-any.whl", hash = "sha256:f19e8f5273dbe3b7ee6a9554678c3973b9695fa66b91f29206d00830a1536c06", size = 594377, upload-time = "2026-03-15T22:33:18.684Z" },
+    { url = "https://files.pythonhosted.org/packages/2c/d4/94304532c0a75a55526119043dd44a9bd1541a21e14483cbb54261c527d2/scipy_stubs-1.17.1.3-py3-none-any.whl", hash = "sha256:7b91d3f05aa47da06fbca14eb6c5bb4c28994e9245fd250cc847e375bab31297", size = 597933, upload-time = "2026-03-22T22:11:56.525Z" },
 ]
 
 [[package]]
@@ -6803,11 +6727,11 @@ wheels = [
 
 [[package]]
 name = "types-cachetools"
-version = "6.2.0.20251022"
+version = "6.2.0.20260317"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/3b/a8/f9bcc7f1be63af43ef0170a773e2d88817bcc7c9d8769f2228c802826efe/types_cachetools-6.2.0.20251022.tar.gz", hash = "sha256:f1d3c736f0f741e89ec10f0e1b0138625023e21eb33603a930c149e0318c0cef", size = 9608, upload-time = "2025-10-22T03:03:58.16Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/8b/7f/16a4d8344c28193a5a74358028c2d2f753f0d9658dd98b9e1967c50045a2/types_cachetools-6.2.0.20260317.tar.gz", hash = "sha256:6d91855bcc944665897c125e720aa3c80aace929b77a64e796343701df4f61c6", size = 9812, upload-time = "2026-03-17T04:06:32.007Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/98/2d/8d821ed80f6c2c5b427f650bf4dc25b80676ed63d03388e4b637d2557107/types_cachetools-6.2.0.20251022-py3-none-any.whl", hash = "sha256:698eb17b8f16b661b90624708b6915f33dbac2d185db499ed57e4997e7962cad", size = 9341, upload-time = "2025-10-22T03:03:57.036Z" },
+    { url = "https://files.pythonhosted.org/packages/17/9a/b00b23054934c4d569c19f7278c4fb32746cd36a64a175a216d3073a4713/types_cachetools-6.2.0.20260317-py3-none-any.whl", hash = "sha256:92fa9bc50e4629e31fca67ceb3fb1de71791e314fa16c0a0d2728724dc222c8b", size = 9346, upload-time = "2026-03-17T04:06:31.184Z" },
 ]
 
 [[package]]
@@ -6851,11 +6775,11 @@ wheels = [
 
 [[package]]
 name = "types-docutils"
-version = "0.22.3.20260316"
+version = "0.22.3.20260322"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/9f/27/a7f16b3a2fad0a4ddd85a668319f9a1d0311c4bd9578894f6471c7e6c788/types_docutils-0.22.3.20260316.tar.gz", hash = "sha256:8ef27d565b9831ff094fe2eac75337a74151013e2d21ecabd445c2955f891564", size = 57263, upload-time = "2026-03-16T04:29:12.211Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/44/bb/243a87fc1605a4a94c2c343d6dbddbf0d7ef7c0b9550f360b8cda8e82c39/types_docutils-0.22.3.20260322.tar.gz", hash = "sha256:e2450bb997283c3141ec5db3e436b91f0aa26efe35eb9165178ca976ccb4930b", size = 57311, upload-time = "2026-03-22T04:08:44.064Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/70/60/c1f22b7cfc4837d5419e5a2d8702c7d65f03343f866364b71cccd8a73b79/types_docutils-0.22.3.20260316-py3-none-any.whl", hash = "sha256:083c7091b8072c242998ec51da1bf1492f0332387da81c3b085efbf5ca754c7d", size = 91968, upload-time = "2026-03-16T04:29:11.114Z" },
+    { url = "https://files.pythonhosted.org/packages/c6/4a/22c090cd4615a16917dff817cbe7c5956da376c961e024c241cd962d2c3d/types_docutils-0.22.3.20260322-py3-none-any.whl", hash = "sha256:681d4510ce9b80a0c6a593f0f9843d81f8caa786db7b39ba04d9fd5480ac4442", size = 91978, upload-time = "2026-03-22T04:08:43.117Z" },
 ]
 
 [[package]]
@@ -6885,15 +6809,15 @@ wheels = [
 
 [[package]]
 name = "types-gevent"
-version = "25.9.0.20251228"
+version = "25.9.0.20260322"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "types-greenlet" },
     { name = "types-psutil" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/06/85/c5043c4472f82c8ee3d9e0673eb4093c7d16770a26541a137a53a1d096f6/types_gevent-25.9.0.20251228.tar.gz", hash = "sha256:423ef9891d25c5a3af236c3e9aace4c444c86ff773fe13ef22731bc61d59abef", size = 38063, upload-time = "2025-12-28T03:28:28.651Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/34/f0/14a99ddcaa69b559fa7cec8c9de880b792bebb0b848ae865d94ea9058533/types_gevent-25.9.0.20260322.tar.gz", hash = "sha256:91257920845762f09753c08aa20fad1743ac13d2de8bcf23f4b8fe967d803732", size = 38241, upload-time = "2026-03-22T04:08:55.213Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/c8/b7/a2d6b652ab5a26318b68cafd58c46fafb9b15c5313d2d76a70b838febb4b/types_gevent-25.9.0.20251228-py3-none-any.whl", hash = "sha256:e2e225af4fface9241c16044983eb2fc3993f2d13d801f55c2932848649b7f2f", size = 55486, upload-time = "2025-12-28T03:28:27.382Z" },
+    { url = "https://files.pythonhosted.org/packages/89/0f/964440b57eb4ddb4aca03479a4093852e1ce79010d1c5967234e6f5d6bd9/types_gevent-25.9.0.20260322-py3-none-any.whl", hash = "sha256:21b3c269b3a20ecb0e4668289c63b97d21694d84a004ab059c1e32ab970eacc2", size = 55500, upload-time = "2026-03-22T04:08:54.103Z" },
 ]
 
 [[package]]
@@ -6976,11 +6900,11 @@ wheels = [
 
 [[package]]
 name = "types-openpyxl"
-version = "3.1.5.20260316"
+version = "3.1.5.20260322"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/a1/38/32f8ee633dd66ca6d52b8853b9fd45dc3869490195a6ed435d5c868b9c2d/types_openpyxl-3.1.5.20260316.tar.gz", hash = "sha256:081dda9427ea1141e5649e3dcf630e7013a4cf254a5862a7e0a3f53c123b7ceb", size = 101318, upload-time = "2026-03-16T04:29:05.004Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/77/bf/15240de4d68192d2a1f385ef2f6f1ecb29b85d2f3791dd2e2d5b980be30f/types_openpyxl-3.1.5.20260322.tar.gz", hash = "sha256:a61d66ebe1e49697853c6db8e0929e1cda2c96755e71fb676ed7fc48dfdcf697", size = 101325, upload-time = "2026-03-22T04:08:40.426Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/d5/df/b87ae6226ed7cc84b9e43119c489c7f053a9a25e209e0ebb5d84bc36fa37/types_openpyxl-3.1.5.20260316-py3-none-any.whl", hash = "sha256:38e7e125df520fb7eb72cb1129c9f024eb99ef9564aad2c27f68f080c26bcf2d", size = 166084, upload-time = "2026-03-16T04:29:03.657Z" },
+    { url = "https://files.pythonhosted.org/packages/bf/b4/c14191b30bcb266365b124b2bb4e67ecd68425a78ba77ee026f33667daa9/types_openpyxl-3.1.5.20260322-py3-none-any.whl", hash = "sha256:2f515f0b0bbfb04bfb587de34f7522d90b5151a8da7bbbd11ecec4ca40f64238", size = 166102, upload-time = "2026-03-22T04:08:39.174Z" },
 ]
 
 [[package]]
@@ -7055,11 +6979,11 @@ wheels = [
 
 [[package]]
 name = "types-python-dateutil"
-version = "2.9.0.20260305"
+version = "2.9.0.20260323"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/1d/c7/025c624f347e10476b439a6619a95f1d200250ea88e7ccea6e09e48a7544/types_python_dateutil-2.9.0.20260305.tar.gz", hash = "sha256:389717c9f64d8f769f36d55a01873915b37e97e52ce21928198d210fbd393c8b", size = 16885, upload-time = "2026-03-05T04:00:47.409Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/e9/02/f72df9ef5ffc4f959b83cb80c8aa03eb8718a43e563ecd99ccffe265fa89/types_python_dateutil-2.9.0.20260323.tar.gz", hash = "sha256:a107aef5841db41ace381dbbbd7e4945220fc940f7a72172a0be5a92d9ab7164", size = 16897, upload-time = "2026-03-23T04:15:14.829Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/0a/77/8c0d1ec97f0d9707ad3d8fa270ab8964e7b31b076d2f641c94987395cc75/types_python_dateutil-2.9.0.20260305-py3-none-any.whl", hash = "sha256:a3be9ca444d38cadabd756cfbb29780d8b338ae2a3020e73c266a83cc3025dd7", size = 18419, upload-time = "2026-03-05T04:00:46.392Z" },
+    { url = "https://files.pythonhosted.org/packages/92/c1/b661838b97453e699a215451f2e22cee750eaaf4ea4619b34bdaf01221a4/types_python_dateutil-2.9.0.20260323-py3-none-any.whl", hash = "sha256:a23a50a07f6eb87e729d4cb0c2eb511c81761eeb3f505db2c1413be94aae8335", size = 18433, upload-time = "2026-03-23T04:15:13.683Z" },
 ]
 
 [[package]]
@@ -7073,11 +6997,11 @@ wheels = [
 
 [[package]]
 name = "types-pywin32"
-version = "311.0.0.20260316"
+version = "311.0.0.20260323"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/17/a8/b4652002a854fcfe5d272872a0ae2d5df0e9dc482e1a6dfb5e97b905b76f/types_pywin32-311.0.0.20260316.tar.gz", hash = "sha256:c136fa489fe6279a13bca167b750414e18d657169b7cf398025856dc363004e8", size = 329956, upload-time = "2026-03-16T04:28:57.366Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/b5/cc/f03ddb7412ac2fc2238358b617c2d5919ba96812dff8d3081f3b2754bb83/types_pywin32-311.0.0.20260323.tar.gz", hash = "sha256:2e8dc6a59fedccbc51b241651ce1e8aa58488934f517debf23a9c6d0ff329b4b", size = 332263, upload-time = "2026-03-23T04:15:20.004Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/f0/83/704698d93788cf1c2f5e236eae2b37f1b2152ef84dc66b4b83f6c7487b76/types_pywin32-311.0.0.20260316-py3-none-any.whl", hash = "sha256:abb643d50012386d697af49384cc0e6e475eab76b0ca2a7f93d480d0862b3692", size = 392959, upload-time = "2026-03-16T04:28:56.104Z" },
+    { url = "https://files.pythonhosted.org/packages/dc/82/d786d5d8b846e3cbe1ee52da8945560b111c789b42c3771b2129b312ab94/types_pywin32-311.0.0.20260323-py3-none-any.whl", hash = "sha256:2f2b03fc72ae77ccbb0ee258da0f181c3a38bd8602f6e332e42587b3b0d5f095", size = 395435, upload-time = "2026-03-23T04:15:18.76Z" },
 ]
 
 [[package]]
@@ -7173,16 +7097,16 @@ wheels = [
 
 [[package]]
 name = "types-tensorflow"
-version = "2.18.0.20260224"
+version = "2.18.0.20260322"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "numpy" },
     { name = "types-protobuf" },
     { name = "types-requests" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/af/cb/4914c2fbc1cf8a8d1ef2a7c727bb6f694879be85edeee880a0c88e696af8/types_tensorflow-2.18.0.20260224.tar.gz", hash = "sha256:9b0ccc91c79c88791e43d3f80d6c879748fa0361409c5ff23c7ffe3709be00f2", size = 258786, upload-time = "2026-02-24T04:06:45.613Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/4a/cb/81dfaa2680031a6e087bcdfaf1c0556371098e229aee541e21c81a381065/types_tensorflow-2.18.0.20260322.tar.gz", hash = "sha256:135dc6ca06cc647a002e1bca5c5c99516fde51efd08e46c48a9b1916fc5df07f", size = 259030, upload-time = "2026-03-22T04:09:14.069Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/d4/1d/a1c3c60f0eb1a204500dbdc66e3d18aafabc86ad07a8eca71ea05bc8c5a8/types_tensorflow-2.18.0.20260224-py3-none-any.whl", hash = "sha256:6a25f5f41f3e06f28c1f65c6e09f484d4ba0031d6d8df83a39df9d890245eefc", size = 329746, upload-time = "2026-02-24T04:06:44.4Z" },
+    { url = "https://files.pythonhosted.org/packages/5b/0c/a178061450b640e53577e2c423ad22bf5d3f692f6bfeeb12156d02b531ef/types_tensorflow-2.18.0.20260322-py3-none-any.whl", hash = "sha256:d8776b6daacdb279e64f105f9dcbc0b8e3544b9a2f2eb71ec6ea5955081f65e6", size = 329771, upload-time = "2026-03-22T04:09:12.844Z" },
 ]
 
 [[package]]

docker/ssrf_proxy/squid.conf.template

@@ -28,6 +28,7 @@ http_access deny manager
 http_access allow localhost
 include /etc/squid/conf.d/*.conf
 http_access deny all
+tcp_outgoing_address 0.0.0.0
 
 ################################## Proxy Server ################################
 http_port ${HTTP_PORT}

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chart-view.tsx

@@ -48,7 +48,7 @@ export default function ChartView({ appId, headerRight }: IChartViewProps) {
   return (
     <div>
       <div className="mb-4">
-        <div className="mb-2 text-text-primary system-xl-semibold">{t('appMenus.overview', { ns: 'common' })}</div>
+        <div className="system-xl-semibold mb-2 text-text-primary">{t('appMenus.overview', { ns: 'common' })}</div>
         <div className="flex items-center justify-between">
           {IS_CLOUD_EDITION
             ? (

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/time-range-picker/date-picker.tsx

@@ -30,7 +30,7 @@ const DatePicker: FC<Props> = ({
 
   const renderDate = useCallback(({ value, handleClickTrigger, isOpen }: TriggerProps) => {
     return (
-      <div className={cn('flex h-7 cursor-pointer items-center rounded-lg px-1 text-components-input-text-filled system-sm-regular hover:bg-state-base-hover', isOpen && 'bg-state-base-hover')} onClick={handleClickTrigger}>
+      <div className={cn('system-sm-regular flex h-7 cursor-pointer items-center rounded-lg px-1 text-components-input-text-filled hover:bg-state-base-hover', isOpen && 'bg-state-base-hover')} onClick={handleClickTrigger}>
         {value ? formatToLocalTime(value, locale, 'MMM D') : ''}
       </div>
     )
@@ -64,7 +64,7 @@ const DatePicker: FC<Props> = ({
         noConfirm
         getIsDateDisabled={startDateDisabled}
       />
-      <span className="text-text-tertiary system-sm-regular">-</span>
+      <span className="system-sm-regular text-text-tertiary">-</span>
       <Picker
         value={end}
         onChange={onEndChange}

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/time-range-picker/range-selector.tsx

@@ -45,7 +45,7 @@ const RangeSelector: FC<Props> = ({
   const renderTrigger = useCallback((item: Item | null, isOpen: boolean) => {
     return (
       <div className={cn('flex h-8 cursor-pointer items-center space-x-1.5 rounded-lg bg-components-input-bg-normal pl-3 pr-2', isOpen && 'bg-state-base-hover-alt')}>
-        <div className="text-components-input-text-filled system-sm-regular">{isCustomRange ? t('filter.period.custom', { ns: 'appLog' }) : item?.name}</div>
+        <div className="system-sm-regular text-components-input-text-filled">{isCustomRange ? t('filter.period.custom', { ns: 'appLog' }) : item?.name}</div>
         <RiArrowDownSLine className={cn('size-4 text-text-quaternary', isOpen && 'text-text-secondary')} />
       </div>
     )
@@ -57,13 +57,13 @@ const RangeSelector: FC<Props> = ({
         {selected && (
           <span
             className={cn(
-              'absolute left-2 top-[9px] flex items-center text-text-accent',
+              'absolute left-2 top-[9px] flex items-center  text-text-accent',
             )}
           >
             <RiCheckLine className="h-4 w-4" aria-hidden="true" />
           </span>
         )}
-        <span className={cn('block truncate system-md-regular')}>{item.name}</span>
+        <span className={cn('system-md-regular block truncate')}>{item.name}</span>
       </>
     )
   }, [])

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config-popup.tsx

@@ -327,11 +327,11 @@ const ConfigPopup: FC<PopupProps> = ({
       <div className="flex items-center justify-between">
         <div className="flex items-center">
           <TracingIcon size="md" className="mr-2" />
-          <div className="text-text-primary title-2xl-semi-bold">{t(`${I18N_PREFIX}.tracing`, { ns: 'app' })}</div>
+          <div className="title-2xl-semi-bold text-text-primary">{t(`${I18N_PREFIX}.tracing`, { ns: 'app' })}</div>
         </div>
         <div className="flex items-center">
           <Indicator color={enabled ? 'green' : 'gray'} />
-          <div className={cn('ml-1 text-text-tertiary system-xs-semibold-uppercase', enabled && 'text-util-colors-green-green-600')}>
+          <div className={cn('system-xs-semibold-uppercase ml-1 text-text-tertiary', enabled && 'text-util-colors-green-green-600')}>
             {t(`${I18N_PREFIX}.${enabled ? 'enabled' : 'disabled'}`, { ns: 'app' })}
           </div>
           {!readOnly && (
@@ -350,7 +350,7 @@ const ConfigPopup: FC<PopupProps> = ({
         </div>
       </div>
 
-      <div className="mt-2 text-text-tertiary system-xs-regular">
+      <div className="system-xs-regular mt-2 text-text-tertiary">
         {t(`${I18N_PREFIX}.tracingDescription`, { ns: 'app' })}
       </div>
       <Divider className="my-3" />
@@ -358,7 +358,7 @@ const ConfigPopup: FC<PopupProps> = ({
         {(providerAllConfigured || providerAllNotConfigured)
           ? (
               <>
-                <div className="text-text-tertiary system-xs-medium-uppercase">{t(`${I18N_PREFIX}.configProviderTitle.${providerAllConfigured ? 'configured' : 'notConfigured'}`, { ns: 'app' })}</div>
+                <div className="system-xs-medium-uppercase text-text-tertiary">{t(`${I18N_PREFIX}.configProviderTitle.${providerAllConfigured ? 'configured' : 'notConfigured'}`, { ns: 'app' })}</div>
                 <div className="mt-2 max-h-96 space-y-2 overflow-y-auto">
                   {langfusePanel}
                   {langSmithPanel}
@@ -375,11 +375,11 @@ const ConfigPopup: FC<PopupProps> = ({
             )
           : (
               <>
-                <div className="text-text-tertiary system-xs-medium-uppercase">{t(`${I18N_PREFIX}.configProviderTitle.configured`, { ns: 'app' })}</div>
+                <div className="system-xs-medium-uppercase text-text-tertiary">{t(`${I18N_PREFIX}.configProviderTitle.configured`, { ns: 'app' })}</div>
                 <div className="mt-2 max-h-40 space-y-2 overflow-y-auto">
                   {configuredProviderPanel()}
                 </div>
-                <div className="mt-3 text-text-tertiary system-xs-medium-uppercase">{t(`${I18N_PREFIX}.configProviderTitle.moreProvider`, { ns: 'app' })}</div>
+                <div className="system-xs-medium-uppercase mt-3 text-text-tertiary">{t(`${I18N_PREFIX}.configProviderTitle.moreProvider`, { ns: 'app' })}</div>
                 <div className="mt-2 max-h-40 space-y-2 overflow-y-auto">
                   {moreProviderPanel()}
                 </div>

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/panel.tsx

@@ -254,7 +254,7 @@ const Panel: FC = () => {
             )}
           >
             <TracingIcon size="md" />
-            <div className="mx-2 text-text-secondary system-sm-semibold">{t(`${I18N_PREFIX}.title`, { ns: 'app' })}</div>
+            <div className="system-sm-semibold mx-2 text-text-secondary">{t(`${I18N_PREFIX}.title`, { ns: 'app' })}</div>
             <div className="rounded-md p-1">
               <RiEqualizer2Line className="h-4 w-4 text-text-tertiary" />
             </div>
@@ -294,7 +294,7 @@ const Panel: FC = () => {
           >
             <div className="ml-4 mr-1 flex items-center">
               <Indicator color={enabled ? 'green' : 'gray'} />
-              <div className="ml-1.5 text-text-tertiary system-xs-semibold-uppercase">
+              <div className="system-xs-semibold-uppercase ml-1.5 text-text-tertiary">
                 {t(`${I18N_PREFIX}.${enabled ? 'enabled' : 'disabled'}`, { ns: 'app' })}
               </div>
             </div>

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-config-modal.tsx

@@ -302,7 +302,7 @@ const ProviderConfigModal: FC<Props> = ({
                   <div className="mx-2 max-h-[calc(100vh-120px)] w-[640px] overflow-y-auto rounded-2xl bg-components-panel-bg shadow-xl">
                     <div className="px-8 pt-8">
                       <div className="mb-4 flex items-center justify-between">
-                        <div className="text-text-primary title-2xl-semi-bold">
+                        <div className="title-2xl-semi-bold text-text-primary">
                           {t(`${I18N_PREFIX}.title`, { ns: 'app' })}
                           {t(`tracing.${type}.title`, { ns: 'app' })}
                         </div>

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-panel.tsx

@@ -82,7 +82,7 @@ const ProviderPanel: FC<Props> = ({
       <div className="flex items-center justify-between space-x-1">
         <div className="flex items-center">
           <Icon className="h-6" />
-          {isChosen && <div className="ml-1 flex h-4 items-center rounded-[4px] border border-text-accent-secondary px-1 text-text-accent-secondary system-2xs-medium-uppercase">{t(`${I18N_PREFIX}.inUse`, { ns: 'app' })}</div>}
+          {isChosen && <div className="system-2xs-medium-uppercase ml-1 flex h-4 items-center rounded-[4px] border border-text-accent-secondary px-1 text-text-accent-secondary">{t(`${I18N_PREFIX}.inUse`, { ns: 'app' })}</div>}
         </div>
         {!readOnly && (
           <div className="flex items-center justify-between space-x-1">
@@ -102,7 +102,7 @@ const ProviderPanel: FC<Props> = ({
           </div>
         )}
       </div>
-      <div className="mt-2 text-text-tertiary system-xs-regular">
+      <div className="system-xs-regular mt-2 text-text-tertiary">
         {t(`${I18N_PREFIX}.${type}.description`, { ns: 'app' })}
       </div>
     </div>

web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/settings/page.tsx

@@ -7,8 +7,8 @@ const Settings = () => {
   return (
     <div className="h-full overflow-y-auto">
       <div className="flex flex-col gap-y-0.5 px-6 pb-2 pt-3">
-        <div className="text-text-primary system-xl-semibold">{t('title')}</div>
-        <div className="text-text-tertiary system-sm-regular">{t('desc')}</div>
+        <div className="system-xl-semibold text-text-primary">{t('title')}</div>
+        <div className="system-sm-regular text-text-tertiary">{t('desc')}</div>
       </div>
       <Form />
     </div>

web/app/(humanInputLayout)/form/[token]/form.tsx

@@ -106,17 +106,17 @@ const FormContent = () => {
               <RiCheckboxCircleFill className="h-8 w-8 text-text-success" />
             </div>
             <div className="grow">
-              <div className="text-text-primary title-4xl-semi-bold">{t('humanInput.thanks', { ns: 'share' })}</div>
-              <div className="text-text-primary title-4xl-semi-bold">{t('humanInput.recorded', { ns: 'share' })}</div>
+              <div className="title-4xl-semi-bold text-text-primary">{t('humanInput.thanks', { ns: 'share' })}</div>
+              <div className="title-4xl-semi-bold text-text-primary">{t('humanInput.recorded', { ns: 'share' })}</div>
             </div>
-            <div className="shrink-0 text-text-tertiary system-2xs-regular-uppercase">{t('humanInput.submissionID', { id: token, ns: 'share' })}</div>
+            <div className="system-2xs-regular-uppercase shrink-0 text-text-tertiary">{t('humanInput.submissionID', { id: token, ns: 'share' })}</div>
           </div>
           <div className="flex flex-row-reverse px-2 py-3">
             <div className={cn(
               'flex shrink-0 items-center gap-1.5 px-1',
             )}
             >
-              <div className="text-text-tertiary system-2xs-medium-uppercase">{t('chat.poweredBy', { ns: 'share' })}</div>
+              <div className="system-2xs-medium-uppercase text-text-tertiary">{t('chat.poweredBy', { ns: 'share' })}</div>
               <DifyLogo size="small" />
             </div>
           </div>
@@ -134,17 +134,17 @@ const FormContent = () => {
               <RiInformation2Fill className="h-8 w-8 text-text-accent" />
             </div>
             <div className="grow">
-              <div className="text-text-primary title-4xl-semi-bold">{t('humanInput.sorry', { ns: 'share' })}</div>
-              <div className="text-text-primary title-4xl-semi-bold">{t('humanInput.expired', { ns: 'share' })}</div>
+              <div className="title-4xl-semi-bold text-text-primary">{t('humanInput.sorry', { ns: 'share' })}</div>
+              <div className="title-4xl-semi-bold text-text-primary">{t('humanInput.expired', { ns: 'share' })}</div>
             </div>
-            <div className="shrink-0 text-text-tertiary system-2xs-regular-uppercase">{t('humanInput.submissionID', { id: token, ns: 'share' })}</div>
+            <div className="system-2xs-regular-uppercase shrink-0 text-text-tertiary">{t('humanInput.submissionID', { id: token, ns: 'share' })}</div>
           </div>
           <div className="flex flex-row-reverse px-2 py-3">
             <div className={cn(
               'flex shrink-0 items-center gap-1.5 px-1',
             )}
             >
-              <div className="text-text-tertiary system-2xs-medium-uppercase">{t('chat.poweredBy', { ns: 'share' })}</div>
+              <div className="system-2xs-medium-uppercase text-text-tertiary">{t('chat.poweredBy', { ns: 'share' })}</div>
               <DifyLogo size="small" />
             </div>
           </div>
@@ -162,17 +162,17 @@ const FormContent = () => {
               <RiInformation2Fill className="h-8 w-8 text-text-accent" />
             </div>
             <div className="grow">
-              <div className="text-text-primary title-4xl-semi-bold">{t('humanInput.sorry', { ns: 'share' })}</div>
-              <div className="text-text-primary title-4xl-semi-bold">{t('humanInput.completed', { ns: 'share' })}</div>
+              <div className="title-4xl-semi-bold text-text-primary">{t('humanInput.sorry', { ns: 'share' })}</div>
+              <div className="title-4xl-semi-bold text-text-primary">{t('humanInput.completed', { ns: 'share' })}</div>
             </div>
-            <div className="shrink-0 text-text-tertiary system-2xs-regular-uppercase">{t('humanInput.submissionID', { id: token, ns: 'share' })}</div>
+            <div className="system-2xs-regular-uppercase shrink-0 text-text-tertiary">{t('humanInput.submissionID', { id: token, ns: 'share' })}</div>
           </div>
           <div className="flex flex-row-reverse px-2 py-3">
             <div className={cn(
               'flex shrink-0 items-center gap-1.5 px-1',
             )}
             >
-              <div className="text-text-tertiary system-2xs-medium-uppercase">{t('chat.poweredBy', { ns: 'share' })}</div>
+              <div className="system-2xs-medium-uppercase text-text-tertiary">{t('chat.poweredBy', { ns: 'share' })}</div>
               <DifyLogo size="small" />
             </div>
           </div>
@@ -190,7 +190,7 @@ const FormContent = () => {
               <RiErrorWarningFill className="h-8 w-8 text-text-destructive" />
             </div>
             <div className="grow">
-              <div className="text-text-primary title-4xl-semi-bold">{t('humanInput.rateLimitExceeded', { ns: 'share' })}</div>
+              <div className="title-4xl-semi-bold text-text-primary">{t('humanInput.rateLimitExceeded', { ns: 'share' })}</div>
             </div>
           </div>
           <div className="flex flex-row-reverse px-2 py-3">
@@ -198,7 +198,7 @@ const FormContent = () => {
               'flex shrink-0 items-center gap-1.5 px-1',
             )}
             >
-              <div className="text-text-tertiary system-2xs-medium-uppercase">{t('chat.poweredBy', { ns: 'share' })}</div>
+              <div className="system-2xs-medium-uppercase text-text-tertiary">{t('chat.poweredBy', { ns: 'share' })}</div>
               <DifyLogo size="small" />
             </div>
           </div>
@@ -216,7 +216,7 @@ const FormContent = () => {
               <RiErrorWarningFill className="h-8 w-8 text-text-destructive" />
             </div>
             <div className="grow">
-              <div className="text-text-primary title-4xl-semi-bold">{t('humanInput.formNotFound', { ns: 'share' })}</div>
+              <div className="title-4xl-semi-bold text-text-primary">{t('humanInput.formNotFound', { ns: 'share' })}</div>
             </div>
           </div>
           <div className="flex flex-row-reverse px-2 py-3">
@@ -224,7 +224,7 @@ const FormContent = () => {
               'flex shrink-0 items-center gap-1.5 px-1',
             )}
             >
-              <div className="text-text-tertiary system-2xs-medium-uppercase">{t('chat.poweredBy', { ns: 'share' })}</div>
+              <div className="system-2xs-medium-uppercase text-text-tertiary">{t('chat.poweredBy', { ns: 'share' })}</div>
               <DifyLogo size="small" />
             </div>
           </div>
@@ -245,7 +245,7 @@ const FormContent = () => {
           background={site.icon_background}
           imageUrl={site.icon_url}
         />
-        <div className="grow text-text-primary system-xl-semibold">{site.title}</div>
+        <div className="system-xl-semibold grow text-text-primary">{site.title}</div>
       </div>
       <div className="h-0 w-full grow overflow-y-auto">
         <div className="border-components-divider-subtle rounded-[20px] border bg-chat-bubble-bg p-4 shadow-lg backdrop-blur-sm">
@@ -277,7 +277,7 @@ const FormContent = () => {
             'flex shrink-0 items-center gap-1.5 px-1',
           )}
           >
-            <div className="text-text-tertiary system-2xs-medium-uppercase">{t('chat.poweredBy', { ns: 'share' })}</div>
+            <div className="system-2xs-medium-uppercase text-text-tertiary">{t('chat.poweredBy', { ns: 'share' })}</div>
             <DifyLogo size="small" />
           </div>
         </div>

web/app/(shareLayout)/components/authenticated-layout.tsx

@@ -81,7 +81,7 @@ const AuthenticatedLayout = ({ children }: { children: React.ReactNode }) => {
     return (
       <div className="flex h-full flex-col items-center justify-center gap-y-2">
         <AppUnavailable className="h-auto w-auto" code={403} unknownReason="no permission." />
-        <span className="cursor-pointer text-text-tertiary system-sm-regular" onClick={backToHome}>{t('userProfile.logout', { ns: 'common' })}</span>
+        <span className="system-sm-regular cursor-pointer text-text-tertiary" onClick={backToHome}>{t('userProfile.logout', { ns: 'common' })}</span>
       </div>
     )
   }

web/app/(shareLayout)/components/splash.tsx

@@ -95,7 +95,7 @@ const Splash: FC<PropsWithChildren> = ({ children }) => {
     return (
       <div className="flex h-full flex-col items-center justify-center gap-y-4">
         <AppUnavailable className="h-auto w-auto" code={code || t('common.appUnavailable', { ns: 'share' })} unknownReason={message} />
-        <span className="cursor-pointer text-text-tertiary system-sm-regular" onClick={backToHome}>{code === '403' ? t('userProfile.logout', { ns: 'common' }) : t('login.backToHome', { ns: 'share' })}</span>
+        <span className="system-sm-regular cursor-pointer text-text-tertiary" onClick={backToHome}>{code === '403' ? t('userProfile.logout', { ns: 'common' }) : t('login.backToHome', { ns: 'share' })}</span>
       </div>
     )
   }

web/app/(shareLayout)/webapp-reset-password/check-code/page.tsx

@@ -63,8 +63,8 @@ export default function CheckCode() {
         <RiMailSendFill className="h-6 w-6 text-2xl" />
       </div>
       <div className="pb-4 pt-2">
-        <h2 className="text-text-primary title-4xl-semi-bold">{t('checkCode.checkYourEmail', { ns: 'login' })}</h2>
-        <p className="mt-2 text-text-secondary body-md-regular">
+        <h2 className="title-4xl-semi-bold text-text-primary">{t('checkCode.checkYourEmail', { ns: 'login' })}</h2>
+        <p className="body-md-regular mt-2 text-text-secondary">
           <span>
             {t('checkCode.tipsPrefix', { ns: 'login' })}
             <strong>{email}</strong>
@@ -76,7 +76,7 @@ export default function CheckCode() {
 
       <form action="">
         <input type="text" className="hidden" />
-        <label htmlFor="code" className="mb-1 text-text-secondary system-md-semibold">{t('checkCode.verificationCode', { ns: 'login' })}</label>
+        <label htmlFor="code" className="system-md-semibold mb-1 text-text-secondary">{t('checkCode.verificationCode', { ns: 'login' })}</label>
         <Input value={code} onChange={e => setVerifyCode(e.target.value)} maxLength={6} className="mt-1" placeholder={t('checkCode.verificationCodePlaceholder', { ns: 'login' }) || ''} />
         <Button loading={loading} disabled={loading} className="my-3 w-full" variant="primary" onClick={verify}>{t('checkCode.verify', { ns: 'login' })}</Button>
         <Countdown onResend={resendCode} />
@@ -88,7 +88,7 @@ export default function CheckCode() {
         <div className="bg-background-default-dimm inline-block rounded-full p-1">
           <RiArrowLeftLine size={12} />
         </div>
-        <span className="ml-2 system-xs-regular">{t('back', { ns: 'login' })}</span>
+        <span className="system-xs-regular ml-2">{t('back', { ns: 'login' })}</span>
       </div>
     </div>
   )

web/app/(shareLayout)/webapp-reset-password/layout.tsx

@@ -24,7 +24,7 @@ export default function SignInLayout({ children }: any) {
             </div>
           </div>
           {!systemFeatures.branding.enabled && (
-            <div className="px-8 py-6 text-text-tertiary system-xs-regular">
+            <div className="system-xs-regular px-8 py-6 text-text-tertiary">
               ©
               {' '}
               {new Date().getFullYear()}

web/app/(shareLayout)/webapp-reset-password/page.tsx

@@ -65,8 +65,8 @@ export default function CheckCode() {
         <RiLockPasswordLine className="h-6 w-6 text-2xl text-text-accent-light-mode-only" />
       </div>
       <div className="pb-4 pt-2">
-        <h2 className="text-text-primary title-4xl-semi-bold">{t('resetPassword', { ns: 'login' })}</h2>
-        <p className="mt-2 text-text-secondary body-md-regular">
+        <h2 className="title-4xl-semi-bold text-text-primary">{t('resetPassword', { ns: 'login' })}</h2>
+        <p className="body-md-regular mt-2 text-text-secondary">
           {t('resetPasswordDesc', { ns: 'login' })}
         </p>
       </div>
@@ -74,7 +74,7 @@ export default function CheckCode() {
       <form onSubmit={noop}>
         <input type="text" className="hidden" />
         <div className="mb-2">
-          <label htmlFor="email" className="my-2 text-text-secondary system-md-semibold">{t('email', { ns: 'login' })}</label>
+          <label htmlFor="email" className="system-md-semibold my-2 text-text-secondary">{t('email', { ns: 'login' })}</label>
           <div className="mt-1">
             <Input id="email" type="email" disabled={loading} value={email} placeholder={t('emailPlaceholder', { ns: 'login' }) as string} onChange={e => setEmail(e.target.value)} />
           </div>
@@ -90,7 +90,7 @@ export default function CheckCode() {
         <div className="inline-block rounded-full bg-background-default-dimmed p-1">
           <RiArrowLeftLine size={12} />
         </div>
-        <span className="ml-2 system-xs-regular">{t('backToLogin', { ns: 'login' })}</span>
+        <span className="system-xs-regular ml-2">{t('backToLogin', { ns: 'login' })}</span>
       </Link>
     </div>
   )

web/app/(shareLayout)/webapp-reset-password/set-password/page.tsx

@@ -88,10 +88,10 @@ const ChangePasswordForm = () => {
       {!showSuccess && (
         <div className="flex flex-col md:w-[400px]">
           <div className="mx-auto w-full">
-            <h2 className="text-text-primary title-4xl-semi-bold">
+            <h2 className="title-4xl-semi-bold text-text-primary">
               {t('changePassword', { ns: 'login' })}
             </h2>
-            <p className="mt-2 text-text-secondary body-md-regular">
+            <p className="body-md-regular mt-2 text-text-secondary">
               {t('changePasswordTip', { ns: 'login' })}
             </p>
           </div>
@@ -100,7 +100,7 @@ const ChangePasswordForm = () => {
             <div className="bg-white">
               {/* Password */}
               <div className="mb-5">
-                <label htmlFor="password" className="my-2 text-text-secondary system-md-semibold">
+                <label htmlFor="password" className="system-md-semibold my-2 text-text-secondary">
                   {t('account.newPassword', { ns: 'common' })}
                 </label>
                 <div className="relative mt-1">
@@ -122,11 +122,11 @@ const ChangePasswordForm = () => {
                     </Button>
                   </div>
                 </div>
-                <div className="mt-1 text-text-secondary body-xs-regular">{t('error.passwordInvalid', { ns: 'login' })}</div>
+                <div className="body-xs-regular mt-1 text-text-secondary">{t('error.passwordInvalid', { ns: 'login' })}</div>
               </div>
               {/* Confirm Password */}
               <div className="mb-5">
-                <label htmlFor="confirmPassword" className="my-2 text-text-secondary system-md-semibold">
+                <label htmlFor="confirmPassword" className="system-md-semibold my-2 text-text-secondary">
                   {t('account.confirmPassword', { ns: 'common' })}
                 </label>
                 <div className="relative mt-1">
@@ -167,7 +167,7 @@ const ChangePasswordForm = () => {
             <div className="mb-3 flex h-14 w-14 items-center justify-center rounded-2xl border border-components-panel-border-subtle font-bold shadow-lg">
               <RiCheckboxCircleFill className="h-6 w-6 text-text-success" />
             </div>
-            <h2 className="text-text-primary title-4xl-semi-bold">
+            <h2 className="title-4xl-semi-bold text-text-primary">
               {t('passwordChangedTip', { ns: 'login' })}
             </h2>
           </div>

web/app/(shareLayout)/webapp-signin/check-code/page.tsx

@@ -101,8 +101,8 @@ export default function CheckCode() {
         <RiMailSendFill className="h-6 w-6 text-2xl text-text-accent-light-mode-only" />
       </div>
       <div className="pb-4 pt-2">
-        <h2 className="text-text-primary title-4xl-semi-bold">{t('checkCode.checkYourEmail', { ns: 'login' })}</h2>
-        <p className="mt-2 text-text-secondary body-md-regular">
+        <h2 className="title-4xl-semi-bold text-text-primary">{t('checkCode.checkYourEmail', { ns: 'login' })}</h2>
+        <p className="body-md-regular mt-2 text-text-secondary">
           <span>
             {t('checkCode.tipsPrefix', { ns: 'login' })}
             <strong>{email}</strong>
@@ -113,7 +113,7 @@ export default function CheckCode() {
       </div>
 
       <form onSubmit={handleSubmit}>
-        <label htmlFor="code" className="mb-1 text-text-secondary system-md-semibold">{t('checkCode.verificationCode', { ns: 'login' })}</label>
+        <label htmlFor="code" className="system-md-semibold mb-1 text-text-secondary">{t('checkCode.verificationCode', { ns: 'login' })}</label>
         <Input
           ref={codeInputRef}
           id="code"
@@ -133,7 +133,7 @@ export default function CheckCode() {
         <div className="bg-background-default-dimm inline-block rounded-full p-1">
           <RiArrowLeftLine size={12} />
         </div>
-        <span className="ml-2 system-xs-regular">{t('back', { ns: 'login' })}</span>
+        <span className="system-xs-regular ml-2">{t('back', { ns: 'login' })}</span>
       </div>
     </div>
   )

web/app/(shareLayout)/webapp-signin/components/mail-and-code-auth.tsx

@@ -52,7 +52,7 @@ export default function MailAndCodeAuth() {
     <form onSubmit={noop}>
       <input type="text" className="hidden" />
       <div className="mb-2">
-        <label htmlFor="email" className="my-2 text-text-secondary system-md-semibold">{t('email', { ns: 'login' })}</label>
+        <label htmlFor="email" className="system-md-semibold my-2 text-text-secondary">{t('email', { ns: 'login' })}</label>
         <div className="mt-1">
           <Input id="email" type="email" value={email} placeholder={t('emailPlaceholder', { ns: 'login' }) as string} onChange={e => setEmail(e.target.value)} />
         </div>

web/app/(shareLayout)/webapp-signin/components/mail-and-password-auth.tsx

@@ -103,7 +103,7 @@ export default function MailAndPasswordAuth({ isEmailSetup }: MailAndPasswordAut
   return (
     <form onSubmit={noop}>
       <div className="mb-3">
-        <label htmlFor="email" className="my-2 text-text-secondary system-md-semibold">
+        <label htmlFor="email" className="system-md-semibold my-2 text-text-secondary">
           {t('email', { ns: 'login' })}
         </label>
         <div className="mt-1">
@@ -121,7 +121,7 @@ export default function MailAndPasswordAuth({ isEmailSetup }: MailAndPasswordAut
 
       <div className="mb-3">
         <label htmlFor="password" className="my-2 flex items-center justify-between">
-          <span className="text-text-secondary system-md-semibold">{t('password', { ns: 'login' })}</span>
+          <span className="system-md-semibold text-text-secondary">{t('password', { ns: 'login' })}</span>
           <Link
             href={`/webapp-reset-password?${searchParams.toString()}`}
             className={`system-xs-regular ${isEmailSetup ? 'text-components-button-secondary-accent-text' : 'pointer-events-none text-components-button-secondary-accent-text-disabled'}`}

web/app/(shareLayout)/webapp-signin/layout.tsx

@@ -21,7 +21,7 @@ export default function SignInLayout({ children }: PropsWithChildren) {
             </div>
           </div>
           {systemFeatures.branding.enabled === false && (
-            <div className="px-8 py-6 text-text-tertiary system-xs-regular">
+            <div className="system-xs-regular px-8 py-6 text-text-tertiary">
               ©
               {' '}
               {new Date().getFullYear()}

web/app/(shareLayout)/webapp-signin/normalForm.tsx

@@ -60,8 +60,8 @@ const NormalForm = () => {
               <RiContractLine className="h-5 w-5" />
               <RiErrorWarningFill className="absolute -right-1 -top-1 h-4 w-4 text-text-warning-secondary" />
             </div>
-            <p className="text-text-primary system-sm-medium">{t('licenseLost', { ns: 'login' })}</p>
-            <p className="mt-1 text-text-tertiary system-xs-regular">{t('licenseLostTip', { ns: 'login' })}</p>
+            <p className="system-sm-medium text-text-primary">{t('licenseLost', { ns: 'login' })}</p>
+            <p className="system-xs-regular mt-1 text-text-tertiary">{t('licenseLostTip', { ns: 'login' })}</p>
           </div>
         </div>
       </div>
@@ -76,8 +76,8 @@ const NormalForm = () => {
               <RiContractLine className="h-5 w-5" />
               <RiErrorWarningFill className="absolute -right-1 -top-1 h-4 w-4 text-text-warning-secondary" />
             </div>
-            <p className="text-text-primary system-sm-medium">{t('licenseExpired', { ns: 'login' })}</p>
-            <p className="mt-1 text-text-tertiary system-xs-regular">{t('licenseExpiredTip', { ns: 'login' })}</p>
+            <p className="system-sm-medium text-text-primary">{t('licenseExpired', { ns: 'login' })}</p>
+            <p className="system-xs-regular mt-1 text-text-tertiary">{t('licenseExpiredTip', { ns: 'login' })}</p>
           </div>
         </div>
       </div>
@@ -92,8 +92,8 @@ const NormalForm = () => {
               <RiContractLine className="h-5 w-5" />
               <RiErrorWarningFill className="absolute -right-1 -top-1 h-4 w-4 text-text-warning-secondary" />
             </div>
-            <p className="text-text-primary system-sm-medium">{t('licenseInactive', { ns: 'login' })}</p>
-            <p className="mt-1 text-text-tertiary system-xs-regular">{t('licenseInactiveTip', { ns: 'login' })}</p>
+            <p className="system-sm-medium text-text-primary">{t('licenseInactive', { ns: 'login' })}</p>
+            <p className="system-xs-regular mt-1 text-text-tertiary">{t('licenseInactiveTip', { ns: 'login' })}</p>
           </div>
         </div>
       </div>
@@ -104,8 +104,8 @@ const NormalForm = () => {
     <>
       <div className="mx-auto mt-8 w-full">
         <div className="mx-auto w-full">
-          <h2 className="text-text-primary title-4xl-semi-bold">{systemFeatures.branding.enabled ? t('pageTitleForE', { ns: 'login' }) : t('pageTitle', { ns: 'login' })}</h2>
-          <p className="mt-2 text-text-tertiary body-md-regular">{t('welcome', { ns: 'login' })}</p>
+          <h2 className="title-4xl-semi-bold text-text-primary">{systemFeatures.branding.enabled ? t('pageTitleForE', { ns: 'login' }) : t('pageTitle', { ns: 'login' })}</h2>
+          <p className="body-md-regular mt-2 text-text-tertiary">{t('welcome', { ns: 'login' })}</p>
         </div>
         <div className="relative">
           <div className="mt-6 flex flex-col gap-3">
@@ -122,7 +122,7 @@ const NormalForm = () => {
                 <div className="h-px w-full bg-gradient-to-r from-background-gradient-mask-transparent via-divider-regular to-background-gradient-mask-transparent"></div>
               </div>
               <div className="relative flex justify-center">
-                <span className="px-2 text-text-tertiary system-xs-medium-uppercase">{t('or', { ns: 'login' })}</span>
+                <span className="system-xs-medium-uppercase px-2 text-text-tertiary">{t('or', { ns: 'login' })}</span>
               </div>
             </div>
           )}
@@ -134,7 +134,7 @@ const NormalForm = () => {
                     <MailAndCodeAuth />
                     {systemFeatures.enable_email_password_login && (
                       <div className="cursor-pointer py-1 text-center" onClick={() => { updateAuthType('password') }}>
-                        <span className="text-components-button-secondary-accent-text system-xs-medium">{t('usePassword', { ns: 'login' })}</span>
+                        <span className="system-xs-medium text-components-button-secondary-accent-text">{t('usePassword', { ns: 'login' })}</span>
                       </div>
                     )}
                   </>
@@ -144,7 +144,7 @@ const NormalForm = () => {
                     <MailAndPasswordAuth isEmailSetup={systemFeatures.is_email_setup} />
                     {systemFeatures.enable_email_code_login && (
                       <div className="cursor-pointer py-1 text-center" onClick={() => { updateAuthType('code') }}>
-                        <span className="text-components-button-secondary-accent-text system-xs-medium">{t('useVerificationCode', { ns: 'login' })}</span>
+                        <span className="system-xs-medium text-components-button-secondary-accent-text">{t('useVerificationCode', { ns: 'login' })}</span>
                       </div>
                     )}
                   </>
@@ -158,8 +158,8 @@ const NormalForm = () => {
                 <div className="shadows-shadow-lg mb-2 flex h-10 w-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
                   <RiDoorLockLine className="h-5 w-5" />
                 </div>
-                <p className="text-text-primary system-sm-medium">{t('noLoginMethod', { ns: 'login' })}</p>
-                <p className="mt-1 text-text-tertiary system-xs-regular">{t('noLoginMethodTip', { ns: 'login' })}</p>
+                <p className="system-sm-medium text-text-primary">{t('noLoginMethod', { ns: 'login' })}</p>
+                <p className="system-xs-regular mt-1 text-text-tertiary">{t('noLoginMethodTip', { ns: 'login' })}</p>
               </div>
               <div className="relative my-2 py-2">
                 <div className="absolute inset-0 flex items-center" aria-hidden="true">
@@ -170,11 +170,11 @@ const NormalForm = () => {
           )}
           {!systemFeatures.branding.enabled && (
             <>
-              <div className="mt-2 block w-full text-text-tertiary system-xs-regular">
+              <div className="system-xs-regular mt-2 block w-full text-text-tertiary">
                 {t('tosDesc', { ns: 'login' })}
               &nbsp;
                 <Link
-                  className="text-text-secondary system-xs-medium hover:underline"
+                  className="system-xs-medium text-text-secondary hover:underline"
                   target="_blank"
                   rel="noopener noreferrer"
                   href="https://dify.ai/terms"
@@ -183,7 +183,7 @@ const NormalForm = () => {
                 </Link>
               &nbsp;&&nbsp;
                 <Link
-                  className="text-text-secondary system-xs-medium hover:underline"
+                  className="system-xs-medium text-text-secondary hover:underline"
                   target="_blank"
                   rel="noopener noreferrer"
                   href="https://dify.ai/privacy"
@@ -192,11 +192,11 @@ const NormalForm = () => {
                 </Link>
               </div>
               {IS_CE_EDITION && (
-                <div className="w-hull mt-2 block text-text-tertiary system-xs-regular">
+                <div className="w-hull system-xs-regular mt-2 block text-text-tertiary">
                   {t('goToInit', { ns: 'login' })}
               &nbsp;
                   <Link
-                    className="text-text-secondary system-xs-medium hover:underline"
+                    className="system-xs-medium text-text-secondary hover:underline"
                     href="/install"
                   >
                     {t('setAdminAccount', { ns: 'login' })}

web/app/(shareLayout)/webapp-signin/page.tsx

@@ -45,7 +45,7 @@ const WebSSOForm: FC = () => {
   if (!systemFeatures.webapp_auth.enabled) {
     return (
       <div className="flex h-full items-center justify-center">
-        <p className="text-text-tertiary system-xs-regular">{t('webapp.disabled', { ns: 'login' })}</p>
+        <p className="system-xs-regular text-text-tertiary">{t('webapp.disabled', { ns: 'login' })}</p>
       </div>
     )
   }
@@ -63,7 +63,7 @@ const WebSSOForm: FC = () => {
   return (
     <div className="flex h-full flex-col items-center justify-center gap-y-4">
       <AppUnavailable className="h-auto w-auto" isUnknownReason={true} />
-      <span className="cursor-pointer text-text-tertiary system-sm-regular" onClick={backToHome}>{t('login.backToHome', { ns: 'share' })}</span>
+      <span className="system-sm-regular cursor-pointer text-text-tertiary" onClick={backToHome}>{t('login.backToHome', { ns: 'share' })}</span>
     </div>
   )
 }

web/app/account/(commonLayout)/avatar.tsx

@@ -77,7 +77,7 @@ export default function AppSelector() {
                   <div className="p-1">
                     <div className="flex flex-nowrap items-center px-3 py-2">
                       <div className="grow">
-                        <div className="break-all text-text-primary system-md-medium">
+                        <div className="system-md-medium break-all text-text-primary">
                           {userProfile.name}
                           {isEducationAccount && (
                             <PremiumBadge size="s" color="blue" className="ml-1 !px-2">
@@ -86,7 +86,7 @@ export default function AppSelector() {
                             </PremiumBadge>
                           )}
                         </div>
-                        <div className="break-all text-text-tertiary system-xs-regular">{userProfile.email}</div>
+                        <div className="system-xs-regular break-all text-text-tertiary">{userProfile.email}</div>
                       </div>
                       <Avatar avatar={userProfile.avatar_url} name={userProfile.name} />
                     </div>

web/app/account/(commonLayout)/delete-account/components/check-email.tsx

@@ -30,14 +30,14 @@ export default function CheckEmail(props: DeleteAccountProps) {
 
   return (
     <>
-      <div className="py-1 text-text-destructive body-md-medium">
+      <div className="body-md-medium py-1 text-text-destructive">
         {t('account.deleteTip', { ns: 'common' })}
       </div>
-      <div className="pb-2 pt-1 text-text-secondary body-md-regular">
+      <div className="body-md-regular pb-2 pt-1 text-text-secondary">
         {t('account.deletePrivacyLinkTip', { ns: 'common' })}
         <Link href="https://dify.ai/privacy" className="text-text-accent">{t('account.deletePrivacyLink', { ns: 'common' })}</Link>
       </div>
-      <label className="mb-1 mt-3 flex h-6 items-center text-text-secondary system-sm-semibold">{t('account.deleteLabel', { ns: 'common' })}</label>
+      <label className="system-sm-semibold mb-1 mt-3 flex h-6 items-center text-text-secondary">{t('account.deleteLabel', { ns: 'common' })}</label>
       <Input
         placeholder={t('account.deletePlaceholder', { ns: 'common' }) as string}
         onChange={(e) => {

web/app/account/(commonLayout)/delete-account/components/feed-back.tsx

@@ -54,7 +54,7 @@ export default function FeedBack(props: DeleteAccountProps) {
       className="max-w-[480px]"
       footer={false}
     >
-      <label className="mb-1 mt-3 flex items-center text-text-secondary system-sm-semibold">{t('account.feedbackLabel', { ns: 'common' })}</label>
+      <label className="system-sm-semibold mb-1 mt-3 flex items-center text-text-secondary">{t('account.feedbackLabel', { ns: 'common' })}</label>
       <Textarea
         rows={6}
         value={userFeedback}

web/app/account/(commonLayout)/delete-account/components/verify-email.tsx

@@ -36,14 +36,14 @@ export default function VerifyEmail(props: DeleteAccountProps) {
   }, [emailToken, verificationCode, confirmDeleteAccount, props])
   return (
     <>
-      <div className="pt-1 text-text-destructive body-md-medium">
+      <div className="body-md-medium pt-1 text-text-destructive">
         {t('account.deleteTip', { ns: 'common' })}
       </div>
-      <div className="pb-2 pt-1 text-text-secondary body-md-regular">
+      <div className="body-md-regular pb-2 pt-1 text-text-secondary">
         {t('account.deletePrivacyLinkTip', { ns: 'common' })}
         <Link href="https://dify.ai/privacy" className="text-text-accent">{t('account.deletePrivacyLink', { ns: 'common' })}</Link>
       </div>
-      <label className="mb-1 mt-3 flex h-6 items-center text-text-secondary system-sm-semibold">{t('account.verificationLabel', { ns: 'common' })}</label>
+      <label className="system-sm-semibold mb-1 mt-3 flex h-6 items-center text-text-secondary">{t('account.verificationLabel', { ns: 'common' })}</label>
       <Input
         minLength={6}
         maxLength={6}

web/app/account/(commonLayout)/header.tsx

@@ -32,10 +32,10 @@ const Header = () => {
             : <DifyLogo />}
         </div>
         <div className="h-4 w-[1px] origin-center rotate-[11.31deg] bg-divider-regular" />
-        <p className="relative mt-[-2px] text-text-primary title-3xl-semi-bold">{t('account.account', { ns: 'common' })}</p>
+        <p className="title-3xl-semi-bold relative mt-[-2px] text-text-primary">{t('account.account', { ns: 'common' })}</p>
       </div>
       <div className="flex shrink-0 items-center gap-3">
-        <Button className="gap-2 px-3 py-2 system-sm-medium" onClick={goToStudio}>
+        <Button className="system-sm-medium gap-2 px-3 py-2" onClick={goToStudio}>
           <RiRobot2Line className="h-4 w-4" />
           <p>{t('account.studio', { ns: 'common' })}</p>
           <RiArrowRightUpLine className="h-4 w-4" />

web/app/components/app/annotation/add-annotation-modal/edit-item/index.tsx

@@ -31,7 +31,7 @@ const EditItem: FC<Props> = ({
         {avatar}
       </div>
       <div className="grow">
-        <div className="mb-1 text-text-primary system-xs-semibold">{name}</div>
+        <div className="system-xs-semibold mb-1 text-text-primary">{name}</div>
         <Textarea
           value={content}
           onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) => onChange(e.target.value)}

web/app/components/app/annotation/add-annotation-modal/index.tsx

@@ -99,7 +99,7 @@ const AddAnnotationModal: FC<Props> = ({
                   <AnnotationFull />
                 </div>
               )}
-              <div className="flex h-16 items-center justify-between rounded-bl-xl rounded-br-xl border-t border-divider-subtle bg-background-section-burn px-4 text-text-tertiary system-sm-medium">
+              <div className="system-sm-medium flex h-16 items-center justify-between rounded-bl-xl rounded-br-xl border-t border-divider-subtle bg-background-section-burn px-4 text-text-tertiary">
                 <div
                   className="flex items-center space-x-2"
                 >

web/app/components/app/annotation/batch-add-annotation-modal/csv-downloader.tsx

@@ -33,7 +33,7 @@ const CSVDownload: FC = () => {
 
   return (
     <div className="mt-6">
-      <div className="text-text-primary system-sm-medium">{t('generation.csvStructureTitle', { ns: 'share' })}</div>
+      <div className="system-sm-medium text-text-primary">{t('generation.csvStructureTitle', { ns: 'share' })}</div>
       <div className="mt-2 max-h-[500px] overflow-auto">
         <table className="w-full table-fixed border-separate border-spacing-0 rounded-lg border border-divider-regular text-xs">
           <thead className="text-text-tertiary">
@@ -77,7 +77,7 @@ const CSVDownload: FC = () => {
         bom={true}
         data={getTemplate()}
       >
-        <div className="flex h-[18px] items-center space-x-1 text-text-accent system-xs-medium">
+        <div className="system-xs-medium flex h-[18px] items-center space-x-1 text-text-accent">
           <DownloadIcon className="mr-1 h-3 w-3" />
           {t('batchModal.template', { ns: 'appAnnotation' })}
         </div>

web/app/components/app/annotation/batch-add-annotation-modal/index.tsx

@@ -52,7 +52,7 @@ const BatchModal: FC<IBatchModalProps> = ({
       const res = await checkAnnotationBatchImportProgress({ jobID, appId })
       setImportStatus(res.job_status)
       if (res.job_status === ProcessStatus.WAITING || res.job_status === ProcessStatus.PROCESSING)
-        setTimeout(checkProcess, 2500, res.job_id)
+        setTimeout(() => checkProcess(res.job_id), 2500)
       if (res.job_status === ProcessStatus.ERROR)
         notify({ type: 'error', message: `${t('batchModal.runError', { ns: 'appAnnotation' })}` })
       if (res.job_status === ProcessStatus.COMPLETED) {
@@ -90,7 +90,7 @@ const BatchModal: FC<IBatchModalProps> = ({
 
   return (
     <Modal isShow={isShow} onClose={noop} className="!max-w-[520px] !rounded-xl px-8 py-6">
-      <div className="relative pb-1 text-text-primary system-xl-medium">{t('batchModal.title', { ns: 'appAnnotation' })}</div>
+      <div className="system-xl-medium relative pb-1 text-text-primary">{t('batchModal.title', { ns: 'appAnnotation' })}</div>
       <div className="absolute right-4 top-4 cursor-pointer p-2" onClick={onCancel}>
         <RiCloseLine className="h-4 w-4 text-text-tertiary" />
       </div>
@@ -107,7 +107,7 @@ const BatchModal: FC<IBatchModalProps> = ({
       )}
 
       <div className="mt-[28px] flex justify-end pt-6">
-        <Button className="mr-2 text-text-tertiary system-sm-medium" onClick={onCancel}>
+        <Button className="system-sm-medium mr-2 text-text-tertiary" onClick={onCancel}>
           {t('batchModal.cancel', { ns: 'appAnnotation' })}
         </Button>
         <Button

web/app/components/app/annotation/edit-annotation-modal/edit-item/index.tsx

@@ -21,7 +21,7 @@ type Props = {
 }
 
 export const EditTitle: FC<{ className?: string, title: string }> = ({ className, title }) => (
-  <div className={cn(className, 'flex h-[18px] items-center text-text-tertiary system-xs-medium')}>
+  <div className={cn(className, 'system-xs-medium flex h-[18px] items-center text-text-tertiary')}>
     <RiEditFill className="mr-1 h-3.5 w-3.5" />
     <div>{title}</div>
     <div
@@ -75,21 +75,21 @@ const EditItem: FC<Props> = ({
         {avatar}
       </div>
       <div className="grow">
-        <div className="mb-1 text-text-primary system-xs-semibold">{name}</div>
-        <div className="text-text-primary system-sm-regular">{content}</div>
+        <div className="system-xs-semibold mb-1 text-text-primary">{name}</div>
+        <div className="system-sm-regular text-text-primary">{content}</div>
         {!isEdit
           ? (
               <div>
                 {showNewContent && (
                   <div className="mt-3">
                     <EditTitle title={editTitle} />
-                    <div className="mt-1 text-text-primary system-sm-regular">{newContent}</div>
+                    <div className="system-sm-regular mt-1 text-text-primary">{newContent}</div>
                   </div>
                 )}
                 <div className="mt-2 flex items-center">
                   {!readonly && (
                     <div
-                      className="flex cursor-pointer items-center space-x-1 text-text-accent system-xs-medium"
+                      className="system-xs-medium flex cursor-pointer items-center space-x-1 text-text-accent"
                       onClick={() => {
                         setIsEdit(true)
                       }}
@@ -100,7 +100,7 @@ const EditItem: FC<Props> = ({
                   )}
 
                   {showNewContent && (
-                    <div className="ml-2 flex items-center text-text-tertiary system-xs-medium">
+                    <div className="system-xs-medium ml-2 flex items-center text-text-tertiary">
                       <div className="mr-2">·</div>
                       <div
                         className="flex cursor-pointer items-center space-x-1"

web/app/components/app/annotation/edit-annotation-modal/index.tsx

@@ -136,7 +136,7 @@ const EditAnnotationModal: FC<Props> = ({
             {
               annotationId
                 ? (
-                    <div className="flex h-16 items-center justify-between rounded-bl-xl rounded-br-xl border-t border-divider-subtle bg-background-section-burn px-4 text-text-tertiary system-sm-medium">
+                    <div className="system-sm-medium flex h-16 items-center justify-between rounded-bl-xl rounded-br-xl border-t border-divider-subtle bg-background-section-burn px-4 text-text-tertiary">
                       <div
                         className="flex cursor-pointer items-center space-x-2 pl-3"
                         onClick={() => setShowModal(true)}

web/app/components/app/annotation/empty-element.tsx

@@ -17,11 +17,11 @@ const EmptyElement: FC = () => {
   return (
     <div className="flex h-full items-center justify-center">
       <div className="box-border h-fit w-[560px] rounded-2xl bg-background-section-burn px-5 py-4">
-        <span className="text-text-secondary system-md-semibold">
+        <span className="system-md-semibold text-text-secondary">
           {t('noData.title', { ns: 'appAnnotation' })}
           <ThreeDotsIcon className="relative -left-1.5 -top-3 inline" />
         </span>
-        <div className="mt-2 text-text-tertiary system-sm-regular">
+        <div className="system-sm-regular mt-2 text-text-tertiary">
           {t('noData.description', { ns: 'appAnnotation' })}
         </div>
       </div>

web/app/components/app/annotation/header-opts/index.tsx

@@ -103,12 +103,12 @@ const HeaderOptions: FC<Props> = ({
           }}
         >
           <FilePlus02 className="h-4 w-4 text-text-tertiary" />
-          <span className="grow text-left text-text-secondary system-sm-regular">{t('table.header.bulkImport', { ns: 'appAnnotation' })}</span>
+          <span className="system-sm-regular grow text-left text-text-secondary">{t('table.header.bulkImport', { ns: 'appAnnotation' })}</span>
         </button>
         <Menu as="div" className="relative h-full w-full">
           <MenuButton className="mx-1 flex h-9 w-[calc(100%_-_8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50">
             <FileDownload02 className="h-4 w-4 text-text-tertiary" />
-            <span className="grow text-left text-text-secondary system-sm-regular">{t('table.header.bulkExport', { ns: 'appAnnotation' })}</span>
+            <span className="system-sm-regular grow text-left text-text-secondary">{t('table.header.bulkExport', { ns: 'appAnnotation' })}</span>
             <ChevronRight className="h-[14px] w-[14px] shrink-0 text-text-tertiary" />
           </MenuButton>
           <Transition
@@ -135,11 +135,11 @@ const HeaderOptions: FC<Props> = ({
                 ]}
               >
                 <button type="button" disabled={annotationUnavailable} className="mx-1 flex h-9 w-[calc(100%_-_8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50">
-                  <span className="grow text-left text-text-secondary system-sm-regular">CSV</span>
+                  <span className="system-sm-regular grow text-left text-text-secondary">CSV</span>
                 </button>
               </CSVDownloader>
               <button type="button" disabled={annotationUnavailable} className={cn('mx-1 flex h-9 w-[calc(100%_-_8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50', '!border-0')} onClick={JSONLOutput}>
-                <span className="grow text-left text-text-secondary system-sm-regular">JSONL</span>
+                <span className="system-sm-regular grow text-left text-text-secondary">JSONL</span>
               </button>
             </MenuItems>
           </Transition>
@@ -150,7 +150,7 @@ const HeaderOptions: FC<Props> = ({
           className="mx-1 flex h-9 w-[calc(100%_-_8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 text-red-600 hover:bg-red-50 disabled:opacity-50"
         >
           <RiDeleteBinLine className="h-4 w-4" />
-          <span className="grow text-left system-sm-regular">
+          <span className="system-sm-regular grow text-left">
             {t('table.header.clearAll', { ns: 'appAnnotation' })}
           </span>
         </button>

web/app/components/app/annotation/list.tsx

@@ -58,7 +58,7 @@ const List: FC<Props> = ({
     <>
       <div className="relative mt-2 grow overflow-x-auto">
         <table className={cn('w-full min-w-[440px] border-collapse border-0')}>
-          <thead className="text-text-tertiary system-xs-medium-uppercase">
+          <thead className="system-xs-medium-uppercase text-text-tertiary">
             <tr>
               <td className="w-12 whitespace-nowrap rounded-l-lg bg-background-section-burn px-2">
                 <Checkbox
@@ -75,7 +75,7 @@ const List: FC<Props> = ({
               <td className="w-[96px] whitespace-nowrap rounded-r-lg bg-background-section-burn py-1.5 pl-3">{t('table.header.actions', { ns: 'appAnnotation' })}</td>
             </tr>
           </thead>
-          <tbody className="text-text-secondary system-sm-regular">
+          <tbody className="system-sm-regular text-text-secondary">
             {list.map(item => (
               <tr
                 key={item.id}

web/app/components/app/annotation/view-annotation-modal/hit-history-no-data.tsx

@@ -11,7 +11,7 @@ const HitHistoryNoData: FC = () => {
       <div className="inline-block rounded-lg border border-divider-subtle p-3">
         <ClockFastForward className="h-5 w-5 text-text-tertiary" />
       </div>
-      <div className="text-text-tertiary system-sm-regular">{t('viewModal.noHitHistory', { ns: 'appAnnotation' })}</div>
+      <div className="system-sm-regular text-text-tertiary">{t('viewModal.noHitHistory', { ns: 'appAnnotation' })}</div>
     </div>
   )
 }

web/app/components/app/annotation/view-annotation-modal/index.tsx

@@ -137,7 +137,7 @@ const ViewAnnotationModal: FC<Props> = ({
     : (
         <div>
           <table className={cn('w-full min-w-[440px] border-collapse border-0')}>
-            <thead className="text-text-tertiary system-xs-medium-uppercase">
+            <thead className="system-xs-medium-uppercase text-text-tertiary">
               <tr>
                 <td className="w-5 whitespace-nowrap rounded-l-lg bg-background-section-burn pl-2 pr-1">{t('hitHistoryTable.query', { ns: 'appAnnotation' })}</td>
                 <td className="whitespace-nowrap bg-background-section-burn py-1.5 pl-3">{t('hitHistoryTable.match', { ns: 'appAnnotation' })}</td>
@@ -147,7 +147,7 @@ const ViewAnnotationModal: FC<Props> = ({
                 <td className="w-[160px] whitespace-nowrap rounded-r-lg bg-background-section-burn py-1.5 pl-3">{t('hitHistoryTable.time', { ns: 'appAnnotation' })}</td>
               </tr>
             </thead>
-            <tbody className="text-text-secondary system-sm-regular">
+            <tbody className="system-sm-regular text-text-secondary">
               {hitHistoryList.map(item => (
                 <tr
                   key={item.id}
@@ -226,7 +226,7 @@ const ViewAnnotationModal: FC<Props> = ({
         )}
         foot={id
           ? (
-              <div className="flex h-16 items-center justify-between rounded-bl-xl rounded-br-xl border-t border-divider-subtle bg-background-section-burn px-4 text-text-tertiary system-sm-medium">
+              <div className="system-sm-medium flex h-16 items-center justify-between rounded-bl-xl rounded-br-xl border-t border-divider-subtle bg-background-section-burn px-4 text-text-tertiary">
                 <div
                   className="flex cursor-pointer items-center space-x-2 pl-3"
                   onClick={() => setShowModal(true)}

web/app/components/app/app-access-control/add-member-or-group-pop.tsx

@@ -24,7 +24,7 @@ export default function AddMemberOrGroupDialog() {
   const selectedGroupsForBreadcrumb = useAccessControlStore(s => s.selectedGroupsForBreadcrumb)
   const debouncedKeyword = useDebounce(keyword, { wait: 500 })
 
-  const lastAvailableGroup = selectedGroupsForBreadcrumb.at(-1)
+  const lastAvailableGroup = selectedGroupsForBreadcrumb[selectedGroupsForBreadcrumb.length - 1]
   const { isLoading, isFetchingNextPage, fetchNextPage, data } = useSearchForWhiteListCandidates({ keyword: debouncedKeyword, groupId: lastAvailableGroup?.id, resultsPerPage: 10 }, open)
   const handleKeywordChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setKeyword(e.target.value)
@@ -76,7 +76,7 @@ export default function AddMemberOrGroupDialog() {
                     )
                   : (
                       <div className="flex h-7 items-center justify-center px-2 py-0.5">
-                        <span className="text-text-tertiary system-xs-regular">{t('accessControlDialog.operateGroupAndMember.noResult', { ns: 'app' })}</span>
+                        <span className="system-xs-regular text-text-tertiary">{t('accessControlDialog.operateGroupAndMember.noResult', { ns: 'app' })}</span>
                       </div>
                     )
           }
@@ -115,10 +115,10 @@ function SelectedGroupsBreadCrumb() {
   }, [setSelectedGroupsForBreadcrumb])
   return (
     <div className="flex h-7 items-center gap-x-0.5 px-2 py-0.5">
-      <span className={cn('text-text-tertiary system-xs-regular', selectedGroupsForBreadcrumb.length > 0 && 'cursor-pointer text-text-accent')} onClick={handleReset}>{t('accessControlDialog.operateGroupAndMember.allMembers', { ns: 'app' })}</span>
+      <span className={cn('system-xs-regular text-text-tertiary', selectedGroupsForBreadcrumb.length > 0 && 'cursor-pointer text-text-accent')} onClick={handleReset}>{t('accessControlDialog.operateGroupAndMember.allMembers', { ns: 'app' })}</span>
       {selectedGroupsForBreadcrumb.map((group, index) => {
         return (
-          <div key={index} className="flex items-center gap-x-0.5 text-text-tertiary system-xs-regular">
+          <div key={index} className="system-xs-regular flex items-center gap-x-0.5 text-text-tertiary">
             <span>/</span>
             <span className={index === selectedGroupsForBreadcrumb.length - 1 ? '' : 'cursor-pointer text-text-accent'} onClick={() => handleBreadCrumbClick(index)}>{group.name}</span>
           </div>
@@ -161,8 +161,8 @@ function GroupItem({ group }: GroupItemProps) {
             <RiOrganizationChart className="h-[14px] w-[14px] text-components-avatar-shape-fill-stop-0" />
           </div>
         </div>
-        <p className="mr-1 text-text-secondary system-sm-medium">{group.name}</p>
-        <p className="text-text-tertiary system-xs-regular">{group.groupSize}</p>
+        <p className="system-sm-medium mr-1 text-text-secondary">{group.name}</p>
+        <p className="system-xs-regular text-text-tertiary">{group.groupSize}</p>
       </div>
       <Button
         size="small"
@@ -206,16 +206,16 @@ function MemberItem({ member }: MemberItemProps) {
             <Avatar size="xxs" avatar={null} name={member.name} />
           </div>
         </div>
-        <p className="mr-1 text-text-secondary system-sm-medium">{member.name}</p>
+        <p className="system-sm-medium mr-1 text-text-secondary">{member.name}</p>
         {currentUser.email === member.email && (
-          <p className="text-text-tertiary system-xs-regular">
+          <p className="system-xs-regular text-text-tertiary">
             (
             {t('you', { ns: 'common' })}
             )
           </p>
         )}
       </div>
-      <p className="text-text-quaternary system-xs-regular">{member.email}</p>
+      <p className="system-xs-regular text-text-quaternary">{member.email}</p>
     </BaseItem>
   )
 }

web/app/components/app/app-access-control/index.tsx

@@ -68,18 +68,18 @@ export default function AccessControl(props: AccessControlProps) {
     <AccessControlDialog show onClose={onClose}>
       <div className="flex flex-col gap-y-3">
         <div className="pb-3 pl-6 pr-14 pt-6">
-          <DialogTitle className="text-text-primary title-2xl-semi-bold">{t('accessControlDialog.title', { ns: 'app' })}</DialogTitle>
-          <DialogDescription className="mt-1 text-text-tertiary system-xs-regular">{t('accessControlDialog.description', { ns: 'app' })}</DialogDescription>
+          <DialogTitle className="title-2xl-semi-bold text-text-primary">{t('accessControlDialog.title', { ns: 'app' })}</DialogTitle>
+          <DialogDescription className="system-xs-regular mt-1 text-text-tertiary">{t('accessControlDialog.description', { ns: 'app' })}</DialogDescription>
         </div>
         <div className="flex flex-col gap-y-1 px-6 pb-3">
           <div className="leading-6">
-            <p className="text-text-tertiary system-sm-medium">{t('accessControlDialog.accessLabel', { ns: 'app' })}</p>
+            <p className="system-sm-medium text-text-tertiary">{t('accessControlDialog.accessLabel', { ns: 'app' })}</p>
           </div>
           <AccessControlItem type={AccessMode.ORGANIZATION}>
             <div className="flex items-center p-3">
               <div className="flex grow items-center gap-x-2">
                 <RiBuildingLine className="h-4 w-4 text-text-primary" />
-                <p className="text-text-primary system-sm-medium">{t('accessControlDialog.accessItems.organization', { ns: 'app' })}</p>
+                <p className="system-sm-medium text-text-primary">{t('accessControlDialog.accessItems.organization', { ns: 'app' })}</p>
               </div>
             </div>
           </AccessControlItem>
@@ -90,7 +90,7 @@ export default function AccessControl(props: AccessControlProps) {
             <div className="flex items-center p-3">
               <div className="flex grow items-center gap-x-2">
                 <RiVerifiedBadgeLine className="h-4 w-4 text-text-primary" />
-                <p className="text-text-primary system-sm-medium">{t('accessControlDialog.accessItems.external', { ns: 'app' })}</p>
+                <p className="system-sm-medium text-text-primary">{t('accessControlDialog.accessItems.external', { ns: 'app' })}</p>
               </div>
               {!hideTip && <WebAppSSONotEnabledTip />}
             </div>
@@ -98,7 +98,7 @@ export default function AccessControl(props: AccessControlProps) {
           <AccessControlItem type={AccessMode.PUBLIC}>
             <div className="flex items-center gap-x-2 p-3">
               <RiGlobalLine className="h-4 w-4 text-text-primary" />
-              <p className="text-text-primary system-sm-medium">{t('accessControlDialog.accessItems.anyone', { ns: 'app' })}</p>
+              <p className="system-sm-medium text-text-primary">{t('accessControlDialog.accessItems.anyone', { ns: 'app' })}</p>
             </div>
           </AccessControlItem>
         </div>