Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

refactor(models): migrate app and conversation models to TypeBase (#40814)

Asuka Minatoee98bdd5b5c2
diff --git a/api/controllers/inner_api/plugin/wraps.py b/api/controllers/inner_api/plugin/wraps.py
index 7371bad01bd..a456ffdd0f1 100644
--- a/api/controllers/inner_api/plugin/wraps.py
+++ b/api/controllers/inner_api/plugin/wraps.py
@@ -79,7 +79,7 @@ def get_user(tenant_id: str, user_id: str | None) -> EndUser:
user_model = EndUser(
tenant_id=tenant_id,
type=EndUserType.SERVICE_API,
- is_anonymous=is_anonymous,
+ _is_anonymous=is_anonymous,
session_id=user_id,
)
session.add(user_model)
diff --git a/api/controllers/service_api/wraps.py b/api/controllers/service_api/wraps.py
index 2e5d02b6016..d20c9969e61 100644
--- a/api/controllers/service_api/wraps.py
+++ b/api/controllers/service_api/wraps.py
@@ -306,6 +306,8 @@ def cloud_edition_billing_rate_limit_check[**P, R](
@wraps(view)
def decorated(*args: P.args, **kwargs: P.kwargs):
api_token = validate_and_get_api_token(api_token_type)
+ if api_token.tenant_id is None:
+ raise Forbidden("API token is not associated with a workspace")
if resource == "knowledge":
check_knowledge_rate_limit(api_token)
diff --git a/api/core/app/apps/message_based_app_generator.py b/api/core/app/apps/message_based_app_generator.py
index 36a9d9c0647..cfc0d8e7d4f 100644
--- a/api/core/app/apps/message_based_app_generator.py
+++ b/api/core/app/apps/message_based_app_generator.py
@@ -1,6 +1,7 @@
import json
import logging
from collections.abc import Callable, Generator, Mapping
+from decimal import Decimal
from typing import cast
from sqlalchemy import select
@@ -34,7 +35,15 @@ from extensions.ext_redis import get_pubsub_broadcast_channel
from libs.broadcast_channel.channel import SupportsPreparedSubscription, Topic
from libs.datetime_utils import naive_utc_now
from models import Account
-from models.enums import ConversationFromSource, CreatorUserRole, MessageFileBelongsTo
+from models.enums import (
+ ConversationFromSource,
+ ConversationStatus,
+ CreatorUserRole,
+ MessageFileBelongsTo,
+)
+from models.enums import (
+ InvokeFrom as ModelInvokeFrom,
+)
from models.model import App, AppMode, AppModelConfig, Conversation, EndUser, Message, MessageFile
from services.errors.app_model_config import AppModelConfigBrokenError
from services.errors.conversation import ConversationNotExistsError
@@ -172,14 +181,14 @@ class MessageBasedAppGenerator(BaseAppGenerator):
model_provider=model_provider,
model_id=model_id,
override_model_configs=json.dumps(override_model_configs) if override_model_configs else None,
- mode=app_config.app_mode.value,
+ mode=AppMode(app_config.app_mode.value),
name=conversation_name,
- inputs=application_generate_entity.inputs,
+ _inputs=dict(application_generate_entity.inputs),
introduction=introduction,
system_instruction="",
system_instruction_tokens=0,
- status="normal",
- invoke_from=application_generate_entity.invoke_from.value,
+ status=ConversationStatus.NORMAL,
+ invoke_from=ModelInvokeFrom(application_generate_entity.invoke_from.value),
from_source=from_source,
from_end_user_id=end_user_id,
from_account_id=account_id,
@@ -197,21 +206,21 @@ class MessageBasedAppGenerator(BaseAppGenerator):
model_id=model_id,
override_model_configs=json.dumps(override_model_configs) if override_model_configs else None,
conversation_id=conversation.id,
- inputs=application_generate_entity.inputs,
+ _inputs=dict(application_generate_entity.inputs),
query=application_generate_entity.query,
message="",
message_tokens=0,
- message_unit_price=0,
- message_price_unit=0,
+ message_unit_price=Decimal(0),
+ message_price_unit=Decimal(0),
answer="",
answer_tokens=0,
- answer_unit_price=0,
- answer_price_unit=0,
+ answer_unit_price=Decimal(0),
+ answer_price_unit=Decimal(0),
parent_message_id=getattr(application_generate_entity, "parent_message_id", None),
provider_response_latency=0,
- total_price=0,
+ total_price=Decimal(0),
currency="USD",
- invoke_from=application_generate_entity.invoke_from.value,
+ invoke_from=ModelInvokeFrom(application_generate_entity.invoke_from.value),
from_source=from_source,
from_end_user_id=end_user_id,
from_account_id=account_id,
diff --git a/api/core/ops/ops_trace_manager.py b/api/core/ops/ops_trace_manager.py
index 742a8dabf47..2814b11e357 100644
--- a/api/core/ops/ops_trace_manager.py
+++ b/api/core/ops/ops_trace_manager.py
@@ -569,8 +569,8 @@ class OpsTraceManager:
return tracing_instance
@classmethod
- def get_app_config_through_message_id(cls, message_id: str):
- app_model_config = None
+ def get_app_config_through_message_id(cls, message_id: str) -> AppModelConfig | str | None:
+ app_model_config: AppModelConfig | str | None = None
message_stmt = select(Message).where(Message.id == message_id)
message_data = db.session.scalar(message_stmt)
if not message_data:
diff --git a/api/models/model.py b/api/models/model.py
index 96fa8282b37..f68d07ea050 100644
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -5,6 +5,7 @@ import json
import re
import uuid
from collections.abc import Callable, Mapping, Sequence
+from dataclasses import field
from datetime import datetime
from decimal import Decimal
from enum import StrEnum, auto
@@ -16,7 +17,7 @@ import sqlalchemy as sa
from flask import request
from flask_login import UserMixin # type: ignore[import-untyped]
from sqlalchemy import BigInteger, Float, Index, PrimaryKeyConstraint, String, exists, func, select, text
-from sqlalchemy.orm import Mapped, Session, mapped_column, scoped_session, validates
+from sqlalchemy.orm import Mapped, Session, mapped_column, relationship, scoped_session, validates
from configs import dify_config
from constants import DEFAULT_FILE_NUMBER_LIMITS
@@ -420,7 +421,7 @@ class IconType(StrEnum):
LINK = auto()
-class App(Base):
+class App(TypeBase):
__tablename__ = "apps"
__table_args__ = (
sa.PrimaryKeyConstraint("id", name="app_pkey"),
@@ -428,40 +429,51 @@ class App(Base):
sa.Index("app_tenant_maintainer_idx", "tenant_id", "maintainer"),
)
- if TYPE_CHECKING:
- # Response-only attributes attached by app list/detail enrichers.
- access_mode: str | None
- has_draft_trigger: bool
- is_starred: bool
+ # Response-only attributes attached by app list/detail enrichers.
+ access_mode: str | None = field(default=None, init=False)
+ has_draft_trigger: bool = field(default=False, init=False)
+ is_starred: bool = field(default=False, init=False)
- id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
- tenant_id: Mapped[str] = mapped_column(StringUUID)
- name: Mapped[str] = mapped_column(String(255))
- description: Mapped[str] = mapped_column(LongText, default=sa.text("''"))
- mode: Mapped[AppMode] = mapped_column(EnumText(AppMode, length=255))
- icon_type: Mapped[IconType | None] = mapped_column(EnumText(IconType, length=255))
- icon = mapped_column(String(255))
- icon_background: Mapped[str | None] = mapped_column(String(255))
- app_model_config_id = mapped_column(StringUUID, nullable=True)
- workflow_id = mapped_column(StringUUID, nullable=True)
+ tenant_id: Mapped[str] = mapped_column(StringUUID, default=None)
+ name: Mapped[str] = mapped_column(String(255), default=None)
+ mode: Mapped[AppMode] = mapped_column(EnumText(AppMode, length=255), default=None)
+ enable_site: Mapped[bool] = mapped_column(sa.Boolean, default=None)
+ enable_api: Mapped[bool] = mapped_column(sa.Boolean, default=None)
+ id: Mapped[str] = mapped_column(
+ StringUUID,
+ insert_default=lambda: str(uuid4()),
+ default_factory=lambda: str(uuid4()),
+ )
+ description: Mapped[str] = mapped_column(LongText, insert_default=sa.text("''"), default="")
+ icon_type: Mapped[IconType | None] = mapped_column(EnumText(IconType, length=255), default=None)
+ icon: Mapped[str | None] = mapped_column(String(255), default=None)
+ icon_background: Mapped[str | None] = mapped_column(String(255), default=None)
+ app_model_config_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
+ workflow_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
status: Mapped[AppStatus] = mapped_column(EnumText(AppStatus, length=255), default=AppStatus.NORMAL)
- enable_site: Mapped[bool] = mapped_column(sa.Boolean)
- enable_api: Mapped[bool] = mapped_column(sa.Boolean)
- api_rpm: Mapped[int] = mapped_column(sa.Integer, server_default=sa.text("0"))
- api_rph: Mapped[int] = mapped_column(sa.Integer, server_default=sa.text("0"))
- is_demo: Mapped[bool] = mapped_column(sa.Boolean, server_default=sa.false())
- is_public: Mapped[bool] = mapped_column(sa.Boolean, server_default=sa.false())
- is_universal: Mapped[bool] = mapped_column(sa.Boolean, server_default=sa.false())
- tracing = mapped_column(LongText, nullable=True)
- max_active_requests: Mapped[int | None]
- created_by = mapped_column(StringUUID, nullable=True)
- maintainer: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
- created_at = mapped_column(sa.DateTime, nullable=False, server_default=func.current_timestamp())
- updated_by = mapped_column(StringUUID, nullable=True)
+ api_rpm: Mapped[int] = mapped_column(sa.Integer, server_default=sa.text("0"), default=0)
+ api_rph: Mapped[int] = mapped_column(sa.Integer, server_default=sa.text("0"), default=0)
+ is_demo: Mapped[bool] = mapped_column(sa.Boolean, server_default=sa.false(), default=False)
+ is_public: Mapped[bool] = mapped_column(sa.Boolean, server_default=sa.false(), default=False)
+ is_universal: Mapped[bool] = mapped_column(sa.Boolean, server_default=sa.false(), default=False)
+ tracing: Mapped[str | None] = mapped_column(LongText, nullable=True, default=None)
+ max_active_requests: Mapped[int | None] = mapped_column(nullable=True, default=None)
+ created_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
+ maintainer: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
+ created_at: Mapped[datetime] = mapped_column(
+ sa.DateTime, nullable=False, server_default=func.current_timestamp(), init=False
+ )
+ updated_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
updated_at: Mapped[datetime] = mapped_column(
- sa.DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
+ sa.DateTime,
+ nullable=False,
+ server_default=func.current_timestamp(),
+ onupdate=func.current_timestamp(),
+ init=False,
+ )
+ use_icon_as_answer_icon: Mapped[bool] = mapped_column(
+ sa.Boolean, nullable=False, server_default=sa.false(), default=False
)
- use_icon_as_answer_icon: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=sa.false())
def desc_or_prompt_with_session(self, *, session: Session) -> str:
if self.description:
@@ -705,7 +717,7 @@ class App(Base):
return None
-class AppStar(Base):
+class AppStar(TypeBase):
"""Account-scoped star marker for apps in a workspace."""
__tablename__ = "app_stars"
@@ -716,11 +728,17 @@ class AppStar(Base):
sa.Index("app_star_app_idx", "app_id"),
)
- id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuidv7()))
- tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
- app_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
- account_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
- created_at: Mapped[datetime] = mapped_column(sa.DateTime, nullable=False, server_default=func.current_timestamp())
+ tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False, default=None)
+ app_id: Mapped[str] = mapped_column(StringUUID, nullable=False, default=None)
+ account_id: Mapped[str] = mapped_column(StringUUID, nullable=False, default=None)
+ id: Mapped[str] = mapped_column(
+ StringUUID,
+ insert_default=lambda: str(uuidv7()),
+ default_factory=lambda: str(uuidv7()),
+ )
+ created_at: Mapped[datetime] = mapped_column(
+ sa.DateTime, nullable=False, server_default=func.current_timestamp(), init=False
+ )
@override
def __repr__(self) -> str:
@@ -1109,7 +1127,7 @@ class OAuthProviderApp(TypeBase):
)
-class Conversation(Base):
+class Conversation(TypeBase):
"""Conversation state, including the exact Agent participant when applicable.
``agent_workspace_binding_id`` is a logical pointer rather than a foreign
@@ -1141,20 +1159,29 @@ class Conversation(Base):
),
)
- id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
- app_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
- app_model_config_id = mapped_column(StringUUID, nullable=True)
- agent_workspace_binding_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
- model_provider = mapped_column(String(255), nullable=True)
- override_model_configs = mapped_column(LongText)
- model_id = mapped_column(String(255), nullable=True)
- mode: Mapped[AppMode] = mapped_column(EnumText(AppMode, length=255))
- name: Mapped[str] = mapped_column(String(255), nullable=False)
- summary = mapped_column(LongText)
- _inputs: Mapped[dict[str, Any]] = mapped_column("inputs", sa.JSON)
- introduction: Mapped[str | None] = mapped_column(LongText, nullable=True)
- system_instruction: Mapped[str | None] = mapped_column(LongText, nullable=True)
- system_instruction_tokens: Mapped[int] = mapped_column(sa.Integer, nullable=False, server_default=sa.text("0"))
+ app_id: Mapped[str] = mapped_column(StringUUID, nullable=False, default=None)
+ mode: Mapped[AppMode] = mapped_column(EnumText(AppMode, length=255), default=None)
+ name: Mapped[str] = mapped_column(String(255), nullable=False, default=None)
+ from_source: Mapped[ConversationFromSource] = mapped_column(
+ EnumText(ConversationFromSource, length=255), nullable=False, default=None
+ )
+ id: Mapped[str] = mapped_column(
+ StringUUID,
+ insert_default=lambda: str(uuid4()),
+ default_factory=lambda: str(uuid4()),
+ )
+ _inputs: Mapped[dict[str, Any]] = mapped_column("inputs", sa.JSON, default_factory=dict)
+ app_model_config_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
+ agent_workspace_binding_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
+ model_provider: Mapped[str | None] = mapped_column(String(255), nullable=True, default=None)
+ override_model_configs: Mapped[str | None] = mapped_column(LongText, default=None)
+ model_id: Mapped[str | None] = mapped_column(String(255), nullable=True, default=None)
+ summary: Mapped[str | None] = mapped_column(LongText, default=None)
+ introduction: Mapped[str | None] = mapped_column(LongText, default=None)
+ system_instruction: Mapped[str | None] = mapped_column(LongText, default=None)
+ system_instruction_tokens: Mapped[int] = mapped_column(
+ sa.Integer, nullable=False, server_default=sa.text("0"), default=0
+ )
status: Mapped[ConversationStatus] = mapped_column(
EnumText(ConversationStatus, length=255), nullable=False, default=ConversationStatus.NORMAL
)
@@ -1163,28 +1190,35 @@ class Conversation(Base):
#
# Its value corresponds to the members of `InvokeFrom`.
# (api/core/app/entities/app_invoke_entities.py)
- invoke_from: Mapped[InvokeFrom | None] = mapped_column(EnumText(InvokeFrom, length=255), nullable=True)
+ invoke_from: Mapped[InvokeFrom | None] = mapped_column(
+ EnumText(InvokeFrom, length=255), nullable=True, default=None
+ )
# ref: ConversationSource.
- from_source: Mapped[ConversationFromSource] = mapped_column(
- EnumText(ConversationFromSource, length=255), nullable=False
- )
- from_end_user_id = mapped_column(StringUUID)
- from_account_id = mapped_column(StringUUID)
- read_at = mapped_column(sa.DateTime)
- read_account_id = mapped_column(StringUUID)
+ from_end_user_id: Mapped[str | None] = mapped_column(StringUUID, default=None)
+ from_account_id: Mapped[str | None] = mapped_column(StringUUID, default=None)
+ read_at: Mapped[datetime | None] = mapped_column(sa.DateTime, default=None)
+ read_account_id: Mapped[str | None] = mapped_column(StringUUID, default=None)
dialogue_count: Mapped[int] = mapped_column(default=0)
- created_at = mapped_column(sa.DateTime, nullable=False, server_default=func.current_timestamp())
- updated_at = mapped_column(
- sa.DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
+ created_at: Mapped[datetime] = mapped_column(
+ sa.DateTime, nullable=False, server_default=func.current_timestamp(), init=False
+ )
+ updated_at: Mapped[datetime] = mapped_column(
+ sa.DateTime,
+ nullable=False,
+ server_default=func.current_timestamp(),
+ onupdate=func.current_timestamp(),
+ init=False,
)
- messages = db.relationship("Message", backref="conversation", lazy="select", passive_deletes="all")
- message_annotations = db.relationship(
- lambda: MessageAnnotation, backref="conversation", lazy="select", passive_deletes="all"
+ messages: Mapped[list[Message]] = relationship(
+ "Message", backref="conversation", lazy="select", passive_deletes="all", init=False
+ )
+ message_annotations: Mapped[list[MessageAnnotation]] = relationship(
+ lambda: MessageAnnotation, backref="conversation", lazy="select", passive_deletes="all", init=False
)
- is_deleted: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=sa.false())
+ is_deleted: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=sa.false(), default=False)
def _set_inputs(self, value: Mapping[str, Any]):
inputs = dict(value)
@@ -1200,6 +1234,9 @@ class Conversation(Base):
# Write-only: reading requires a session, use inputs_with_session instead.
inputs = property(fset=_set_inputs)
+ def __post_init__(self) -> None:
+ self.inputs = self._inputs
+
def inputs_with_session(self, *, session: Session) -> dict[str, Any]:
inputs = self._inputs.copy()
# Compatibility bridge: stored input payloads may come from before or after the
@@ -1438,7 +1475,7 @@ class Conversation(Base):
}
-class Message(Base):
+class Message(TypeBase):
__tablename__ = "messages"
__table_args__ = (
PrimaryKeyConstraint("id", name="message_pkey"),
@@ -1451,50 +1488,64 @@ class Message(Base):
Index("message_created_at_id_idx", "created_at", "id"),
)
- id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
- app_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
- model_provider: Mapped[str | None] = mapped_column(String(255), nullable=True)
- model_id: Mapped[str | None] = mapped_column(String(255), nullable=True)
- override_model_configs: Mapped[str | None] = mapped_column(LongText)
- conversation_id: Mapped[str] = mapped_column(StringUUID, sa.ForeignKey("conversations.id"), nullable=False)
- _inputs: Mapped[dict[str, Any]] = mapped_column("inputs", sa.JSON)
- query: Mapped[str] = mapped_column(LongText, nullable=False)
- message: Mapped[dict[str, Any]] = mapped_column(sa.JSON, nullable=False)
- message_tokens: Mapped[int] = mapped_column(sa.Integer, nullable=False, server_default=sa.text("0"))
- message_unit_price: Mapped[Decimal] = mapped_column(sa.Numeric(10, 4), nullable=False)
+ app_id: Mapped[str] = mapped_column(StringUUID, nullable=False, default=None)
+ conversation_id: Mapped[str] = mapped_column(
+ StringUUID, sa.ForeignKey("conversations.id"), nullable=False, default=None
+ )
+ query: Mapped[str] = mapped_column(LongText, nullable=False, default=None)
+ message: Mapped[Any] = mapped_column(sa.JSON, nullable=False, default=None)
+ answer: Mapped[str] = mapped_column(LongText, nullable=False, default=None)
+ from_source: Mapped[ConversationFromSource] = mapped_column(
+ EnumText(ConversationFromSource, length=255), nullable=False, default=None
+ )
+ id: Mapped[str] = mapped_column(
+ StringUUID,
+ insert_default=lambda: str(uuid4()),
+ default_factory=lambda: str(uuid4()),
+ )
+ _inputs: Mapped[dict[str, Any]] = mapped_column("inputs", sa.JSON, default_factory=dict)
+ model_provider: Mapped[str | None] = mapped_column(String(255), nullable=True, default=None)
+ model_id: Mapped[str | None] = mapped_column(String(255), nullable=True, default=None)
+ override_model_configs: Mapped[str | None] = mapped_column(LongText, default=None)
+ message_tokens: Mapped[int] = mapped_column(sa.Integer, nullable=False, server_default=sa.text("0"), default=0)
+ message_unit_price: Mapped[Decimal] = mapped_column(sa.Numeric(10, 4), nullable=False, default=Decimal(0))
message_price_unit: Mapped[Decimal] = mapped_column(
- sa.Numeric(10, 7), nullable=False, server_default=sa.text("0.001")
+ sa.Numeric(10, 7), nullable=False, server_default=sa.text("0.001"), default=Decimal("0.001")
)
- answer: Mapped[str] = mapped_column(LongText, nullable=False)
- answer_tokens: Mapped[int] = mapped_column(sa.Integer, nullable=False, server_default=sa.text("0"))
- answer_unit_price: Mapped[Decimal] = mapped_column(sa.Numeric(10, 4), nullable=False)
+ answer_tokens: Mapped[int] = mapped_column(sa.Integer, nullable=False, server_default=sa.text("0"), default=0)
+ answer_unit_price: Mapped[Decimal] = mapped_column(sa.Numeric(10, 4), nullable=False, default=Decimal(0))
answer_price_unit: Mapped[Decimal] = mapped_column(
- sa.Numeric(10, 7), nullable=False, server_default=sa.text("0.001")
+ sa.Numeric(10, 7), nullable=False, server_default=sa.text("0.001"), default=Decimal("0.001")
)
- parent_message_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
- provider_response_latency: Mapped[float] = mapped_column(sa.Float, nullable=False, server_default=sa.text("0"))
- total_price: Mapped[Decimal | None] = mapped_column(sa.Numeric(10, 7))
- currency: Mapped[str] = mapped_column(String(255), nullable=False)
+ parent_message_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
+ provider_response_latency: Mapped[float] = mapped_column(
+ sa.Float, nullable=False, server_default=sa.text("0"), default=0
+ )
+ total_price: Mapped[Decimal | None] = mapped_column(sa.Numeric(10, 7), default=None)
+ currency: Mapped[str] = mapped_column(String(255), nullable=False, default="USD")
status: Mapped[MessageStatus] = mapped_column(
EnumText(MessageStatus, length=255),
nullable=False,
default=MessageStatus.NORMAL,
)
- error: Mapped[str | None] = mapped_column(LongText)
- message_metadata: Mapped[str | None] = mapped_column(LongText)
- invoke_from: Mapped[InvokeFrom | None] = mapped_column(EnumText(InvokeFrom, length=255), nullable=True)
- from_source: Mapped[ConversationFromSource] = mapped_column(
- EnumText(ConversationFromSource, length=255), nullable=False
+ error: Mapped[str | None] = mapped_column(LongText, default=None)
+ message_metadata: Mapped[str | None] = mapped_column(LongText, default=None)
+ invoke_from: Mapped[InvokeFrom | None] = mapped_column(
+ EnumText(InvokeFrom, length=255), nullable=True, default=None
)
- from_end_user_id: Mapped[str | None] = mapped_column(StringUUID)
- from_account_id: Mapped[str | None] = mapped_column(StringUUID)
- created_at: Mapped[datetime] = mapped_column(sa.DateTime, server_default=func.current_timestamp())
+ from_end_user_id: Mapped[str | None] = mapped_column(StringUUID, default=None)
+ from_account_id: Mapped[str | None] = mapped_column(StringUUID, default=None)
+ created_at: Mapped[datetime] = mapped_column(sa.DateTime, server_default=func.current_timestamp(), init=False)
updated_at: Mapped[datetime] = mapped_column(
- sa.DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
+ sa.DateTime,
+ nullable=False,
+ server_default=func.current_timestamp(),
+ onupdate=func.current_timestamp(),
+ init=False,
)
- agent_based: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=sa.false())
- workflow_run_id: Mapped[str | None] = mapped_column(StringUUID)
- app_mode: Mapped[AppMode | None] = mapped_column(EnumText(AppMode, length=255), nullable=True)
+ agent_based: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=sa.false(), default=False)
+ workflow_run_id: Mapped[str | None] = mapped_column(StringUUID, default=None)
+ app_mode: Mapped[AppMode | None] = mapped_column(EnumText(AppMode, length=255), nullable=True, default=None)
def _set_inputs(self, value: Mapping[str, Any]):
inputs = dict(value)
@@ -1511,6 +1562,9 @@ class Message(Base):
# Write-only: reading requires a session, use inputs_with_session instead.
inputs = property(fset=_set_inputs)
+ def __post_init__(self) -> None:
+ self.inputs = self._inputs
+
def inputs_with_session(self, *, session: Session) -> dict[str, Any]:
inputs = self._inputs.copy()
# Compatibility bridge: message inputs are persisted as JSON and must remain
@@ -1809,28 +1863,29 @@ class Message(Base):
@classmethod
def from_dict(cls, data: MessageDict) -> Message:
- return cls(
+ message = cls(
id=data["id"],
app_id=data["app_id"],
conversation_id=data["conversation_id"],
model_provider=data.get("model_provider"),
model_id=data["model_id"],
- inputs=data["inputs"],
+ _inputs=data["inputs"],
total_price=data["total_price"],
query=data["query"],
message=data["message"],
answer=data["answer"],
- status=data["status"],
+ status=MessageStatus(data["status"]),
error=data["error"],
message_metadata=json.dumps(data["message_metadata"]),
- from_source=data["from_source"],
+ from_source=ConversationFromSource(data["from_source"]),
from_end_user_id=data["from_end_user_id"],
from_account_id=data["from_account_id"],
- created_at=data["created_at"],
- updated_at=data["updated_at"],
agent_based=data["agent_based"],
workflow_run_id=data["workflow_run_id"],
)
+ message.created_at = datetime.fromisoformat(data["created_at"])
+ message.updated_at = datetime.fromisoformat(data["updated_at"])
+ return message
class MessageFeedback(TypeBase):
@@ -2078,7 +2133,7 @@ class OperationLog(TypeBase):
)
-class EndUser(Base, UserMixin):
+class EndUser(UserMixin, TypeBase):
__tablename__ = "end_users"
__table_args__ = (
sa.PrimaryKeyConstraint("id", name="end_user_pkey"),
@@ -2086,13 +2141,20 @@ class EndUser(Base, UserMixin):
sa.Index("end_user_tenant_session_id_idx", "tenant_id", "session_id", "type"),
)
- id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
- tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
- app_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
- type: Mapped[EndUserType] = mapped_column(EnumText(EndUserType, length=255), nullable=False)
- external_user_id: Mapped[str | None] = mapped_column(String(255), nullable=True)
- name: Mapped[str | None] = mapped_column(String(255), nullable=True)
- _is_anonymous: Mapped[bool] = mapped_column("is_anonymous", sa.Boolean, nullable=False, server_default=sa.true())
+ tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False, default=None)
+ type: Mapped[EndUserType] = mapped_column(EnumText(EndUserType, length=255), nullable=False, default=None)
+ session_id: Mapped[str] = mapped_column(String(255), nullable=False, default=None)
+ id: Mapped[str] = mapped_column(
+ StringUUID,
+ insert_default=lambda: str(uuid4()),
+ default_factory=lambda: str(uuid4()),
+ )
+ app_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
+ external_user_id: Mapped[str | None] = mapped_column(String(255), nullable=True, default=None)
+ name: Mapped[str | None] = mapped_column(String(255), default=None)
+ _is_anonymous: Mapped[bool] = mapped_column(
+ "is_anonymous", sa.Boolean, nullable=False, server_default=sa.true(), default=True
+ )
@property
@override
@@ -2104,10 +2166,15 @@ class EndUser(Base, UserMixin):
def is_anonymous(self, value: bool) -> None:
self._is_anonymous = value
- session_id: Mapped[str] = mapped_column(String(255), nullable=False)
- created_at: Mapped[datetime] = mapped_column(sa.DateTime, nullable=False, server_default=func.current_timestamp())
+ created_at: Mapped[datetime] = mapped_column(
+ sa.DateTime, nullable=False, server_default=func.current_timestamp(), init=False
+ )
updated_at: Mapped[datetime] = mapped_column(
- sa.DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
+ sa.DateTime,
+ nullable=False,
+ server_default=func.current_timestamp(),
+ onupdate=func.current_timestamp(),
+ init=False,
)
@@ -2234,7 +2301,7 @@ class Site(TypeBase):
return dify_config.APP_WEB_URL or request.url_root.rstrip("/")
-class ApiToken(Base):
+class ApiToken(TypeBase):
"""API token for the service API.
Scoping rules:
@@ -2255,13 +2322,19 @@ class ApiToken(Base):
sa.Index("api_token_tenant_idx", "tenant_id", "type"),
)
- id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
- app_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
- tenant_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
- type: Mapped[ApiTokenType] = mapped_column(EnumText(ApiTokenType, length=16), nullable=False)
- token: Mapped[str] = mapped_column(String(255), nullable=False)
- last_used_at: Mapped[datetime | None] = mapped_column(sa.DateTime, nullable=True)
- created_at: Mapped[datetime] = mapped_column(sa.DateTime, nullable=False, server_default=func.current_timestamp())
+ type: Mapped[ApiTokenType] = mapped_column(EnumText(ApiTokenType, length=16), nullable=False, default=None)
+ token: Mapped[str] = mapped_column(String(255), nullable=False, default=None)
+ id: Mapped[str] = mapped_column(
+ StringUUID,
+ insert_default=lambda: str(uuid4()),
+ default_factory=lambda: str(uuid4()),
+ )
+ app_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
+ tenant_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
+ last_used_at: Mapped[datetime | None] = mapped_column(sa.DateTime, nullable=True, default=None)
+ created_at: Mapped[datetime] = mapped_column(
+ sa.DateTime, nullable=False, server_default=func.current_timestamp(), init=False
+ )
@staticmethod
def generate_api_key(prefix: str, n: int, *, session: Session) -> str:
diff --git a/api/repositories/app_scoped_end_user_repository.py b/api/repositories/app_scoped_end_user_repository.py
index 3e5dcb7af1c..1b5da749830 100644
--- a/api/repositories/app_scoped_end_user_repository.py
+++ b/api/repositories/app_scoped_end_user_repository.py
@@ -119,7 +119,7 @@ class AppScopedEndUserRepo(AppScopedEndUserQuery, AppScopedEndUserRepository[End
tenant_id=command.tenant_id,
app_id=command.app_id,
type=EndUserType(command.type),
- is_anonymous=command.is_anonymous,
+ _is_anonymous=command.is_anonymous,
session_id=command.session_id,
external_user_id=command.external_user_id,
)
@@ -138,7 +138,7 @@ class AppScopedEndUserRepo(AppScopedEndUserQuery, AppScopedEndUserRepository[End
tenant_id=command.tenant_id,
app_id=command.app_id,
type=EndUserType(command.type),
- is_anonymous=command.is_anonymous,
+ _is_anonymous=command.is_anonymous,
session_id=command.session_id,
external_user_id=command.external_user_id,
)
diff --git a/api/repositories/file_grant_repository.py b/api/repositories/file_grant_repository.py
index 98ff0fa8b16..959ac0b5e3c 100644
--- a/api/repositories/file_grant_repository.py
+++ b/api/repositories/file_grant_repository.py
@@ -61,7 +61,7 @@ class FileGrantRepository:
tenant_id=tenant_id,
app_id=app_id,
type=EndUserType.APP_DEPLOY,
- is_anonymous=is_anonymous,
+ _is_anonymous=is_anonymous,
session_id=session_id,
external_user_id=external_user_id,
)
diff --git a/api/repositories/recommended_app_catalog_repository.py b/api/repositories/recommended_app_catalog_repository.py
index 097c25284c2..2bd8b9d9dc6 100644
--- a/api/repositories/recommended_app_catalog_repository.py
+++ b/api/repositories/recommended_app_catalog_repository.py
@@ -186,7 +186,7 @@ class DatabaseRecommendedAppCatalogRepository(RecommendedAppCatalogQuery):
id=app.id,
name=app.name,
mode=app.mode.value,
- icon=cast(str | None, app.icon),
+ icon=app.icon,
icon_type=app.icon_type.value if app.icon_type is not None else None,
icon_background=app.icon_background,
),
@@ -229,7 +229,7 @@ class DatabaseRecommendedAppCatalogRepository(RecommendedAppCatalogQuery):
return RecommendedAppDetailRecord(
id=app.id,
name=app.name,
- icon=cast(str | None, app.icon),
+ icon=app.icon,
icon_background=app.icon_background,
mode=app.mode.value,
export_data="" if app.mode == AppMode.AGENT else AppDslService.export_dsl(app_model=app, session=session),
diff --git a/api/repositories/web_passport_repository.py b/api/repositories/web_passport_repository.py
index 47ef50fd001..50ba87cffb1 100644
--- a/api/repositories/web_passport_repository.py
+++ b/api/repositories/web_passport_repository.py
@@ -163,7 +163,7 @@ class WebPassportRepository:
tenant_id=app.tenant_id,
app_id=app.app_id,
type=EndUserType.BROWSER,
- is_anonymous=True,
+ _is_anonymous=True,
session_id=session_id,
)
session.add(end_user)
diff --git a/api/services/agent/roster_service.py b/api/services/agent/roster_service.py
index 8b1be995984..af70071736e 100644
--- a/api/services/agent/roster_service.py
+++ b/api/services/agent/roster_service.py
@@ -8,7 +8,6 @@ from sqlalchemy.exc import IntegrityError
from constants.model_template import default_app_templates
from core.agent.publish_visibility import workflow_callable_active_snapshot_filter
-from core.app.entities.app_invoke_entities import InvokeFrom
from libs.datetime_utils import naive_utc_now
from libs.helper import to_timestamp
from models.agent import (
@@ -31,7 +30,7 @@ from models.agent import (
WorkflowAgentNodeBinding,
)
from models.agent_config_entities import AgentSoulConfig
-from models.enums import AppStatus, ConversationFromSource, ConversationStatus
+from models.enums import AppStatus, ConversationFromSource, ConversationStatus, InvokeFrom
from models.model import App, AppMode, AppModelConfig, Conversation, IconType, Message
from models.workflow import Workflow
from services.agent.agent_soul_state import agent_soul_has_model
@@ -514,7 +513,7 @@ class AgentRosterService:
override_model_configs=None,
mode=AppMode.AGENT,
name="Agent Debugging Conversation",
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
diff --git a/api/services/trigger/webhook_service.py b/api/services/trigger/webhook_service.py
index df7ccc1af32..78a67caa3a3 100644
--- a/api/services/trigger/webhook_service.py
+++ b/api/services/trigger/webhook_service.py
@@ -973,6 +973,8 @@ class WebhookService:
# create new webhook records
for node_id in nodes_not_found:
+ if app.created_by is None:
+ raise RuntimeError("App is missing created_by; cannot create webhook trigger")
webhook_record = WorkflowWebhookTrigger(
app_id=app.id,
tenant_id=app.tenant_id,
diff --git a/api/services/webapp_auth_service.py b/api/services/webapp_auth_service.py
index 0036566051f..ef417215a21 100644
--- a/api/services/webapp_auth_service.py
+++ b/api/services/webapp_auth_service.py
@@ -21,7 +21,7 @@ class WebAppAuthService:
tenant_id=app_model.tenant_id,
app_id=app_model.id,
type=EndUserType.BROWSER,
- is_anonymous=False,
+ _is_anonymous=False,
session_id=email,
name="enterpriseuser",
external_user_id="enterpriseuser",
diff --git a/api/services/workflow_draft_variable_service.py b/api/services/workflow_draft_variable_service.py
index 5f010c8ca85..e42640058fe 100644
--- a/api/services/workflow_draft_variable_service.py
+++ b/api/services/workflow_draft_variable_service.py
@@ -14,7 +14,6 @@ from sqlalchemy.orm import Session, sessionmaker
from sqlalchemy.sql.expression import and_, or_
from configs import dify_config
-from core.app.entities.app_invoke_entities import InvokeFrom
from core.app.file_access import DatabaseFileAccessController
from core.trigger.constants import is_trigger_node_type
from core.workflow.system_variables import SystemVariableKey
@@ -43,7 +42,7 @@ from graphon.variables.utils import dumps_with_segments
from libs.datetime_utils import naive_utc_now
from libs.uuid_utils import uuidv7
from models import Account, App, Conversation
-from models.enums import ConversationFromSource, DraftVariableType
+from models.enums import ConversationFromSource, ConversationStatus, DraftVariableType, InvokeFrom
from models.utils.file_input_compat import build_file_from_stored_mapping
from models.workflow import Workflow, WorkflowDraftVariable, WorkflowDraftVariableFile, is_system_variable_editable
from repositories.factory import DifyAPIRepositoryFactory
@@ -620,11 +619,11 @@ class WorkflowDraftVariableService:
override_model_configs=None,
mode=app.mode,
name="Draft Debugging Conversation",
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
- status="normal",
+ status=ConversationStatus.NORMAL,
invoke_from=InvokeFrom.DEBUGGER,
from_source=ConversationFromSource.CONSOLE,
from_end_user_id=None,
diff --git a/api/tests/integration_tests/controllers/openapi/conftest.py b/api/tests/integration_tests/controllers/openapi/conftest.py
index 5dc1e00f305..834e6438481 100644
--- a/api/tests/integration_tests/controllers/openapi/conftest.py
+++ b/api/tests/integration_tests/controllers/openapi/conftest.py
@@ -13,10 +13,12 @@ from flask import Flask
from constants.oauth_bearer import TokenType
from controllers.openapi._catalog import CATALOG_HEADER, catalog_for
from enums import DeploymentEdition
+from enums.account import TenantAccountRole
from extensions.ext_database import db
from extensions.ext_redis import redis_client
-from models import Account, App, OAuthAccessToken, Tenant, TenantAccountJoin
+from models import Account, App, AppMode, OAuthAccessToken, Tenant, TenantAccountJoin, TenantStatus
from models.account import AccountStatus
+from models.enums import AppStatus
def _sha256(token: str) -> str:
@@ -35,12 +37,12 @@ def disable_enterprise(monkeypatch: pytest.MonkeyPatch):
@pytest.fixture
def workspace_account(flask_app: Flask) -> Generator[tuple[Account, Tenant, TenantAccountJoin]]:
with flask_app.app_context():
- tenant = Tenant(name="t1", status="normal")
+ tenant = Tenant(name="t1", status=TenantStatus.NORMAL)
account = Account(email="[email protected]", name="u")
db.session.add_all([tenant, account])
db.session.commit()
account.status = AccountStatus.ACTIVE
- join = TenantAccountJoin(tenant_id=tenant.id, account_id=account.id, role="owner")
+ join = TenantAccountJoin(tenant_id=tenant.id, account_id=account.id, role=TenantAccountRole.OWNER)
db.session.add(join)
db.session.commit()
yield account, tenant, join
@@ -54,7 +56,9 @@ def workspace_account(flask_app: Flask) -> Generator[tuple[Account, Tenant, Tena
def app_in_workspace(flask_app: Flask, workspace_account) -> Generator[App]:
_, tenant, _ = workspace_account
with flask_app.app_context():
- app = App(tenant_id=tenant.id, name="a", mode="chat", status="normal", enable_site=True, enable_api=True)
+ app = App(
+ tenant_id=tenant.id, name="a", mode=AppMode.CHAT, status=AppStatus.NORMAL, enable_site=True, enable_api=True
+ )
db.session.add(app)
db.session.commit()
yield app
diff --git a/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py b/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py
index f3e2c4c7249..0d5deadb3b9 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py
@@ -70,7 +70,7 @@ def _create_conversation(db_session: Session, app_id: str, account_id: str) -> C
conversation = Conversation(
app_id=app_id,
name="Test Conversation",
- inputs={},
+ _inputs={},
status="normal",
mode=AppMode.CHAT,
from_source=ConversationFromSource.CONSOLE,
@@ -125,7 +125,7 @@ def _create_message(
from_source=ConversationFromSource.CONSOLE,
from_account_id=account_id,
workflow_run_id=workflow_run_id,
- inputs={"query": "Hello"},
+ _inputs={"query": "Hello"},
)
db_session.add(message)
db_session.commit()
diff --git a/api/tests/test_containers_integration_tests/controllers/console/app/test_conversation_read_timestamp.py b/api/tests/test_containers_integration_tests/controllers/console/app/test_conversation_read_timestamp.py
index c7625580d30..a15f8991875 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/app/test_conversation_read_timestamp.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/app/test_conversation_read_timestamp.py
@@ -24,13 +24,13 @@ def test_get_conversation_mark_read_keeps_updated_at_unchanged(
conversation = Conversation(
app_id=app.id,
name="read timestamp test",
- inputs={},
+ _inputs={},
status="normal",
mode=AppMode.CHAT,
from_source=ConversationFromSource.CONSOLE,
from_account_id=account.id,
- updated_at=original_updated_at,
)
+ conversation.updated_at = original_updated_at
db_session_with_containers.add(conversation)
db_session_with_containers.commit()
diff --git a/api/tests/test_containers_integration_tests/controllers/console/app/test_message.py b/api/tests/test_containers_integration_tests/controllers/console/app/test_message.py
index acc819db864..bcfc4a5981c 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/app/test_message.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/app/test_message.py
@@ -14,7 +14,7 @@ from controllers.console.app.message import AppMessageFeedbackPayload, ChatMessa
from controllers.console.app.message import attach_message_extra_contents as _attach_message_extra_contents
from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
from libs.datetime_utils import naive_utc_now
-from models.enums import ConversationFromSource, FeedbackRating
+from models.enums import ConversationFromSource, ConversationStatus, FeedbackRating
from models.model import AppMode, Conversation, Message, MessageAnnotation, MessageFeedback
from services.errors.conversation import ConversationNotExistsError
from services.errors.message import MessageNotExistsError, SuggestedQuestionsAfterAnswerDisabledError
@@ -34,11 +34,11 @@ def _create_conversation(db_session: Session, app_id: str, account_id: str, mode
override_model_configs=None,
mode=mode,
name="Test Conversation",
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
- status="normal",
+ status=ConversationStatus.NORMAL,
from_source=ConversationFromSource.CONSOLE,
from_account_id=account_id,
)
@@ -62,7 +62,7 @@ def _create_message(
model_id="",
override_model_configs=None,
conversation_id=conversation_id,
- inputs={},
+ _inputs={},
query="Hello",
message={"type": "text", "content": "Hello"},
message_tokens=1,
@@ -78,10 +78,10 @@ def _create_message(
currency="USD",
from_source=ConversationFromSource.CONSOLE,
from_account_id=account_id,
- created_at=created_at,
- updated_at=created_at,
app_mode=AppMode.CHAT,
)
+ message.created_at = created_at
+ message.updated_at = created_at
db_session.add(message)
db_session.commit()
return message
diff --git a/api/tests/test_containers_integration_tests/controllers/console/app/test_statistic.py b/api/tests/test_containers_integration_tests/controllers/console/app/test_statistic.py
index 963cfe53e55..ddf2974d62e 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/app/test_statistic.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/app/test_statistic.py
@@ -8,9 +8,8 @@ from uuid import uuid4
from flask.testing import FlaskClient
from sqlalchemy.orm import Session
-from core.app.entities.app_invoke_entities import InvokeFrom
from libs.datetime_utils import naive_utc_now
-from models.enums import ConversationFromSource, FeedbackFromSource, FeedbackRating
+from models.enums import ConversationFromSource, ConversationStatus, FeedbackFromSource, FeedbackRating, InvokeFrom
from models.model import AppMode, Conversation, Message, MessageFeedback
from tests.test_containers_integration_tests.controllers.console.helpers import (
authenticate_console_client,
@@ -36,16 +35,16 @@ def _create_conversation(
override_model_configs=None,
mode=mode,
name="Stats Conversation",
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
- status="normal",
+ status=ConversationStatus.NORMAL,
from_source=ConversationFromSource.CONSOLE,
from_account_id=account_id,
- created_at=created_at,
- updated_at=created_at,
)
+ conversation.created_at = created_at
+ conversation.updated_at = created_at
db_session.add(conversation)
db_session.commit()
return conversation
@@ -71,7 +70,7 @@ def _create_message(
model_id="",
override_model_configs=None,
conversation_id=conversation_id,
- inputs={},
+ _inputs={},
query="Hello",
message={"type": "text", "content": "Hello"},
message_tokens=message_tokens,
@@ -89,10 +88,10 @@ def _create_message(
from_source=ConversationFromSource.CONSOLE,
from_end_user_id=from_end_user_id,
from_account_id=from_account_id,
- created_at=created_at,
- updated_at=created_at,
app_mode=AppMode.CHAT,
)
+ message.created_at = created_at
+ message.updated_at = created_at
db_session.add(message)
db_session.commit()
return message
diff --git a/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py b/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py
index 094ca6ca04f..d71e419620f 100644
--- a/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py
+++ b/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py
@@ -93,7 +93,7 @@ def create_human_input_message_fixture(db_session) -> HumanInputMessageFixture:
message = Message(
app_id=app.id,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query="Human input query",
message={"messages": []},
answer="Human input answer",
diff --git a/api/tests/test_containers_integration_tests/models/test_conversation_status_count.py b/api/tests/test_containers_integration_tests/models/test_conversation_status_count.py
index e1456147289..079ef49fd59 100644
--- a/api/tests/test_containers_integration_tests/models/test_conversation_status_count.py
+++ b/api/tests/test_containers_integration_tests/models/test_conversation_status_count.py
@@ -6,13 +6,14 @@ test_site_generate_code, replacing db.session.scalars mocks with real PostgreSQL
"""
from collections.abc import Generator
+from decimal import Decimal
from uuid import uuid4
import pytest
from sqlalchemy.orm import Session
from graphon.enums import WorkflowExecutionStatus
-from models.enums import ConversationFromSource, CustomizeTokenStrategy, InvokeFrom
+from models.enums import ConversationFromSource, ConversationStatus, CustomizeTokenStrategy, InvokeFrom
from models.model import App, AppMode, Conversation, Message, Site
from models.workflow import Workflow, WorkflowRun, WorkflowRunTriggeredFrom, WorkflowType
@@ -49,11 +50,11 @@ class TestConversationStatusCount:
mode=app.mode,
name=f"Conversation {uuid4()}",
summary="",
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
- status="normal",
+ status=ConversationStatus.NORMAL,
invoke_from=InvokeFrom.WEB_APP,
from_source=ConversationFromSource.API,
dialogue_count=0,
@@ -109,10 +110,10 @@ class TestConversationStatusCount:
model_provider="openai",
model_id="gpt-4",
message_tokens=10,
- message_unit_price=0,
+ message_unit_price=Decimal(0),
answer_tokens=10,
- answer_unit_price=0,
- total_price=0,
+ answer_unit_price=Decimal(0),
+ total_price=Decimal(0),
currency="USD",
from_source=ConversationFromSource.API,
invoke_from=InvokeFrom.WEB_APP,
diff --git a/api/tests/test_containers_integration_tests/repositories/test_recommended_app_catalog_repository.py b/api/tests/test_containers_integration_tests/repositories/test_recommended_app_catalog_repository.py
index 205f0bdf4e8..5fca35846da 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_recommended_app_catalog_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_recommended_app_catalog_repository.py
@@ -8,7 +8,7 @@ from sqlalchemy.orm import Session, object_session, sessionmaker
from extensions.ext_redis import RedisClientWrapper
from models.enums import CustomizeTokenStrategy
-from models.model import App, RecommendedApp, Site
+from models.model import App, AppMode, RecommendedApp, Site
from repositories.recommended_app_catalog_repository import DatabaseRecommendedAppCatalogRepository
from services.recommended_app_query_service import RecommendedAppDetailRecord
@@ -24,7 +24,7 @@ def _add_catalog_app(
app = App(
tenant_id=str(uuid4()),
name=f"app-{uuid4()}",
- mode="chat",
+ mode=AppMode.CHAT,
enable_site=True,
enable_api=True,
is_public=is_public,
diff --git a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
index 4c8e51048a5..b1d1c2cfc5d 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
@@ -148,7 +148,7 @@ def _create_message(
message = Message(
app_id=scope.app_id,
conversation_id=conversation_id,
- inputs={},
+ _inputs={},
query="test query",
message={"messages": []},
answer="test answer",
diff --git a/api/tests/test_containers_integration_tests/services/test_agent_service.py b/api/tests/test_containers_integration_tests/services/test_agent_service.py
index 42e040f0154..96e7375d6af 100644
--- a/api/tests/test_containers_integration_tests/services/test_agent_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_agent_service.py
@@ -164,7 +164,7 @@ class TestAgentService:
from_account_id=account.id,
from_end_user_id=None,
name=fake.sentence(),
- inputs={},
+ _inputs={},
status="normal",
mode="chat",
from_source=ConversationFromSource.API,
@@ -196,7 +196,7 @@ class TestAgentService:
app_id=app.id,
from_account_id=account.id,
from_end_user_id=None,
- inputs={},
+ _inputs={},
query=fake.text(max_nb_chars=100),
message=[{"role": "user", "text": fake.text(max_nb_chars=100)}],
answer=fake.text(max_nb_chars=200),
@@ -389,7 +389,7 @@ class TestAgentService:
tenant_id=app.tenant_id,
app_id=app.id,
type=EndUserType.BROWSER,
- is_anonymous=False,
+ _is_anonymous=False,
session_id=fake.uuid4(),
name=fake.name(),
)
@@ -403,7 +403,7 @@ class TestAgentService:
from_account_id=None,
from_end_user_id=end_user.id,
name=fake.sentence(),
- inputs={},
+ _inputs={},
status="normal",
mode="chat",
from_source=ConversationFromSource.API,
@@ -435,7 +435,7 @@ class TestAgentService:
app_id=app.id,
from_account_id=None,
from_end_user_id=end_user.id,
- inputs={},
+ _inputs={},
query=fake.text(max_nb_chars=100),
message=[{"role": "user", "text": fake.text(max_nb_chars=100)}],
answer=fake.text(max_nb_chars=200),
@@ -475,7 +475,7 @@ class TestAgentService:
from_account_id=fake.uuid4(), # Non-existent account
from_end_user_id=None,
name=fake.sentence(),
- inputs={},
+ _inputs={},
status="normal",
mode="chat",
from_source=ConversationFromSource.API,
@@ -507,7 +507,7 @@ class TestAgentService:
app_id=app.id,
from_account_id=fake.uuid4(), # Non-existent account
from_end_user_id=None,
- inputs={},
+ _inputs={},
query=fake.text(max_nb_chars=100),
message=[{"role": "user", "text": fake.text(max_nb_chars=100)}],
answer=fake.text(max_nb_chars=200),
@@ -619,7 +619,7 @@ class TestAgentService:
from_account_id=account.id,
from_end_user_id=None,
name=fake.sentence(),
- inputs={},
+ _inputs={},
status="normal",
mode="chat",
from_source=ConversationFromSource.API,
@@ -635,7 +635,7 @@ class TestAgentService:
app_id=app.id,
from_account_id=account.id,
from_end_user_id=None,
- inputs={},
+ _inputs={},
query=fake.text(max_nb_chars=100),
message=[{"role": "user", "text": fake.text(max_nb_chars=100)}],
answer=fake.text(max_nb_chars=200),
diff --git a/api/tests/test_containers_integration_tests/services/test_annotation_service.py b/api/tests/test_containers_integration_tests/services/test_annotation_service.py
index 93e49764f81..6cab51ba01c 100644
--- a/api/tests/test_containers_integration_tests/services/test_annotation_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_annotation_service.py
@@ -137,7 +137,7 @@ class TestAnnotationService:
override_model_configs=None,
mode=app.mode,
name=fake.sentence(),
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
@@ -166,7 +166,7 @@ class TestAnnotationService:
model_id="",
override_model_configs=None,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query=fake.sentence(),
message=json.dumps([{"role": "user", "text": fake.sentence()}]),
message_tokens=0,
diff --git a/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py b/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py
index 8c0a0366fed..5ffe0a16994 100644
--- a/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py
@@ -104,7 +104,12 @@ def _app_record(**overrides: Any) -> App:
"icon_background": "#fff",
"use_icon_as_answer_icon": False,
}
- return App(**(defaults | overrides))
+ attributes = defaults | overrides
+ timestamps = {name: attributes.pop(name) for name in ("created_at", "updated_at") if name in attributes}
+ app = App(**attributes)
+ for name, value in timestamps.items():
+ setattr(app, name, value)
+ return app
class TestAppDslService:
diff --git a/api/tests/test_containers_integration_tests/services/test_app_generate_service.py b/api/tests/test_containers_integration_tests/services/test_app_generate_service.py
index 233c8fbbb38..2a90e8a3273 100644
--- a/api/tests/test_containers_integration_tests/services/test_app_generate_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_app_generate_service.py
@@ -498,7 +498,7 @@ class TestAppGenerateService:
type=EndUserType.BROWSER,
external_user_id=fake.uuid4(),
name=fake.name(),
- is_anonymous=False,
+ _is_anonymous=False,
session_id=fake.uuid4(),
)
@@ -953,7 +953,7 @@ class TestAppGenerateService:
type=EndUserType.BROWSER,
external_user_id=fake.uuid4(),
name=fake.name(),
- is_anonymous=False,
+ _is_anonymous=False,
session_id=fake.uuid4(),
)
diff --git a/api/tests/test_containers_integration_tests/services/test_audio_service_db.py b/api/tests/test_containers_integration_tests/services/test_audio_service_db.py
index 3a9657154e3..110d2cf100a 100644
--- a/api/tests/test_containers_integration_tests/services/test_audio_service_db.py
+++ b/api/tests/test_containers_integration_tests/services/test_audio_service_db.py
@@ -43,7 +43,7 @@ def _create_conversation(db_session: Session, app: App, account_id: str) -> Conv
mode=app.mode,
name=f"Conversation {uuid4()}",
summary="",
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
@@ -76,7 +76,7 @@ def _create_message(
model_id="",
override_model_configs=None,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query="Test query",
message={"messages": [{"role": "user", "content": "Test query"}]},
message_tokens=0,
diff --git a/api/tests/test_containers_integration_tests/services/test_conversation_service.py b/api/tests/test_containers_integration_tests/services/test_conversation_service.py
index 33cc75edac7..45ac5a7bdeb 100644
--- a/api/tests/test_containers_integration_tests/services/test_conversation_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_conversation_service.py
@@ -79,7 +79,7 @@ class ConversationServiceIntegrationTestDataFactory:
type=EndUserType.SERVICE_API,
external_user_id=f"external-{uuid4()}",
name="End User",
- is_anonymous=False,
+ _is_anonymous=False,
session_id=f"session-{uuid4()}",
)
db_session_with_containers.add(end_user)
@@ -104,7 +104,7 @@ class ConversationServiceIntegrationTestDataFactory:
mode=app.mode,
name=f"Conversation {uuid4()}",
summary="",
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
@@ -141,7 +141,7 @@ class ConversationServiceIntegrationTestDataFactory:
model_id="",
override_model_configs=None,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query=query,
message={"messages": [{"role": "user", "content": query}]},
message_tokens=0,
diff --git a/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py b/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py
index 9a725b06b64..2113ffedff1 100644
--- a/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py
+++ b/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py
@@ -80,7 +80,7 @@ class ConversationServiceVariableIntegrationFactory:
type=EndUserType.SERVICE_API,
external_user_id=f"external-{uuid4()}",
name=f"End User {uuid4()}",
- is_anonymous=False,
+ _is_anonymous=False,
session_id=f"session-{uuid4()}",
)
db_session_with_containers.add(end_user)
@@ -107,7 +107,7 @@ class ConversationServiceVariableIntegrationFactory:
mode=app.mode,
name=name or f"Conversation {uuid4()}",
summary="",
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
diff --git a/api/tests/test_containers_integration_tests/services/test_end_user_service.py b/api/tests/test_containers_integration_tests/services/test_end_user_service.py
index b82a0a227e2..652e41f1140 100644
--- a/api/tests/test_containers_integration_tests/services/test_end_user_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_end_user_service.py
@@ -84,7 +84,7 @@ class TestEndUserServiceFactory:
type=invoke_type,
external_user_id=session_id,
name=f"User-{uuid4()}",
- is_anonymous=is_anonymous,
+ _is_anonymous=is_anonymous,
session_id=session_id,
)
db_session_with_containers.add(end_user)
diff --git a/api/tests/test_containers_integration_tests/services/test_file_service.py b/api/tests/test_containers_integration_tests/services/test_file_service.py
index 0f3016ba81c..329e68af061 100644
--- a/api/tests/test_containers_integration_tests/services/test_file_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_file_service.py
@@ -112,7 +112,7 @@ class TestFileService:
tenant_id=str(fake.uuid4()),
type=EndUserType.BROWSER,
name=fake.name(),
- is_anonymous=False,
+ _is_anonymous=False,
session_id=fake.uuid4(),
)
diff --git a/api/tests/test_containers_integration_tests/services/test_message_export_service.py b/api/tests/test_containers_integration_tests/services/test_message_export_service.py
index 00dfe9dda41..08f600e9df2 100644
--- a/api/tests/test_containers_integration_tests/services/test_message_export_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_message_export_service.py
@@ -92,7 +92,7 @@ class TestAppMessageExportServiceIntegration:
model_id="gpt-4o-mini",
mode="chat",
name="conv",
- inputs={"seed": 1},
+ _inputs={"seed": 1},
status="normal",
from_source=ConversationFromSource.API,
from_end_user_id=str(uuid.uuid4()),
@@ -118,7 +118,7 @@ class TestAppMessageExportServiceIntegration:
conversation_id=conversation.id,
model_provider="openai",
model_id="gpt-4o-mini",
- inputs=inputs,
+ _inputs=inputs,
query=query,
answer=answer,
message=[{"role": "assistant", "content": answer}],
@@ -131,8 +131,8 @@ class TestAppMessageExportServiceIntegration:
message_metadata=message_metadata,
from_source=ConversationFromSource.API,
from_end_user_id=conversation.from_end_user_id,
- created_at=created_at,
)
+ message.created_at = created_at
session.add(message)
session.flush()
return message
diff --git a/api/tests/test_containers_integration_tests/services/test_message_service.py b/api/tests/test_containers_integration_tests/services/test_message_service.py
index cc4d8bc641b..427d81dbd29 100644
--- a/api/tests/test_containers_integration_tests/services/test_message_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_message_service.py
@@ -142,7 +142,7 @@ class TestMessageService:
override_model_configs=None,
mode=app.mode,
name=fake.sentence(),
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
@@ -171,7 +171,7 @@ class TestMessageService:
model_id="",
override_model_configs=None,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query=fake.sentence(),
message=json.dumps([{"role": "user", "text": fake.sentence()}]),
message_tokens=0,
diff --git a/api/tests/test_containers_integration_tests/services/test_message_service_extra_contents.py b/api/tests/test_containers_integration_tests/services/test_message_service_extra_contents.py
index d76a925d0e9..78a2e344ae0 100644
--- a/api/tests/test_containers_integration_tests/services/test_message_service_extra_contents.py
+++ b/api/tests/test_containers_integration_tests/services/test_message_service_extra_contents.py
@@ -23,7 +23,7 @@ def test_attach_message_extra_contents_assigns_serialized_payload(db_session_wit
model_id="",
override_model_configs=None,
conversation_id=fixture.conversation.id,
- inputs={},
+ _inputs={},
query="Query without extra content",
message={"messages": [{"role": "user", "content": "Query without extra content"}]},
message_tokens=0,
diff --git a/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py b/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py
index 07cd578a207..0f57d61a813 100644
--- a/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py
@@ -180,7 +180,7 @@ class TestMessagesCleanServiceIntegration:
model_id="gpt-3.5-turbo",
mode="chat",
name="Test conversation",
- inputs={},
+ _inputs={},
status="normal",
from_source=ConversationFromSource.API,
from_end_user_id=str(uuid.uuid4()),
@@ -202,7 +202,7 @@ class TestMessagesCleanServiceIntegration:
conversation_id=conversation.id,
model_provider="openai",
model_id="gpt-3.5-turbo",
- inputs={},
+ _inputs={},
query="Test query",
answer="Test answer",
message=[{"role": "user", "text": "Test message"}],
@@ -214,8 +214,8 @@ class TestMessagesCleanServiceIntegration:
currency="USD",
from_source=ConversationFromSource.API,
from_account_id=conversation.from_end_user_id,
- created_at=created_at,
)
+ message.created_at = created_at
db_session_with_containers.add(message)
db_session_with_containers.flush()
diff --git a/api/tests/test_containers_integration_tests/services/test_tag_service.py b/api/tests/test_containers_integration_tests/services/test_tag_service.py
index e85711fc5e8..702c413d33e 100644
--- a/api/tests/test_containers_integration_tests/services/test_tag_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_tag_service.py
@@ -13,7 +13,7 @@ from extensions.ext_application_services import application_services
from models import Account, AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole, TenantStatus
from models.dataset import Dataset
from models.enums import DataSourceType, TagType
-from models.model import App, Tag, TagBinding
+from models.model import App, AppMode, IconType, Tag, TagBinding
from models.snippet import CustomizedSnippet, SnippetType
from services.tag_service import (
SaveTagPayload,
@@ -105,8 +105,8 @@ def _create_app(
app = App(
name=f"Tag Service App {suffix}",
description="Tag service test app",
- mode="chat",
- icon_type="emoji",
+ mode=AppMode.CHAT,
+ icon_type=IconType.EMOJI,
icon="🤖",
icon_background="#FF6B6B",
enable_site=False,
diff --git a/api/tests/test_containers_integration_tests/services/test_web_conversation_service.py b/api/tests/test_containers_integration_tests/services/test_web_conversation_service.py
index f231661e725..3c703e0203c 100644
--- a/api/tests/test_containers_integration_tests/services/test_web_conversation_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_web_conversation_service.py
@@ -109,7 +109,7 @@ class TestWebConversationService:
session_id=fake.uuid4(),
app_id=app.id,
type=EndUserType.BROWSER,
- is_anonymous=False,
+ _is_anonymous=False,
tenant_id=app.tenant_id,
)
@@ -139,7 +139,7 @@ class TestWebConversationService:
mode="chat",
name=fake.sentence(nb_words=3),
summary=fake.text(max_nb_chars=100),
- inputs={},
+ _inputs={},
introduction=fake.text(max_nb_chars=200),
system_instruction=fake.text(max_nb_chars=300),
system_instruction_tokens=50,
diff --git a/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py b/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py
index 654db34b817..4576b1ec736 100644
--- a/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py
@@ -842,11 +842,11 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
type=EndUserType.BROWSER,
- is_anonymous=False,
+ _is_anonymous=False,
session_id="test_session_123",
- created_at=datetime.now(UTC),
- updated_at=datetime.now(UTC),
)
+ end_user.created_at = datetime.now(UTC)
+ end_user.updated_at = datetime.now(UTC)
db_session_with_containers.add(end_user)
db_session_with_containers.commit()
diff --git a/api/tests/test_containers_integration_tests/services/test_workflow_run_service.py b/api/tests/test_containers_integration_tests/services/test_workflow_run_service.py
index b37b1a558ea..74158b79bd7 100644
--- a/api/tests/test_containers_integration_tests/services/test_workflow_run_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_workflow_run_service.py
@@ -9,8 +9,10 @@ from sqlalchemy import Engine
from sqlalchemy.orm import Session, sessionmaker
from machinery.context import RequestContext
-from models.enums import ConversationFromSource, CreatorUserRole
+from models.enums import ConversationFromSource, ConversationStatus, CreatorUserRole
from models.model import (
+ AppMode,
+ Conversation,
Message,
)
from models.workflow import WorkflowRun
@@ -181,14 +183,12 @@ class TestWorkflowRunService:
fake = Faker()
# Create conversation first (required for message)
- from models.model import Conversation
-
conversation = Conversation(
app_id=app.id,
name=fake.sentence(),
- inputs={},
- status="normal",
- mode="chat",
+ _inputs={},
+ status=ConversationStatus.NORMAL,
+ mode=AppMode.CHAT,
from_source=ConversationFromSource.CONSOLE,
from_account_id=account.id,
)
diff --git a/api/tests/unit_tests/agent_runtime_fixtures.py b/api/tests/unit_tests/agent_runtime_fixtures.py
index be0eff6a99f..818546ab33a 100644
--- a/api/tests/unit_tests/agent_runtime_fixtures.py
+++ b/api/tests/unit_tests/agent_runtime_fixtures.py
@@ -2,6 +2,7 @@
from collections.abc import Iterator
from datetime import datetime
+from decimal import Decimal
import pytest
from flask import Flask
@@ -22,7 +23,8 @@ from extensions.ext_redis import RedisClientWrapper
from graphon.model_runtime.entities.llm_entities import LLMMode
from graphon.model_runtime.entities.model_entities import ModelPropertyKey
from graphon.model_runtime.model_providers.base.large_language_model import LargeLanguageModel
-from models.enums import ConversationFromSource
+from models.enums import ConversationFromSource, ConversationStatus
+from models.enums import InvokeFrom as ModelInvokeFrom
from models.model import App, AppMode, Conversation, Message
from tests.unit_tests.core.model_fixtures import make_model_config
@@ -129,12 +131,12 @@ def agent_records(sqlite_session: Session) -> tuple[Conversation, Message]:
model_id=None,
mode=AppMode.AGENT_CHAT,
name="Conversation",
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
- status="normal",
- invoke_from=InvokeFrom.SERVICE_API,
+ status=ConversationStatus.NORMAL,
+ invoke_from=ModelInvokeFrom.SERVICE_API,
from_source=ConversationFromSource.API,
from_end_user_id=None,
from_account_id="user",
@@ -143,26 +145,26 @@ def agent_records(sqlite_session: Session) -> tuple[Conversation, Message]:
id="msg",
app_id=app.id,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query="q",
message={},
message_tokens=0,
- message_unit_price=0,
- message_price_unit=0,
+ message_unit_price=Decimal(0),
+ message_price_unit=Decimal(0),
answer="",
answer_tokens=0,
- answer_unit_price=0,
- answer_price_unit=0,
+ answer_unit_price=Decimal(0),
+ answer_price_unit=Decimal(0),
provider_response_latency=0,
- total_price=0,
+ total_price=Decimal(0),
currency="USD",
- invoke_from=InvokeFrom.SERVICE_API,
+ invoke_from=ModelInvokeFrom.SERVICE_API,
from_source=ConversationFromSource.API,
from_end_user_id=None,
from_account_id="user",
app_mode=AppMode.AGENT_CHAT,
- created_at=datetime(2025, 1, 1),
)
+ message.created_at = datetime(2025, 1, 1)
sqlite_session.add_all([app, conversation, message])
sqlite_session.commit()
return conversation, message
diff --git a/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py b/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py
index 8223bb17e3d..68808e5dd34 100644
--- a/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py
+++ b/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py
@@ -1,5 +1,6 @@
from collections.abc import Generator
from datetime import datetime
+from decimal import Decimal
from inspect import getsource, unwrap
from types import SimpleNamespace
from typing import Any, Self, cast
@@ -60,12 +61,12 @@ from controllers.console.app.message import (
AgentMessageApi,
AgentMessageFeedbackApi,
)
-from core.app.entities.app_invoke_entities import InvokeFrom
from enums import CloudPlan, DeploymentEdition
from libs.infinite_scroll_pagination import InfiniteScrollPagination
from models.account import Account, TenantAccountRole
from models.agent import Agent, AgentConfigDraftType, AgentScope, AgentSource, AgentStatus
-from models.enums import ApiTokenType, ConversationFromSource, CustomizeTokenStrategy, TagType
+from models.enums import ApiTokenType, ConversationFromSource, ConversationStatus, CustomizeTokenStrategy, TagType
+from models.enums import InvokeFrom as ModelInvokeFrom
from models.model import ApiToken, App, AppMode, Conversation, IconType, Message, Site, Tag, TagBinding
from services.agent.observability_service import AgentLogQueryParams, AgentStatisticsQueryParams
from services.enterprise.rbac_service import RBACService
@@ -105,12 +106,12 @@ def _persist_conversation_message(
model_id=None,
mode=AppMode.CHAT,
name="Conversation",
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
- status="normal",
- invoke_from=InvokeFrom.DEBUGGER,
+ status=ConversationStatus.NORMAL,
+ invoke_from=ModelInvokeFrom.DEBUGGER,
from_source=ConversationFromSource.CONSOLE,
from_end_user_id=None,
from_account_id="00000000-0000-0000-0000-000000000021",
@@ -121,27 +122,27 @@ def _persist_conversation_message(
message = Message(
app_id=app_id,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query="query",
message={},
message_tokens=0,
- message_unit_price=0,
- message_price_unit=0,
+ message_unit_price=Decimal(0),
+ message_price_unit=Decimal(0),
answer="answer",
answer_tokens=0,
- answer_unit_price=0,
- answer_price_unit=0,
+ answer_unit_price=Decimal(0),
+ answer_price_unit=Decimal(0),
provider_response_latency=0,
- total_price=0,
+ total_price=Decimal(0),
currency="USD",
- invoke_from=InvokeFrom.DEBUGGER,
+ invoke_from=ModelInvokeFrom.DEBUGGER,
from_source=ConversationFromSource.CONSOLE,
from_end_user_id=None,
from_account_id="00000000-0000-0000-0000-000000000021",
app_mode=AppMode.CHAT,
- created_at=created_at,
)
message.id = message_id
+ message.created_at = created_at
session.add(message)
session.flush()
return conversation, message
@@ -234,7 +235,10 @@ def _app_detail_obj(**overrides: object) -> App:
overrides.pop("bound_agent_id", None)
data.update(overrides)
data["icon_type"] = IconType(data["icon_type"])
- return App(**data)
+ app = App()
+ for key, value in data.items():
+ setattr(app, key, value)
+ return app
def _account(*, account_id: str = "account-1", privileged: bool = False, timezone: str | None = None) -> Account:
diff --git a/api/tests/unit_tests/controllers/console/app/test_app_response_models.py b/api/tests/unit_tests/controllers/console/app/test_app_response_models.py
index e93ef70c0fa..50fd30c65de 100644
--- a/api/tests/unit_tests/controllers/console/app/test_app_response_models.py
+++ b/api/tests/unit_tests/controllers/console/app/test_app_response_models.py
@@ -68,7 +68,7 @@ def _app(
created_at: datetime | None = None,
) -> App:
timestamp = created_at or _ts()
- return App(
+ app = App(
id=app_id,
tenant_id=tenant_id,
name=name,
@@ -80,9 +80,10 @@ def _app(
enable_site=True,
enable_api=True,
max_active_requests=0,
- created_at=timestamp,
- updated_at=timestamp,
)
+ app.created_at = timestamp
+ app.updated_at = timestamp
+ return app
def _workflow(*, app_id: str = APP_ID, tenant_id: str = TENANT_ID) -> Workflow:
diff --git a/api/tests/unit_tests/controllers/console/app/test_conversation_api.py b/api/tests/unit_tests/controllers/console/app/test_conversation_api.py
index 1dfd995db93..26b0286e030 100644
--- a/api/tests/unit_tests/controllers/console/app/test_conversation_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_conversation_api.py
@@ -170,7 +170,7 @@ def test_conversation_response_source_uses_caller_session(sqlite_session: Sessio
model_id=None,
override_model_configs=None,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query="first question",
message={},
message_tokens=1,
diff --git a/api/tests/unit_tests/controllers/console/app/test_message_api.py b/api/tests/unit_tests/controllers/console/app/test_message_api.py
index 0c1a090ede9..26125d6c3c3 100644
--- a/api/tests/unit_tests/controllers/console/app/test_message_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_message_api.py
@@ -53,7 +53,7 @@ def _persist_message(session: Session, *, message_id: str, app_id: str = "app-1"
model_id=None,
mode=AppMode.CHAT,
name="Conversation",
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
@@ -67,7 +67,7 @@ def _persist_message(session: Session, *, message_id: str, app_id: str = "app-1"
message = Message(
app_id=app_id,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query="query",
message="",
message_tokens=0,
diff --git a/api/tests/unit_tests/controllers/console/app/test_model_config_api.py b/api/tests/unit_tests/controllers/console/app/test_model_config_api.py
index bc13892a4d6..228bbb85609 100644
--- a/api/tests/unit_tests/controllers/console/app/test_model_config_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_model_config_api.py
@@ -128,7 +128,6 @@ def model_config_http(sqlite_session: Session, monkeypatch: pytest.MonkeyPatch)
mode=AppMode.CHAT,
app_model_config_id="config-0",
updated_by=None,
- updated_at=None,
)
original_config = AppModelConfig(app_id=app_model.id, created_by="u1", updated_by="u1")
original_config.id = "config-0"
@@ -679,7 +678,6 @@ def test_post_updates_non_agent_model_config_without_implicit_properties(
mode=app_mode,
app_model_config_id="config-0",
updated_by=None,
- updated_at=None,
)
original_config = AppModelConfig(app_id="app-1", created_by="u1", updated_by="u1")
original_config.id = "config-0"
@@ -818,7 +816,6 @@ def test_post_encrypts_agent_tool_parameters(
mode=AppMode.AGENT_CHAT,
app_model_config_id="config-0",
updated_by=None,
- updated_at=None,
)
_assert_no_implicit_app_config_properties()
diff --git a/api/tests/unit_tests/controllers/console/explore/test_conversation.py b/api/tests/unit_tests/controllers/console/explore/test_conversation.py
index 30c131a9cc3..20a9010d668 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_conversation.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_conversation.py
@@ -15,6 +15,7 @@ from werkzeug.test import TestResponse
import controllers.console.explore.conversation as module
from core.app.entities.app_invoke_entities import InvokeFrom
from models.enums import ConversationFromSource, ConversationStatus, CreatorUserRole
+from models.enums import InvokeFrom as ModelInvokeFrom
from models.model import App, AppMode, Conversation, Message
from models.web import PinnedConversation
from repositories.installed_app_conversation_repository import SQLAlchemyInstalledAppConversationRepository
@@ -156,11 +157,11 @@ def _conversation(
from_source=source,
from_account_id=account_id or state.harness.account.id,
from_end_user_id=end_user_id,
- invoke_from=invoke_from,
+ invoke_from=ModelInvokeFrom(invoke_from) if invoke_from is not None else None,
is_deleted=is_deleted,
- created_at=_CREATED_AT,
- updated_at=_CREATED_AT - timedelta(minutes=age),
)
+ conversation.created_at = _CREATED_AT
+ conversation.updated_at = _CREATED_AT - timedelta(minutes=age)
with state.factory.begin() as session:
session.add(conversation)
return conversation
@@ -168,22 +169,21 @@ def _conversation(
def _message(state: _Conversations, conversation: Conversation, *, query: str = "First question", age: int = 0) -> None:
with state.factory.begin() as session:
- session.add(
- Message(
- app_id=conversation.app_id,
- conversation_id=conversation.id,
- _inputs={},
- query=query,
- message={},
- answer="answer",
- message_unit_price=Decimal(0),
- answer_unit_price=Decimal(0),
- currency="USD",
- from_source=ConversationFromSource.CONSOLE,
- from_account_id=state.harness.account.id,
- created_at=_CREATED_AT + timedelta(minutes=age),
- )
+ created_message = Message(
+ app_id=conversation.app_id,
+ conversation_id=conversation.id,
+ _inputs={},
+ query=query,
+ message={},
+ answer="answer",
+ message_unit_price=Decimal(0),
+ answer_unit_price=Decimal(0),
+ currency="USD",
+ from_source=ConversationFromSource.CONSOLE,
+ from_account_id=state.harness.account.id,
)
+ created_message.created_at = _CREATED_AT + timedelta(minutes=age)
+ session.add(created_message)
def _pin(state: _Conversations, conversation: Conversation, *, account_id: str | None = None) -> None:
diff --git a/api/tests/unit_tests/controllers/console/explore/test_message.py b/api/tests/unit_tests/controllers/console/explore/test_message.py
index 6e386bafb34..0a8bfd79f84 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_message.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_message.py
@@ -370,8 +370,8 @@ def _message(
from_source=source,
from_account_id=account_id or state.harness.account.id,
from_end_user_id=end_user_id,
- created_at=_CREATED_AT - timedelta(minutes=age),
)
+ message.created_at = _CREATED_AT - timedelta(minutes=age)
with state.factory.begin() as session:
session.add(message)
return message
diff --git a/api/tests/unit_tests/controllers/console/explore/test_trial_preview_details.py b/api/tests/unit_tests/controllers/console/explore/test_trial_preview_details.py
index 77807d81a4d..e618179e66c 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_trial_preview_details.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_trial_preview_details.py
@@ -253,9 +253,9 @@ def harness(
enable_site=False,
enable_api=False,
max_active_requests=0,
- created_at=_CREATED_AT,
- updated_at=_UPDATED_AT,
)
+ target.created_at = _CREATED_AT
+ target.updated_at = _UPDATED_AT
config = AppModelConfig(
app_id=target.id,
opening_statement="",
diff --git a/api/tests/unit_tests/controllers/console/explore/test_trial_suggested_questions.py b/api/tests/unit_tests/controllers/console/explore/test_trial_suggested_questions.py
index 7a140410c83..df23cd50b9b 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_trial_suggested_questions.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_trial_suggested_questions.py
@@ -198,7 +198,7 @@ def harness(
app_model_config_id=config.id,
mode=AppMode.CHAT,
name="Trial conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.CONSOLE,
from_account_id=account.id,
)
@@ -207,7 +207,7 @@ def harness(
message = Message(
app_id=target.id,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query="What is a trial?",
message={},
message_unit_price=Decimal(0),
diff --git a/api/tests/unit_tests/controllers/files/test_appdeploy_files.py b/api/tests/unit_tests/controllers/files/test_appdeploy_files.py
index 04623b8a2fc..92ba817c388 100644
--- a/api/tests/unit_tests/controllers/files/test_appdeploy_files.py
+++ b/api/tests/unit_tests/controllers/files/test_appdeploy_files.py
@@ -126,7 +126,7 @@ def end_user(sqlite_session: Session) -> EndUser:
tenant_id=TENANT_ID,
app_id=APP_ID,
type=EndUserType.APP_DEPLOY,
- is_anonymous=True,
+ _is_anonymous=True,
session_id="seeded",
external_user_id="adp1.seeded",
)
diff --git a/api/tests/unit_tests/controllers/inner_api/app/test_app.py b/api/tests/unit_tests/controllers/inner_api/app/test_app.py
index 9c60274c8bf..930e3af8c1c 100644
--- a/api/tests/unit_tests/controllers/inner_api/app/test_app.py
+++ b/api/tests/unit_tests/controllers/inner_api/app/test_app.py
@@ -104,10 +104,11 @@ def _app(tenant_id: str, name: str, *, mode: AppMode = AppMode.WORKFLOW, created
mode=mode,
enable_site=False,
enable_api=False,
- created_at=created_at,
- updated_at=created_at,
- **kwargs,
)
+ for name, value in kwargs.items():
+ setattr(app, name, value)
+ app.created_at = created_at
+ app.updated_at = created_at
app.id = str(uuid4())
return app
@@ -418,7 +419,7 @@ def _message(app_id: str, status: MessageStatus, created_at: datetime, invoke_fr
message = Message(
app_id=app_id,
conversation_id=str(uuid4()),
- inputs={},
+ _inputs={},
query="q",
message={},
message_unit_price=Decimal(0),
diff --git a/api/tests/unit_tests/controllers/inner_api/app/test_file_grants.py b/api/tests/unit_tests/controllers/inner_api/app/test_file_grants.py
index a0b91cc5f1c..06624988468 100644
--- a/api/tests/unit_tests/controllers/inner_api/app/test_file_grants.py
+++ b/api/tests/unit_tests/controllers/inner_api/app/test_file_grants.py
@@ -27,7 +27,7 @@ from extensions.ext_application_services import _build_file_grant_service
from extensions.storage.storage_type import StorageType
from libs.datetime_utils import naive_utc_now
from models.enums import CreatorUserRole, EndUserType
-from models.model import App, EndUser, UploadFile
+from models.model import App, AppMode, EndUser, UploadFile
from models.tools import ToolFile
from repositories.app_scoped_end_user_repository import AppScopedEndUserRepo
from services.app_scoped_end_user_service import AppScopedEndUserService
@@ -64,7 +64,7 @@ def seeded_app(sqlite_session: Session) -> App:
id=APP_ID,
tenant_id=TENANT_ID,
name="deployed app",
- mode="workflow",
+ mode=AppMode.WORKFLOW,
enable_site=True,
enable_api=True,
)
@@ -452,7 +452,7 @@ def test_end_user_service_never_retypes_an_app_deploy_row(
tenant_id=TENANT_ID,
app_id=APP_ID,
type=EndUserType.APP_DEPLOY,
- is_anonymous=True,
+ _is_anonymous=True,
session_id=session_id,
external_user_id=session_id,
)
diff --git a/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py b/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py
index cede38eb486..de31640baa0 100644
--- a/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py
+++ b/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py
@@ -67,7 +67,7 @@ def _persist_end_user(
id=user_id,
tenant_id=tenant_id,
type=EndUserType.SERVICE_API,
- is_anonymous=is_anonymous,
+ _is_anonymous=is_anonymous,
session_id=session_id,
)
with Session(sqlite_engine) as session, session.begin():
diff --git a/api/tests/unit_tests/controllers/openapi/auth/test_resource_access.py b/api/tests/unit_tests/controllers/openapi/auth/test_resource_access.py
index 715c78ca7b1..3c3ff9fc858 100644
--- a/api/tests/unit_tests/controllers/openapi/auth/test_resource_access.py
+++ b/api/tests/unit_tests/controllers/openapi/auth/test_resource_access.py
@@ -23,7 +23,7 @@ from extensions.application_services.resource_access_token import build_resource
from extensions.ext_application_services import ApplicationServices
from libs.oauth_bearer import Scope, TokenType
from models.account import Tenant, TenantStatus
-from models.enums import CreatorUserRole
+from models.enums import CreatorUserRole, EndUserType
from models.model import App, AppMode, AppStar, EndUser
from models.resource_access_token import (
ResourceAccessToken,
@@ -87,7 +87,7 @@ def resource_fixture(
),
):
end_user = end_user.return_value.app_scoped_end_users.commands.get_or_create_end_user_by_type
- end_user.return_value = EndUser(id="machine-user", tenant_id=tenant.id, app_id=app.id, type="openapi")
+ end_user.return_value = EndUser(id="machine-user", tenant_id=tenant.id, app_id=app.id, type=EndUserType.OPENAPI)
yield flask_app, app.id, token.id, tenant.id, end_user
diff --git a/api/tests/unit_tests/controllers/openapi/test_auth_matrix.py b/api/tests/unit_tests/controllers/openapi/test_auth_matrix.py
index 6e9878bb848..c4e5900f581 100644
--- a/api/tests/unit_tests/controllers/openapi/test_auth_matrix.py
+++ b/api/tests/unit_tests/controllers/openapi/test_auth_matrix.py
@@ -1626,7 +1626,7 @@ def world(sqlite_session_factory: sessionmaker[Session], token_rows: dict[str, R
tenant_id=built.workspace_id,
name="matrix app",
description="",
- mode="workflow",
+ mode=AppMode.WORKFLOW,
enable_site=False,
enable_api=enable_api,
)
@@ -1742,7 +1742,7 @@ def _end_user(_type: EndUserType, tenant_id: str, app_id: str, user_id: str | No
tenant_id=tenant_id,
app_id=app_id,
type=EndUserType.OPENAPI,
- is_anonymous=False,
+ _is_anonymous=False,
session_id=user_id or "",
)
row.external_user_id = user_id
diff --git a/api/tests/unit_tests/controllers/web/test_message_list.py b/api/tests/unit_tests/controllers/web/test_message_list.py
index 3f45840a73a..1b5d79ef324 100644
--- a/api/tests/unit_tests/controllers/web/test_message_list.py
+++ b/api/tests/unit_tests/controllers/web/test_message_list.py
@@ -189,10 +189,10 @@ def test_message_list_mapping(app: Flask, monkeypatch: pytest.MonkeyPatch, sqlit
],
}
),
- created_at=created_at,
status="normal",
error=None,
)
+ message.created_at = created_at
message.set_extra_contents(
[
HumanInputContent(
diff --git a/api/tests/unit_tests/controllers/web/test_public_app_admission.py b/api/tests/unit_tests/controllers/web/test_public_app_admission.py
index 427841eed16..cf2aa7e3fbd 100644
--- a/api/tests/unit_tests/controllers/web/test_public_app_admission.py
+++ b/api/tests/unit_tests/controllers/web/test_public_app_admission.py
@@ -73,7 +73,7 @@ def _harness(
tenant_id=app.tenant_id,
app_id=app.id,
session_id="old",
- is_anonymous=True,
+ _is_anonymous=True,
type=EndUserType.BROWSER,
)
if not missing:
diff --git a/api/tests/unit_tests/controllers/web/test_site.py b/api/tests/unit_tests/controllers/web/test_site.py
index 246ac935bf7..6e2800e9452 100644
--- a/api/tests/unit_tests/controllers/web/test_site.py
+++ b/api/tests/unit_tests/controllers/web/test_site.py
@@ -11,6 +11,7 @@ from controllers.web import site as site_module
from controllers.web.error import WebAppNotFoundError
from extensions.ext_application_services import ApplicationServices
from libs.external_api import ExternalApi
+from models.enums import EndUserType
from models.model import App, EndUser
from services.app_definition_query_service import AppSiteConfiguration
from services.web_app_runtime_query_service import (
@@ -125,7 +126,7 @@ def test_site_final_response_only_reclassifies_terminal_runtime_failure(
"decode_jwt_token",
lambda: (
App(id="fixture-app"),
- EndUser(id="fixture-user", tenant_id="fixture-tenant", type="browser"),
+ EndUser(id="fixture-user", tenant_id="fixture-tenant", type=EndUserType.BROWSER),
),
)
apply_config_overrides(monkeypatch, NETWORK_ACCESS_TRUSTED_PROXY_CIDRS="172.18.0.0/16")
diff --git a/api/tests/unit_tests/core/agent/test_cot_agent_runner.py b/api/tests/unit_tests/core/agent/test_cot_agent_runner.py
index 771b819fa02..635ddcfa803 100644
--- a/api/tests/unit_tests/core/agent/test_cot_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_cot_agent_runner.py
@@ -26,17 +26,17 @@ def _make_conversation(*, conversation_id: str = "conv1") -> Conversation:
app_id="app",
mode=AppMode.AGENT_CHAT,
name="Agent Conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.API,
)
def _make_message(*, message_id: str = "msg-id", conversation_id: str = "conv1") -> Message:
- return Message(
+ message = Message(
id=message_id,
app_id="app",
conversation_id=conversation_id,
- inputs={},
+ _inputs={},
query="query",
message={},
answer="",
@@ -45,8 +45,9 @@ def _make_message(*, message_id: str = "msg-id", conversation_id: str = "conv1")
answer_unit_price=Decimal(0),
currency="USD",
from_source=ConversationFromSource.API,
- created_at=naive_utc_now(),
)
+ message.created_at = naive_utc_now()
+ return message
class DummyRunner(CotAgentRunner):
diff --git a/api/tests/unit_tests/core/agent/test_fc_agent_runner.py b/api/tests/unit_tests/core/agent/test_fc_agent_runner.py
index 89eb6c4674d..0b6e9bd429e 100644
--- a/api/tests/unit_tests/core/agent/test_fc_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_fc_agent_runner.py
@@ -60,17 +60,17 @@ def _make_conversation(*, conversation_id: str = "conv1") -> Conversation:
app_id="app",
mode=AppMode.AGENT_CHAT,
name="Agent Conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.API,
)
def _make_message(*, message_id: str = "m1", conversation_id: str = "conv1") -> Message:
- return Message(
+ message = Message(
id=message_id,
app_id="app",
conversation_id=conversation_id,
- inputs={},
+ _inputs={},
query="query",
message={},
answer="",
@@ -79,8 +79,9 @@ def _make_message(*, message_id: str = "m1", conversation_id: str = "conv1") ->
answer_unit_price=Decimal(0),
currency="USD",
from_source=ConversationFromSource.API,
- created_at=naive_utc_now(),
)
+ message.created_at = naive_utc_now()
+ return message
class DummyMessage:
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py
index fec64f59ff4..a1c4bdfb5d2 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py
@@ -84,7 +84,7 @@ def _make_conversation(*, conversation_id: str = "conversation-id", app_id: str
app_id=app_id,
mode=AppMode.ADVANCED_CHAT,
name="Advanced Chat Conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.API,
)
@@ -92,11 +92,11 @@ def _make_conversation(*, conversation_id: str = "conversation-id", app_id: str
def _make_message(
*, message_id: str = "message-id", conversation_id: str = "conversation-id", app_id: str = "app"
) -> Message:
- return Message(
+ message = Message(
id=message_id,
app_id=app_id,
conversation_id=conversation_id,
- inputs={},
+ _inputs={},
query="hello",
message={},
answer="",
@@ -105,8 +105,9 @@ def _make_message(
answer_unit_price=Decimal(0),
currency="USD",
from_source=ConversationFromSource.API,
- created_at=naive_utc_now(),
)
+ message.created_at = naive_utc_now()
+ return message
class TestAdvancedChatAppGeneratorValidation:
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py
index 6ce0d5aeb26..5be3635fba4 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py
@@ -120,7 +120,7 @@ def _persist_message(session: Session, *, message_id: str = "message-id") -> Mes
model_id="model",
override_model_configs=None,
conversation_id="conv-id",
- inputs={},
+ _inputs={},
query="hello",
message="",
message_tokens=0,
diff --git a/api/tests/unit_tests/core/app/apps/agent_app/test_app_runner.py b/api/tests/unit_tests/core/app/apps/agent_app/test_app_runner.py
index 936786db06b..ce33a95dda5 100644
--- a/api/tests/unit_tests/core/app/apps/agent_app/test_app_runner.py
+++ b/api/tests/unit_tests/core/app/apps/agent_app/test_app_runner.py
@@ -682,7 +682,7 @@ def _message_record() -> Message:
message = Message(
app_id="app-1",
conversation_id="conv-1",
- inputs={},
+ _inputs={},
query="hello",
message={},
message_tokens=0,
diff --git a/api/tests/unit_tests/core/app/apps/agent_app/test_session_store.py b/api/tests/unit_tests/core/app/apps/agent_app/test_session_store.py
index 936d2fc79df..85d08277497 100644
--- a/api/tests/unit_tests/core/app/apps/agent_app/test_session_store.py
+++ b/api/tests/unit_tests/core/app/apps/agent_app/test_session_store.py
@@ -77,7 +77,7 @@ def _persist_conversation(session: Session, *, binding_id: str | None = None) ->
mode=AppMode.AGENT_CHAT,
name="Agent conversation",
summary=None,
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
invoke_from=None,
diff --git a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_config_manager.py b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_config_manager.py
index 1584d15fc90..cd309ed6e20 100644
--- a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_config_manager.py
+++ b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_config_manager.py
@@ -43,7 +43,7 @@ def _conversation() -> Conversation:
app_id="app1",
mode=AppMode.AGENT_CHAT,
name="Conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.CONSOLE,
)
diff --git a/api/tests/unit_tests/core/app/apps/chat/test_app_generator_and_runner.py b/api/tests/unit_tests/core/app/apps/chat/test_app_generator_and_runner.py
index 3802ab247cd..cf438c6824c 100644
--- a/api/tests/unit_tests/core/app/apps/chat/test_app_generator_and_runner.py
+++ b/api/tests/unit_tests/core/app/apps/chat/test_app_generator_and_runner.py
@@ -65,7 +65,7 @@ def _conversation() -> Conversation:
model_id=None,
mode=AppMode.CHAT,
name="Conversation",
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
@@ -83,7 +83,7 @@ def _message() -> Message:
id="m1",
app_id="app-1",
conversation_id="c1",
- inputs={},
+ _inputs={},
query="hi",
message={},
message_tokens=0,
diff --git a/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py b/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py
index a284d7f3450..ecd8499c103 100644
--- a/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py
+++ b/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py
@@ -44,6 +44,7 @@ from graphon.model_runtime.entities.message_entities import (
from graphon.model_runtime.entities.model_entities import ModelType
from models.dataset import Dataset
from models.enums import ConversationFromSource
+from models.enums import InvokeFrom as ModelInvokeFrom
from models.model import App, AppMode, Conversation, IconType, Message
from services.knowledge.external.service import ExternalDatasetService
from tests.unit_tests.core.model_fixtures import make_model_config
@@ -218,7 +219,7 @@ def _message() -> Message:
id="msg",
app_id=APP_ID,
conversation_id="conv",
- inputs={},
+ _inputs={},
query="query",
message={},
message_unit_price=Decimal(0),
@@ -226,7 +227,7 @@ def _message() -> Message:
answer_unit_price=Decimal(0),
total_price=Decimal(0),
currency="USD",
- invoke_from=InvokeFrom.SERVICE_API,
+ invoke_from=ModelInvokeFrom.SERVICE_API,
from_source=ConversationFromSource.API,
from_account_id="user",
app_mode=AppMode.COMPLETION,
@@ -250,8 +251,8 @@ def _persist_records(session: Session) -> tuple[App, Message]:
app_id=APP_ID,
mode=AppMode.COMPLETION,
name="Conversation",
- inputs={},
- invoke_from=InvokeFrom.SERVICE_API,
+ _inputs={},
+ invoke_from=ModelInvokeFrom.SERVICE_API,
from_source=ConversationFromSource.API,
from_account_id="user",
)
diff --git a/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py b/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py
index 04b359b045b..9fda53567e9 100644
--- a/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py
@@ -89,7 +89,7 @@ def _persist_message(
mode=AppMode.COMPLETION,
name="completion conversation",
summary=None,
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
invoke_from=InvokeFrom.WEB_APP,
@@ -109,7 +109,7 @@ def _persist_message(
model_id=None,
override_model_configs=None,
conversation_id=conversation.id,
- inputs={"a": 1},
+ _inputs={"a": 1},
query="q",
message={},
message_unit_price=Decimal(0),
@@ -184,14 +184,14 @@ class TestCompletionAppGenerator:
app_id="app1",
mode=AppMode.COMPLETION,
name="Conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.CONSOLE,
)
message = Message(
id="msg",
app_id="app1",
conversation_id="conv",
- inputs={},
+ _inputs={},
query="q",
message={},
message_unit_price=Decimal(0),
@@ -241,14 +241,14 @@ class TestCompletionAppGenerator:
app_id="app1",
mode=AppMode.COMPLETION,
name="Conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.CONSOLE,
)
message = Message(
id="msg",
app_id="app1",
conversation_id="conv",
- inputs={},
+ _inputs={},
query="q",
message={},
message_unit_price=Decimal(0),
@@ -299,14 +299,14 @@ class TestCompletionAppGenerator:
app_id="app1",
mode=AppMode.COMPLETION,
name="Conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.CONSOLE,
),
Message(
id="msg",
app_id="app1",
conversation_id="conv",
- inputs={},
+ _inputs={},
query="q",
message={},
message_unit_price=Decimal(0),
@@ -433,14 +433,14 @@ class TestCompletionAppGenerator:
app_id="app1",
mode=AppMode.COMPLETION,
name="Conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.CONSOLE,
),
Message(
id="msg",
app_id="app1",
conversation_id="conv",
- inputs={},
+ _inputs={},
query="q",
message={},
message_unit_price=Decimal(0),
diff --git a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generator.py b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generator.py
index 734f82f47b7..ec3a12bf1bb 100644
--- a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generator.py
+++ b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generator.py
@@ -155,7 +155,7 @@ def _persist_worker_records(session: Session) -> None:
type=EndUserType.BROWSER,
session_id="session",
name="User",
- is_anonymous=True,
+ _is_anonymous=True,
)
session.add_all([workflow, end_user])
session.commit()
diff --git a/api/tests/unit_tests/core/app/apps/test_advanced_chat_app_generator.py b/api/tests/unit_tests/core/app/apps/test_advanced_chat_app_generator.py
index e06c58c471a..f8b8599162b 100644
--- a/api/tests/unit_tests/core/app/apps/test_advanced_chat_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/test_advanced_chat_app_generator.py
@@ -112,7 +112,7 @@ def test_init_generate_records_marks_existing_conversation(sqlite_session: Sessi
model_id=None,
mode=app_config.app_mode.value,
name="existing",
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
diff --git a/api/tests/unit_tests/core/app/apps/test_pause_resume.py b/api/tests/unit_tests/core/app/apps/test_pause_resume.py
index 779c79b442e..660fac5dce1 100644
--- a/api/tests/unit_tests/core/app/apps/test_pause_resume.py
+++ b/api/tests/unit_tests/core/app/apps/test_pause_resume.py
@@ -231,7 +231,7 @@ def _make_conversation() -> Conversation:
app_id="app",
mode=AppMode.ADVANCED_CHAT,
name="Pause Resume Conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.API,
)
@@ -241,7 +241,7 @@ def _make_message() -> Message:
id="msg",
app_id="app",
conversation_id="conv",
- inputs={},
+ _inputs={},
query="query",
message={},
answer="answer",
diff --git a/api/tests/unit_tests/core/app/task_pipeline/test_based_generate_task_pipeline.py b/api/tests/unit_tests/core/app/task_pipeline/test_based_generate_task_pipeline.py
index 18c2fdd97a2..b492ca7f62c 100644
--- a/api/tests/unit_tests/core/app/task_pipeline/test_based_generate_task_pipeline.py
+++ b/api/tests/unit_tests/core/app/task_pipeline/test_based_generate_task_pipeline.py
@@ -25,7 +25,7 @@ def _persist_message(session: Session, *, message_id: str) -> Message:
model_id=None,
override_model_configs=None,
conversation_id="conversation-1",
- inputs={},
+ _inputs={},
query="query",
message={},
message_unit_price=Decimal(0),
diff --git a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline.py b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline.py
index ad4d6a55631..82bc7710f8d 100644
--- a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline.py
+++ b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline.py
@@ -166,16 +166,15 @@ class TestEasyUIBasedGenerateTaskPipelineProcessStreamResponse:
name="Test Conversation",
status="normal",
from_source=ConversationFromSource.API,
- inputs={},
+ _inputs={},
)
@pytest.fixture
def message(self):
"""Create a transient mapped message."""
- return Message(
- id="test-message-id",
- created_at=datetime.fromtimestamp(1234567890, tz=UTC),
- )
+ message = Message(id="test-message-id")
+ message.created_at = datetime.fromtimestamp(1234567890, tz=UTC)
+ return message
@pytest.fixture
def task_state(self):
diff --git a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py
index dc98873ab87..afe1c85e94d 100644
--- a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py
+++ b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py
@@ -148,7 +148,7 @@ def _make_conversation(app_mode: AppMode) -> Conversation:
model_id=None,
mode=app_mode,
name="conversation",
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
system_instruction_tokens=0,
@@ -167,7 +167,7 @@ def _make_message() -> Message:
message = Message(
app_id="app",
conversation_id="conv",
- inputs={},
+ _inputs={},
query="query",
message="",
message_tokens=0,
diff --git a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_message_end_files.py b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_message_end_files.py
index 4337e3a4ebe..91fd4d77bd7 100644
--- a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_message_end_files.py
+++ b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_message_end_files.py
@@ -76,9 +76,10 @@ class TestMessageEndStreamResponseFiles:
mode=AppMode.CHAT,
name="Conversation",
from_source=ConversationFromSource.API,
- inputs={},
+ _inputs={},
)
- message = Message(id=str(uuid.uuid4()), created_at=datetime.now())
+ message = Message(id=str(uuid.uuid4()))
+ message.created_at = datetime.now()
queue = MessageBasedAppQueueManager(
task_id=request.task_id,
user_id=request.user_id,
diff --git a/api/tests/unit_tests/core/llm_generator/test_llm_generator.py b/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
index c744d433356..eb469ddb6bb 100644
--- a/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
+++ b/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
@@ -106,8 +106,9 @@ def _persist_message(
currency="USD",
from_source=ConversationFromSource.API,
error="e",
- created_at=created_at,
)
+ if created_at is not None:
+ message.created_at = created_at
database.add(message)
database.commit()
return message
diff --git a/api/tests/unit_tests/core/memory/test_token_buffer_memory.py b/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
index 7a11d716b5f..211a0fe4484 100644
--- a/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
+++ b/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
@@ -164,8 +164,8 @@ def _persist_message(
currency="USD",
from_source=ConversationFromSource.API,
workflow_run_id=workflow_run_id,
- created_at=created_at or datetime.now(UTC).replace(tzinfo=None),
)
+ message.created_at = created_at or datetime.now(UTC).replace(tzinfo=None)
database.session.add(message)
database.session.commit()
return message
diff --git a/api/tests/unit_tests/core/ops/test_trace_session_metadata.py b/api/tests/unit_tests/core/ops/test_trace_session_metadata.py
index ea6ca53a56f..695578109d7 100644
--- a/api/tests/unit_tests/core/ops/test_trace_session_metadata.py
+++ b/api/tests/unit_tests/core/ops/test_trace_session_metadata.py
@@ -139,7 +139,7 @@ def test_message_trace_metadata_includes_trace_session_id(monkeypatch, sqlite_se
mode=AppMode.CHAT,
name="Trace Conversation",
summary=None,
- inputs={},
+ _inputs={},
introduction="",
system_instruction="",
invoke_from=None,
diff --git a/api/tests/unit_tests/core/plugin/test_backwards_invocation_app.py b/api/tests/unit_tests/core/plugin/test_backwards_invocation_app.py
index 9c7721624e8..ef9cd5fc0ce 100644
--- a/api/tests/unit_tests/core/plugin/test_backwards_invocation_app.py
+++ b/api/tests/unit_tests/core/plugin/test_backwards_invocation_app.py
@@ -428,7 +428,7 @@ class TestPluginAppBackwardsInvocation:
type=EndUserType.BROWSER,
session_id="browser-session",
name="Browser user",
- is_anonymous=True,
+ _is_anonymous=True,
)
self.session.add(end_user)
self.session.commit()
@@ -448,7 +448,7 @@ class TestPluginAppBackwardsInvocation:
type=EndUserType.BROWSER,
session_id="wecom-sender-1",
name="External user",
- is_anonymous=True,
+ _is_anonymous=True,
)
self.session.add(end_user)
self.session.commit()
@@ -466,7 +466,7 @@ class TestPluginAppBackwardsInvocation:
type=EndUserType.BROWSER,
session_id="browser-session",
name="Browser user",
- is_anonymous=True,
+ _is_anonymous=True,
)
self.session.add(end_user)
self.session.commit()
@@ -483,7 +483,7 @@ class TestPluginAppBackwardsInvocation:
type=EndUserType.BROWSER,
session_id="other-session",
name="External user",
- is_anonymous=True,
+ _is_anonymous=True,
)
self.session.add(end_user)
self.session.commit()
@@ -527,7 +527,7 @@ class TestPluginAppBackwardsInvocation:
type=EndUserType.BROWSER,
session_id="uid",
name="Wrong tenant",
- is_anonymous=True,
+ _is_anonymous=True,
)
self.session.add(other_tenant_user)
self.session.commit()
diff --git a/api/tests/unit_tests/core/prompt/test_extract_thread_messages.py b/api/tests/unit_tests/core/prompt/test_extract_thread_messages.py
index da6c7c64981..03ce1067f40 100644
--- a/api/tests/unit_tests/core/prompt/test_extract_thread_messages.py
+++ b/api/tests/unit_tests/core/prompt/test_extract_thread_messages.py
@@ -34,10 +34,10 @@ def _persisted_message(
currency="USD",
from_source=ConversationFromSource.API,
parent_message_id=parent_message_id,
- created_at=created_at,
- updated_at=created_at,
)
message._inputs = {}
+ message.created_at = created_at
+ message.updated_at = created_at
return message
diff --git a/api/tests/unit_tests/core/tools/test_tool_engine.py b/api/tests/unit_tests/core/tools/test_tool_engine.py
index 4384eedbfbb..7082e46e3f4 100644
--- a/api/tests/unit_tests/core/tools/test_tool_engine.py
+++ b/api/tests/unit_tests/core/tools/test_tool_engine.py
@@ -47,7 +47,7 @@ def _message() -> Message:
model_id="model",
override_model_configs=None,
conversation_id=str(uuid4()),
- inputs={},
+ _inputs={},
query="query",
message="",
message_tokens=0,
diff --git a/api/tests/unit_tests/extensions/test_ext_application_services.py b/api/tests/unit_tests/extensions/test_ext_application_services.py
index 3bafee7497b..1f8210890bf 100644
--- a/api/tests/unit_tests/extensions/test_ext_application_services.py
+++ b/api/tests/unit_tests/extensions/test_ext_application_services.py
@@ -29,7 +29,8 @@ from extensions.ext_database import db
from extensions.ext_redis import RedisClientWrapper
from machinery.context import RequestContext
from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
-from models.enums import AppStatus, CustomizeTokenStrategy
+from models.enums import AppStatus, ConversationFromSource, CustomizeTokenStrategy
+from models.enums import InvokeFrom as ModelInvokeFrom
from models.model import (
AccountTrialAppRecord,
App,
@@ -1274,7 +1275,14 @@ def test_trial_generation_uses_configured_access_runtime_and_usage(
app_id, tenant_id, account_id = str(uuid4()), str(uuid4()), str(uuid4())
with sqlite_session_factory.begin() as session:
session.add(
- App(id=app_id, tenant_id=tenant_id, name="Trial", mode="completion", enable_site=True, enable_api=False)
+ App(
+ id=app_id,
+ tenant_id=tenant_id,
+ name="Trial",
+ mode=AppMode.COMPLETION,
+ enable_site=True,
+ enable_api=False,
+ )
)
account = Account(name="Account", email="[email protected]")
account.id = account_id
@@ -1317,7 +1325,7 @@ def test_app_audio_uses_the_configured_database_and_app_owner(
id=app_id,
tenant_id=tenant_id,
name="Trial",
- mode="chat",
+ mode=AppMode.CHAT,
app_model_config_id=config.id,
enable_site=True,
enable_api=False,
@@ -1366,8 +1374,22 @@ def test_app_previews_use_the_configured_catalog_and_app_owner(
with sqlite_session_factory.begin() as session:
session.add_all(
[
- App(id=app_id, tenant_id=tenant_id, name="Preview", mode="chat", enable_site=False, enable_api=False),
- App(id=other_id, tenant_id=tenant_id, name="Private", mode="chat", enable_site=False, enable_api=False),
+ App(
+ id=app_id,
+ tenant_id=tenant_id,
+ name="Preview",
+ mode=AppMode.CHAT,
+ enable_site=False,
+ enable_api=False,
+ ),
+ App(
+ id=other_id,
+ tenant_id=tenant_id,
+ name="Private",
+ mode=AppMode.CHAT,
+ enable_site=False,
+ enable_api=False,
+ ),
]
)
@@ -1394,7 +1416,14 @@ def test_app_preview_details_use_the_configured_database_without_request_globals
session.add_all(
[
account,
- App(id=app_id, tenant_id=owner_id, name="Preview", mode="chat", enable_site=True, enable_api=False),
+ App(
+ id=app_id,
+ tenant_id=owner_id,
+ name="Preview",
+ mode=AppMode.CHAT,
+ enable_site=True,
+ enable_api=False,
+ ),
Site(
app_id=app_id,
title="Preview site",
@@ -1747,11 +1776,11 @@ def test_installed_app_conversations_wire_real_persistence_naming_and_cleanup(
app_id=app.id,
mode=AppMode.CHAT,
name="Original",
- inputs={"enabled": False},
- from_source="console",
+ _inputs={"enabled": False},
+ from_source=ConversationFromSource.CONSOLE,
from_account_id=account_id,
from_end_user_id=None,
- invoke_from="explore",
+ invoke_from=ModelInvokeFrom.EXPLORE,
)
session.add(conversation)
session.flush()
@@ -1760,14 +1789,14 @@ def test_installed_app_conversations_wire_real_persistence_naming_and_cleanup(
Message(
app_id=app.id,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query="First question",
message={},
message_unit_price=Decimal(0),
answer="Answer",
answer_unit_price=Decimal(0),
currency="USD",
- from_source="console",
+ from_source=ConversationFromSource.CONSOLE,
from_account_id=account_id,
)
)
diff --git a/api/tests/unit_tests/model_factories.py b/api/tests/unit_tests/model_factories.py
index 3f79f797657..cdb5cb8e59e 100644
--- a/api/tests/unit_tests/model_factories.py
+++ b/api/tests/unit_tests/model_factories.py
@@ -17,10 +17,13 @@ from models.account import Account, AccountStatus, Tenant, TenantAccountRole, Te
from models.dataset import Dataset, Document
from models.enums import (
AppStatus,
+ ConversationStatus,
CreatorUserRole,
DataSourceType,
DocumentCreatedFrom,
EndUserType,
+ InvokeFrom,
+ MessageStatus,
PermissionEnum,
)
from models.model import (
@@ -164,7 +167,7 @@ def make_end_user(
session_id=session_id,
external_user_id=external_user_id,
name=name,
- is_anonymous=is_anonymous,
+ _is_anonymous=is_anonymous,
)
@@ -357,11 +360,11 @@ def make_conversation(
mode: AppMode = AppMode.CHAT,
name: str = "Conversation",
inputs: Mapping[str, object] | None = None,
- status: str | None = None,
+ status: ConversationStatus | str | None = None,
from_source: ConversationFromSource | None = None,
from_account_id: str | None = None,
from_end_user_id: str | None = None,
- invoke_from: str | None = None,
+ invoke_from: InvokeFrom | str | None = None,
introduction: str | None = None,
system_instruction: str | None = None,
system_instruction_tokens: int | None = None,
@@ -372,26 +375,38 @@ def make_conversation(
agent_workspace_binding_id: str | None = None,
) -> Conversation:
"""Build a transient ``Conversation``; unset keywords leave their column unset."""
- values: dict[str, object] = {"app_id": app_id, "mode": mode, "name": name}
- optional: dict[str, object | None] = {
- "id": conversation_id,
- "inputs": inputs,
- "status": status,
- "from_source": from_source,
- "from_account_id": from_account_id,
- "from_end_user_id": from_end_user_id,
- "invoke_from": invoke_from,
- "introduction": introduction,
- "system_instruction": system_instruction,
- "system_instruction_tokens": system_instruction_tokens,
- "override_model_configs": override_model_configs,
- "summary": summary,
- "dialogue_count": dialogue_count,
- "is_deleted": is_deleted,
- "agent_workspace_binding_id": agent_workspace_binding_id,
- }
- values.update({key: value for key, value in optional.items() if value is not None})
- return Conversation(**values)
+ result = Conversation(app_id=app_id, mode=mode, name=name)
+ if conversation_id is not None:
+ result.id = conversation_id
+ if inputs is not None:
+ result.inputs = inputs
+ if status is not None:
+ result.status = ConversationStatus(status)
+ if from_source is not None:
+ result.from_source = from_source
+ if from_account_id is not None:
+ result.from_account_id = from_account_id
+ if from_end_user_id is not None:
+ result.from_end_user_id = from_end_user_id
+ if invoke_from is not None:
+ result.invoke_from = InvokeFrom(invoke_from)
+ if introduction is not None:
+ result.introduction = introduction
+ if system_instruction is not None:
+ result.system_instruction = system_instruction
+ if system_instruction_tokens is not None:
+ result.system_instruction_tokens = system_instruction_tokens
+ if override_model_configs is not None:
+ result.override_model_configs = override_model_configs
+ if summary is not None:
+ result.summary = summary
+ if dialogue_count is not None:
+ result.dialogue_count = dialogue_count
+ if is_deleted is not None:
+ result.is_deleted = is_deleted
+ if agent_workspace_binding_id is not None:
+ result.agent_workspace_binding_id = agent_workspace_binding_id
+ return result
def make_message(
@@ -403,7 +418,7 @@ def make_message(
query: str | None = None,
message: object | None = None,
answer: str | None = None,
- status: str | None = None,
+ status: MessageStatus | str | None = None,
message_unit_price: Decimal | None = None,
answer_unit_price: Decimal | None = None,
total_price: Decimal | None = None,
@@ -411,7 +426,7 @@ def make_message(
from_source: ConversationFromSource | None = None,
from_account_id: str | None = None,
from_end_user_id: str | None = None,
- invoke_from: str | None = None,
+ invoke_from: InvokeFrom | str | None = None,
message_tokens: int | None = None,
answer_tokens: int | None = None,
provider_response_latency: float | None = None,
@@ -420,33 +435,52 @@ def make_message(
updated_at: datetime | None = None,
) -> Message:
"""Build a transient ``Message``; unset keywords leave their column unset."""
- values: dict[str, object] = {}
- optional: dict[str, object | None] = {
- "id": message_id,
- "app_id": app_id,
- "conversation_id": conversation_id,
- "inputs": inputs,
- "query": query,
- "message": message,
- "answer": answer,
- "status": status,
- "message_unit_price": message_unit_price,
- "answer_unit_price": answer_unit_price,
- "total_price": total_price,
- "currency": currency,
- "from_source": from_source,
- "from_account_id": from_account_id,
- "from_end_user_id": from_end_user_id,
- "invoke_from": invoke_from,
- "message_tokens": message_tokens,
- "answer_tokens": answer_tokens,
- "provider_response_latency": provider_response_latency,
- "workflow_run_id": workflow_run_id,
- "created_at": created_at,
- "updated_at": updated_at,
- }
- values.update({key: value for key, value in optional.items() if value is not None})
- return Message(**values)
+ result = Message()
+ if message_id is not None:
+ result.id = message_id
+ if app_id is not None:
+ result.app_id = app_id
+ if conversation_id is not None:
+ result.conversation_id = conversation_id
+ if inputs is not None:
+ result.inputs = inputs
+ if query is not None:
+ result.query = query
+ if message is not None:
+ result.message = message
+ if answer is not None:
+ result.answer = answer
+ if status is not None:
+ result.status = MessageStatus(status)
+ if message_unit_price is not None:
+ result.message_unit_price = message_unit_price
+ if answer_unit_price is not None:
+ result.answer_unit_price = answer_unit_price
+ if total_price is not None:
+ result.total_price = total_price
+ if currency is not None:
+ result.currency = currency
+ if from_source is not None:
+ result.from_source = from_source
+ if from_account_id is not None:
+ result.from_account_id = from_account_id
+ if from_end_user_id is not None:
+ result.from_end_user_id = from_end_user_id
+ if invoke_from is not None:
+ result.invoke_from = InvokeFrom(invoke_from)
+ if message_tokens is not None:
+ result.message_tokens = message_tokens
+ if answer_tokens is not None:
+ result.answer_tokens = answer_tokens
+ if provider_response_latency is not None:
+ result.provider_response_latency = provider_response_latency
+ if workflow_run_id is not None:
+ result.workflow_run_id = workflow_run_id
+ if created_at is not None:
+ result.created_at = created_at
+ if updated_at is not None:
+ result.updated_at = updated_at
+ return result
def make_document(
diff --git a/api/tests/unit_tests/models/test_app_models.py b/api/tests/unit_tests/models/test_app_models.py
index f1a1e8280df..fe224066551 100644
--- a/api/tests/unit_tests/models/test_app_models.py
+++ b/api/tests/unit_tests/models/test_app_models.py
@@ -756,8 +756,8 @@ class TestConversationModel:
answer_unit_price=Decimal(0),
currency="USD",
from_source=ConversationFromSource.API,
- created_at=datetime(2024, 1, 1),
)
+ first_message.created_at = datetime(2024, 1, 1)
first_message._inputs = {}
later_message = Message(
app_id=conversation.app_id,
@@ -769,8 +769,8 @@ class TestConversationModel:
answer_unit_price=Decimal(0),
currency="USD",
from_source=ConversationFromSource.API,
- created_at=datetime(2024, 1, 2),
)
+ later_message.created_at = datetime(2024, 1, 2)
later_message._inputs = {}
sqlite_session.add_all([later_message, first_message])
sqlite_session.flush()
@@ -1057,9 +1057,9 @@ class TestMessageModel:
status="normal",
id=str(uuid4()),
_inputs={"query": "test"},
- created_at=now,
- updated_at=now,
)
+ message.created_at = now
+ message.updated_at = now
# Act
result = message.to_dict(session=sqlite_session)
diff --git a/api/tests/unit_tests/models/test_typebase_app_conversation_models.py b/api/tests/unit_tests/models/test_typebase_app_conversation_models.py
new file mode 100644
index 00000000000..db9d73f0e5c
--- /dev/null
+++ b/api/tests/unit_tests/models/test_typebase_app_conversation_models.py
@@ -0,0 +1,92 @@
+from decimal import Decimal
+
+import pytest
+from sqlalchemy import inspect
+from sqlalchemy.orm import Session
+
+from models.base import Base, TypeBase
+from models.enums import ApiTokenType, ConversationFromSource, EndUserType
+from models.model import ApiToken, App, AppMode, AppStar, Conversation, EndUser, Message
+
+TARGET_MODELS = (App, AppStar, Conversation, Message, EndUser, ApiToken)
+
+
+def test_app_conversation_models_use_typebase_registry() -> None:
+ for model in TARGET_MODELS:
+ mapper = inspect(model)
+ assert mapper.registry is TypeBase.registry
+ assert mapper.registry is not Base.registry
+
+
+def test_generated_identifiers_and_collection_defaults_are_independent() -> None:
+ first = Conversation(
+ app_id="app-1",
+ mode=AppMode.CHAT,
+ name="First",
+ from_source=ConversationFromSource.API,
+ )
+ second = Conversation(
+ app_id="app-1",
+ mode=AppMode.CHAT,
+ name="Second",
+ from_source=ConversationFromSource.API,
+ )
+
+ assert first.id != second.id
+ assert first._inputs == second._inputs == {}
+ assert first._inputs is not second._inputs
+
+
[email protected]("sqlite_session", [TARGET_MODELS], indirect=True)
+def test_app_conversation_models_persist_with_relationships(sqlite_session: Session) -> None:
+ app = App(
+ id="app-1",
+ tenant_id="tenant-1",
+ name="Typed app",
+ mode=AppMode.CHAT,
+ enable_site=True,
+ enable_api=True,
+ )
+ star = AppStar(id="star-1", tenant_id=app.tenant_id, app_id=app.id, account_id="account-1")
+ conversation = Conversation(
+ id="conversation-1",
+ app_id=app.id,
+ mode=AppMode.CHAT,
+ name="Typed conversation",
+ from_source=ConversationFromSource.API,
+ )
+ message = Message(
+ id="message-1",
+ app_id=app.id,
+ conversation_id=conversation.id,
+ query="hello",
+ message={"role": "user"},
+ answer="world",
+ from_source=ConversationFromSource.API,
+ total_price=Decimal(0),
+ )
+ end_user = EndUser(
+ id="end-user-1",
+ tenant_id=app.tenant_id,
+ app_id=app.id,
+ type=EndUserType.BROWSER,
+ session_id="session-1",
+ )
+ token = ApiToken(
+ id="token-1",
+ app_id=app.id,
+ tenant_id=app.tenant_id,
+ type=ApiTokenType.APP,
+ token="secret",
+ )
+
+ sqlite_session.add_all([app, star, conversation, message, end_user, token])
+ sqlite_session.commit()
+
+ persisted_conversation = sqlite_session.get(Conversation, conversation.id)
+ assert persisted_conversation is not None
+ assert [item.id for item in persisted_conversation.messages] == [message.id]
+ assert sqlite_session.get(AppStar, star.id) is not None
+ assert sqlite_session.get(EndUser, end_user.id) is not None
+ assert sqlite_session.get(ApiToken, token.id) is not None
+ assert message.created_at is not None
diff --git a/api/tests/unit_tests/models/test_web_models.py b/api/tests/unit_tests/models/test_web_models.py
index 1abd9fb094e..d9c8b4caa75 100644
--- a/api/tests/unit_tests/models/test_web_models.py
+++ b/api/tests/unit_tests/models/test_web_models.py
@@ -24,7 +24,7 @@ def _persist_message(session: Session, *, app_id: str) -> Message:
message = Message(
app_id=app_id,
conversation_id=str(uuid4()),
- inputs={},
+ _inputs={},
query="hello",
message=[{"role": "user", "text": "hello"}],
message_unit_price=Decimal(0),
diff --git a/api/tests/unit_tests/repositories/app/test_tracing_settings_repository.py b/api/tests/unit_tests/repositories/app/test_tracing_settings_repository.py
index e76f69e4233..6ff338346ea 100644
--- a/api/tests/unit_tests/repositories/app/test_tracing_settings_repository.py
+++ b/api/tests/unit_tests/repositories/app/test_tracing_settings_repository.py
@@ -6,7 +6,7 @@ import pytest
from sqlalchemy.orm import Session, sessionmaker
from machinery.context import RequestContext
-from models.model import App
+from models.model import App, AppMode
from repositories.app.console_repository import ConsoleAppRepository
from repositories.app.tracing_config_repository import SQLAlchemyAppTracingConfigRepository
from services.app_tracing_config_service import AppTraceSettings, AppTracingConfigAppNotFoundError
@@ -20,7 +20,7 @@ def test_capture_policy_round_trip_and_legacy_defaults(sqlite_session_factory: s
id="app",
tenant_id="tenant",
name="Trace app",
- mode="workflow",
+ mode=AppMode.WORKFLOW,
enable_site=False,
enable_api=False,
tracing=json.dumps({"enabled": True, "tracing_provider": "langfuse"}),
diff --git a/api/tests/unit_tests/repositories/test_console_app_repository.py b/api/tests/unit_tests/repositories/test_console_app_repository.py
index 44f12f5ccc6..91eab436241 100644
--- a/api/tests/unit_tests/repositories/test_console_app_repository.py
+++ b/api/tests/unit_tests/repositories/test_console_app_repository.py
@@ -46,7 +46,9 @@ def persist_app(session: Session, **changes: object) -> App:
"updated_by": ACTOR,
}
values.update(changes)
- app = App(**values)
+ app = App()
+ for key, value in values.items():
+ setattr(app, key, value)
session.add(app)
session.commit()
return app
diff --git a/api/tests/unit_tests/repositories/test_end_user_repository.py b/api/tests/unit_tests/repositories/test_end_user_repository.py
index c990a886d38..f5d6f701a93 100644
--- a/api/tests/unit_tests/repositories/test_end_user_repository.py
+++ b/api/tests/unit_tests/repositories/test_end_user_repository.py
@@ -15,20 +15,19 @@ _APP_ID = "33333333-3333-3333-3333-333333333333"
def _persist_end_user(session: Session) -> None:
timestamp = datetime(2026, 1, 1)
- session.add(
- EndUser(
- id=_END_USER_ID,
- tenant_id=_TENANT_ID,
- app_id=_APP_ID,
- type=EndUserType.SERVICE_API,
- external_user_id="external-1",
- name="Alice",
- is_anonymous=True,
- session_id="session-1",
- created_at=timestamp,
- updated_at=timestamp,
- )
+ end_user = EndUser(
+ id=_END_USER_ID,
+ tenant_id=_TENANT_ID,
+ app_id=_APP_ID,
+ type=EndUserType.SERVICE_API,
+ external_user_id="external-1",
+ name="Alice",
+ _is_anonymous=True,
+ session_id="session-1",
)
+ end_user.created_at = timestamp
+ end_user.updated_at = timestamp
+ session.add(end_user)
session.commit()
diff --git a/api/tests/unit_tests/repositories/test_human_input_file_upload_repository.py b/api/tests/unit_tests/repositories/test_human_input_file_upload_repository.py
index 35639bc8aad..61c4346bbf1 100644
--- a/api/tests/unit_tests/repositories/test_human_input_file_upload_repository.py
+++ b/api/tests/unit_tests/repositories/test_human_input_file_upload_repository.py
@@ -198,7 +198,7 @@ def test_get_upload_owner_scopes_end_user_to_tenant_and_app(
tenant_id=_TENANT_ID,
app_id=_APP_ID,
type=EndUserType.BROWSER,
- is_anonymous=False,
+ _is_anonymous=False,
session_id="session",
external_user_id="external-user",
)
diff --git a/api/tests/unit_tests/repositories/test_installed_app_conversation_repository.py b/api/tests/unit_tests/repositories/test_installed_app_conversation_repository.py
index 51ecfd88a30..b4476ec79d6 100644
--- a/api/tests/unit_tests/repositories/test_installed_app_conversation_repository.py
+++ b/api/tests/unit_tests/repositories/test_installed_app_conversation_repository.py
@@ -11,6 +11,7 @@ from sqlalchemy.orm import Session, sessionmaker
from core.app.entities.app_invoke_entities import InvokeFrom
from models.agent import AgentWorkingResourceStatus, AgentWorkspace, AgentWorkspaceOwnerType
from models.enums import ConversationFromSource, CreatorUserRole
+from models.enums import InvokeFrom as ModelInvokeFrom
from models.model import App, AppMode, Conversation, InstalledApp, Message
from models.web import PinnedConversation
from repositories.installed_app_conversation_repository import SQLAlchemyInstalledAppConversationRepository
@@ -55,38 +56,37 @@ def _conversation(
app_id=installation.app_id,
mode=AppMode.CHAT,
name="Original name",
- inputs={"empty": "", "list": [], "zero": 0, "flag": False, "none": None},
+ _inputs={"empty": "", "list": [], "zero": 0, "flag": False, "none": None},
introduction=None,
from_source=ConversationFromSource.CONSOLE,
from_account_id=_ACCOUNT_ID,
from_end_user_id=None,
- created_at=_TIME - timedelta(days=1),
- updated_at=updated_at,
- invoke_from=invoke_from,
+ invoke_from=ModelInvokeFrom(invoke_from) if invoke_from is not None else None,
is_deleted=False,
)
+ conversation.created_at = _TIME - timedelta(days=1)
+ conversation.updated_at = updated_at
session.add(conversation)
session.flush()
return conversation
def _message(session: Session, conversation: Conversation, *, query: str, created_at: datetime) -> None:
- session.add(
- Message(
- app_id=conversation.app_id,
- conversation_id=conversation.id,
- inputs={},
- query=query,
- message={},
- message_unit_price=Decimal(0),
- answer="",
- answer_unit_price=Decimal(0),
- currency="USD",
- from_source=ConversationFromSource.CONSOLE,
- from_account_id=_ACCOUNT_ID,
- created_at=created_at,
- )
+ created_message = Message(
+ app_id=conversation.app_id,
+ conversation_id=conversation.id,
+ _inputs={},
+ query=query,
+ message={},
+ message_unit_price=Decimal(0),
+ answer="",
+ answer_unit_price=Decimal(0),
+ currency="USD",
+ from_source=ConversationFromSource.CONSOLE,
+ from_account_id=_ACCOUNT_ID,
)
+ created_message.created_at = created_at
+ session.add(created_message)
def _pin(
diff --git a/api/tests/unit_tests/repositories/test_installed_app_message_repository.py b/api/tests/unit_tests/repositories/test_installed_app_message_repository.py
index 14f5200a0a8..a82611889df 100644
--- a/api/tests/unit_tests/repositories/test_installed_app_message_repository.py
+++ b/api/tests/unit_tests/repositories/test_installed_app_message_repository.py
@@ -47,7 +47,7 @@ def _conversation(session: Session, installation: InstalledAppRef) -> Conversati
app_id=installation.app_id,
mode=AppMode.CHAT,
name="Chat",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.CONSOLE,
from_account_id=_ACCOUNT_ID,
from_end_user_id=None,
@@ -62,7 +62,7 @@ def _message(session: Session, conversation: Conversation, *, created_at: dateti
message = Message(
app_id=conversation.app_id,
conversation_id=conversation.id,
- inputs={"empty": "", "list": [], "zero": 0, "false": False, "none": None},
+ _inputs={"empty": "", "list": [], "zero": 0, "false": False, "none": None},
query="Question",
message={},
answer="Answer",
@@ -76,8 +76,8 @@ def _message(session: Session, conversation: Conversation, *, created_at: dateti
from_source=ConversationFromSource.CONSOLE,
from_account_id=_ACCOUNT_ID,
from_end_user_id=None,
- created_at=created_at,
)
+ message.created_at = created_at
session.add(message)
session.flush()
return message
diff --git a/api/tests/unit_tests/repositories/test_webapp_access_query_repository.py b/api/tests/unit_tests/repositories/test_webapp_access_query_repository.py
index dc3adc6f325..01d80684a65 100644
--- a/api/tests/unit_tests/repositories/test_webapp_access_query_repository.py
+++ b/api/tests/unit_tests/repositories/test_webapp_access_query_repository.py
@@ -63,7 +63,7 @@ def test_find_app_id_by_code_returns_matching_site_app(sqlite_session_factory: s
id=_APP_ID,
tenant_id=_APP_ID,
name="Test App",
- mode="chat",
+ mode=AppMode.CHAT,
enable_site=True,
enable_api=True,
app_model_config_id=config.id,
@@ -99,7 +99,7 @@ def test_inactive_or_dangling_site_does_not_resolve_as_public_app(
id=_APP_ID,
tenant_id=_APP_ID,
name="Test App",
- mode="chat",
+ mode=AppMode.CHAT,
enable_site=disabled != "app",
enable_api=True,
app_model_config_id=config.id,
diff --git a/api/tests/unit_tests/schedule/test_clean_workflow_runlogs_precise.py b/api/tests/unit_tests/schedule/test_clean_workflow_runlogs_precise.py
index adaa42a3d59..b7f8d195661 100644
--- a/api/tests/unit_tests/schedule/test_clean_workflow_runlogs_precise.py
+++ b/api/tests/unit_tests/schedule/test_clean_workflow_runlogs_precise.py
@@ -146,7 +146,7 @@ def _seed_batch(session: Session) -> WorkflowRun:
app_id=app_id,
mode=AppMode.ADVANCED_CHAT,
name="cleanup test",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.CONSOLE,
)
session.add_all([run, conversation])
@@ -167,7 +167,7 @@ def _seed_batch(session: Session) -> WorkflowRun:
app_id=app_id,
conversation_id=conversation_id,
workflow_run_id=run_id,
- inputs={},
+ _inputs={},
query="question",
message={},
answer="answer",
diff --git a/api/tests/unit_tests/services/agent/test_agent_observability_service.py b/api/tests/unit_tests/services/agent/test_agent_observability_service.py
index 698a8dde3ca..ccfcc6e76e1 100644
--- a/api/tests/unit_tests/services/agent/test_agent_observability_service.py
+++ b/api/tests/unit_tests/services/agent/test_agent_observability_service.py
@@ -58,7 +58,7 @@ def _message(
created_at: datetime | None = None,
) -> Message:
timestamp = created_at or naive_utc_now()
- return make_message(
+ message = make_message(
message_id=message_id,
app_id=app_id,
conversation_id=conversation_id,
@@ -77,9 +77,10 @@ def _message(
message_tokens=3,
answer_tokens=4,
provider_response_latency=1.25,
- created_at=timestamp,
- updated_at=timestamp,
)
+ message.created_at = timestamp
+ message.updated_at = timestamp
+ return message
def _feedback(
diff --git a/api/tests/unit_tests/services/agent/test_roster_package_importer.py b/api/tests/unit_tests/services/agent/test_roster_package_importer.py
index fe09773a625..9a8a1ce7c56 100644
--- a/api/tests/unit_tests/services/agent/test_roster_package_importer.py
+++ b/api/tests/unit_tests/services/agent/test_roster_package_importer.py
@@ -33,7 +33,7 @@ from models.agent import (
)
from models.agent_config_entities import AgentSoulConfig
from models.base import Base, TypeBase
-from models.model import App, AppModelConfig, InstalledApp, Site, UploadFile
+from models.model import App, AppMode, AppModelConfig, InstalledApp, Site, UploadFile
from models.tools import ToolFile
from services.agent import roster_package_importer as importer_module
from services.agent.dsl_entities import (
@@ -190,7 +190,7 @@ def _package(
value=PluginDependency.Marketplace(marketplace_plugin_unique_identifier="langgenius/example:1.0.0@digest"),
)
app = make_agent_app_dsl(
- App(name=name, mode="agent"),
+ App(name=name, mode=AppMode.AGENT),
package_ref="agent_1",
packages={
"agent_1": AgentPackage(
diff --git a/api/tests/unit_tests/services/agent/test_runtime_usage_service.py b/api/tests/unit_tests/services/agent/test_runtime_usage_service.py
index cc29dadf456..28859d264ca 100644
--- a/api/tests/unit_tests/services/agent/test_runtime_usage_service.py
+++ b/api/tests/unit_tests/services/agent/test_runtime_usage_service.py
@@ -24,7 +24,7 @@ from models.agent import (
AgentWorkspaceOwnerType,
)
from models.agent_sandbox_usage import AgentSandboxExecution, AgentSandboxUsageEvent
-from models.model import App
+from models.model import App, AppMode
from services.agent.runtime_usage_service import SandboxUsageError, SandboxUsageEvent, SandboxUsageService
from tests.unit_tests.config_override import config_overrides_context
@@ -484,7 +484,7 @@ def business_owner(
tenant_id=tenant_id,
name="Metering test",
description="",
- mode="agent",
+ mode=AppMode.AGENT,
enable_site=False,
enable_api=False,
max_active_requests=None,
diff --git a/api/tests/unit_tests/services/app/test_agent_app_feature_service.py b/api/tests/unit_tests/services/app/test_agent_app_feature_service.py
index 76d66264042..b181ad2c0c9 100644
--- a/api/tests/unit_tests/services/app/test_agent_app_feature_service.py
+++ b/api/tests/unit_tests/services/app/test_agent_app_feature_service.py
@@ -15,6 +15,7 @@ from events.app_event import app_model_config_was_updated
from extensions.application_services.agent import build_agent_app_services
from machinery.context import RequestContext
from models.agent import Agent, AgentKind, AgentScope, AgentSource, AgentStatus
+from models.enums import AppStatus
from models.model import App, AppMode, AppModelConfig
from services.app.agent_app_contracts import AgentAppNotFoundError
from services.app.agent_app_feature_gateway import AgentAppFeatureValidator
@@ -85,7 +86,7 @@ def agent_app(sqlite_session: Session) -> App:
tenant_id=TENANT_ID,
name="Agent App",
mode=AppMode.AGENT,
- status="normal",
+ status=AppStatus.NORMAL,
enable_site=False,
enable_api=False,
max_active_requests=0,
diff --git a/api/tests/unit_tests/services/app/test_agent_app_sandbox_service.py b/api/tests/unit_tests/services/app/test_agent_app_sandbox_service.py
index cde8969bbb8..7393afb23b8 100644
--- a/api/tests/unit_tests/services/app/test_agent_app_sandbox_service.py
+++ b/api/tests/unit_tests/services/app/test_agent_app_sandbox_service.py
@@ -35,7 +35,7 @@ from models.agent import (
AgentWorkspaceOwnerType,
)
from models.agent_config_entities import AgentSoulConfig
-from models.enums import ConversationFromSource, CreatorUserRole
+from models.enums import AppStatus, ConversationFromSource, CreatorUserRole
from models.model import App, AppMode, Conversation
from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom
from repositories.app.agent_app_repository import AgentAppRepository
@@ -113,7 +113,7 @@ def sandbox(
tenant_id="tenant-1",
name="Sandbox",
mode=AppMode.ADVANCED_CHAT if kind == "advanced_chat" else AppMode.WORKFLOW if workflow else AppMode.AGENT,
- status="normal",
+ status=AppStatus.NORMAL,
enable_site=False,
enable_api=False,
max_active_requests=0,
diff --git a/api/tests/unit_tests/services/app/test_api_key_service.py b/api/tests/unit_tests/services/app/test_api_key_service.py
index f66336cc04a..8e930c557b1 100644
--- a/api/tests/unit_tests/services/app/test_api_key_service.py
+++ b/api/tests/unit_tests/services/app/test_api_key_service.py
@@ -7,6 +7,7 @@ from sqlalchemy.orm import Session, sessionmaker
from extensions.application_services.app import build_app_api_key_service
from machinery.context import RequestContext
from models.agent import Agent, AgentConfigRevision, AgentConfigRevisionOperation, AgentScope, AgentSource, AgentStatus
+from models.enums import ApiTokenType
from models.model import ApiToken, App, AppMode
from repositories.app.api_key_repository import AppApiKeyRepository
from services.app.api_key_service import AppApiKeyNotReadyError, AppApiKeyService
@@ -223,7 +224,9 @@ def test_hidden_workflow_app_keys_remain_inaccessible(
backing_app_id="app",
)
)
- sqlite_session.add(ApiToken(id="hidden-key", tenant_id="tenant", app_id="app", type="app", token="secret"))
+ sqlite_session.add(
+ ApiToken(id="hidden-key", tenant_id="tenant", app_id="app", type=ApiTokenType.APP, token="secret")
+ )
sqlite_session.commit()
context = RequestContext("request", None, "actor", "tenant")
invoke = {
diff --git a/api/tests/unit_tests/services/app/test_query_service.py b/api/tests/unit_tests/services/app/test_query_service.py
index a4a14b886e6..3a8b5d7c195 100644
--- a/api/tests/unit_tests/services/app/test_query_service.py
+++ b/api/tests/unit_tests/services/app/test_query_service.py
@@ -62,7 +62,10 @@ def persist_app(session: Session, *, tenant_id: str, **values: object) -> str:
"enable_site": False,
}
attributes.update(values)
- session.add(App(**attributes))
+ app = App()
+ for key, value in attributes.items():
+ setattr(app, key, value)
+ session.add(app)
session.commit()
return app_id
diff --git a/api/tests/unit_tests/services/knowledge/test_dataset_adapters.py b/api/tests/unit_tests/services/knowledge/test_dataset_adapters.py
index 50029e979f1..af252d99a56 100644
--- a/api/tests/unit_tests/services/knowledge/test_dataset_adapters.py
+++ b/api/tests/unit_tests/services/knowledge/test_dataset_adapters.py
@@ -30,6 +30,7 @@ from models.enums import (
IndexingStatus,
SegmentStatus,
)
+from models.model import AppMode
from repositories.app.console_repository import ConsoleAppRepository
from services.enterprise import rbac_service
from services.knowledge.dataset_access import DatasetNotFoundError
@@ -396,9 +397,14 @@ def test_queries_and_related_apps_materialize_after_session_close(
)
session.add_all(
[
- App(id="app", tenant_id="tenant", name="App", mode="chat", enable_api=False, enable_site=False),
+ App(id="app", tenant_id="tenant", name="App", mode=AppMode.CHAT, enable_api=False, enable_site=False),
App(
- id="foreign-app", tenant_id="other", name="Other", mode="chat", enable_api=False, enable_site=False
+ id="foreign-app",
+ tenant_id="other",
+ name="Other",
+ mode=AppMode.CHAT,
+ enable_api=False,
+ enable_site=False,
),
AppDatasetJoin(app_id="app", dataset_id="dataset"),
AppDatasetJoin(app_id="foreign-app", dataset_id="dataset"),
diff --git a/api/tests/unit_tests/services/retention/test_messages_clean_service_sqlite.py b/api/tests/unit_tests/services/retention/test_messages_clean_service_sqlite.py
index d6380c8e5f1..10cae80c214 100644
--- a/api/tests/unit_tests/services/retention/test_messages_clean_service_sqlite.py
+++ b/api/tests/unit_tests/services/retention/test_messages_clean_service_sqlite.py
@@ -4,6 +4,7 @@ import datetime
import math
import uuid
from collections.abc import Iterator
+from decimal import Decimal
from types import SimpleNamespace
from typing import TypedDict
@@ -15,7 +16,10 @@ from models import Tenant
from models.enums import FeedbackFromSource, FeedbackRating
from models.model import (
App,
+ AppMode,
Conversation,
+ ConversationFromSource,
+ ConversationStatus,
Message,
MessageAnnotation,
MessageFeedback,
@@ -73,7 +77,7 @@ def tenant_and_app() -> Iterator[TenantAndApp]:
app = App(
tenant_id=tenant.id,
name="Retention IT App",
- mode="chat",
+ mode=AppMode.CHAT,
enable_site=True,
enable_api=True,
)
@@ -82,10 +86,10 @@ def tenant_and_app() -> Iterator[TenantAndApp]:
conv = Conversation(
app_id=app.id,
- mode="chat",
+ mode=AppMode.CHAT,
name="test_conv",
- status="normal",
- from_source="console",
+ status=ConversationStatus.NORMAL,
+ from_source=ConversationFromSource.CONSOLE,
_inputs={},
)
session.add(conv)
@@ -105,21 +109,22 @@ def tenant_and_app() -> Iterator[TenantAndApp]:
def _make_message(app_id: str, conversation_id: str, created_at: datetime.datetime) -> Message:
- return Message(
+ message = Message(
app_id=app_id,
conversation_id=conversation_id,
query="test",
message=[{"text": "hello"}],
answer="world",
message_tokens=1,
- message_unit_price=0,
+ message_unit_price=Decimal(0),
answer_tokens=1,
- answer_unit_price=0,
- from_source="console",
+ answer_unit_price=Decimal(0),
+ from_source=ConversationFromSource.CONSOLE,
currency="USD",
_inputs={},
- created_at=created_at,
)
+ message.created_at = created_at
+ return message
class TestMessagesCleanServiceIntegration:
diff --git a/api/tests/unit_tests/services/test_app_audio_adapters.py b/api/tests/unit_tests/services/test_app_audio_adapters.py
index 9dbe7d0c985..3fc8ee8675e 100644
--- a/api/tests/unit_tests/services/test_app_audio_adapters.py
+++ b/api/tests/unit_tests/services/test_app_audio_adapters.py
@@ -77,7 +77,7 @@ def harness(
conversation_id=str(uuid4()),
query="Question",
answer=" Message answer ",
- inputs={},
+ _inputs={},
message={},
message_unit_price=Decimal(0),
answer_unit_price=Decimal(0),
diff --git a/api/tests/unit_tests/services/test_app_preview_details_adapters.py b/api/tests/unit_tests/services/test_app_preview_details_adapters.py
index d83a24d2859..b14c151cb68 100644
--- a/api/tests/unit_tests/services/test_app_preview_details_adapters.py
+++ b/api/tests/unit_tests/services/test_app_preview_details_adapters.py
@@ -85,9 +85,21 @@ class _Harness:
@pytest.fixture
def harness(sqlite_engine: Engine, sqlite_session_factory: sessionmaker[Session]) -> Iterator[_Harness]:
target = App(
- id=str(uuid4()), tenant_id=str(uuid4()), name="Preview", mode="chat", enable_site=True, enable_api=True
+ id=str(uuid4()),
+ tenant_id=str(uuid4()),
+ name="Preview",
+ mode=AppMode.CHAT,
+ enable_site=True,
+ enable_api=True,
+ )
+ decoy = App(
+ id=str(uuid4()),
+ tenant_id=str(uuid4()),
+ name="Decoy",
+ mode=AppMode.CHAT,
+ enable_site=True,
+ enable_api=True,
)
- decoy = App(id=str(uuid4()), tenant_id=str(uuid4()), name="Decoy", mode="chat", enable_site=True, enable_api=True)
account = Account(name="Viewer", email="[email protected]")
active_workspace = Tenant(name="Active workspace")
config = AppModelConfig(app_id=target.id, opening_statement="Preview opening", pre_prompt="Visible prompt")
diff --git a/api/tests/unit_tests/services/test_app_service.py b/api/tests/unit_tests/services/test_app_service.py
index 48fe5e2767f..1a5f3cbaec4 100644
--- a/api/tests/unit_tests/services/test_app_service.py
+++ b/api/tests/unit_tests/services/test_app_service.py
@@ -475,10 +475,10 @@ def test_get_recent_apps_uses_one_tenant_scoped_projection_query(sqlite_session:
enable_api=False,
created_by=account.id,
maintainer=account.id,
- created_at=updated_at,
- updated_at=updated_at,
use_icon_as_answer_icon=False,
)
+ app.created_at = updated_at
+ app.updated_at = updated_at
return app
newest = create_app(name="Newest", tenant_id=tenant_id, updated_at=datetime(2026, 7, 3))
diff --git a/api/tests/unit_tests/services/test_app_storage_cleanup_service.py b/api/tests/unit_tests/services/test_app_storage_cleanup_service.py
index 4a2b3af0ae8..4550e05961a 100644
--- a/api/tests/unit_tests/services/test_app_storage_cleanup_service.py
+++ b/api/tests/unit_tests/services/test_app_storage_cleanup_service.py
@@ -1,5 +1,6 @@
import json
from datetime import UTC, datetime
+from decimal import Decimal
from types import SimpleNamespace
from unittest.mock import MagicMock
@@ -445,19 +446,19 @@ def test_shared_message_files_are_retained(sqlite_session: Session, storage: Mag
upload.created_by_role = CreatorUserRole.END_USER
upload.created_by = user.id
conversation = Conversation(
- app_id="app-2", mode=AppMode.CHAT, name="other app", inputs={}, from_source=ConversationFromSource.API
+ app_id="app-2", mode=AppMode.CHAT, name="other app", _inputs={}, from_source=ConversationFromSource.API
)
sqlite_session.add(conversation)
sqlite_session.flush()
message = Message(
app_id="app-2",
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query="q",
message={},
- message_unit_price=0,
+ message_unit_price=Decimal(0),
answer="a",
- answer_unit_price=0,
+ answer_unit_price=Decimal(0),
currency="USD",
from_source=ConversationFromSource.API,
)
@@ -506,7 +507,7 @@ def test_conversation_owned_tools_are_cleaned_and_account_assets_retained(
sqlite_session: Session, storage: MagicMock
) -> None:
conversation = Conversation(
- app_id="app-1", mode=AppMode.CHAT, name="owned", inputs={}, from_source=ConversationFromSource.CONSOLE
+ app_id="app-1", mode=AppMode.CHAT, name="owned", _inputs={}, from_source=ConversationFromSource.CONSOLE
)
sqlite_session.add(conversation)
sqlite_session.flush()
diff --git a/api/tests/unit_tests/services/test_app_tracing_atomic_operations.py b/api/tests/unit_tests/services/test_app_tracing_atomic_operations.py
index 092bec779b9..035bb5eed5a 100644
--- a/api/tests/unit_tests/services/test_app_tracing_atomic_operations.py
+++ b/api/tests/unit_tests/services/test_app_tracing_atomic_operations.py
@@ -8,7 +8,7 @@ from sqlalchemy import event, select
from sqlalchemy.orm import Session, sessionmaker
from machinery.context import RequestContext
-from models.model import App, TraceAppConfig
+from models.model import App, AppMode, TraceAppConfig
from repositories.app.console_repository import ConsoleAppRepository
from repositories.app.tracing_config_repository import SQLAlchemyAppTracingConfigRepository
from services.app_tracing_config_gateway import OpsTraceManagerGateway
@@ -47,7 +47,7 @@ def case(sqlite_session_factory: sessionmaker[Session], monkeypatch: pytest.Monk
id="app",
tenant_id="tenant",
name="Trace",
- mode="workflow",
+ mode=AppMode.WORKFLOW,
enable_site=False,
enable_api=False,
tracing=json.dumps(
diff --git a/api/tests/unit_tests/services/test_conversation_service.py b/api/tests/unit_tests/services/test_conversation_service.py
index 0a34f832425..bfc1fcfbec1 100644
--- a/api/tests/unit_tests/services/test_conversation_service.py
+++ b/api/tests/unit_tests/services/test_conversation_service.py
@@ -172,10 +172,10 @@ class ConversationServiceTestDataFactory:
from_end_user_id=kwargs.get("from_end_user_id"),
from_account_id=kwargs.get("from_account_id", ACCOUNT_ID),
is_deleted=kwargs.get("is_deleted", False),
- created_at=kwargs.get("created_at", naive_utc_now()),
- updated_at=kwargs.get("updated_at", naive_utc_now()),
)
conversation._inputs = {}
+ conversation.created_at = kwargs.get("created_at", naive_utc_now())
+ conversation.updated_at = kwargs.get("updated_at", naive_utc_now())
for key, value in kwargs.items():
setattr(conversation, key, value)
return conversation
diff --git a/api/tests/unit_tests/services/test_installed_app_generation_adapters.py b/api/tests/unit_tests/services/test_installed_app_generation_adapters.py
index 9c36a3c6b09..277725c8fc2 100644
--- a/api/tests/unit_tests/services/test_installed_app_generation_adapters.py
+++ b/api/tests/unit_tests/services/test_installed_app_generation_adapters.py
@@ -1,6 +1,7 @@
import json
from collections.abc import Callable, Generator, Mapping
from dataclasses import dataclass, field
+from decimal import Decimal
from inspect import GEN_CLOSED, getgeneratorstate
from typing import cast, override
from unittest.mock import MagicMock
@@ -395,7 +396,7 @@ def _seed_more_like_this_message(harness: _RuntimeHarness, session_factory: sess
app_id=harness.app_id,
mode=AppMode.COMPLETION,
name="Earlier completion",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.CONSOLE,
from_account_id=harness.account_id,
)
@@ -404,12 +405,12 @@ def _seed_more_like_this_message(harness: _RuntimeHarness, session_factory: sess
message = Message(
app_id=harness.app_id,
conversation_id=conversation.id,
- inputs={"count": 0},
+ _inputs={"count": 0},
query="Earlier query",
message={},
answer="Earlier answer",
- message_unit_price=0,
- answer_unit_price=0,
+ message_unit_price=Decimal(0),
+ answer_unit_price=Decimal(0),
currency="USD",
from_source=ConversationFromSource.CONSOLE,
from_account_id=harness.account_id,
@@ -564,7 +565,7 @@ def _seed_chat_conversation(
app_id=app.id,
mode=mode,
name="Existing conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.CONSOLE,
from_account_id=harness.account_id,
from_end_user_id=None,
diff --git a/api/tests/unit_tests/services/test_message_suggested_questions_adapters.py b/api/tests/unit_tests/services/test_message_suggested_questions_adapters.py
index c492145d956..ee7fce5f813 100644
--- a/api/tests/unit_tests/services/test_message_suggested_questions_adapters.py
+++ b/api/tests/unit_tests/services/test_message_suggested_questions_adapters.py
@@ -199,7 +199,7 @@ def harness(
app_model_config_id=config.id,
mode=AppMode.CHAT,
name="End-user conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.API,
from_end_user_id=end_user.id,
)
@@ -208,7 +208,7 @@ def harness(
message = Message(
app_id=target.id,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query="How does this work?",
message={},
message_unit_price=Decimal(0),
diff --git a/api/tests/unit_tests/services/test_package_icons.py b/api/tests/unit_tests/services/test_package_icons.py
index b31bdf0901e..c5ea988eafe 100644
--- a/api/tests/unit_tests/services/test_package_icons.py
+++ b/api/tests/unit_tests/services/test_package_icons.py
@@ -168,7 +168,7 @@ def test_materialized_icon_is_owned_by_destination(monkeypatch: pytest.MonkeyPat
def test_roster_export_embeds_agent_icon(monkeypatch: pytest.MonkeyPatch) -> None:
from models.agent_config_entities import AgentSoulConfig
- from models.model import App
+ from models.model import App, AppMode
from services.agent.dsl_entities import AgentPackage, AgentPackageMetadata, make_agent_app_dsl
from services.agent.roster_package_exporter import RosterAgentPackageExporter
from services.agent.roster_package_reader import RosterAgentPackageReader
@@ -190,7 +190,7 @@ def test_roster_export_embeds_agent_icon(monkeypatch: pytest.MonkeyPatch) -> Non
)
resources.collect_icon(session=Mock(), tenant_id="source", metadata=metadata)
app = make_agent_app_dsl(
- App(name="Agent", mode="agent"),
+ App(name="Agent", mode=AppMode.AGENT),
package_ref="agent_1",
packages={
"agent_1": AgentPackage(metadata=AgentPackageMetadata.model_validate(metadata), soul=AgentSoulConfig())
diff --git a/api/tests/unit_tests/services/test_trial_app_generation_adapters.py b/api/tests/unit_tests/services/test_trial_app_generation_adapters.py
index 826bcc35de0..5e5ce5b4ea6 100644
--- a/api/tests/unit_tests/services/test_trial_app_generation_adapters.py
+++ b/api/tests/unit_tests/services/test_trial_app_generation_adapters.py
@@ -340,7 +340,7 @@ def _add_conversation(harness: _Harness, session_factory: sessionmaker[Session])
app_id=harness.app.app_id,
mode=AppMode.CHAT,
name="Conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.CONSOLE,
from_account_id=harness.account_id,
from_end_user_id=None,
diff --git a/api/tests/unit_tests/services/test_webapp_access_query_service.py b/api/tests/unit_tests/services/test_webapp_access_query_service.py
index 9212883b9ec..30170c98e17 100644
--- a/api/tests/unit_tests/services/test_webapp_access_query_service.py
+++ b/api/tests/unit_tests/services/test_webapp_access_query_service.py
@@ -7,7 +7,7 @@ from sqlalchemy.orm import sessionmaker
from enums import WebAppAccessMode
from models.enums import CustomizeTokenStrategy
-from models.model import App, AppModelConfig, Site
+from models.model import App, AppMode, AppModelConfig, Site
from repositories.webapp_access_query_repository import WebAppAccessQueryRepository
from services.webapp_access_query_service import (
WebAppAccessAppNotFoundError,
@@ -305,7 +305,7 @@ def test_app_code_lookup_releases_database_before_access_policy(sqlite_engine: E
id=app_id,
tenant_id=app_id,
name="Test App",
- mode="chat",
+ mode=AppMode.CHAT,
enable_site=True,
enable_api=True,
app_model_config_id=config.id,
diff --git a/api/tests/unit_tests/services/test_webhook_service_relationships.py b/api/tests/unit_tests/services/test_webhook_service_relationships.py
index ed22c91624a..55e16db554a 100644
--- a/api/tests/unit_tests/services/test_webhook_service_relationships.py
+++ b/api/tests/unit_tests/services/test_webhook_service_relationships.py
@@ -25,6 +25,7 @@ def test_draft_sync_preserves_webhook_id_when_deleted_node_is_restored(
App,
SimpleNamespace(id="00000000-0000-0000-0000-000000000001", tenant_id="tenant-1", created_by="user-1"),
)
+ assert app.created_by is not None
webhook_trigger = WorkflowWebhookTrigger(
app_id=app.id,
tenant_id=app.tenant_id,
@@ -69,6 +70,7 @@ def test_published_sync_removes_stale_webhook_relationships(
App,
SimpleNamespace(id="00000000-0000-0000-0000-000000000001", tenant_id="tenant-1", created_by="user-1"),
)
+ assert app.created_by is not None
webhook_trigger = WorkflowWebhookTrigger(
app_id=app.id,
tenant_id=app.tenant_id,
diff --git a/api/tests/unit_tests/services/tracing/test_mlflow_legacy_destination.py b/api/tests/unit_tests/services/tracing/test_mlflow_legacy_destination.py
index 9a2ab3b6bea..060e1e32e59 100644
--- a/api/tests/unit_tests/services/tracing/test_mlflow_legacy_destination.py
+++ b/api/tests/unit_tests/services/tracing/test_mlflow_legacy_destination.py
@@ -4,6 +4,7 @@ import json
import os
from concurrent.futures import ThreadPoolExecutor
from datetime import UTC, datetime, timedelta
+from decimal import Decimal
from threading import Barrier
from typing import Never
@@ -298,10 +299,10 @@ def test_other_legacy_entrypoints_use_the_same_private_sdk(
model_provider="test",
model_id="model",
answer="answer",
- total_price=0,
- created_at=started,
- updated_at=started + timedelta(seconds=1),
+ total_price=Decimal(0),
)
+ message.created_at = started
+ message.updated_at = started + timedelta(seconds=1)
common = {
"metadata": {},
"message_data": message,
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service.py b/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service.py
index 385d05f3266..282824e41b3 100644
--- a/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service.py
+++ b/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service.py
@@ -505,9 +505,10 @@ def test_get_message_context_by_app_should_scope_and_bound_compatibility_lookup(
def test_get_message_context_by_conversation_should_default_created_at_to_zero_when_message_has_no_timestamp() -> None:
session_maker = MagicMock()
- session_maker.return_value.__enter__.return_value.scalar.return_value = Message(
- id="msg-1", conversation_id="conv-1", answer="answer", created_at=None
- )
+ message = Message(id="msg-1", conversation_id="conv-1", answer="answer")
+ # Exercise a legacy row without a timestamp.
+ message.created_at = None # pyrefly: ignore[bad-assignment]
+ session_maker.return_value.__enter__.return_value.scalar.return_value = message
result = service_module._get_message_context_by_conversation(
session_maker, conversation_id="conv-1", workflow_run_id="run-1"
diff --git a/api/tests/unit_tests/services/workspace/test_member_service.py b/api/tests/unit_tests/services/workspace/test_member_service.py
index ddb97bafb76..d66e7e04af9 100644
--- a/api/tests/unit_tests/services/workspace/test_member_service.py
+++ b/api/tests/unit_tests/services/workspace/test_member_service.py
@@ -14,7 +14,7 @@ from extensions.ext_redis import RedisClientWrapper
from machinery.context import RequestContext
from models.account import Account, AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole
from models.dataset import Dataset
-from models.model import App
+from models.model import App, AppMode
from services.account.adapters import RedisInvitationTokenStore
from services.account_errors import AccountNotFoundError
from services.enterprise.rbac_service import RBACService
@@ -290,7 +290,7 @@ def test_removal_transfers_maintainers_only_in_the_target_workspace(
App(
tenant_id=tenant_id,
name="App",
- mode="chat",
+ mode=AppMode.CHAT,
maintainer=member_id,
enable_site=True,
enable_api=True,
diff --git a/api/tests/unit_tests/tasks/test_delete_conversation_task.py b/api/tests/unit_tests/tasks/test_delete_conversation_task.py
index aa86ac156a0..c21c3391183 100644
--- a/api/tests/unit_tests/tasks/test_delete_conversation_task.py
+++ b/api/tests/unit_tests/tasks/test_delete_conversation_task.py
@@ -6,7 +6,6 @@ import pytest
from sqlalchemy import select
from sqlalchemy.orm import Session
-from core.app.entities.app_invoke_entities import InvokeFrom
from core.workflow.human_input_adapter import DeliveryMethodType
from core.workflow.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
from graphon.file import FileTransferMethod, FileType
@@ -33,6 +32,7 @@ from models.enums import (
CreatorUserRole,
FeedbackFromSource,
FeedbackRating,
+ InvokeFrom,
MessageChainType,
)
from models.human_input import HumanInputDelivery, HumanInputFormRecipient, RecipientType
diff --git a/api/tests/unit_tests/tasks/test_workflow_execute_task.py b/api/tests/unit_tests/tasks/test_workflow_execute_task.py
index 1e11b3eaec6..2c622d21657 100644
--- a/api/tests/unit_tests/tasks/test_workflow_execute_task.py
+++ b/api/tests/unit_tests/tasks/test_workflow_execute_task.py
@@ -130,7 +130,7 @@ def _make_conversation(*, conversation_id: str = "conversation-id", app_id: str
app_id=app_id,
mode=AppMode.ADVANCED_CHAT,
name="Test Conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.API,
)
@@ -140,7 +140,7 @@ def _make_message(*, conversation_id: str = "conversation-id", workflow_run_id:
id="message-id",
app_id="app-id",
conversation_id=conversation_id,
- inputs={},
+ _inputs={},
query="query",
message={"role": "user", "content": "query"},
answer="answer",
@@ -254,7 +254,7 @@ def _persist_resumption_models(
app_id=app.id,
mode=AppMode.ADVANCED_CHAT,
name="Test Conversation",
- inputs={},
+ _inputs={},
from_source=ConversationFromSource.API,
)
messages = [
@@ -262,7 +262,7 @@ def _persist_resumption_models(
id="older-message-id",
app_id=app.id,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query="older matching message",
message={"role": "user", "content": "older"},
answer="older",
@@ -271,13 +271,12 @@ def _persist_resumption_models(
currency="USD",
from_source=ConversationFromSource.API,
workflow_run_id=workflow_run_id,
- created_at=datetime(2025, 1, 1),
),
Message(
id="expected-message-id",
app_id=app.id,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query="newer matching message",
message={"role": "user", "content": "expected"},
answer="expected",
@@ -286,13 +285,12 @@ def _persist_resumption_models(
currency="USD",
from_source=ConversationFromSource.API,
workflow_run_id=workflow_run_id,
- created_at=datetime(2025, 1, 2),
),
Message(
id="other-run-message-id",
app_id=app.id,
conversation_id=conversation.id,
- inputs={},
+ _inputs={},
query="newest message from another run",
message={"role": "user", "content": "other run"},
answer="other run",
@@ -301,9 +299,14 @@ def _persist_resumption_models(
currency="USD",
from_source=ConversationFromSource.API,
workflow_run_id="other-run-id",
- created_at=datetime(2025, 1, 3),
),
]
+ for message, created_at in zip(
+ messages,
+ (datetime(2025, 1, 1), datetime(2025, 1, 2), datetime(2025, 1, 3)),
+ strict=True,
+ ):
+ message.created_at = created_at
session.add(conversation)
session.add_all(messages)