mirror of
https://github.com/langgenius/dify.git
synced 2025-12-20 09:47:35 -05:00
* test: adding some web tests (#27792) * feat: add validation to prevent saving empty opening statement in conversation opener modal (#27843) * fix(web): improve the consistency of the inputs-form UI (#27837) * fix(web): increase z-index of PortalToFollowElemContent (#27823) * fix: installation_id is missing when in tools page (#27849) * fix: avoid passing empty uniqueIdentifier to InstallFromMarketplace (#27802) Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * test: create new test scripts and update some existing test scripts o… (#27850) * feat: change feedback to forum (#27862) * chore: translate i18n files and update type definitions (#27868) Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com> * Fix/template transformer line number (#27867) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com> * bump vite to 6.4.1 (#27877) * Add WEAVIATE_GRPC_ENDPOINT as designed in weaviate migration guide (#27861) Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> * Fix: correct DraftWorkflowApi.post response model (#27289) Signed-off-by: Yongtao Huang <yongtaoh2022@gmail.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> * fix Version 2.0.0-beta.2: Chat annotations Api Error #25506 (#27206) Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Asuka Minato <i@asukaminato.eu.org> * fix jina reader creadential migration command (#27883) * fix agent putout the output of workflow-tool twice (#26835) (#27087) * fix jina reader transform (#27922) * fix: prevent fetch version info in enterprise edition (#27923) * fix(api): fix `VariablePool.get` adding unexpected keys to variable_dictionary (#26767) Co-authored-by: -LAN- <laipz8200@outlook.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * refactor: implement tenant self queue for rag tasks (#27559) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: -LAN- <laipz8200@outlook.com> * fix: bump brotli to 1.2.0 resloved CVE-2025-6176 (#27950) Signed-off-by: kenwoodjw <blackxin55+@gmail.com> * docs: clarify how to obtain workflow_id for version execution (#28007) Signed-off-by: OneZero-Y <aukovyps@163.com> * fix: fix https://github.com/langgenius/dify/issues/27939 (#27985) * fix: the model list encountered two children with the same key (#27956) Co-authored-by: haokai <haokai@shuwen.com> * add onupdate=func.current_timestamp() (#28014) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * chore(deps): bump scipy-stubs from 1.16.2.3 to 1.16.3.0 in /api (#28025) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix typo in weaviate comment, improve time test precision, and add security tests for get-icon utility (#27919) Signed-off-by: NeatGuyCoding <15627489+NeatGuyCoding@users.noreply.github.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * feat: Add Audio Content Support for MCP Tools (#27979) * fix: elasticsearch_vector version (#28028) Co-authored-by: huangzhuo <huangzhuo1@xiaomi.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * fix workflow default updated_at (#28047) * feat(api): Introduce Broadcast Channel (#27835) This PR introduces a `BroadcastChannel` abstraction with broadcasting and at-most once delivery semantics, serving as the communication component between celery worker and API server. It also includes a reference implementation backed by Redis PubSub. Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> * fix * back --------- Signed-off-by: Yongtao Huang <yongtaoh2022@gmail.com> Signed-off-by: kenwoodjw <blackxin55+@gmail.com> Signed-off-by: OneZero-Y <aukovyps@163.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: NeatGuyCoding <15627489+NeatGuyCoding@users.noreply.github.com> Co-authored-by: aka James4u <smart.jamesjin@gmail.com> Co-authored-by: Novice <novice12185727@gmail.com> Co-authored-by: yangzheli <43645580+yangzheli@users.noreply.github.com> Co-authored-by: Elliott <105957288+Elliott-byte@users.noreply.github.com> Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com> Co-authored-by: johnny0120 <johnny0120@users.noreply.github.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Gritty_dev <101377478+codomposer@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: wangjifeng <163279492+kk-wangjifeng@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Boris Polonsky <BorisPolonsky@users.noreply.github.com> Co-authored-by: Yongtao Huang <yongtaoh2022@gmail.com> Co-authored-by: Cursx <33718736+Cursx@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Asuka Minato <i@asukaminato.eu.org> Co-authored-by: Jyong <76649700+JohnJyong@users.noreply.github.com> Co-authored-by: red_sun <56100962+redSun64@users.noreply.github.com> Co-authored-by: NFish <douxc512@gmail.com> Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com> Co-authored-by: -LAN- <laipz8200@outlook.com> Co-authored-by: hj24 <huangjian@dify.ai> Co-authored-by: kenwoodjw <blackxin55+@gmail.com> Co-authored-by: OneZero-Y <aukovyps@163.com> Co-authored-by: wangxiaolei <fatelei@gmail.com> Co-authored-by: Kenn <kennfalcon@gmail.com> Co-authored-by: haokai <haokai@shuwen.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: NeatGuyCoding <15627489+NeatGuyCoding@users.noreply.github.com> Co-authored-by: Will <vvfriday@gmail.com> Co-authored-by: huangzhuo1949 <167434202+huangzhuo1949@users.noreply.github.com> Co-authored-by: huangzhuo <huangzhuo1@xiaomi.com>
332 lines
14 KiB
Python
332 lines
14 KiB
Python
from datetime import datetime
|
|
from enum import StrEnum, auto
|
|
from functools import cached_property
|
|
from uuid import uuid4
|
|
|
|
import sqlalchemy as sa
|
|
from sqlalchemy import DateTime, String, func, text
|
|
from sqlalchemy.orm import Mapped, mapped_column
|
|
|
|
from libs.uuid_utils import uuidv7
|
|
|
|
from .base import Base
|
|
from .engine import db
|
|
from .types import LongText, StringUUID
|
|
|
|
|
|
class ProviderType(StrEnum):
|
|
CUSTOM = auto()
|
|
SYSTEM = auto()
|
|
|
|
@staticmethod
|
|
def value_of(value: str) -> "ProviderType":
|
|
for member in ProviderType:
|
|
if member.value == value:
|
|
return member
|
|
raise ValueError(f"No matching enum found for value '{value}'")
|
|
|
|
|
|
class ProviderQuotaType(StrEnum):
|
|
PAID = auto()
|
|
"""hosted paid quota"""
|
|
|
|
FREE = auto()
|
|
"""third-party free quota"""
|
|
|
|
TRIAL = auto()
|
|
"""hosted trial quota"""
|
|
|
|
@staticmethod
|
|
def value_of(value: str) -> "ProviderQuotaType":
|
|
for member in ProviderQuotaType:
|
|
if member.value == value:
|
|
return member
|
|
raise ValueError(f"No matching enum found for value '{value}'")
|
|
|
|
|
|
class Provider(Base):
|
|
"""
|
|
Provider model representing the API providers and their configurations.
|
|
"""
|
|
|
|
__tablename__ = "providers"
|
|
__table_args__ = (
|
|
sa.PrimaryKeyConstraint("id", name="provider_pkey"),
|
|
sa.Index("provider_tenant_id_provider_idx", "tenant_id", "provider_name"),
|
|
sa.UniqueConstraint(
|
|
"tenant_id", "provider_name", "provider_type", "quota_type", name="unique_provider_name_type_quota"
|
|
),
|
|
)
|
|
|
|
id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
|
|
tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
|
|
provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
provider_type: Mapped[str] = mapped_column(
|
|
String(40), nullable=False, server_default=text("'custom'")
|
|
)
|
|
is_valid: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=text("false"))
|
|
last_used: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
|
credential_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
|
|
|
|
quota_type: Mapped[str | None] = mapped_column(
|
|
String(40), nullable=True, server_default=text("''")
|
|
)
|
|
quota_limit: Mapped[int | None] = mapped_column(sa.BigInteger, nullable=True)
|
|
quota_used: Mapped[int | None] = mapped_column(sa.BigInteger, default=0)
|
|
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
|
|
updated_at: Mapped[datetime] = mapped_column(
|
|
DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
|
|
)
|
|
|
|
def __repr__(self):
|
|
return (
|
|
f"<Provider(id={self.id}, tenant_id={self.tenant_id}, provider_name='{self.provider_name}',"
|
|
f" provider_type='{self.provider_type}')>"
|
|
)
|
|
|
|
@cached_property
|
|
def credential(self):
|
|
if self.credential_id:
|
|
return db.session.query(ProviderCredential).where(ProviderCredential.id == self.credential_id).first()
|
|
|
|
@property
|
|
def credential_name(self):
|
|
credential = self.credential
|
|
return credential.credential_name if credential else None
|
|
|
|
@property
|
|
def encrypted_config(self):
|
|
credential = self.credential
|
|
return credential.encrypted_config if credential else None
|
|
|
|
@property
|
|
def token_is_set(self):
|
|
"""
|
|
Returns True if the encrypted_config is not None, indicating that the token is set.
|
|
"""
|
|
return self.encrypted_config is not None
|
|
|
|
@property
|
|
def is_enabled(self):
|
|
"""
|
|
Returns True if the provider is enabled.
|
|
"""
|
|
if self.provider_type == ProviderType.SYSTEM:
|
|
return self.is_valid
|
|
else:
|
|
return self.is_valid and self.token_is_set
|
|
|
|
|
|
class ProviderModel(Base):
|
|
"""
|
|
Provider model representing the API provider_models and their configurations.
|
|
"""
|
|
|
|
__tablename__ = "provider_models"
|
|
__table_args__ = (
|
|
sa.PrimaryKeyConstraint("id", name="provider_model_pkey"),
|
|
sa.Index("provider_model_tenant_id_provider_idx", "tenant_id", "provider_name"),
|
|
sa.UniqueConstraint(
|
|
"tenant_id", "provider_name", "model_name", "model_type", name="unique_provider_model_name"
|
|
),
|
|
)
|
|
|
|
id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
|
|
tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
|
|
provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
model_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
model_type: Mapped[str] = mapped_column(String(40), nullable=False)
|
|
credential_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
|
|
is_valid: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=text("false"))
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
|
|
updated_at: Mapped[datetime] = mapped_column(
|
|
DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
|
|
)
|
|
|
|
@cached_property
|
|
def credential(self):
|
|
if self.credential_id:
|
|
return (
|
|
db.session.query(ProviderModelCredential)
|
|
.where(ProviderModelCredential.id == self.credential_id)
|
|
.first()
|
|
)
|
|
|
|
@property
|
|
def credential_name(self):
|
|
credential = self.credential
|
|
return credential.credential_name if credential else None
|
|
|
|
@property
|
|
def encrypted_config(self):
|
|
credential = self.credential
|
|
return credential.encrypted_config if credential else None
|
|
|
|
|
|
class TenantDefaultModel(Base):
|
|
__tablename__ = "tenant_default_models"
|
|
__table_args__ = (
|
|
sa.PrimaryKeyConstraint("id", name="tenant_default_model_pkey"),
|
|
sa.Index("tenant_default_model_tenant_id_provider_type_idx", "tenant_id", "provider_name", "model_type"),
|
|
)
|
|
|
|
id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
|
|
tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
|
|
provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
model_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
model_type: Mapped[str] = mapped_column(String(40), nullable=False)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
|
|
updated_at: Mapped[datetime] = mapped_column(
|
|
DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
|
|
)
|
|
|
|
|
|
class TenantPreferredModelProvider(Base):
|
|
__tablename__ = "tenant_preferred_model_providers"
|
|
__table_args__ = (
|
|
sa.PrimaryKeyConstraint("id", name="tenant_preferred_model_provider_pkey"),
|
|
sa.Index("tenant_preferred_model_provider_tenant_provider_idx", "tenant_id", "provider_name"),
|
|
)
|
|
|
|
id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
|
|
tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
|
|
provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
preferred_provider_type: Mapped[str] = mapped_column(String(40), nullable=False)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
|
|
updated_at: Mapped[datetime] = mapped_column(
|
|
DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
|
|
)
|
|
|
|
|
|
class ProviderOrder(Base):
|
|
__tablename__ = "provider_orders"
|
|
__table_args__ = (
|
|
sa.PrimaryKeyConstraint("id", name="provider_order_pkey"),
|
|
sa.Index("provider_order_tenant_provider_idx", "tenant_id", "provider_name"),
|
|
)
|
|
|
|
id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
|
|
tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
|
|
provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
account_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
|
|
payment_product_id: Mapped[str] = mapped_column(String(191), nullable=False)
|
|
payment_id: Mapped[str | None] = mapped_column(String(191))
|
|
transaction_id: Mapped[str | None] = mapped_column(String(191))
|
|
quantity: Mapped[int] = mapped_column(sa.Integer, nullable=False, server_default=text("1"))
|
|
currency: Mapped[str | None] = mapped_column(String(40))
|
|
total_amount: Mapped[int | None] = mapped_column(sa.Integer)
|
|
payment_status: Mapped[str] = mapped_column(
|
|
String(40), nullable=False, server_default=text("'wait_pay'")
|
|
)
|
|
paid_at: Mapped[datetime | None] = mapped_column(DateTime)
|
|
pay_failed_at: Mapped[datetime | None] = mapped_column(DateTime)
|
|
refunded_at: Mapped[datetime | None] = mapped_column(DateTime)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
|
|
updated_at: Mapped[datetime] = mapped_column(
|
|
DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
|
|
)
|
|
|
|
|
|
class ProviderModelSetting(Base):
|
|
"""
|
|
Provider model settings for record the model enabled status and load balancing status.
|
|
"""
|
|
|
|
__tablename__ = "provider_model_settings"
|
|
__table_args__ = (
|
|
sa.PrimaryKeyConstraint("id", name="provider_model_setting_pkey"),
|
|
sa.Index("provider_model_setting_tenant_provider_model_idx", "tenant_id", "provider_name", "model_type"),
|
|
)
|
|
|
|
id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
|
|
tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
|
|
provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
model_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
model_type: Mapped[str] = mapped_column(String(40), nullable=False)
|
|
enabled: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=text("true"))
|
|
load_balancing_enabled: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=text("false"))
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
|
|
updated_at: Mapped[datetime] = mapped_column(
|
|
DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
|
|
)
|
|
|
|
|
|
class LoadBalancingModelConfig(Base):
|
|
"""
|
|
Configurations for load balancing models.
|
|
"""
|
|
|
|
__tablename__ = "load_balancing_model_configs"
|
|
__table_args__ = (
|
|
sa.PrimaryKeyConstraint("id", name="load_balancing_model_config_pkey"),
|
|
sa.Index("load_balancing_model_config_tenant_provider_model_idx", "tenant_id", "provider_name", "model_type"),
|
|
)
|
|
|
|
id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
|
|
tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
|
|
provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
model_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
model_type: Mapped[str] = mapped_column(String(40), nullable=False)
|
|
name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
encrypted_config: Mapped[str | None] = mapped_column(LongText, nullable=True)
|
|
credential_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
|
|
credential_source_type: Mapped[str | None] = mapped_column(String(40), nullable=True)
|
|
enabled: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=text("true"))
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
|
|
updated_at: Mapped[datetime] = mapped_column(
|
|
DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
|
|
)
|
|
|
|
|
|
class ProviderCredential(Base):
|
|
"""
|
|
Provider credential - stores multiple named credentials for each provider
|
|
"""
|
|
|
|
__tablename__ = "provider_credentials"
|
|
__table_args__ = (
|
|
sa.PrimaryKeyConstraint("id", name="provider_credential_pkey"),
|
|
sa.Index("provider_credential_tenant_provider_idx", "tenant_id", "provider_name"),
|
|
)
|
|
|
|
id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuidv7()))
|
|
tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
|
|
provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
credential_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
encrypted_config: Mapped[str] = mapped_column(LongText, nullable=False)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
|
|
updated_at: Mapped[datetime] = mapped_column(
|
|
DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
|
|
)
|
|
|
|
|
|
class ProviderModelCredential(Base):
|
|
"""
|
|
Provider model credential - stores multiple named credentials for each provider model
|
|
"""
|
|
|
|
__tablename__ = "provider_model_credentials"
|
|
__table_args__ = (
|
|
sa.PrimaryKeyConstraint("id", name="provider_model_credential_pkey"),
|
|
sa.Index(
|
|
"provider_model_credential_tenant_provider_model_idx",
|
|
"tenant_id",
|
|
"provider_name",
|
|
"model_name",
|
|
"model_type",
|
|
),
|
|
)
|
|
|
|
id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuidv7()))
|
|
tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
|
|
provider_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
model_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
model_type: Mapped[str] = mapped_column(String(40), nullable=False)
|
|
credential_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
encrypted_config: Mapped[str] = mapped_column(LongText, nullable=False)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
|
|
updated_at: Mapped[datetime] = mapped_column(
|
|
DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
|
|
)
|