mirror of
https://github.com/MODSetter/SurfSense.git
synced 2026-06-04 20:05:16 +02:00
refactor(gateway): rename persistence models to external chat
This commit is contained in:
Anish Sarkar
parent
f2d82234d4
commit
a57b741d5e
8 changed files with 274 additions and 323 deletions
|
|
@ -574,62 +574,45 @@ class ChatVisibility(StrEnum):
|
|||
# PUBLIC = "PUBLIC" # Reserved for future implementation
|
||||
|
||||
|
||||
class GatewayPlatform(StrEnum):
|
||||
class ExternalChatPlatform(StrEnum):
|
||||
TELEGRAM = "telegram"
|
||||
WHATSAPP = "whatsapp"
|
||||
SIGNAL = "signal"
|
||||
|
||||
|
||||
class GatewayAccountMode(StrEnum):
|
||||
class ExternalChatAccountMode(StrEnum):
|
||||
CLOUD_SHARED = "cloud_shared"
|
||||
SELF_HOST_BYO = "self_host_byo"
|
||||
|
||||
|
||||
class GatewayHealthStatus(StrEnum):
|
||||
class ExternalChatHealthStatus(StrEnum):
|
||||
UNKNOWN = "unknown"
|
||||
OK = "ok"
|
||||
FAILING = "failing"
|
||||
|
||||
|
||||
class GatewayBindingState(StrEnum):
|
||||
class ExternalChatBindingState(StrEnum):
|
||||
PENDING = "pending"
|
||||
BOUND = "bound"
|
||||
REVOKED = "revoked"
|
||||
SUSPENDED = "suspended"
|
||||
|
||||
|
||||
class GatewayPeerKind(StrEnum):
|
||||
class ExternalChatPeerKind(StrEnum):
|
||||
DIRECT = "direct"
|
||||
GROUP = "group"
|
||||
CHANNEL = "channel"
|
||||
UNKNOWN = "unknown"
|
||||
|
||||
|
||||
class GatewaySessionScope(StrEnum):
|
||||
PER_BINDING = "per_binding"
|
||||
PER_USER_SEARCH_SPACE = "per_user_search_space"
|
||||
EPHEMERAL = "ephemeral"
|
||||
|
||||
|
||||
class GatewayDmPolicy(StrEnum):
|
||||
ENABLED = "enabled"
|
||||
DISABLED = "disabled"
|
||||
|
||||
|
||||
class GatewayGroupPolicy(StrEnum):
|
||||
DISABLED = "disabled"
|
||||
ALLOWLIST = "allowlist"
|
||||
MENTION_REQUIRED = "mention_required"
|
||||
|
||||
|
||||
class GatewayEventKind(StrEnum):
|
||||
class ExternalChatEventKind(StrEnum):
|
||||
MESSAGE = "message"
|
||||
EDITED_MESSAGE = "edited_message"
|
||||
CALLBACK_QUERY = "callback_query"
|
||||
OTHER = "other"
|
||||
|
||||
|
||||
class GatewayEventStatus(StrEnum):
|
||||
class ExternalChatEventStatus(StrEnum):
|
||||
RECEIVED = "received"
|
||||
PROCESSING = "processing"
|
||||
PROCESSED = "processed"
|
||||
|
|
@ -713,12 +696,12 @@ class NewChatThread(BaseModel, TimestampMixin):
|
|||
# agent_llm_id changes). Unindexed: all reads are by primary key.
|
||||
pinned_llm_config_id = Column(Integer, nullable=True)
|
||||
|
||||
# Gateway-originated threads are persisted for the agent, but the UI Zero
|
||||
# publication only exposes ``source='web'`` rows.
|
||||
# Surface metadata for web and external chat threads. Zero publishes all
|
||||
# chat-message sources; the UI can decide which surfaces to render.
|
||||
source = Column(Text, nullable=False, default="web", server_default="web")
|
||||
binding_id = Column(
|
||||
external_chat_binding_id = Column(
|
||||
BigInteger,
|
||||
ForeignKey("gateway_conversation_bindings.id", ondelete="SET NULL"),
|
||||
ForeignKey("external_chat_bindings.id", ondelete="SET NULL"),
|
||||
nullable=True,
|
||||
index=True,
|
||||
)
|
||||
|
|
@ -743,9 +726,9 @@ class NewChatThread(BaseModel, TimestampMixin):
|
|||
back_populates="thread",
|
||||
cascade="all, delete-orphan",
|
||||
)
|
||||
gateway_binding = relationship(
|
||||
"GatewayConversationBinding",
|
||||
foreign_keys=[binding_id],
|
||||
external_chat_binding = relationship(
|
||||
"ExternalChatBinding",
|
||||
foreign_keys=[external_chat_binding_id],
|
||||
back_populates="threads",
|
||||
)
|
||||
|
||||
|
|
@ -822,23 +805,23 @@ class NewChatMessage(BaseModel, TimestampMixin):
|
|||
)
|
||||
|
||||
|
||||
class GatewayPlatformAccount(Base, TimestampMixin):
|
||||
__tablename__ = "gateway_platform_accounts"
|
||||
class ExternalChatAccount(Base, TimestampMixin):
|
||||
__tablename__ = "external_chat_accounts"
|
||||
__allow_unmapped__ = True
|
||||
|
||||
id = Column(BigInteger, primary_key=True, index=True)
|
||||
platform = Column(
|
||||
SQLAlchemyEnum(
|
||||
GatewayPlatform,
|
||||
name="gateway_platform",
|
||||
ExternalChatPlatform,
|
||||
name="external_chat_platform",
|
||||
values_callable=_enum_values,
|
||||
),
|
||||
nullable=False,
|
||||
)
|
||||
mode = Column(
|
||||
SQLAlchemyEnum(
|
||||
GatewayAccountMode,
|
||||
name="gateway_account_mode",
|
||||
ExternalChatAccountMode,
|
||||
name="external_chat_account_mode",
|
||||
values_callable=_enum_values,
|
||||
),
|
||||
nullable=False,
|
||||
|
|
@ -851,17 +834,18 @@ class GatewayPlatformAccount(Base, TimestampMixin):
|
|||
)
|
||||
is_system_account = Column(Boolean, nullable=False, default=False, server_default="false")
|
||||
encrypted_credentials = Column(Text, nullable=True)
|
||||
account_metadata = Column(JSONB, nullable=False, default=dict, server_default=text("'{}'::jsonb"))
|
||||
bot_username = Column(String(255), nullable=True)
|
||||
webhook_secret = Column(String(64), nullable=True)
|
||||
cursor_state = Column(JSONB, nullable=False, default=dict, server_default=text("'{}'::jsonb"))
|
||||
health_status = Column(
|
||||
SQLAlchemyEnum(
|
||||
GatewayHealthStatus,
|
||||
name="gateway_health_status",
|
||||
ExternalChatHealthStatus,
|
||||
name="external_chat_health_status",
|
||||
values_callable=_enum_values,
|
||||
),
|
||||
nullable=False,
|
||||
default=GatewayHealthStatus.UNKNOWN,
|
||||
server_default=GatewayHealthStatus.UNKNOWN.value,
|
||||
default=ExternalChatHealthStatus.UNKNOWN,
|
||||
server_default=ExternalChatHealthStatus.UNKNOWN.value,
|
||||
)
|
||||
last_health_check_at = Column(TIMESTAMP(timezone=True), nullable=True)
|
||||
suspended_at = Column(TIMESTAMP(timezone=True), nullable=True)
|
||||
|
|
@ -877,12 +861,12 @@ class GatewayPlatformAccount(Base, TimestampMixin):
|
|||
owner = relationship("User", foreign_keys=[owner_user_id])
|
||||
owner_search_space = relationship("SearchSpace", foreign_keys=[owner_search_space_id])
|
||||
bindings = relationship(
|
||||
"GatewayConversationBinding",
|
||||
"ExternalChatBinding",
|
||||
back_populates="account",
|
||||
cascade="all, delete-orphan",
|
||||
)
|
||||
inbound_events = relationship(
|
||||
"GatewayInboundEvent",
|
||||
"ExternalChatInboundEvent",
|
||||
back_populates="account",
|
||||
cascade="all, delete-orphan",
|
||||
)
|
||||
|
|
@ -891,32 +875,38 @@ class GatewayPlatformAccount(Base, TimestampMixin):
|
|||
CheckConstraint(
|
||||
"(is_system_account = true AND owner_user_id IS NULL) OR "
|
||||
"(is_system_account = false AND owner_user_id IS NOT NULL)",
|
||||
name="ck_gateway_accounts_owner_shape",
|
||||
name="ck_external_chat_accounts_owner_shape",
|
||||
),
|
||||
Index(
|
||||
"uq_gateway_accounts_owner_platform",
|
||||
"uq_external_chat_accounts_owner_platform",
|
||||
"owner_user_id",
|
||||
"platform",
|
||||
unique=True,
|
||||
postgresql_where=text("is_system_account = false"),
|
||||
),
|
||||
Index(
|
||||
"uq_gateway_accounts_system_platform",
|
||||
"uq_external_chat_accounts_system_platform",
|
||||
"platform",
|
||||
unique=True,
|
||||
postgresql_where=text("is_system_account = true"),
|
||||
),
|
||||
Index(
|
||||
"uq_external_chat_accounts_webhook_secret",
|
||||
"webhook_secret",
|
||||
unique=True,
|
||||
postgresql_where=text("webhook_secret IS NOT NULL"),
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
class GatewayConversationBinding(Base, TimestampMixin):
|
||||
__tablename__ = "gateway_conversation_bindings"
|
||||
class ExternalChatBinding(Base, TimestampMixin):
|
||||
__tablename__ = "external_chat_bindings"
|
||||
__allow_unmapped__ = True
|
||||
|
||||
id = Column(BigInteger, primary_key=True, index=True)
|
||||
account_id = Column(
|
||||
BigInteger,
|
||||
ForeignKey("gateway_platform_accounts.id", ondelete="CASCADE"),
|
||||
ForeignKey("external_chat_accounts.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
index=True,
|
||||
)
|
||||
|
|
@ -928,68 +918,37 @@ class GatewayConversationBinding(Base, TimestampMixin):
|
|||
)
|
||||
state = Column(
|
||||
SQLAlchemyEnum(
|
||||
GatewayBindingState,
|
||||
name="gateway_binding_state",
|
||||
ExternalChatBindingState,
|
||||
name="external_chat_binding_state",
|
||||
values_callable=_enum_values,
|
||||
),
|
||||
nullable=False,
|
||||
default=GatewayBindingState.PENDING,
|
||||
server_default=GatewayBindingState.PENDING.value,
|
||||
default=ExternalChatBindingState.PENDING,
|
||||
server_default=ExternalChatBindingState.PENDING.value,
|
||||
)
|
||||
pairing_code = Column(Text, nullable=True)
|
||||
pairing_code_expires_at = Column(TIMESTAMP(timezone=True), nullable=True)
|
||||
external_peer_id = Column(Text, nullable=True)
|
||||
external_peer_kind = Column(
|
||||
SQLAlchemyEnum(
|
||||
GatewayPeerKind,
|
||||
name="gateway_peer_kind",
|
||||
ExternalChatPeerKind,
|
||||
name="external_chat_peer_kind",
|
||||
values_callable=_enum_values,
|
||||
),
|
||||
nullable=False,
|
||||
default=GatewayPeerKind.UNKNOWN,
|
||||
server_default=GatewayPeerKind.UNKNOWN.value,
|
||||
default=ExternalChatPeerKind.UNKNOWN,
|
||||
server_default=ExternalChatPeerKind.UNKNOWN.value,
|
||||
)
|
||||
external_thread_id = Column(Text, nullable=True)
|
||||
external_display_name = Column(Text, nullable=True)
|
||||
external_username = Column(Text, nullable=True)
|
||||
external_pii_hashes = Column(JSONB, nullable=True)
|
||||
external_metadata = Column(JSONB, nullable=False, default=dict, server_default=text("'{}'::jsonb"))
|
||||
active_thread_id = Column(
|
||||
new_chat_thread_id = Column(
|
||||
Integer,
|
||||
ForeignKey("new_chat_threads.id", ondelete="SET NULL"),
|
||||
nullable=True,
|
||||
index=True,
|
||||
)
|
||||
session_scope = Column(
|
||||
SQLAlchemyEnum(
|
||||
GatewaySessionScope,
|
||||
name="gateway_session_scope",
|
||||
values_callable=_enum_values,
|
||||
),
|
||||
nullable=False,
|
||||
default=GatewaySessionScope.PER_BINDING,
|
||||
server_default=GatewaySessionScope.PER_BINDING.value,
|
||||
)
|
||||
dm_policy = Column(
|
||||
SQLAlchemyEnum(
|
||||
GatewayDmPolicy,
|
||||
name="gateway_dm_policy",
|
||||
values_callable=_enum_values,
|
||||
),
|
||||
nullable=False,
|
||||
default=GatewayDmPolicy.ENABLED,
|
||||
server_default=GatewayDmPolicy.ENABLED.value,
|
||||
)
|
||||
group_policy = Column(
|
||||
SQLAlchemyEnum(
|
||||
GatewayGroupPolicy,
|
||||
name="gateway_group_policy",
|
||||
values_callable=_enum_values,
|
||||
),
|
||||
nullable=False,
|
||||
default=GatewayGroupPolicy.DISABLED,
|
||||
server_default=GatewayGroupPolicy.DISABLED.value,
|
||||
)
|
||||
revoked_at = Column(TIMESTAMP(timezone=True), nullable=True)
|
||||
suspended_at = Column(TIMESTAMP(timezone=True), nullable=True)
|
||||
suspended_reason = Column(Text, nullable=True)
|
||||
|
|
@ -1001,24 +960,24 @@ class GatewayConversationBinding(Base, TimestampMixin):
|
|||
server_default=text("(now() AT TIME ZONE 'utc')"),
|
||||
)
|
||||
|
||||
account = relationship("GatewayPlatformAccount", back_populates="bindings")
|
||||
account = relationship("ExternalChatAccount", back_populates="bindings")
|
||||
user = relationship("User", foreign_keys=[user_id])
|
||||
search_space = relationship("SearchSpace", foreign_keys=[search_space_id])
|
||||
active_thread = relationship("NewChatThread", foreign_keys=[active_thread_id])
|
||||
new_chat_thread = relationship("NewChatThread", foreign_keys=[new_chat_thread_id])
|
||||
threads = relationship(
|
||||
"NewChatThread",
|
||||
back_populates="gateway_binding",
|
||||
foreign_keys="NewChatThread.binding_id",
|
||||
back_populates="external_chat_binding",
|
||||
foreign_keys="NewChatThread.external_chat_binding_id",
|
||||
)
|
||||
inbound_events = relationship(
|
||||
"GatewayInboundEvent",
|
||||
"ExternalChatInboundEvent",
|
||||
back_populates="binding",
|
||||
foreign_keys="GatewayInboundEvent.binding_id",
|
||||
foreign_keys="ExternalChatInboundEvent.external_chat_binding_id",
|
||||
)
|
||||
|
||||
__table_args__ = (
|
||||
Index(
|
||||
"uq_gateway_bindings_account_peer_active",
|
||||
"uq_external_chat_bindings_account_peer_active",
|
||||
"account_id",
|
||||
"external_peer_id",
|
||||
unique=True,
|
||||
|
|
@ -1027,37 +986,37 @@ class GatewayConversationBinding(Base, TimestampMixin):
|
|||
),
|
||||
),
|
||||
Index(
|
||||
"uq_gateway_bindings_pairing_code_pending",
|
||||
"uq_external_chat_bindings_pairing_code_pending",
|
||||
"pairing_code",
|
||||
unique=True,
|
||||
postgresql_where=text("state = 'pending'"),
|
||||
),
|
||||
Index("ix_gateway_bindings_user_state", "user_id", "state"),
|
||||
Index("ix_gateway_bindings_search_space_state", "search_space_id", "state"),
|
||||
Index("ix_external_chat_bindings_user_state", "user_id", "state"),
|
||||
Index("ix_external_chat_bindings_search_space_state", "search_space_id", "state"),
|
||||
)
|
||||
|
||||
|
||||
class GatewayInboundEvent(Base, TimestampMixin):
|
||||
__tablename__ = "gateway_inbound_events"
|
||||
class ExternalChatInboundEvent(Base, TimestampMixin):
|
||||
__tablename__ = "external_chat_inbound_events"
|
||||
__allow_unmapped__ = True
|
||||
|
||||
id = Column(BigInteger, primary_key=True, index=True)
|
||||
account_id = Column(
|
||||
BigInteger,
|
||||
ForeignKey("gateway_platform_accounts.id", ondelete="CASCADE"),
|
||||
ForeignKey("external_chat_accounts.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
index=True,
|
||||
)
|
||||
binding_id = Column(
|
||||
external_chat_binding_id = Column(
|
||||
BigInteger,
|
||||
ForeignKey("gateway_conversation_bindings.id", ondelete="SET NULL"),
|
||||
ForeignKey("external_chat_bindings.id", ondelete="SET NULL"),
|
||||
nullable=True,
|
||||
index=True,
|
||||
)
|
||||
platform = Column(
|
||||
SQLAlchemyEnum(
|
||||
GatewayPlatform,
|
||||
name="gateway_platform",
|
||||
ExternalChatPlatform,
|
||||
name="external_chat_platform",
|
||||
values_callable=_enum_values,
|
||||
),
|
||||
nullable=False,
|
||||
|
|
@ -1067,28 +1026,23 @@ class GatewayInboundEvent(Base, TimestampMixin):
|
|||
external_message_id = Column(Text, nullable=True)
|
||||
event_kind = Column(
|
||||
SQLAlchemyEnum(
|
||||
GatewayEventKind,
|
||||
name="gateway_event_kind",
|
||||
ExternalChatEventKind,
|
||||
name="external_chat_event_kind",
|
||||
values_callable=_enum_values,
|
||||
),
|
||||
nullable=False,
|
||||
)
|
||||
raw_payload = Column(JSONB, nullable=True)
|
||||
processing_metadata = Column(
|
||||
JSONB,
|
||||
nullable=False,
|
||||
default=dict,
|
||||
server_default=text("'{}'::jsonb"),
|
||||
)
|
||||
request_id = Column(String(64), nullable=True)
|
||||
status = Column(
|
||||
SQLAlchemyEnum(
|
||||
GatewayEventStatus,
|
||||
name="gateway_event_status",
|
||||
ExternalChatEventStatus,
|
||||
name="external_chat_event_status",
|
||||
values_callable=_enum_values,
|
||||
),
|
||||
nullable=False,
|
||||
default=GatewayEventStatus.RECEIVED,
|
||||
server_default=GatewayEventStatus.RECEIVED.value,
|
||||
default=ExternalChatEventStatus.RECEIVED,
|
||||
server_default=ExternalChatEventStatus.RECEIVED.value,
|
||||
)
|
||||
attempt_count = Column(Integer, nullable=False, default=0, server_default="0")
|
||||
last_error = Column(Text, nullable=True)
|
||||
|
|
@ -1100,17 +1054,26 @@ class GatewayInboundEvent(Base, TimestampMixin):
|
|||
)
|
||||
processed_at = Column(TIMESTAMP(timezone=True), nullable=True)
|
||||
|
||||
account = relationship("GatewayPlatformAccount", back_populates="inbound_events")
|
||||
binding = relationship("GatewayConversationBinding", back_populates="inbound_events")
|
||||
account = relationship("ExternalChatAccount", back_populates="inbound_events")
|
||||
binding = relationship("ExternalChatBinding", back_populates="inbound_events")
|
||||
|
||||
__table_args__ = (
|
||||
UniqueConstraint(
|
||||
"account_id",
|
||||
"event_dedupe_key",
|
||||
name="uq_gateway_inbound_account_dedupe_key",
|
||||
name="uq_external_chat_inbound_account_dedupe_key",
|
||||
),
|
||||
Index("ix_external_chat_inbound_status_received_at", "status", "received_at"),
|
||||
Index(
|
||||
"ix_external_chat_inbound_binding_received_at",
|
||||
"external_chat_binding_id",
|
||||
"received_at",
|
||||
),
|
||||
Index(
|
||||
"ix_external_chat_inbound_request_id",
|
||||
"request_id",
|
||||
postgresql_where=text("request_id IS NOT NULL"),
|
||||
),
|
||||
Index("ix_gateway_inbound_status_received_at", "status", "received_at"),
|
||||
Index("ix_gateway_inbound_binding_received_at", "binding_id", "received_at"),
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue