-
Dear {{ to }},
-
{{ inviter_name }} is pleased to invite you to join our workspace on Dify, a platform specifically designed for LLM application development. On Dify, you can explore, create, and collaborate to build and operate AI applications.
-
Click the button below to log in to Dify and join the workspace.
-
Login Here
-
diff --git a/api/templates/invite_member_mail_template_zh-CN.html b/api/templates/invite_member_mail_template_zh-CN.html
index b9d6619fa4..c7c321bf6f 100644
--- a/api/templates/invite_member_mail_template_zh-CN.html
+++ b/api/templates/invite_member_mail_template_zh-CN.html
@@ -1,72 +1,93 @@
-
+
-
-
-
-
尊敬的 {{ to }}，
-
{{ inviter_name }} 现邀请您加入我们在 Dify 的工作区，这是一个专为 LLM 应用开发而设计的平台。在 Dify 上，您可以探索、创造和合作，构建和运营 AI 应用。
-
点击下方按钮即可登录 Dify 并且加入空间。
-
在此登录
-
-
+
+
+
+
尊敬的 {{ to }}，
+
{{ inviter_name }} 现邀请您加入我们在 Dify 的工作区，这是一个专为 LLM 应用开发而设计的平台。在 Dify 上，您可以探索、创造和合作，构建和运营 AI 应用。
+
点击下方按钮即可登录 Dify 并且加入空间。
+
在此登录
+
此致，
+
Dify 团队
+
diff --git a/api/templates/transfer_workspace_new_owner_notify_template_en-US.html b/api/templates/transfer_workspace_new_owner_notify_template_en-US.html
new file mode 100644
index 0000000000..6e9dac8b9e
--- /dev/null
+++ b/api/templates/transfer_workspace_new_owner_notify_template_en-US.html
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
You are now the owner of {{WorkspaceName}}
+
+
You have been assigned as the new owner of the workspace "{{WorkspaceName}}".
+
As the new owner, you now have full administrative privileges for this workspace.
+
If you have any questions, please contact support@dify.ai.
+
+
+
+
+
+
diff --git a/api/templates/transfer_workspace_new_owner_notify_template_zh-CN.html b/api/templates/transfer_workspace_new_owner_notify_template_zh-CN.html
new file mode 100644
index 0000000000..5439079d95
--- /dev/null
+++ b/api/templates/transfer_workspace_new_owner_notify_template_zh-CN.html
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
您现在是 {{WorkspaceName}} 的所有者
+
+
您已被分配为工作空间“{{WorkspaceName}}”的新所有者。
+
作为新所有者，您现在对该工作空间拥有完全的管理权限。
+
如果您有任何问题，请联系support@dify.ai。
+
+
+
+
+
+
diff --git a/api/templates/transfer_workspace_old_owner_notify_template_en-US.html b/api/templates/transfer_workspace_old_owner_notify_template_en-US.html
new file mode 100644
index 0000000000..43f18fffc2
--- /dev/null
+++ b/api/templates/transfer_workspace_old_owner_notify_template_en-US.html
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
Workspace ownership has been transferred
+
+
You have successfully transferred ownership of the workspace "{{WorkspaceName}}" to {{NewOwnerEmail}}.
+
You no longer have owner privileges for this workspace. Your access level has been changed to Admin.
+
If you did not initiate this transfer or have concerns about this change, please contact support@dify.ai immediately.
+
+
+
+
+
+
diff --git a/api/templates/transfer_workspace_old_owner_notify_template_zh-CN.html b/api/templates/transfer_workspace_old_owner_notify_template_zh-CN.html
new file mode 100644
index 0000000000..48e855266e
--- /dev/null
+++ b/api/templates/transfer_workspace_old_owner_notify_template_zh-CN.html
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
工作区所有权已转移
+
+
您已成功将工作空间“{{WorkspaceName}}”的所有权转移给{{NewOwnerEmail}}。
+
您不再拥有此工作空间的拥有者权限。您的访问级别已更改为管理员。
+
如果您没有发起此转移或对此变更有任何疑问，请立即联系support@dify.ai。
+
+
+
+
+
+
diff --git a/api/templates/transfer_workspace_owner_confirm_template_en-US.html b/api/templates/transfer_workspace_owner_confirm_template_en-US.html
new file mode 100644
index 0000000000..101495ea8f
--- /dev/null
+++ b/api/templates/transfer_workspace_owner_confirm_template_en-US.html
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+
+
+
Verify Your Request to Transfer Workspace Ownership
+
+
We received a request to transfer ownership of your workspace “{{WorkspaceName}}”.
+
To confirm this action, please use the verification code below.
+
This code will only be valid for the next 5 minutes:
+
+
+ {{code}}
+
+
Please note:
+
+ The ownership transfer will take effect immediately once confirmed and cannot be undone.
+ You’ll become an admin member, and the new owner will have full control of the workspace.
+
+
If you didn’t make this request, please ignore this email or contact support immediately.
+
+
+
+
+
diff --git a/api/templates/transfer_workspace_owner_confirm_template_zh-CN.html b/api/templates/transfer_workspace_owner_confirm_template_zh-CN.html
new file mode 100644
index 0000000000..bd484f7cd4
--- /dev/null
+++ b/api/templates/transfer_workspace_owner_confirm_template_zh-CN.html
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+
+
+
验证您的工作空间所有权转移请求
+
+
我们收到了将您的工作空间“{{WorkspaceName}}”的所有权转移的请求。
+
为了确认此操作，请使用以下验证码。
+
此验证码仅在5分钟内有效：
+
+
+ {{code}}
+
+
请注意：
+
+ 所有权转移一旦确认将立即生效且无法撤销。
+ 您将成为管理员成员，新的所有者将拥有工作空间的完全控制权。
+
+
如果您没有发起此请求，请忽略此邮件或立即联系客服。
+
+
+
+
+
diff --git a/api/templates/without-brand/change_mail_confirm_new_template_en-US.html b/api/templates/without-brand/change_mail_confirm_new_template_en-US.html
new file mode 100644
index 0000000000..69a8978f42
--- /dev/null
+++ b/api/templates/without-brand/change_mail_confirm_new_template_en-US.html
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
Confirm Your New Email Address
+
+
You’re updating the email address linked to your Dify account.
+
To confirm this action, please use the verification code below.
+
This code will only be valid for the next 5 minutes:
+
+
+ {{code}}
+
+
If you didn’t make this request, please ignore this email or contact support immediately.
+
+
+
+
+
diff --git a/api/templates/without-brand/change_mail_confirm_new_template_zh-CN.html b/api/templates/without-brand/change_mail_confirm_new_template_zh-CN.html
new file mode 100644
index 0000000000..e3e9e7c45a
--- /dev/null
+++ b/api/templates/without-brand/change_mail_confirm_new_template_zh-CN.html
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
确认您的邮箱地址变更
+
+
您正在更新与您的 Dify 账户关联的邮箱地址。
+
为了确认此操作，请使用以下验证码。
+
此验证码仅在接下来的5分钟内有效：
+
+
+ {{code}}
+
+
如果您没有请求变更邮箱地址，请忽略此邮件或立即联系支持。
+
+
+
+
+
diff --git a/api/templates/without-brand/change_mail_confirm_old_template_en-US.html b/api/templates/without-brand/change_mail_confirm_old_template_en-US.html
new file mode 100644
index 0000000000..9d79fa7ff9
--- /dev/null
+++ b/api/templates/without-brand/change_mail_confirm_old_template_en-US.html
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
Verify Your Request to Change Email
+
+
We received a request to change the email address associated with your Dify account.
+
To confirm this action, please use the verification code below.
+
This code will only be valid for the next 5 minutes:
+
+
+ {{code}}
+
+
If you didn’t make this request, please ignore this email or contact support immediately.
+
+
+
+
+
diff --git a/api/templates/without-brand/change_mail_confirm_old_template_zh-CN.html b/api/templates/without-brand/change_mail_confirm_old_template_zh-CN.html
new file mode 100644
index 0000000000..41f0839190
--- /dev/null
+++ b/api/templates/without-brand/change_mail_confirm_old_template_zh-CN.html
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
验证您的邮箱变更请求
+
+
我们收到了一个变更您 Dify 账户关联邮箱地址的请求。
+
此验证码仅在接下来的5分钟内有效：
+
+
+ {{code}}
+
+
如果您没有请求变更邮箱地址，请忽略此邮件或立即联系支持。
+
+
+
+
+
diff --git a/api/templates/without-brand/invite_member_mail_template_en-US.html b/api/templates/without-brand/invite_member_mail_template_en-US.html
index 45f2ea292c..f6b1966c52 100644
--- a/api/templates/without-brand/invite_member_mail_template_en-US.html
+++ b/api/templates/without-brand/invite_member_mail_template_en-US.html
@@ -1,69 +1,94 @@
-
+
-
-
-
Dear {{ to }},
-
{{ inviter_name }} is pleased to invite you to join our workspace on {{application_title}}, a platform specifically designed for LLM application development. On {{application_title}}, you can explore, create, and collaborate to build and operate AI applications.
-
Click the button below to log in to {{application_title}} and join the workspace.
-
Login Here
-
-
+
+
+
+
Dear {{ to }},
+
{{ inviter_name }} is pleased to invite you to join our workspace on {{application_title}}, a platform specifically designed for LLM application development. On {{application_title}}, you can explore, create, and collaborate to build and operate AI applications.
+
Click the button below to log in to {{application_title}} and join the workspace.
+
Login Here
+
Best regards,
+
{{application_title}} Team
+
diff --git a/api/templates/without-brand/invite_member_mail_template_zh-CN.html b/api/templates/without-brand/invite_member_mail_template_zh-CN.html
index d4f80c66f8..fd2d6b873f 100644
--- a/api/templates/without-brand/invite_member_mail_template_zh-CN.html
+++ b/api/templates/without-brand/invite_member_mail_template_zh-CN.html
@@ -1,69 +1,91 @@
-
+
-
-
-
尊敬的 {{ to }}，
-
{{ inviter_name }} 现邀请您加入我们在 {{application_title}} 的工作区，这是一个专为 LLM 应用开发而设计的平台。在 {{application_title}} 上，您可以探索、创造和合作，构建和运营 AI 应用。
-
点击下方按钮即可登录 {{application_title}} 并且加入空间。
-
在此登录
-
-
+
+
+
+
尊敬的 {{ to }}，
+
{{ inviter_name }} 现邀请您加入我们在 {{application_title}} 的工作区，这是一个专为 LLM 应用开发而设计的平台。在 {{application_title}} 上，您可以探索、创造和合作，构建和运营 AI 应用。
+
点击下方按钮即可登录 {{application_title}} 并且加入空间。
+
在此登录
+
此致，
+
{{application_title}} 团队
+
diff --git a/api/templates/without-brand/transfer_workspace_new_owner_notify_template_en-US.html b/api/templates/without-brand/transfer_workspace_new_owner_notify_template_en-US.html
new file mode 100644
index 0000000000..a5758a2184
--- /dev/null
+++ b/api/templates/without-brand/transfer_workspace_new_owner_notify_template_en-US.html
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
You are now the owner of {{WorkspaceName}}
+
+
You have been assigned as the new owner of the workspace "{{WorkspaceName}}".
+
As the new owner, you now have full administrative privileges for this workspace.
+
If you have any questions, please contact support@dify.ai.
+
+
+
+
+
+
diff --git a/api/templates/without-brand/transfer_workspace_new_owner_notify_template_zh-CN.html b/api/templates/without-brand/transfer_workspace_new_owner_notify_template_zh-CN.html
new file mode 100644
index 0000000000..53bab92552
--- /dev/null
+++ b/api/templates/without-brand/transfer_workspace_new_owner_notify_template_zh-CN.html
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
您现在是 {{WorkspaceName}} 的所有者
+
+
您已被分配为工作空间“{{WorkspaceName}}”的新所有者。
+
作为新所有者，您现在对该工作空间拥有完全的管理权限。
+
如果您有任何问题，请联系support@dify.ai。
+
+
+
+
+
+
diff --git a/api/templates/without-brand/transfer_workspace_old_owner_notify_template_en-US.html b/api/templates/without-brand/transfer_workspace_old_owner_notify_template_en-US.html
new file mode 100644
index 0000000000..3e7faeb01e
--- /dev/null
+++ b/api/templates/without-brand/transfer_workspace_old_owner_notify_template_en-US.html
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
Workspace ownership has been transferred
+
+
You have successfully transferred ownership of the workspace "{{WorkspaceName}}" to {{NewOwnerEmail}}.
+
You no longer have owner privileges for this workspace. Your access level has been changed to Admin.
+
If you did not initiate this transfer or have concerns about this change, please contact support@dify.ai immediately.
+
+
+
+
+
+
diff --git a/api/templates/without-brand/transfer_workspace_old_owner_notify_template_zh-CN.html b/api/templates/without-brand/transfer_workspace_old_owner_notify_template_zh-CN.html
new file mode 100644
index 0000000000..31e3c23140
--- /dev/null
+++ b/api/templates/without-brand/transfer_workspace_old_owner_notify_template_zh-CN.html
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
工作区所有权已转移
+
+
您已成功将工作空间“{{WorkspaceName}}”的所有权转移给{{NewOwnerEmail}}。
+
您不再拥有此工作空间的拥有者权限。您的访问级别已更改为管理员。
+
如果您没有发起此转移或对此变更有任何疑问，请立即联系support@dify.ai。
+
+
+
+
+
+
diff --git a/api/templates/without-brand/transfer_workspace_owner_confirm_template_en-US.html b/api/templates/without-brand/transfer_workspace_owner_confirm_template_en-US.html
new file mode 100644
index 0000000000..11ce275641
--- /dev/null
+++ b/api/templates/without-brand/transfer_workspace_owner_confirm_template_en-US.html
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+
+
+
Verify Your Request to Transfer Workspace Ownership
+
+
We received a request to transfer ownership of your workspace “{{WorkspaceName}}”.
+
To confirm this action, please use the verification code below.
+
This code will only be valid for the next 5 minutes:
+
+
+ {{code}}
+
+
Please note:
+
+ The ownership transfer will take effect immediately once confirmed and cannot be undone.
+ You’ll become an admin member, and the new owner will have full control of the workspace.
+
+
If you didn’t make this request, please ignore this email or contact support immediately.
+
+
+
+
+
diff --git a/api/templates/without-brand/transfer_workspace_owner_confirm_template_zh-CN.html b/api/templates/without-brand/transfer_workspace_owner_confirm_template_zh-CN.html
new file mode 100644
index 0000000000..36b9a24a89
--- /dev/null
+++ b/api/templates/without-brand/transfer_workspace_owner_confirm_template_zh-CN.html
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+
+
+
验证您的工作空间所有权转移请求
+
+
我们收到了将您的工作空间“{{WorkspaceName}}”的所有权转移的请求。
+
为了确认此操作，请使用以下验证码。
+
此验证码仅在5分钟内有效：
+
+
+ {{code}}
+
+
请注意：
+
+ 所有权转移一旦确认将立即生效且无法撤销。
+ 您将成为管理员成员，新的所有者将拥有工作空间的完全控制权。
+
+
如果您没有发起此请求，请忽略此邮件或立即联系客服。
+
+
+
+
+
diff --git a/api/tests/integration_tests/.env.example b/api/tests/integration_tests/.env.example
index 9e40a8494d..2e98dec964 100644
--- a/api/tests/integration_tests/.env.example
+++ b/api/tests/integration_tests/.env.example
@@ -1,107 +1,219 @@
-# OpenAI API Key
-OPENAI_API_KEY=
+FLASK_APP=app.py
+FLASK_DEBUG=0
+SECRET_KEY='uhySf6a3aZuvRNfAlcr47paOw9TRYBY6j8ZHXpVw1yx5RP27Yj3w2uvI'
+
+CONSOLE_API_URL=http://127.0.0.1:5001
+CONSOLE_WEB_URL=http://127.0.0.1:3000
+
+# Service API base URL
+SERVICE_API_URL=http://127.0.0.1:5001
+
+# Web APP base URL
+APP_WEB_URL=http://127.0.0.1:3000
+
+# Files URL
+FILES_URL=http://127.0.0.1:5001
+
+# The time in seconds after the signature is rejected
+FILES_ACCESS_TIMEOUT=300
+
+# Access token expiration time in minutes
+ACCESS_TOKEN_EXPIRE_MINUTES=60
+
+# Refresh token expiration time in days
+REFRESH_TOKEN_EXPIRE_DAYS=30
+
+# celery configuration
+CELERY_BROKER_URL=redis://:difyai123456@localhost:6379/1
+
+# redis configuration
+REDIS_HOST=localhost
+REDIS_PORT=6379
+REDIS_USERNAME=
+REDIS_PASSWORD=difyai123456
+REDIS_USE_SSL=false
+REDIS_DB=0
+
+# PostgreSQL database configuration
+DB_USERNAME=postgres
+DB_PASSWORD=difyai123456
+DB_HOST=localhost
+DB_PORT=5432
+DB_DATABASE=dify
+
+# Storage configuration
+# use for store upload files, private keys...
+# storage type: opendal, s3, aliyun-oss, azure-blob, baidu-obs, google-storage, huawei-obs, oci-storage, tencent-cos, volcengine-tos, supabase
+STORAGE_TYPE=opendal
+
+# Apache OpenDAL storage configuration, refer to https://github.com/apache/opendal
+OPENDAL_SCHEME=fs
+OPENDAL_FS_ROOT=storage
+
+# CORS configuration
+WEB_API_CORS_ALLOW_ORIGINS=http://127.0.0.1:3000,*
+CONSOLE_CORS_ALLOW_ORIGINS=http://127.0.0.1:3000,*
+
+# Vector database configuration
+# support: weaviate, qdrant, milvus, myscale, relyt, pgvecto_rs, pgvector, pgvector, chroma, opensearch, tidb_vector, couchbase, vikingdb, upstash, lindorm, oceanbase
+VECTOR_STORE=weaviate
+# Weaviate configuration
+WEAVIATE_ENDPOINT=http://localhost:8080
+WEAVIATE_API_KEY=WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih
+WEAVIATE_GRPC_ENABLED=false
+WEAVIATE_BATCH_SIZE=100
+
+
+# Upload configuration
+UPLOAD_FILE_SIZE_LIMIT=15
+UPLOAD_FILE_BATCH_LIMIT=5
+UPLOAD_IMAGE_FILE_SIZE_LIMIT=10
+UPLOAD_VIDEO_FILE_SIZE_LIMIT=100
+UPLOAD_AUDIO_FILE_SIZE_LIMIT=50
+
+# Model configuration
+MULTIMODAL_SEND_FORMAT=base64
+PROMPT_GENERATION_MAX_TOKENS=4096
+CODE_GENERATION_MAX_TOKENS=1024
+
+# Mail configuration, support: resend, smtp
+MAIL_TYPE=
+MAIL_DEFAULT_SEND_FROM=no-reply
+RESEND_API_KEY=
+RESEND_API_URL=https://api.resend.com
+# smtp configuration
+SMTP_SERVER=smtp.example.com
+SMTP_PORT=465
+SMTP_USERNAME=123
+SMTP_PASSWORD=abc
+SMTP_USE_TLS=true
+SMTP_OPPORTUNISTIC_TLS=false
+
+# Sentry configuration
+SENTRY_DSN=
+
+# DEBUG
+DEBUG=false
+SQLALCHEMY_ECHO=false
+
+# Notion import configuration, support public and internal
+NOTION_INTEGRATION_TYPE=public
+NOTION_CLIENT_SECRET=you-client-secret
+NOTION_CLIENT_ID=you-client-id
+NOTION_INTERNAL_SECRET=you-internal-secret
+
+ETL_TYPE=dify
+UNSTRUCTURED_API_URL=
+UNSTRUCTURED_API_KEY=
+SCARF_NO_ANALYTICS=false
+
+#ssrf
+SSRF_PROXY_HTTP_URL=
+SSRF_PROXY_HTTPS_URL=
+SSRF_DEFAULT_MAX_RETRIES=3
+SSRF_DEFAULT_TIME_OUT=5
+SSRF_DEFAULT_CONNECT_TIME_OUT=5
+SSRF_DEFAULT_READ_TIME_OUT=5
+SSRF_DEFAULT_WRITE_TIME_OUT=5
+
+BATCH_UPLOAD_LIMIT=10
+KEYWORD_DATA_SOURCE_TYPE=database
+
+# Workflow file upload limit
+WORKFLOW_FILE_UPLOAD_LIMIT=10
-# Azure OpenAI API Base Endpoint & API Key
-AZURE_OPENAI_API_BASE=
-AZURE_OPENAI_API_KEY=
-
-# Anthropic API Key
-ANTHROPIC_API_KEY=
-
-# Replicate API Key
-REPLICATE_API_KEY=
-
-# Hugging Face API Key
-HUGGINGFACE_API_KEY=
-HUGGINGFACE_TEXT_GEN_ENDPOINT_URL=
-HUGGINGFACE_TEXT2TEXT_GEN_ENDPOINT_URL=
-HUGGINGFACE_EMBEDDINGS_ENDPOINT_URL=
-
-# Minimax Credentials
-MINIMAX_API_KEY=
-MINIMAX_GROUP_ID=
-
-# Spark Credentials
-SPARK_APP_ID=
-SPARK_API_KEY=
-SPARK_API_SECRET=
-
-# Tongyi Credentials
-TONGYI_DASHSCOPE_API_KEY=
-
-# Wenxin Credentials
-WENXIN_API_KEY=
-WENXIN_SECRET_KEY=
-
-# ZhipuAI Credentials
-ZHIPUAI_API_KEY=
-
-# Baichuan Credentials
-BAICHUAN_API_KEY=
-BAICHUAN_SECRET_KEY=
-
-# ChatGLM Credentials
-CHATGLM_API_BASE=
-
-# Xinference Credentials
-XINFERENCE_SERVER_URL=
-XINFERENCE_GENERATION_MODEL_UID=
-XINFERENCE_CHAT_MODEL_UID=
-XINFERENCE_EMBEDDINGS_MODEL_UID=
-XINFERENCE_RERANK_MODEL_UID=
-
-# OpenLLM Credentials
-OPENLLM_SERVER_URL=
-
-# LocalAI Credentials
-LOCALAI_SERVER_URL=
-
-# Cohere Credentials
-COHERE_API_KEY=
-
-# Jina Credentials
-JINA_API_KEY=
-
-# Ollama Credentials
-OLLAMA_BASE_URL=
+# CODE EXECUTION CONFIGURATION
+CODE_EXECUTION_ENDPOINT=http://127.0.0.1:8194
+CODE_EXECUTION_API_KEY=dify-sandbox
+CODE_MAX_NUMBER=9223372036854775807
+CODE_MIN_NUMBER=-9223372036854775808
+CODE_MAX_STRING_LENGTH=80000
+TEMPLATE_TRANSFORM_MAX_LENGTH=80000
+CODE_MAX_STRING_ARRAY_LENGTH=30
+CODE_MAX_OBJECT_ARRAY_LENGTH=30
+CODE_MAX_NUMBER_ARRAY_LENGTH=1000
+
+# API Tool configuration
+API_TOOL_DEFAULT_CONNECT_TIMEOUT=10
+API_TOOL_DEFAULT_READ_TIMEOUT=60
+
+# HTTP Node configuration
+HTTP_REQUEST_MAX_CONNECT_TIMEOUT=300
+HTTP_REQUEST_MAX_READ_TIMEOUT=600
+HTTP_REQUEST_MAX_WRITE_TIMEOUT=600
+HTTP_REQUEST_NODE_MAX_BINARY_SIZE=10485760
+HTTP_REQUEST_NODE_MAX_TEXT_SIZE=1048576
+
+# Respect X-* headers to redirect clients
+RESPECT_XFORWARD_HEADERS_ENABLED=false
+
+# Log file path
+LOG_FILE=
+# Log file max size, the unit is MB
+LOG_FILE_MAX_SIZE=20
+# Log file max backup count
+LOG_FILE_BACKUP_COUNT=5
+# Log dateformat
+LOG_DATEFORMAT=%Y-%m-%d %H:%M:%S
+# Log Timezone
+LOG_TZ=UTC
+# Log format
+LOG_FORMAT=%(asctime)s,%(msecs)d %(levelname)-2s [%(filename)s:%(lineno)d] %(req_id)s %(message)s
+
+# Indexing configuration
+INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH=4000
+
+# Workflow runtime configuration
+WORKFLOW_MAX_EXECUTION_STEPS=500
+WORKFLOW_MAX_EXECUTION_TIME=1200
+WORKFLOW_CALL_MAX_DEPTH=5
+WORKFLOW_PARALLEL_DEPTH_LIMIT=3
+MAX_VARIABLE_SIZE=204800
+
+# App configuration
+APP_MAX_EXECUTION_TIME=1200
+APP_MAX_ACTIVE_REQUESTS=0
+
+# Celery beat configuration
+CELERY_BEAT_SCHEDULER_TIME=1
+
+# Position configuration
+POSITION_TOOL_PINS=
+POSITION_TOOL_INCLUDES=
+POSITION_TOOL_EXCLUDES=
+
+POSITION_PROVIDER_PINS=
+POSITION_PROVIDER_INCLUDES=
+POSITION_PROVIDER_EXCLUDES=
-# Together API Key
-TOGETHER_API_KEY=
+# Plugin configuration
+PLUGIN_DAEMON_KEY=lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi
+PLUGIN_DAEMON_URL=http://127.0.0.1:5002
+PLUGIN_REMOTE_INSTALL_PORT=5003
+PLUGIN_REMOTE_INSTALL_HOST=localhost
+PLUGIN_MAX_PACKAGE_SIZE=15728640
+INNER_API_KEY_FOR_PLUGIN=QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1
-# Mock Switch
-MOCK_SWITCH=false
+# Marketplace configuration
+MARKETPLACE_ENABLED=true
+MARKETPLACE_API_URL=https://marketplace.dify.ai
-# CODE EXECUTION CONFIGURATION
-CODE_EXECUTION_ENDPOINT=
-CODE_EXECUTION_API_KEY=
+# Endpoint configuration
+ENDPOINT_URL_TEMPLATE=http://localhost:5002/e/{hook_id}
-# Volcengine MaaS Credentials
-VOLC_API_KEY=
-VOLC_SECRET_KEY=
-VOLC_MODEL_ENDPOINT_ID=
-VOLC_EMBEDDING_ENDPOINT_ID=
+# Reset password token expiry minutes
+RESET_PASSWORD_TOKEN_EXPIRY_MINUTES=5
+CHANGE_EMAIL_TOKEN_EXPIRY_MINUTES=5
+OWNER_TRANSFER_TOKEN_EXPIRY_MINUTES=5
-# 360 AI Credentials
-ZHINAO_API_KEY=
+CREATE_TIDB_SERVICE_JOB_ENABLED=false
-# Plugin configuration
-PLUGIN_DAEMON_KEY=
-PLUGIN_DAEMON_URL=
+# Maximum number of submitted thread count in a ThreadPool for parallel node execution
+MAX_SUBMIT_COUNT=100
+# Lockout duration in seconds
+LOGIN_LOCKOUT_DURATION=86400
-# Marketplace configuration
-MARKETPLACE_API_URL=
-# VESSL AI Credentials
-VESSL_AI_MODEL_NAME=
-VESSL_AI_API_KEY=
-VESSL_AI_ENDPOINT_URL=
-
-# GPUStack Credentials
-GPUSTACK_SERVER_URL=
-GPUSTACK_API_KEY=
-
-# Gitee AI Credentials
-GITEE_AI_API_KEY=
-
-# xAI Credentials
-XAI_API_KEY=
-XAI_API_BASE=
+HTTP_PROXY='http://127.0.0.1:1092'
+HTTPS_PROXY='http://127.0.0.1:1092'
+NO_PROXY='localhost,127.0.0.1'
+LOG_LEVEL=INFO
diff --git a/api/tests/integration_tests/conftest.py b/api/tests/integration_tests/conftest.py
index 6e3ab4b74b..d9f90f992e 100644
--- a/api/tests/integration_tests/conftest.py
+++ b/api/tests/integration_tests/conftest.py
@@ -1,19 +1,91 @@
-import os
+import pathlib
+import random
+import secrets
+from collections.abc import Generator
-# Getting the absolute path of the current file's directory
-ABS_PATH = os.path.dirname(os.path.abspath(__file__))
+import pytest
+from flask import Flask
+from flask.testing import FlaskClient
+from sqlalchemy.orm import Session
-# Getting the absolute path of the project's root directory
-PROJECT_DIR = os.path.abspath(os.path.join(ABS_PATH, os.pardir, os.pardir))
+from app_factory import create_app
+from models import Account, DifySetup, Tenant, TenantAccountJoin, db
+from services.account_service import AccountService, RegisterService
# Loading the .env file if it exists
def _load_env() -> None:
- dotenv_path = os.path.join(PROJECT_DIR, "tests", "integration_tests", ".env")
- if os.path.exists(dotenv_path):
+ current_file_path = pathlib.Path(__file__).absolute()
+ # Items later in the list have higher precedence.
+ files_to_load = [".env", "vdb.env"]
+
+ env_file_paths = [current_file_path.parent / i for i in files_to_load]
+ for path in env_file_paths:
+ if not path.exists():
+ continue
+
from dotenv import load_dotenv
- load_dotenv(dotenv_path)
+ # Set `override=True` to ensure values from `vdb.env` take priority over values from `.env`
+ load_dotenv(str(path), override=True)
_load_env()
+
+_CACHED_APP = create_app()
+
+
+@pytest.fixture
+def flask_app() -> Flask:
+ return _CACHED_APP
+
+
+@pytest.fixture(scope="session")
+def setup_account(request) -> Generator[Account, None, None]:
+ """`dify_setup` completes the setup process for the Dify application.
+
+ It creates `Account` and `Tenant`, and inserts a `DifySetup` record into the database.
+
+ Most tests in the `controllers` package may require dify has been successfully setup.
+ """
+ with _CACHED_APP.test_request_context():
+ rand_suffix = random.randint(int(1e6), int(1e7)) # noqa
+ name = f"test-user-{rand_suffix}"
+ email = f"{name}@example.com"
+ RegisterService.setup(
+ email=email,
+ name=name,
+ password=secrets.token_hex(16),
+ ip_address="localhost",
+ )
+
+ with _CACHED_APP.test_request_context():
+ with Session(bind=db.engine, expire_on_commit=False) as session:
+ account = session.query(Account).filter_by(email=email).one()
+
+ yield account
+
+ with _CACHED_APP.test_request_context():
+ db.session.query(DifySetup).delete()
+ db.session.query(TenantAccountJoin).delete()
+ db.session.query(Account).delete()
+ db.session.query(Tenant).delete()
+ db.session.commit()
+
+
+@pytest.fixture
+def flask_req_ctx():
+ with _CACHED_APP.test_request_context():
+ yield
+
+
+@pytest.fixture
+def auth_header(setup_account) -> dict[str, str]:
+ token = AccountService.get_account_jwt_token(setup_account)
+ return {"Authorization": f"Bearer {token}"}
+
+
+@pytest.fixture
+def test_client() -> Generator[FlaskClient, None, None]:
+ with _CACHED_APP.test_client() as client:
+ yield client
diff --git a/api/tests/integration_tests/controllers/app_fixture.py b/api/tests/integration_tests/controllers/app_fixture.py
deleted file mode 100644
index 32e8c11d19..0000000000
--- a/api/tests/integration_tests/controllers/app_fixture.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import pytest
-
-from app_factory import create_app
-from configs import dify_config
-
-mock_user = type(
- "MockUser",
- (object,),
- {
- "is_authenticated": True,
- "id": "123",
- "is_editor": True,
- "is_dataset_editor": True,
- "status": "active",
- "get_id": "123",
- "current_tenant_id": "9d2074fc-6f86-45a9-b09d-6ecc63b9056b",
- },
-)
-
-
-@pytest.fixture
-def app():
- app = create_app()
- dify_config.LOGIN_DISABLED = True
- return app
diff --git a/api/tests/integration_tests/controllers/console/__init__.py b/api/tests/integration_tests/controllers/console/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api/tests/integration_tests/controllers/console/app/__init__.py b/api/tests/integration_tests/controllers/console/app/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api/tests/integration_tests/controllers/console/app/test_workflow_draft_variable.py b/api/tests/integration_tests/controllers/console/app/test_workflow_draft_variable.py
new file mode 100644
index 0000000000..038f37af5f
--- /dev/null
+++ b/api/tests/integration_tests/controllers/console/app/test_workflow_draft_variable.py
@@ -0,0 +1,47 @@
+import uuid
+from unittest import mock
+
+from controllers.console.app import workflow_draft_variable as draft_variable_api
+from controllers.console.app import wraps
+from factories.variable_factory import build_segment
+from models import App, AppMode
+from models.workflow import WorkflowDraftVariable
+from services.workflow_draft_variable_service import WorkflowDraftVariableList, WorkflowDraftVariableService
+
+
+def _get_mock_srv_class() -> type[WorkflowDraftVariableService]:
+ return mock.create_autospec(WorkflowDraftVariableService)
+
+
+class TestWorkflowDraftNodeVariableListApi:
+ def test_get(self, test_client, auth_header, monkeypatch):
+ srv_class = _get_mock_srv_class()
+ mock_app_model: App = App()
+ mock_app_model.id = str(uuid.uuid4())
+ test_node_id = "test_node_id"
+ mock_app_model.mode = AppMode.ADVANCED_CHAT
+ mock_load_app_model = mock.Mock(return_value=mock_app_model)
+
+ monkeypatch.setattr(draft_variable_api, "WorkflowDraftVariableService", srv_class)
+ monkeypatch.setattr(wraps, "_load_app_model", mock_load_app_model)
+
+ var1 = WorkflowDraftVariable.new_node_variable(
+ app_id="test_app_1",
+ node_id="test_node_1",
+ name="str_var",
+ value=build_segment("str_value"),
+ node_execution_id=str(uuid.uuid4()),
+ )
+ srv_instance = mock.create_autospec(WorkflowDraftVariableService, instance=True)
+ srv_class.return_value = srv_instance
+ srv_instance.list_node_variables.return_value = WorkflowDraftVariableList(variables=[var1])
+
+ response = test_client.get(
+ f"/console/api/apps/{mock_app_model.id}/workflows/draft/nodes/{test_node_id}/variables",
+ headers=auth_header,
+ )
+ assert response.status_code == 200
+ response_dict = response.json
+ assert isinstance(response_dict, dict)
+ assert "items" in response_dict
+ assert len(response_dict["items"]) == 1
diff --git a/api/tests/integration_tests/controllers/test_controllers.py b/api/tests/integration_tests/controllers/test_controllers.py
deleted file mode 100644
index 276ad3a7ed..0000000000
--- a/api/tests/integration_tests/controllers/test_controllers.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from unittest.mock import patch
-
-from app_fixture import mock_user # type: ignore
-
-
-def test_post_requires_login(app):
- with app.test_client() as client, patch("flask_login.utils._get_user", mock_user):
- response = client.get("/console/api/data-source/integrates")
- assert response.status_code == 200
diff --git a/api/tests/integration_tests/factories/__init__.py b/api/tests/integration_tests/factories/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api/tests/integration_tests/factories/test_storage_key_loader.py b/api/tests/integration_tests/factories/test_storage_key_loader.py
new file mode 100644
index 0000000000..fecb3f6d95
--- /dev/null
+++ b/api/tests/integration_tests/factories/test_storage_key_loader.py
@@ -0,0 +1,371 @@
+import unittest
+from datetime import UTC, datetime
+from typing import Optional
+from unittest.mock import patch
+from uuid import uuid4
+
+import pytest
+from sqlalchemy.orm import Session
+
+from core.file import File, FileTransferMethod, FileType
+from extensions.ext_database import db
+from factories.file_factory import StorageKeyLoader
+from models import ToolFile, UploadFile
+from models.enums import CreatorUserRole
+
+
+@pytest.mark.usefixtures("flask_req_ctx")
+class TestStorageKeyLoader(unittest.TestCase):
+ """
+ Integration tests for StorageKeyLoader class.
+
+ Tests the batched loading of storage keys from the database for files
+ with different transfer methods: LOCAL_FILE, REMOTE_URL, and TOOL_FILE.
+ """
+
+ def setUp(self):
+ """Set up test data before each test method."""
+ self.session = db.session()
+ self.tenant_id = str(uuid4())
+ self.user_id = str(uuid4())
+ self.conversation_id = str(uuid4())
+
+ # Create test data that will be cleaned up after each test
+ self.test_upload_files = []
+ self.test_tool_files = []
+
+ # Create StorageKeyLoader instance
+ self.loader = StorageKeyLoader(self.session, self.tenant_id)
+
+ def tearDown(self):
+ """Clean up test data after each test method."""
+ self.session.rollback()
+
+ def _create_upload_file(
+ self, file_id: Optional[str] = None, storage_key: Optional[str] = None, tenant_id: Optional[str] = None
+ ) -> UploadFile:
+ """Helper method to create an UploadFile record for testing."""
+ if file_id is None:
+ file_id = str(uuid4())
+ if storage_key is None:
+ storage_key = f"test_storage_key_{uuid4()}"
+ if tenant_id is None:
+ tenant_id = self.tenant_id
+
+ upload_file = UploadFile(
+ tenant_id=tenant_id,
+ storage_type="local",
+ key=storage_key,
+ name="test_file.txt",
+ size=1024,
+ extension=".txt",
+ mime_type="text/plain",
+ created_by_role=CreatorUserRole.ACCOUNT,
+ created_by=self.user_id,
+ created_at=datetime.now(UTC),
+ used=False,
+ )
+ upload_file.id = file_id
+
+ self.session.add(upload_file)
+ self.session.flush()
+ self.test_upload_files.append(upload_file)
+
+ return upload_file
+
+ def _create_tool_file(
+ self, file_id: Optional[str] = None, file_key: Optional[str] = None, tenant_id: Optional[str] = None
+ ) -> ToolFile:
+ """Helper method to create a ToolFile record for testing."""
+ if file_id is None:
+ file_id = str(uuid4())
+ if file_key is None:
+ file_key = f"test_file_key_{uuid4()}"
+ if tenant_id is None:
+ tenant_id = self.tenant_id
+
+ tool_file = ToolFile()
+ tool_file.id = file_id
+ tool_file.user_id = self.user_id
+ tool_file.tenant_id = tenant_id
+ tool_file.conversation_id = self.conversation_id
+ tool_file.file_key = file_key
+ tool_file.mimetype = "text/plain"
+ tool_file.original_url = "http://example.com/file.txt"
+ tool_file.name = "test_tool_file.txt"
+ tool_file.size = 2048
+
+ self.session.add(tool_file)
+ self.session.flush()
+ self.test_tool_files.append(tool_file)
+
+ return tool_file
+
+ def _create_file(
+ self, related_id: str, transfer_method: FileTransferMethod, tenant_id: Optional[str] = None
+ ) -> File:
+ """Helper method to create a File object for testing."""
+ if tenant_id is None:
+ tenant_id = self.tenant_id
+
+ # Set related_id for LOCAL_FILE and TOOL_FILE transfer methods
+ file_related_id = None
+ remote_url = None
+
+ if transfer_method in (FileTransferMethod.LOCAL_FILE, FileTransferMethod.TOOL_FILE):
+ file_related_id = related_id
+ elif transfer_method == FileTransferMethod.REMOTE_URL:
+ remote_url = "https://example.com/test_file.txt"
+ file_related_id = related_id
+
+ return File(
+ id=str(uuid4()), # Generate new UUID for File.id
+ tenant_id=tenant_id,
+ type=FileType.DOCUMENT,
+ transfer_method=transfer_method,
+ related_id=file_related_id,
+ remote_url=remote_url,
+ filename="test_file.txt",
+ extension=".txt",
+ mime_type="text/plain",
+ size=1024,
+ storage_key="initial_key",
+ )
+
+ def test_load_storage_keys_local_file(self):
+ """Test loading storage keys for LOCAL_FILE transfer method."""
+ # Create test data
+ upload_file = self._create_upload_file()
+ file = self._create_file(related_id=upload_file.id, transfer_method=FileTransferMethod.LOCAL_FILE)
+
+ # Load storage keys
+ self.loader.load_storage_keys([file])
+
+ # Verify storage key was loaded correctly
+ assert file._storage_key == upload_file.key
+
+ def test_load_storage_keys_remote_url(self):
+ """Test loading storage keys for REMOTE_URL transfer method."""
+ # Create test data
+ upload_file = self._create_upload_file()
+ file = self._create_file(related_id=upload_file.id, transfer_method=FileTransferMethod.REMOTE_URL)
+
+ # Load storage keys
+ self.loader.load_storage_keys([file])
+
+ # Verify storage key was loaded correctly
+ assert file._storage_key == upload_file.key
+
+ def test_load_storage_keys_tool_file(self):
+ """Test loading storage keys for TOOL_FILE transfer method."""
+ # Create test data
+ tool_file = self._create_tool_file()
+ file = self._create_file(related_id=tool_file.id, transfer_method=FileTransferMethod.TOOL_FILE)
+
+ # Load storage keys
+ self.loader.load_storage_keys([file])
+
+ # Verify storage key was loaded correctly
+ assert file._storage_key == tool_file.file_key
+
+ def test_load_storage_keys_mixed_methods(self):
+ """Test batch loading with mixed transfer methods."""
+ # Create test data for different transfer methods
+ upload_file1 = self._create_upload_file()
+ upload_file2 = self._create_upload_file()
+ tool_file = self._create_tool_file()
+
+ file1 = self._create_file(related_id=upload_file1.id, transfer_method=FileTransferMethod.LOCAL_FILE)
+ file2 = self._create_file(related_id=upload_file2.id, transfer_method=FileTransferMethod.REMOTE_URL)
+ file3 = self._create_file(related_id=tool_file.id, transfer_method=FileTransferMethod.TOOL_FILE)
+
+ files = [file1, file2, file3]
+
+ # Load storage keys
+ self.loader.load_storage_keys(files)
+
+ # Verify all storage keys were loaded correctly
+ assert file1._storage_key == upload_file1.key
+ assert file2._storage_key == upload_file2.key
+ assert file3._storage_key == tool_file.file_key
+
+ def test_load_storage_keys_empty_list(self):
+ """Test with empty file list."""
+ # Should not raise any exceptions
+ self.loader.load_storage_keys([])
+
+ def test_load_storage_keys_tenant_mismatch(self):
+ """Test tenant_id validation."""
+ # Create file with different tenant_id
+ upload_file = self._create_upload_file()
+ file = self._create_file(
+ related_id=upload_file.id, transfer_method=FileTransferMethod.LOCAL_FILE, tenant_id=str(uuid4())
+ )
+
+ # Should raise ValueError for tenant mismatch
+ with pytest.raises(ValueError) as context:
+ self.loader.load_storage_keys([file])
+
+ assert "invalid file, expected tenant_id" in str(context.value)
+
+ def test_load_storage_keys_missing_file_id(self):
+ """Test with None file.related_id."""
+ # Create a file with valid parameters first, then manually set related_id to None
+ file = self._create_file(related_id=str(uuid4()), transfer_method=FileTransferMethod.LOCAL_FILE)
+ file.related_id = None
+
+ # Should raise ValueError for None file related_id
+ with pytest.raises(ValueError) as context:
+ self.loader.load_storage_keys([file])
+
+ assert str(context.value) == "file id should not be None."
+
+ def test_load_storage_keys_nonexistent_upload_file_records(self):
+ """Test with missing UploadFile database records."""
+ # Create file with non-existent upload file id
+ non_existent_id = str(uuid4())
+ file = self._create_file(related_id=non_existent_id, transfer_method=FileTransferMethod.LOCAL_FILE)
+
+ # Should raise ValueError for missing record
+ with pytest.raises(ValueError):
+ self.loader.load_storage_keys([file])
+
+ def test_load_storage_keys_nonexistent_tool_file_records(self):
+ """Test with missing ToolFile database records."""
+ # Create file with non-existent tool file id
+ non_existent_id = str(uuid4())
+ file = self._create_file(related_id=non_existent_id, transfer_method=FileTransferMethod.TOOL_FILE)
+
+ # Should raise ValueError for missing record
+ with pytest.raises(ValueError):
+ self.loader.load_storage_keys([file])
+
+ def test_load_storage_keys_invalid_uuid(self):
+ """Test with invalid UUID format."""
+ # Create a file with valid parameters first, then manually set invalid related_id
+ file = self._create_file(related_id=str(uuid4()), transfer_method=FileTransferMethod.LOCAL_FILE)
+ file.related_id = "invalid-uuid-format"
+
+ # Should raise ValueError for invalid UUID
+ with pytest.raises(ValueError):
+ self.loader.load_storage_keys([file])
+
+ def test_load_storage_keys_batch_efficiency(self):
+ """Test batched operations use efficient queries."""
+ # Create multiple files of different types
+ upload_files = [self._create_upload_file() for _ in range(3)]
+ tool_files = [self._create_tool_file() for _ in range(2)]
+
+ files = []
+ files.extend(
+ [self._create_file(related_id=uf.id, transfer_method=FileTransferMethod.LOCAL_FILE) for uf in upload_files]
+ )
+ files.extend(
+ [self._create_file(related_id=tf.id, transfer_method=FileTransferMethod.TOOL_FILE) for tf in tool_files]
+ )
+
+ # Mock the session to count queries
+ with patch.object(self.session, "scalars", wraps=self.session.scalars) as mock_scalars:
+ self.loader.load_storage_keys(files)
+
+ # Should make exactly 2 queries (one for upload_files, one for tool_files)
+ assert mock_scalars.call_count == 2
+
+ # Verify all storage keys were loaded correctly
+ for i, file in enumerate(files[:3]):
+ assert file._storage_key == upload_files[i].key
+ for i, file in enumerate(files[3:]):
+ assert file._storage_key == tool_files[i].file_key
+
+ def test_load_storage_keys_tenant_isolation(self):
+ """Test that tenant isolation works correctly."""
+ # Create files for different tenants
+ other_tenant_id = str(uuid4())
+
+ # Create upload file for current tenant
+ upload_file_current = self._create_upload_file()
+ file_current = self._create_file(
+ related_id=upload_file_current.id, transfer_method=FileTransferMethod.LOCAL_FILE
+ )
+
+ # Create upload file for other tenant (but don't add to cleanup list)
+ upload_file_other = UploadFile(
+ tenant_id=other_tenant_id,
+ storage_type="local",
+ key="other_tenant_key",
+ name="other_file.txt",
+ size=1024,
+ extension=".txt",
+ mime_type="text/plain",
+ created_by_role=CreatorUserRole.ACCOUNT,
+ created_by=self.user_id,
+ created_at=datetime.now(UTC),
+ used=False,
+ )
+ upload_file_other.id = str(uuid4())
+ self.session.add(upload_file_other)
+ self.session.flush()
+
+ # Create file for other tenant but try to load with current tenant's loader
+ file_other = self._create_file(
+ related_id=upload_file_other.id, transfer_method=FileTransferMethod.LOCAL_FILE, tenant_id=other_tenant_id
+ )
+
+ # Should raise ValueError due to tenant mismatch
+ with pytest.raises(ValueError) as context:
+ self.loader.load_storage_keys([file_other])
+
+ assert "invalid file, expected tenant_id" in str(context.value)
+
+ # Current tenant's file should still work
+ self.loader.load_storage_keys([file_current])
+ assert file_current._storage_key == upload_file_current.key
+
+ def test_load_storage_keys_mixed_tenant_batch(self):
+ """Test batch with mixed tenant files (should fail on first mismatch)."""
+ # Create files for current tenant
+ upload_file_current = self._create_upload_file()
+ file_current = self._create_file(
+ related_id=upload_file_current.id, transfer_method=FileTransferMethod.LOCAL_FILE
+ )
+
+ # Create file for different tenant
+ other_tenant_id = str(uuid4())
+ file_other = self._create_file(
+ related_id=str(uuid4()), transfer_method=FileTransferMethod.LOCAL_FILE, tenant_id=other_tenant_id
+ )
+
+ # Should raise ValueError on tenant mismatch
+ with pytest.raises(ValueError) as context:
+ self.loader.load_storage_keys([file_current, file_other])
+
+ assert "invalid file, expected tenant_id" in str(context.value)
+
+ def test_load_storage_keys_duplicate_file_ids(self):
+ """Test handling of duplicate file IDs in the batch."""
+ # Create upload file
+ upload_file = self._create_upload_file()
+
+ # Create two File objects with same related_id
+ file1 = self._create_file(related_id=upload_file.id, transfer_method=FileTransferMethod.LOCAL_FILE)
+ file2 = self._create_file(related_id=upload_file.id, transfer_method=FileTransferMethod.LOCAL_FILE)
+
+ # Should handle duplicates gracefully
+ self.loader.load_storage_keys([file1, file2])
+
+ # Both files should have the same storage key
+ assert file1._storage_key == upload_file.key
+ assert file2._storage_key == upload_file.key
+
+ def test_load_storage_keys_session_isolation(self):
+ """Test that the loader uses the provided session correctly."""
+ # Create test data
+ upload_file = self._create_upload_file()
+ file = self._create_file(related_id=upload_file.id, transfer_method=FileTransferMethod.LOCAL_FILE)
+
+ # Create loader with different session (same underlying connection)
+
+ with Session(bind=db.engine) as other_session:
+ other_loader = StorageKeyLoader(other_session, self.tenant_id)
+ with pytest.raises(ValueError):
+ other_loader.load_storage_keys([file])
diff --git a/api/tests/integration_tests/services/__init__.py b/api/tests/integration_tests/services/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api/tests/integration_tests/services/test_workflow_draft_variable_service.py b/api/tests/integration_tests/services/test_workflow_draft_variable_service.py
new file mode 100644
index 0000000000..30cd2e60cb
--- /dev/null
+++ b/api/tests/integration_tests/services/test_workflow_draft_variable_service.py
@@ -0,0 +1,501 @@
+import json
+import unittest
+import uuid
+
+import pytest
+from sqlalchemy.orm import Session
+
+from core.variables.variables import StringVariable
+from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
+from core.workflow.nodes import NodeType
+from factories.variable_factory import build_segment
+from libs import datetime_utils
+from models import db
+from models.workflow import Workflow, WorkflowDraftVariable, WorkflowNodeExecutionModel
+from services.workflow_draft_variable_service import DraftVarLoader, VariableResetError, WorkflowDraftVariableService
+
+
+@pytest.mark.usefixtures("flask_req_ctx")
+class TestWorkflowDraftVariableService(unittest.TestCase):
+ _test_app_id: str
+ _session: Session
+ _node1_id = "test_node_1"
+ _node2_id = "test_node_2"
+ _node_exec_id = str(uuid.uuid4())
+
+ def setUp(self):
+ self._test_app_id = str(uuid.uuid4())
+ self._session: Session = db.session()
+ sys_var = WorkflowDraftVariable.new_sys_variable(
+ app_id=self._test_app_id,
+ name="sys_var",
+ value=build_segment("sys_value"),
+ node_execution_id=self._node_exec_id,
+ )
+ conv_var = WorkflowDraftVariable.new_conversation_variable(
+ app_id=self._test_app_id,
+ name="conv_var",
+ value=build_segment("conv_value"),
+ )
+ node2_vars = [
+ WorkflowDraftVariable.new_node_variable(
+ app_id=self._test_app_id,
+ node_id=self._node2_id,
+ name="int_var",
+ value=build_segment(1),
+ visible=False,
+ node_execution_id=self._node_exec_id,
+ ),
+ WorkflowDraftVariable.new_node_variable(
+ app_id=self._test_app_id,
+ node_id=self._node2_id,
+ name="str_var",
+ value=build_segment("str_value"),
+ visible=True,
+ node_execution_id=self._node_exec_id,
+ ),
+ ]
+ node1_var = WorkflowDraftVariable.new_node_variable(
+ app_id=self._test_app_id,
+ node_id=self._node1_id,
+ name="str_var",
+ value=build_segment("str_value"),
+ visible=True,
+ node_execution_id=self._node_exec_id,
+ )
+ _variables = list(node2_vars)
+ _variables.extend(
+ [
+ node1_var,
+ sys_var,
+ conv_var,
+ ]
+ )
+
+ db.session.add_all(_variables)
+ db.session.flush()
+ self._variable_ids = [v.id for v in _variables]
+ self._node1_str_var_id = node1_var.id
+ self._sys_var_id = sys_var.id
+ self._conv_var_id = conv_var.id
+ self._node2_var_ids = [v.id for v in node2_vars]
+
+ def _get_test_srv(self) -> WorkflowDraftVariableService:
+ return WorkflowDraftVariableService(session=self._session)
+
+ def tearDown(self):
+ self._session.rollback()
+
+ def test_list_variables(self):
+ srv = self._get_test_srv()
+ var_list = srv.list_variables_without_values(self._test_app_id, page=1, limit=2)
+ assert var_list.total == 5
+ assert len(var_list.variables) == 2
+ page1_var_ids = {v.id for v in var_list.variables}
+ assert page1_var_ids.issubset(self._variable_ids)
+
+ var_list_2 = srv.list_variables_without_values(self._test_app_id, page=2, limit=2)
+ assert var_list_2.total is None
+ assert len(var_list_2.variables) == 2
+ page2_var_ids = {v.id for v in var_list_2.variables}
+ assert page2_var_ids.isdisjoint(page1_var_ids)
+ assert page2_var_ids.issubset(self._variable_ids)
+
+ def test_get_node_variable(self):
+ srv = self._get_test_srv()
+ node_var = srv.get_node_variable(self._test_app_id, self._node1_id, "str_var")
+ assert node_var is not None
+ assert node_var.id == self._node1_str_var_id
+ assert node_var.name == "str_var"
+ assert node_var.get_value() == build_segment("str_value")
+
+ def test_get_system_variable(self):
+ srv = self._get_test_srv()
+ sys_var = srv.get_system_variable(self._test_app_id, "sys_var")
+ assert sys_var is not None
+ assert sys_var.id == self._sys_var_id
+ assert sys_var.name == "sys_var"
+ assert sys_var.get_value() == build_segment("sys_value")
+
+ def test_get_conversation_variable(self):
+ srv = self._get_test_srv()
+ conv_var = srv.get_conversation_variable(self._test_app_id, "conv_var")
+ assert conv_var is not None
+ assert conv_var.id == self._conv_var_id
+ assert conv_var.name == "conv_var"
+ assert conv_var.get_value() == build_segment("conv_value")
+
+ def test_delete_node_variables(self):
+ srv = self._get_test_srv()
+ srv.delete_node_variables(self._test_app_id, self._node2_id)
+ node2_var_count = (
+ self._session.query(WorkflowDraftVariable)
+ .where(
+ WorkflowDraftVariable.app_id == self._test_app_id,
+ WorkflowDraftVariable.node_id == self._node2_id,
+ )
+ .count()
+ )
+ assert node2_var_count == 0
+
+ def test_delete_variable(self):
+ srv = self._get_test_srv()
+ node_1_var = (
+ self._session.query(WorkflowDraftVariable).where(WorkflowDraftVariable.id == self._node1_str_var_id).one()
+ )
+ srv.delete_variable(node_1_var)
+ exists = bool(
+ self._session.query(WorkflowDraftVariable).where(WorkflowDraftVariable.id == self._node1_str_var_id).first()
+ )
+ assert exists is False
+
+ def test__list_node_variables(self):
+ srv = self._get_test_srv()
+ node_vars = srv._list_node_variables(self._test_app_id, self._node2_id)
+ assert len(node_vars.variables) == 2
+ assert {v.id for v in node_vars.variables} == set(self._node2_var_ids)
+
+ def test_get_draft_variables_by_selectors(self):
+ srv = self._get_test_srv()
+ selectors = [
+ [self._node1_id, "str_var"],
+ [self._node2_id, "str_var"],
+ [self._node2_id, "int_var"],
+ ]
+ variables = srv.get_draft_variables_by_selectors(self._test_app_id, selectors)
+ assert len(variables) == 3
+ assert {v.id for v in variables} == {self._node1_str_var_id} | set(self._node2_var_ids)
+
+
+@pytest.mark.usefixtures("flask_req_ctx")
+class TestDraftVariableLoader(unittest.TestCase):
+ _test_app_id: str
+ _test_tenant_id: str
+
+ _node1_id = "test_loader_node_1"
+ _node_exec_id = str(uuid.uuid4())
+
+ def setUp(self):
+ self._test_app_id = str(uuid.uuid4())
+ self._test_tenant_id = str(uuid.uuid4())
+ sys_var = WorkflowDraftVariable.new_sys_variable(
+ app_id=self._test_app_id,
+ name="sys_var",
+ value=build_segment("sys_value"),
+ node_execution_id=self._node_exec_id,
+ )
+ conv_var = WorkflowDraftVariable.new_conversation_variable(
+ app_id=self._test_app_id,
+ name="conv_var",
+ value=build_segment("conv_value"),
+ )
+ node_var = WorkflowDraftVariable.new_node_variable(
+ app_id=self._test_app_id,
+ node_id=self._node1_id,
+ name="str_var",
+ value=build_segment("str_value"),
+ visible=True,
+ node_execution_id=self._node_exec_id,
+ )
+ _variables = [
+ node_var,
+ sys_var,
+ conv_var,
+ ]
+
+ with Session(bind=db.engine, expire_on_commit=False) as session:
+ session.add_all(_variables)
+ session.flush()
+ session.commit()
+ self._variable_ids = [v.id for v in _variables]
+ self._node_var_id = node_var.id
+ self._sys_var_id = sys_var.id
+ self._conv_var_id = conv_var.id
+
+ def tearDown(self):
+ with Session(bind=db.engine, expire_on_commit=False) as session:
+ session.query(WorkflowDraftVariable).filter(WorkflowDraftVariable.app_id == self._test_app_id).delete(
+ synchronize_session=False
+ )
+ session.commit()
+
+ def test_variable_loader_with_empty_selector(self):
+ var_loader = DraftVarLoader(engine=db.engine, app_id=self._test_app_id, tenant_id=self._test_tenant_id)
+ variables = var_loader.load_variables([])
+ assert len(variables) == 0
+
+ def test_variable_loader_with_non_empty_selector(self):
+ var_loader = DraftVarLoader(engine=db.engine, app_id=self._test_app_id, tenant_id=self._test_tenant_id)
+ variables = var_loader.load_variables(
+ [
+ [SYSTEM_VARIABLE_NODE_ID, "sys_var"],
+ [CONVERSATION_VARIABLE_NODE_ID, "conv_var"],
+ [self._node1_id, "str_var"],
+ ]
+ )
+ assert len(variables) == 3
+ conv_var = next(v for v in variables if v.selector[0] == CONVERSATION_VARIABLE_NODE_ID)
+ assert conv_var.id == self._conv_var_id
+ sys_var = next(v for v in variables if v.selector[0] == SYSTEM_VARIABLE_NODE_ID)
+ assert sys_var.id == self._sys_var_id
+ node1_var = next(v for v in variables if v.selector[0] == self._node1_id)
+ assert node1_var.id == self._node_var_id
+
+
+@pytest.mark.usefixtures("flask_req_ctx")
+class TestWorkflowDraftVariableServiceResetVariable(unittest.TestCase):
+ """Integration tests for reset_variable functionality using real database"""
+
+ _test_app_id: str
+ _test_tenant_id: str
+ _test_workflow_id: str
+ _session: Session
+ _node_id = "test_reset_node"
+ _node_exec_id: str
+ _workflow_node_exec_id: str
+
+ def setUp(self):
+ self._test_app_id = str(uuid.uuid4())
+ self._test_tenant_id = str(uuid.uuid4())
+ self._test_workflow_id = str(uuid.uuid4())
+ self._node_exec_id = str(uuid.uuid4())
+ self._workflow_node_exec_id = str(uuid.uuid4())
+ self._session: Session = db.session()
+
+ # Create a workflow node execution record with outputs
+ # Note: The WorkflowNodeExecutionModel.id should match the node_execution_id in WorkflowDraftVariable
+ self._workflow_node_execution = WorkflowNodeExecutionModel(
+ id=self._node_exec_id, # This should match the node_execution_id in the variable
+ tenant_id=self._test_tenant_id,
+ app_id=self._test_app_id,
+ workflow_id=self._test_workflow_id,
+ triggered_from="workflow-run",
+ workflow_run_id=str(uuid.uuid4()),
+ index=1,
+ node_execution_id=self._node_exec_id,
+ node_id=self._node_id,
+ node_type=NodeType.LLM.value,
+ title="Test Node",
+ inputs='{"input": "test input"}',
+ process_data='{"test_var": "process_value", "other_var": "other_process"}',
+ outputs='{"test_var": "output_value", "other_var": "other_output"}',
+ status="succeeded",
+ elapsed_time=1.5,
+ created_by_role="account",
+ created_by=str(uuid.uuid4()),
+ )
+
+ # Create conversation variables for the workflow
+ self._conv_variables = [
+ StringVariable(
+ id=str(uuid.uuid4()),
+ name="conv_var_1",
+ description="Test conversation variable 1",
+ value="default_value_1",
+ ),
+ StringVariable(
+ id=str(uuid.uuid4()),
+ name="conv_var_2",
+ description="Test conversation variable 2",
+ value="default_value_2",
+ ),
+ ]
+
+ # Create test variables
+ self._node_var_with_exec = WorkflowDraftVariable.new_node_variable(
+ app_id=self._test_app_id,
+ node_id=self._node_id,
+ name="test_var",
+ value=build_segment("old_value"),
+ node_execution_id=self._node_exec_id,
+ )
+ self._node_var_with_exec.last_edited_at = datetime_utils.naive_utc_now()
+
+ self._node_var_without_exec = WorkflowDraftVariable.new_node_variable(
+ app_id=self._test_app_id,
+ node_id=self._node_id,
+ name="no_exec_var",
+ value=build_segment("some_value"),
+ node_execution_id="temp_exec_id",
+ )
+ # Manually set node_execution_id to None after creation
+ self._node_var_without_exec.node_execution_id = None
+
+ self._node_var_missing_exec = WorkflowDraftVariable.new_node_variable(
+ app_id=self._test_app_id,
+ node_id=self._node_id,
+ name="missing_exec_var",
+ value=build_segment("some_value"),
+ node_execution_id=str(uuid.uuid4()), # Use a valid UUID that doesn't exist in database
+ )
+
+ self._conv_var = WorkflowDraftVariable.new_conversation_variable(
+ app_id=self._test_app_id,
+ name="conv_var_1",
+ value=build_segment("old_conv_value"),
+ )
+ self._conv_var.last_edited_at = datetime_utils.naive_utc_now()
+
+ # Add all to database
+ db.session.add_all(
+ [
+ self._workflow_node_execution,
+ self._node_var_with_exec,
+ self._node_var_without_exec,
+ self._node_var_missing_exec,
+ self._conv_var,
+ ]
+ )
+ db.session.flush()
+
+ # Store IDs for assertions
+ self._node_var_with_exec_id = self._node_var_with_exec.id
+ self._node_var_without_exec_id = self._node_var_without_exec.id
+ self._node_var_missing_exec_id = self._node_var_missing_exec.id
+ self._conv_var_id = self._conv_var.id
+
+ def _get_test_srv(self) -> WorkflowDraftVariableService:
+ return WorkflowDraftVariableService(session=self._session)
+
+ def _create_mock_workflow(self) -> Workflow:
+ """Create a real workflow with conversation variables and graph"""
+ conversation_vars = self._conv_variables
+
+ # Create a simple graph with the test node
+ graph = {
+ "nodes": [{"id": "test_reset_node", "type": "llm", "title": "Test Node", "data": {"type": "llm"}}],
+ "edges": [],
+ }
+
+ workflow = Workflow.new(
+ tenant_id=str(uuid.uuid4()),
+ app_id=self._test_app_id,
+ type="workflow",
+ version="1.0",
+ graph=json.dumps(graph),
+ features="{}",
+ created_by=str(uuid.uuid4()),
+ environment_variables=[],
+ conversation_variables=conversation_vars,
+ )
+ return workflow
+
+ def tearDown(self):
+ self._session.rollback()
+
+ def test_reset_node_variable_with_valid_execution_record(self):
+ """Test resetting a node variable with valid execution record - should restore from execution"""
+ srv = self._get_test_srv()
+ mock_workflow = self._create_mock_workflow()
+
+ # Get the variable before reset
+ variable = srv.get_variable(self._node_var_with_exec_id)
+ assert variable is not None
+ assert variable.get_value().value == "old_value"
+ assert variable.last_edited_at is not None
+
+ # Reset the variable
+ result = srv.reset_variable(mock_workflow, variable)
+
+ # Should return the updated variable
+ assert result is not None
+ assert result.id == self._node_var_with_exec_id
+ assert result.node_execution_id == self._workflow_node_execution.id
+ assert result.last_edited_at is None # Should be reset to None
+
+ # The returned variable should have the updated value from execution record
+ assert result.get_value().value == "output_value"
+
+ # Verify the variable was updated in database
+ updated_variable = srv.get_variable(self._node_var_with_exec_id)
+ assert updated_variable is not None
+ # The value should be updated from the execution record's outputs
+ assert updated_variable.get_value().value == "output_value"
+ assert updated_variable.last_edited_at is None
+ assert updated_variable.node_execution_id == self._workflow_node_execution.id
+
+ def test_reset_node_variable_with_no_execution_id(self):
+ """Test resetting a node variable with no execution ID - should delete variable"""
+ srv = self._get_test_srv()
+ mock_workflow = self._create_mock_workflow()
+
+ # Get the variable before reset
+ variable = srv.get_variable(self._node_var_without_exec_id)
+ assert variable is not None
+
+ # Reset the variable
+ result = srv.reset_variable(mock_workflow, variable)
+
+ # Should return None (variable deleted)
+ assert result is None
+
+ # Verify the variable was deleted
+ deleted_variable = srv.get_variable(self._node_var_without_exec_id)
+ assert deleted_variable is None
+
+ def test_reset_node_variable_with_missing_execution_record(self):
+ """Test resetting a node variable when execution record doesn't exist"""
+ srv = self._get_test_srv()
+ mock_workflow = self._create_mock_workflow()
+
+ # Get the variable before reset
+ variable = srv.get_variable(self._node_var_missing_exec_id)
+ assert variable is not None
+
+ # Reset the variable
+ result = srv.reset_variable(mock_workflow, variable)
+
+ # Should return None (variable deleted)
+ assert result is None
+
+ # Verify the variable was deleted
+ deleted_variable = srv.get_variable(self._node_var_missing_exec_id)
+ assert deleted_variable is None
+
+ def test_reset_conversation_variable(self):
+ """Test resetting a conversation variable"""
+ srv = self._get_test_srv()
+ mock_workflow = self._create_mock_workflow()
+
+ # Get the variable before reset
+ variable = srv.get_variable(self._conv_var_id)
+ assert variable is not None
+ assert variable.get_value().value == "old_conv_value"
+ assert variable.last_edited_at is not None
+
+ # Reset the variable
+ result = srv.reset_variable(mock_workflow, variable)
+
+ # Should return the updated variable
+ assert result is not None
+ assert result.id == self._conv_var_id
+ assert result.last_edited_at is None # Should be reset to None
+
+ # Verify the variable was updated with default value from workflow
+ updated_variable = srv.get_variable(self._conv_var_id)
+ assert updated_variable is not None
+ # The value should be updated from the workflow's conversation variable default
+ assert updated_variable.get_value().value == "default_value_1"
+ assert updated_variable.last_edited_at is None
+
+ def test_reset_system_variable_raises_error(self):
+ """Test that resetting a system variable raises an error"""
+ srv = self._get_test_srv()
+ mock_workflow = self._create_mock_workflow()
+
+ # Create a system variable
+ sys_var = WorkflowDraftVariable.new_sys_variable(
+ app_id=self._test_app_id,
+ name="sys_var",
+ value=build_segment("sys_value"),
+ node_execution_id=self._node_exec_id,
+ )
+ db.session.add(sys_var)
+ db.session.flush()
+
+ # Attempt to reset the system variable
+ with pytest.raises(VariableResetError) as exc_info:
+ srv.reset_variable(mock_workflow, sys_var)
+
+ assert "cannot reset system variable" in str(exc_info.value)
+ assert sys_var.id in str(exc_info.value)
diff --git a/api/tests/integration_tests/vdb/couchbase/test_couchbase.py b/api/tests/integration_tests/vdb/couchbase/test_couchbase.py
index d76c34ba0e..eef1ee4e75 100644
--- a/api/tests/integration_tests/vdb/couchbase/test_couchbase.py
+++ b/api/tests/integration_tests/vdb/couchbase/test_couchbase.py
@@ -4,7 +4,6 @@ import time
from core.rag.datasource.vdb.couchbase.couchbase_vector import CouchbaseConfig, CouchbaseVector
from tests.integration_tests.vdb.test_vector_store import (
AbstractVectorTest,
- get_example_text,
setup_mock_redis,
)
diff --git a/api/tests/integration_tests/vdb/matrixone/__init__.py b/api/tests/integration_tests/vdb/matrixone/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api/tests/integration_tests/vdb/matrixone/test_matrixone.py b/api/tests/integration_tests/vdb/matrixone/test_matrixone.py
new file mode 100644
index 0000000000..c4056db63e
--- /dev/null
+++ b/api/tests/integration_tests/vdb/matrixone/test_matrixone.py
@@ -0,0 +1,24 @@
+from core.rag.datasource.vdb.matrixone.matrixone_vector import MatrixoneConfig, MatrixoneVector
+from tests.integration_tests.vdb.test_vector_store import (
+ AbstractVectorTest,
+ setup_mock_redis,
+)
+
+
+class MatrixoneVectorTest(AbstractVectorTest):
+ def __init__(self):
+ super().__init__()
+ self.vector = MatrixoneVector(
+ collection_name=self.collection_name,
+ config=MatrixoneConfig(
+ host="localhost", port=6001, user="dump", password="111", database="dify", metric="l2"
+ ),
+ )
+
+ def get_ids_by_metadata_field(self):
+ ids = self.vector.get_ids_by_metadata_field(key="document_id", value=self.example_doc_id)
+ assert len(ids) == 1
+
+
+def test_matrixone_vector(setup_mock_redis):
+ MatrixoneVectorTest().run_all_tests()
diff --git a/api/tests/integration_tests/vdb/oceanbase/check_oceanbase_ready.py b/api/tests/integration_tests/vdb/oceanbase/check_oceanbase_ready.py
deleted file mode 100644
index 94a51292ff..0000000000
--- a/api/tests/integration_tests/vdb/oceanbase/check_oceanbase_ready.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import time
-
-import pymysql
-
-
-def check_oceanbase_ready() -> bool:
- try:
- connection = pymysql.connect(
- host="localhost",
- port=2881,
- user="root",
- password="difyai123456",
- )
- affected_rows = connection.query("SELECT 1")
- return affected_rows == 1
- except Exception as e:
- print(f"Oceanbase is not ready. Exception: {e}")
- return False
- finally:
- if connection:
- connection.close()
-
-
-def main():
- max_attempts = 50
- retry_interval_seconds = 2
- is_oceanbase_ready = False
- for attempt in range(max_attempts):
- try:
- is_oceanbase_ready = check_oceanbase_ready()
- except Exception as e:
- print(f"Oceanbase is not ready. Exception: {e}")
- is_oceanbase_ready = False
-
- if is_oceanbase_ready:
- break
- else:
- print(f"Attempt {attempt + 1} failed, retry in {retry_interval_seconds} seconds...")
- time.sleep(retry_interval_seconds)
-
- if is_oceanbase_ready:
- print("Oceanbase is ready.")
- else:
- print(f"Oceanbase is not ready after {max_attempts} attempting checks.")
- exit(1)
-
-
-if __name__ == "__main__":
- main()
diff --git a/api/tests/integration_tests/vdb/opengauss/test_opengauss.py b/api/tests/integration_tests/vdb/opengauss/test_opengauss.py
index f2013848bf..2a1129493c 100644
--- a/api/tests/integration_tests/vdb/opengauss/test_opengauss.py
+++ b/api/tests/integration_tests/vdb/opengauss/test_opengauss.py
@@ -5,7 +5,6 @@ import psycopg2 # type: ignore
from core.rag.datasource.vdb.opengauss.opengauss import OpenGauss, OpenGaussConfig
from tests.integration_tests.vdb.test_vector_store import (
AbstractVectorTest,
- get_example_text,
setup_mock_redis,
)
diff --git a/api/tests/integration_tests/vdb/pyvastbase/test_vastbase_vector.py b/api/tests/integration_tests/vdb/pyvastbase/test_vastbase_vector.py
index 3d7873442b..02931fef5a 100644
--- a/api/tests/integration_tests/vdb/pyvastbase/test_vastbase_vector.py
+++ b/api/tests/integration_tests/vdb/pyvastbase/test_vastbase_vector.py
@@ -1,7 +1,6 @@
from core.rag.datasource.vdb.pyvastbase.vastbase_vector import VastbaseVector, VastbaseVectorConfig
from tests.integration_tests.vdb.test_vector_store import (
AbstractVectorTest,
- get_example_text,
setup_mock_redis,
)
diff --git a/api/tests/integration_tests/workflow/nodes/__mock/model.py b/api/tests/integration_tests/workflow/nodes/__mock/model.py
index 7c48d84d69..330ebfd54a 100644
--- a/api/tests/integration_tests/workflow/nodes/__mock/model.py
+++ b/api/tests/integration_tests/workflow/nodes/__mock/model.py
@@ -15,7 +15,7 @@ def get_mocked_fetch_model_config(
mode: str,
credentials: dict,
):
- model_provider_factory = ModelProviderFactory(tenant_id="test_tenant")
+ model_provider_factory = ModelProviderFactory(tenant_id="9d2074fc-6f86-45a9-b09d-6ecc63b9056b")
model_type_instance = model_provider_factory.get_model_type_instance(provider, ModelType.LLM)
provider_model_bundle = ProviderModelBundle(
configuration=ProviderConfiguration(
diff --git a/api/tests/integration_tests/workflow/nodes/test_code.py b/api/tests/integration_tests/workflow/nodes/test_code.py
index 13d78c2d83..707b28e6d8 100644
--- a/api/tests/integration_tests/workflow/nodes/test_code.py
+++ b/api/tests/integration_tests/workflow/nodes/test_code.py
@@ -9,12 +9,12 @@ from core.app.entities.app_invoke_entities import InvokeFrom
from core.workflow.entities.node_entities import NodeRunResult
from core.workflow.entities.variable_pool import VariablePool
from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.graph import Graph
from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
from core.workflow.nodes.code.code_node import CodeNode
from core.workflow.nodes.code.entities import CodeNodeData
+from core.workflow.system_variable import SystemVariable
from models.enums import UserFrom
from models.workflow import WorkflowType
from tests.integration_tests.workflow.nodes.__mock.code_executor import setup_code_executor_mock
@@ -50,7 +50,7 @@ def init_code_node(code_config: dict):
# construct variable pool
variable_pool = VariablePool(
- system_variables={SystemVariableKey.FILES: [], SystemVariableKey.USER_ID: "aaa"},
+ system_variables=SystemVariable(user_id="aaa", files=[]),
user_inputs={},
environment_variables=[],
conversation_variables=[],
@@ -66,6 +66,10 @@ def init_code_node(code_config: dict):
config=code_config,
)
+ # Initialize node data
+ if "data" in code_config:
+ node.init_node_data(code_config["data"])
+
return node
@@ -234,10 +238,10 @@ def test_execute_code_output_validator_depth():
"object_validator": {"result": 1, "depth": {"depth": {"depth": 1}}},
}
- node.node_data = cast(CodeNodeData, node.node_data)
+ node._node_data = cast(CodeNodeData, node._node_data)
# validate
- node._transform_result(result, node.node_data.outputs)
+ node._transform_result(result, node._node_data.outputs)
# construct result
result = {
@@ -250,7 +254,7 @@ def test_execute_code_output_validator_depth():
# validate
with pytest.raises(ValueError):
- node._transform_result(result, node.node_data.outputs)
+ node._transform_result(result, node._node_data.outputs)
# construct result
result = {
@@ -263,7 +267,7 @@ def test_execute_code_output_validator_depth():
# validate
with pytest.raises(ValueError):
- node._transform_result(result, node.node_data.outputs)
+ node._transform_result(result, node._node_data.outputs)
# construct result
result = {
@@ -276,7 +280,7 @@ def test_execute_code_output_validator_depth():
# validate
with pytest.raises(ValueError):
- node._transform_result(result, node.node_data.outputs)
+ node._transform_result(result, node._node_data.outputs)
def test_execute_code_output_object_list():
@@ -330,10 +334,10 @@ def test_execute_code_output_object_list():
]
}
- node.node_data = cast(CodeNodeData, node.node_data)
+ node._node_data = cast(CodeNodeData, node._node_data)
# validate
- node._transform_result(result, node.node_data.outputs)
+ node._transform_result(result, node._node_data.outputs)
# construct result
result = {
@@ -353,4 +357,36 @@ def test_execute_code_output_object_list():
# validate
with pytest.raises(ValueError):
- node._transform_result(result, node.node_data.outputs)
+ node._transform_result(result, node._node_data.outputs)
+
+
+def test_execute_code_scientific_notation():
+ code = """
+ def main() -> dict:
+ return {
+ "result": -8.0E-5
+ }
+ """
+ code = "\n".join([line[4:] for line in code.split("\n")])
+
+ code_config = {
+ "id": "code",
+ "data": {
+ "outputs": {
+ "result": {
+ "type": "number",
+ },
+ },
+ "title": "123",
+ "variables": [],
+ "answer": "123",
+ "code_language": "python3",
+ "code": code,
+ },
+ }
+
+ node = init_code_node(code_config)
+ # execute node
+ result = node._run()
+ assert isinstance(result, NodeRunResult)
+ assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
diff --git a/api/tests/integration_tests/workflow/nodes/test_http.py b/api/tests/integration_tests/workflow/nodes/test_http.py
index 1ab0cc2451..d7856129a3 100644
--- a/api/tests/integration_tests/workflow/nodes/test_http.py
+++ b/api/tests/integration_tests/workflow/nodes/test_http.py
@@ -6,11 +6,11 @@ import pytest
from core.app.entities.app_invoke_entities import InvokeFrom
from core.workflow.entities.variable_pool import VariablePool
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.graph import Graph
from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
from core.workflow.nodes.http_request.node import HttpRequestNode
+from core.workflow.system_variable import SystemVariable
from models.enums import UserFrom
from models.workflow import WorkflowType
from tests.integration_tests.workflow.nodes.__mock.http import setup_http_mock
@@ -44,7 +44,7 @@ def init_http_node(config: dict):
# construct variable pool
variable_pool = VariablePool(
- system_variables={SystemVariableKey.FILES: [], SystemVariableKey.USER_ID: "aaa"},
+ system_variables=SystemVariable(user_id="aaa", files=[]),
user_inputs={},
environment_variables=[],
conversation_variables=[],
@@ -52,7 +52,7 @@ def init_http_node(config: dict):
variable_pool.add(["a", "b123", "args1"], 1)
variable_pool.add(["a", "b123", "args2"], 2)
- return HttpRequestNode(
+ node = HttpRequestNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
@@ -60,6 +60,12 @@ def init_http_node(config: dict):
config=config,
)
+ # Initialize node data
+ if "data" in config:
+ node.init_node_data(config["data"])
+
+ return node
+
@pytest.mark.parametrize("setup_http_mock", [["none"]], indirect=True)
def test_get(setup_http_mock):
diff --git a/api/tests/integration_tests/workflow/nodes/test_llm.py b/api/tests/integration_tests/workflow/nodes/test_llm.py
index 6aa48b1cbb..a14791bc67 100644
--- a/api/tests/integration_tests/workflow/nodes/test_llm.py
+++ b/api/tests/integration_tests/workflow/nodes/test_llm.py
@@ -1,48 +1,24 @@
import json
-import os
import time
import uuid
from collections.abc import Generator
-from decimal import Decimal
from unittest.mock import MagicMock, patch
-import pytest
-
-from app_factory import create_app
-from configs import dify_config
from core.app.entities.app_invoke_entities import InvokeFrom
-from core.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-from core.model_runtime.entities.message_entities import AssistantPromptMessage
+from core.llm_generator.output_parser.structured_output import _parse_structured_output
from core.workflow.entities.variable_pool import VariablePool
from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.graph import Graph
from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
from core.workflow.nodes.event import RunCompletedEvent
from core.workflow.nodes.llm.node import LLMNode
+from core.workflow.system_variable import SystemVariable
from extensions.ext_database import db
from models.enums import UserFrom
from models.workflow import WorkflowType
"""FOR MOCK FIXTURES, DO NOT REMOVE"""
-from tests.integration_tests.model_runtime.__mock.plugin_daemon import setup_model_mock
-from tests.integration_tests.workflow.nodes.__mock.code_executor import setup_code_executor_mock
-
-
-@pytest.fixture(scope="session")
-def app():
- # Set up storage configuration
- os.environ["STORAGE_TYPE"] = "opendal"
- os.environ["OPENDAL_SCHEME"] = "fs"
- os.environ["OPENDAL_FS_ROOT"] = "storage"
-
- # Ensure storage directory exists
- os.makedirs("storage", exist_ok=True)
-
- app = create_app()
- dify_config.LOGIN_DISABLED = True
- return app
def init_llm_node(config: dict) -> LLMNode:
@@ -79,12 +55,14 @@ def init_llm_node(config: dict) -> LLMNode:
# construct variable pool
variable_pool = VariablePool(
- system_variables={
- SystemVariableKey.QUERY: "what's the weather today?",
- SystemVariableKey.FILES: [],
- SystemVariableKey.CONVERSATION_ID: "abababa",
- SystemVariableKey.USER_ID: "aaa",
- },
+ system_variables=SystemVariable(
+ user_id="aaa",
+ app_id=app_id,
+ workflow_id=workflow_id,
+ files=[],
+ query="what's the weather today?",
+ conversation_id="abababa",
+ ),
user_inputs={},
environment_variables=[],
conversation_variables=[],
@@ -99,226 +77,221 @@ def init_llm_node(config: dict) -> LLMNode:
config=config,
)
+ # Initialize node data
+ if "data" in config:
+ node.init_node_data(config["data"])
+
return node
-def test_execute_llm(app):
- with app.app_context():
- node = init_llm_node(
- config={
- "id": "llm",
- "data": {
- "title": "123",
- "type": "llm",
- "model": {
- "provider": "langgenius/openai/openai",
- "name": "gpt-3.5-turbo",
- "mode": "chat",
- "completion_params": {},
- },
- "prompt_template": [
- {
- "role": "system",
- "text": "you are a helpful assistant.\ntoday's weather is {{#abc.output#}}.",
- },
- {"role": "user", "text": "{{#sys.query#}}"},
- ],
- "memory": None,
- "context": {"enabled": False},
- "vision": {"enabled": False},
+def test_execute_llm():
+ node = init_llm_node(
+ config={
+ "id": "llm",
+ "data": {
+ "title": "123",
+ "type": "llm",
+ "model": {
+ "provider": "openai",
+ "name": "gpt-3.5-turbo",
+ "mode": "chat",
+ "completion_params": {},
},
+ "prompt_template": [
+ {
+ "role": "system",
+ "text": "you are a helpful assistant.\ntoday's weather is {{#abc.output#}}.",
+ },
+ {"role": "user", "text": "{{#sys.query#}}"},
+ ],
+ "memory": None,
+ "context": {"enabled": False},
+ "vision": {"enabled": False},
},
- )
+ },
+ )
+
+ db.session.close = MagicMock()
+
+ # Mock the _fetch_model_config to avoid database calls
+ def mock_fetch_model_config(**_kwargs):
+ from decimal import Decimal
+ from unittest.mock import MagicMock
- credentials = {"openai_api_key": os.environ.get("OPENAI_API_KEY")}
+ from core.model_runtime.entities.llm_entities import LLMResult, LLMUsage
+ from core.model_runtime.entities.message_entities import AssistantPromptMessage
- # Create a proper LLM result with real entities
+ # Create mock model instance
+ mock_model_instance = MagicMock()
mock_usage = LLMUsage(
prompt_tokens=30,
prompt_unit_price=Decimal("0.001"),
- prompt_price_unit=Decimal("1000"),
+ prompt_price_unit=Decimal(1000),
prompt_price=Decimal("0.00003"),
completion_tokens=20,
completion_unit_price=Decimal("0.002"),
- completion_price_unit=Decimal("1000"),
+ completion_price_unit=Decimal(1000),
completion_price=Decimal("0.00004"),
total_tokens=50,
total_price=Decimal("0.00007"),
currency="USD",
latency=0.5,
)
-
- mock_message = AssistantPromptMessage(content="This is a test response from the mocked LLM.")
-
+ mock_message = AssistantPromptMessage(content="Test response from mock")
mock_llm_result = LLMResult(
model="gpt-3.5-turbo",
prompt_messages=[],
message=mock_message,
usage=mock_usage,
)
-
- # Create a simple mock model instance that doesn't call real providers
- mock_model_instance = MagicMock()
mock_model_instance.invoke_llm.return_value = mock_llm_result
- # Create a simple mock model config with required attributes
+ # Create mock model config
mock_model_config = MagicMock()
mock_model_config.mode = "chat"
- mock_model_config.provider = "langgenius/openai/openai"
+ mock_model_config.provider = "openai"
mock_model_config.model = "gpt-3.5-turbo"
- mock_model_config.provider_model_bundle.configuration.tenant_id = "9d2074fc-6f86-45a9-b09d-6ecc63b9056b"
-
- # Mock the _fetch_model_config method
- def mock_fetch_model_config_func(_node_data_model):
- return mock_model_instance, mock_model_config
-
- # Also mock ModelManager.get_model_instance to avoid database calls
- def mock_get_model_instance(_self, **kwargs):
- return mock_model_instance
-
- with (
- patch.object(node, "_fetch_model_config", mock_fetch_model_config_func),
- patch("core.model_manager.ModelManager.get_model_instance", mock_get_model_instance),
- ):
- # execute node
- result = node._run()
- assert isinstance(result, Generator)
-
- for item in result:
- if isinstance(item, RunCompletedEvent):
- assert item.run_result.status == WorkflowNodeExecutionStatus.SUCCEEDED
- assert item.run_result.process_data is not None
- assert item.run_result.outputs is not None
- assert item.run_result.outputs.get("text") is not None
- assert item.run_result.outputs.get("usage", {})["total_tokens"] > 0
-
-
-@pytest.mark.parametrize("setup_code_executor_mock", [["none"]], indirect=True)
-def test_execute_llm_with_jinja2(app, setup_code_executor_mock):
+ mock_model_config.parameters = {}
+
+ return mock_model_instance, mock_model_config
+
+ # Mock fetch_prompt_messages to avoid database calls
+ def mock_fetch_prompt_messages_1(**_kwargs):
+ from core.model_runtime.entities.message_entities import SystemPromptMessage, UserPromptMessage
+
+ return [
+ SystemPromptMessage(content="you are a helpful assistant. today's weather is sunny."),
+ UserPromptMessage(content="what's the weather today?"),
+ ], []
+
+ with (
+ patch.object(LLMNode, "_fetch_model_config", mock_fetch_model_config),
+ patch.object(LLMNode, "fetch_prompt_messages", mock_fetch_prompt_messages_1),
+ ):
+ # execute node
+ result = node._run()
+ assert isinstance(result, Generator)
+
+ for item in result:
+ if isinstance(item, RunCompletedEvent):
+ if item.run_result.status != WorkflowNodeExecutionStatus.SUCCEEDED:
+ print(f"Error: {item.run_result.error}")
+ print(f"Error type: {item.run_result.error_type}")
+ assert item.run_result.status == WorkflowNodeExecutionStatus.SUCCEEDED
+ assert item.run_result.process_data is not None
+ assert item.run_result.outputs is not None
+ assert item.run_result.outputs.get("text") is not None
+ assert item.run_result.outputs.get("usage", {})["total_tokens"] > 0
+
+
+def test_execute_llm_with_jinja2():
"""
Test execute LLM node with jinja2
"""
- with app.app_context():
- node = init_llm_node(
- config={
- "id": "llm",
- "data": {
- "title": "123",
- "type": "llm",
- "model": {"provider": "openai", "name": "gpt-3.5-turbo", "mode": "chat", "completion_params": {}},
- "prompt_config": {
- "jinja2_variables": [
- {"variable": "sys_query", "value_selector": ["sys", "query"]},
- {"variable": "output", "value_selector": ["abc", "output"]},
- ]
- },
- "prompt_template": [
- {
- "role": "system",
- "text": "you are a helpful assistant.\ntoday's weather is {{#abc.output#}}",
- "jinja2_text": "you are a helpful assistant.\ntoday's weather is {{output}}.",
- "edition_type": "jinja2",
- },
- {
- "role": "user",
- "text": "{{#sys.query#}}",
- "jinja2_text": "{{sys_query}}",
- "edition_type": "basic",
- },
- ],
- "memory": None,
- "context": {"enabled": False},
- "vision": {"enabled": False},
+ node = init_llm_node(
+ config={
+ "id": "llm",
+ "data": {
+ "title": "123",
+ "type": "llm",
+ "model": {"provider": "openai", "name": "gpt-3.5-turbo", "mode": "chat", "completion_params": {}},
+ "prompt_config": {
+ "jinja2_variables": [
+ {"variable": "sys_query", "value_selector": ["sys", "query"]},
+ {"variable": "output", "value_selector": ["abc", "output"]},
+ ]
},
+ "prompt_template": [
+ {
+ "role": "system",
+ "text": "you are a helpful assistant.\ntoday's weather is {{#abc.output#}}",
+ "jinja2_text": "you are a helpful assistant.\ntoday's weather is {{output}}.",
+ "edition_type": "jinja2",
+ },
+ {
+ "role": "user",
+ "text": "{{#sys.query#}}",
+ "jinja2_text": "{{sys_query}}",
+ "edition_type": "basic",
+ },
+ ],
+ "memory": None,
+ "context": {"enabled": False},
+ "vision": {"enabled": False},
},
- )
+ },
+ )
+
+ # Mock db.session.close()
+ db.session.close = MagicMock()
+
+ # Mock the _fetch_model_config method
+ def mock_fetch_model_config(**_kwargs):
+ from decimal import Decimal
+ from unittest.mock import MagicMock
- # Mock db.session.close()
- db.session.close = MagicMock()
+ from core.model_runtime.entities.llm_entities import LLMResult, LLMUsage
+ from core.model_runtime.entities.message_entities import AssistantPromptMessage
- # Create a proper LLM result with real entities
+ # Create mock model instance
+ mock_model_instance = MagicMock()
mock_usage = LLMUsage(
prompt_tokens=30,
prompt_unit_price=Decimal("0.001"),
- prompt_price_unit=Decimal("1000"),
+ prompt_price_unit=Decimal(1000),
prompt_price=Decimal("0.00003"),
completion_tokens=20,
completion_unit_price=Decimal("0.002"),
- completion_price_unit=Decimal("1000"),
+ completion_price_unit=Decimal(1000),
completion_price=Decimal("0.00004"),
total_tokens=50,
total_price=Decimal("0.00007"),
currency="USD",
latency=0.5,
)
-
mock_message = AssistantPromptMessage(content="Test response: sunny weather and what's the weather today?")
-
mock_llm_result = LLMResult(
model="gpt-3.5-turbo",
prompt_messages=[],
message=mock_message,
usage=mock_usage,
)
-
- # Create a simple mock model instance that doesn't call real providers
- mock_model_instance = MagicMock()
mock_model_instance.invoke_llm.return_value = mock_llm_result
- # Create a simple mock model config with required attributes
+ # Create mock model config
mock_model_config = MagicMock()
mock_model_config.mode = "chat"
mock_model_config.provider = "openai"
mock_model_config.model = "gpt-3.5-turbo"
- mock_model_config.provider_model_bundle.configuration.tenant_id = "9d2074fc-6f86-45a9-b09d-6ecc63b9056b"
+ mock_model_config.parameters = {}
+
+ return mock_model_instance, mock_model_config
- # Mock the _fetch_model_config method
- def mock_fetch_model_config_func(_node_data_model):
- return mock_model_instance, mock_model_config
+ # Mock fetch_prompt_messages to avoid database calls
+ def mock_fetch_prompt_messages_2(**_kwargs):
+ from core.model_runtime.entities.message_entities import SystemPromptMessage, UserPromptMessage
- # Also mock ModelManager.get_model_instance to avoid database calls
- def mock_get_model_instance(_self, **kwargs):
- return mock_model_instance
+ return [
+ SystemPromptMessage(content="you are a helpful assistant. today's weather is sunny."),
+ UserPromptMessage(content="what's the weather today?"),
+ ], []
- with (
- patch.object(node, "_fetch_model_config", mock_fetch_model_config_func),
- patch("core.model_manager.ModelManager.get_model_instance", mock_get_model_instance),
- ):
- # execute node
- result = node._run()
+ with (
+ patch.object(LLMNode, "_fetch_model_config", mock_fetch_model_config),
+ patch.object(LLMNode, "fetch_prompt_messages", mock_fetch_prompt_messages_2),
+ ):
+ # execute node
+ result = node._run()
- for item in result:
- if isinstance(item, RunCompletedEvent):
- assert item.run_result.status == WorkflowNodeExecutionStatus.SUCCEEDED
- assert item.run_result.process_data is not None
- assert "sunny" in json.dumps(item.run_result.process_data)
- assert "what's the weather today?" in json.dumps(item.run_result.process_data)
+ for item in result:
+ if isinstance(item, RunCompletedEvent):
+ assert item.run_result.status == WorkflowNodeExecutionStatus.SUCCEEDED
+ assert item.run_result.process_data is not None
+ assert "sunny" in json.dumps(item.run_result.process_data)
+ assert "what's the weather today?" in json.dumps(item.run_result.process_data)
def test_extract_json():
- node = init_llm_node(
- config={
- "id": "llm",
- "data": {
- "title": "123",
- "type": "llm",
- "model": {"provider": "openai", "name": "gpt-3.5-turbo", "mode": "chat", "completion_params": {}},
- "prompt_config": {
- "structured_output": {
- "enabled": True,
- "schema": {
- "type": "object",
- "properties": {"name": {"type": "string"}, "age": {"type": "number"}},
- },
- }
- },
- "prompt_template": [{"role": "user", "text": "{{#sys.query#}}"}],
- "memory": None,
- "context": {"enabled": False},
- "vision": {"enabled": False},
- },
- },
- )
llm_texts = [
'\n\n {"name": "test", "age": 123', # resoning model (deepseek-r1)
'{"name":"test","age":123}', # json schema model (gpt-4o)
@@ -327,4 +300,4 @@ def test_extract_json():
'{"name":"test",age:123}', # without quotes (qwen-2.5-0.5b)
]
result = {"name": "test", "age": 123}
- assert all(node._parse_structured_output(item) == result for item in llm_texts)
+ assert all(_parse_structured_output(item) == result for item in llm_texts)
diff --git a/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py b/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
index 0df8e8b146..edd70193a8 100644
--- a/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
+++ b/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
@@ -8,11 +8,11 @@ from core.app.entities.app_invoke_entities import InvokeFrom
from core.model_runtime.entities import AssistantPromptMessage
from core.workflow.entities.variable_pool import VariablePool
from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.graph import Graph
from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
from core.workflow.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
+from core.workflow.system_variable import SystemVariable
from extensions.ext_database import db
from models.enums import UserFrom
from tests.integration_tests.workflow.nodes.__mock.model import get_mocked_fetch_model_config
@@ -64,12 +64,9 @@ def init_parameter_extractor_node(config: dict):
# construct variable pool
variable_pool = VariablePool(
- system_variables={
- SystemVariableKey.QUERY: "what's the weather in SF",
- SystemVariableKey.FILES: [],
- SystemVariableKey.CONVERSATION_ID: "abababa",
- SystemVariableKey.USER_ID: "aaa",
- },
+ system_variables=SystemVariable(
+ user_id="aaa", files=[], query="what's the weather in SF", conversation_id="abababa"
+ ),
user_inputs={},
environment_variables=[],
conversation_variables=[],
@@ -77,13 +74,15 @@ def init_parameter_extractor_node(config: dict):
variable_pool.add(["a", "b123", "args1"], 1)
variable_pool.add(["a", "b123", "args2"], 2)
- return ParameterExtractorNode(
+ node = ParameterExtractorNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter()),
config=config,
)
+ node.init_node_data(config.get("data", {}))
+ return node
def test_function_calling_parameter_extractor(setup_model_mock):
diff --git a/api/tests/integration_tests/workflow/nodes/test_template_transform.py b/api/tests/integration_tests/workflow/nodes/test_template_transform.py
index a5f2677a59..f71a5ee140 100644
--- a/api/tests/integration_tests/workflow/nodes/test_template_transform.py
+++ b/api/tests/integration_tests/workflow/nodes/test_template_transform.py
@@ -6,11 +6,11 @@ import pytest
from core.app.entities.app_invoke_entities import InvokeFrom
from core.workflow.entities.variable_pool import VariablePool
from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.graph import Graph
from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
from core.workflow.nodes.template_transform.template_transform_node import TemplateTransformNode
+from core.workflow.system_variable import SystemVariable
from models.enums import UserFrom
from models.workflow import WorkflowType
from tests.integration_tests.workflow.nodes.__mock.code_executor import setup_code_executor_mock
@@ -61,7 +61,7 @@ def test_execute_code(setup_code_executor_mock):
# construct variable pool
variable_pool = VariablePool(
- system_variables={SystemVariableKey.FILES: [], SystemVariableKey.USER_ID: "aaa"},
+ system_variables=SystemVariable(user_id="aaa", files=[]),
user_inputs={},
environment_variables=[],
conversation_variables=[],
@@ -76,6 +76,7 @@ def test_execute_code(setup_code_executor_mock):
graph_runtime_state=GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter()),
config=config,
)
+ node.init_node_data(config.get("data", {}))
# execute node
result = node._run()
diff --git a/api/tests/integration_tests/workflow/nodes/test_tool.py b/api/tests/integration_tests/workflow/nodes/test_tool.py
index 039beedafe..8476c1f874 100644
--- a/api/tests/integration_tests/workflow/nodes/test_tool.py
+++ b/api/tests/integration_tests/workflow/nodes/test_tool.py
@@ -6,12 +6,12 @@ from core.app.entities.app_invoke_entities import InvokeFrom
from core.tools.utils.configuration import ToolParameterConfigurationManager
from core.workflow.entities.variable_pool import VariablePool
from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.graph import Graph
from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
from core.workflow.nodes.event.event import RunCompletedEvent
from core.workflow.nodes.tool.tool_node import ToolNode
+from core.workflow.system_variable import SystemVariable
from models.enums import UserFrom
from models.workflow import WorkflowType
@@ -44,19 +44,21 @@ def init_tool_node(config: dict):
# construct variable pool
variable_pool = VariablePool(
- system_variables={SystemVariableKey.FILES: [], SystemVariableKey.USER_ID: "aaa"},
+ system_variables=SystemVariable(user_id="aaa", files=[]),
user_inputs={},
environment_variables=[],
conversation_variables=[],
)
- return ToolNode(
+ node = ToolNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter()),
config=config,
)
+ node.init_node_data(config.get("data", {}))
+ return node
def test_tool_variable_invoke():
diff --git a/api/tests/unit_tests/configs/test_dify_config.py b/api/tests/unit_tests/configs/test_dify_config.py
index cac0a688cd..e9d4ee1935 100644
--- a/api/tests/unit_tests/configs/test_dify_config.py
+++ b/api/tests/unit_tests/configs/test_dify_config.py
@@ -1,6 +1,7 @@
import os
from flask import Flask
+from packaging.version import Version
from yarl import URL
from configs.app_config import DifyConfig
@@ -40,6 +41,9 @@ def test_dify_config(monkeypatch):
assert config.WORKFLOW_PARALLEL_DEPTH_LIMIT == 3
+ # values from pyproject.toml
+ assert Version(config.project.version) >= Version("1.0.0")
+
# NOTE: If there is a `.env` file in your Workspace, this test might not succeed as expected.
# This is due to `pymilvus` loading all the variables from the `.env` file into `os.environ`.
@@ -84,6 +88,7 @@ def test_flask_configs(monkeypatch):
"pool_pre_ping": False,
"pool_recycle": 3600,
"pool_size": 30,
+ "pool_use_lifo": False,
}
assert config["CONSOLE_WEB_URL"] == "https://example.com"
diff --git a/api/tests/unit_tests/conftest.py b/api/tests/unit_tests/conftest.py
index e09acc4c39..f484fb22d3 100644
--- a/api/tests/unit_tests/conftest.py
+++ b/api/tests/unit_tests/conftest.py
@@ -1,4 +1,5 @@
import os
+from unittest.mock import MagicMock, patch
import pytest
from flask import Flask
@@ -11,6 +12,31 @@ PROJECT_DIR = os.path.abspath(os.path.join(ABS_PATH, os.pardir, os.pardir))
CACHED_APP = Flask(__name__)
+# set global mock for Redis client
+redis_mock = MagicMock()
+redis_mock.get = MagicMock(return_value=None)
+redis_mock.setex = MagicMock()
+redis_mock.setnx = MagicMock()
+redis_mock.delete = MagicMock()
+redis_mock.lock = MagicMock()
+redis_mock.exists = MagicMock(return_value=False)
+redis_mock.set = MagicMock()
+redis_mock.expire = MagicMock()
+redis_mock.hgetall = MagicMock(return_value={})
+redis_mock.hdel = MagicMock()
+redis_mock.incr = MagicMock(return_value=1)
+
+# Add the API directory to Python path to ensure proper imports
+import sys
+
+sys.path.insert(0, PROJECT_DIR)
+
+# apply the mock to the Redis client in the Flask app
+from extensions import ext_redis
+
+redis_patcher = patch.object(ext_redis, "redis_client", redis_mock)
+redis_patcher.start()
+
@pytest.fixture
def app() -> Flask:
@@ -21,3 +47,19 @@ def app() -> Flask:
def _provide_app_context(app: Flask):
with app.app_context():
yield
+
+
+@pytest.fixture(autouse=True)
+def reset_redis_mock():
+ """reset the Redis mock before each test"""
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+ redis_mock.setex.return_value = None
+ redis_mock.setnx.return_value = None
+ redis_mock.delete.return_value = None
+ redis_mock.exists.return_value = False
+ redis_mock.set.return_value = None
+ redis_mock.expire.return_value = None
+ redis_mock.hgetall.return_value = {}
+ redis_mock.hdel.return_value = None
+ redis_mock.incr.return_value = 1
diff --git a/api/tests/unit_tests/controllers/console/app/workflow_draft_variables_test.py b/api/tests/unit_tests/controllers/console/app/workflow_draft_variables_test.py
new file mode 100644
index 0000000000..f26be6702a
--- /dev/null
+++ b/api/tests/unit_tests/controllers/console/app/workflow_draft_variables_test.py
@@ -0,0 +1,302 @@
+import datetime
+import uuid
+from collections import OrderedDict
+from typing import Any, NamedTuple
+
+from flask_restful import marshal
+
+from controllers.console.app.workflow_draft_variable import (
+ _WORKFLOW_DRAFT_VARIABLE_FIELDS,
+ _WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS,
+ _WORKFLOW_DRAFT_VARIABLE_LIST_WITHOUT_VALUE_FIELDS,
+ _WORKFLOW_DRAFT_VARIABLE_WITHOUT_VALUE_FIELDS,
+)
+from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
+from factories.variable_factory import build_segment
+from models.workflow import WorkflowDraftVariable
+from services.workflow_draft_variable_service import WorkflowDraftVariableList
+
+_TEST_APP_ID = "test_app_id"
+_TEST_NODE_EXEC_ID = str(uuid.uuid4())
+
+
+class TestWorkflowDraftVariableFields:
+ def test_conversation_variable(self):
+ conv_var = WorkflowDraftVariable.new_conversation_variable(
+ app_id=_TEST_APP_ID, name="conv_var", value=build_segment(1)
+ )
+
+ conv_var.id = str(uuid.uuid4())
+ conv_var.visible = True
+
+ expected_without_value: OrderedDict[str, Any] = OrderedDict(
+ {
+ "id": str(conv_var.id),
+ "type": conv_var.get_variable_type().value,
+ "name": "conv_var",
+ "description": "",
+ "selector": [CONVERSATION_VARIABLE_NODE_ID, "conv_var"],
+ "value_type": "number",
+ "edited": False,
+ "visible": True,
+ }
+ )
+
+ assert marshal(conv_var, _WORKFLOW_DRAFT_VARIABLE_WITHOUT_VALUE_FIELDS) == expected_without_value
+ expected_with_value = expected_without_value.copy()
+ expected_with_value["value"] = 1
+ assert marshal(conv_var, _WORKFLOW_DRAFT_VARIABLE_FIELDS) == expected_with_value
+
+ def test_create_sys_variable(self):
+ sys_var = WorkflowDraftVariable.new_sys_variable(
+ app_id=_TEST_APP_ID,
+ name="sys_var",
+ value=build_segment("a"),
+ editable=True,
+ node_execution_id=_TEST_NODE_EXEC_ID,
+ )
+
+ sys_var.id = str(uuid.uuid4())
+ sys_var.last_edited_at = datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
+ sys_var.visible = True
+
+ expected_without_value = OrderedDict(
+ {
+ "id": str(sys_var.id),
+ "type": sys_var.get_variable_type().value,
+ "name": "sys_var",
+ "description": "",
+ "selector": [SYSTEM_VARIABLE_NODE_ID, "sys_var"],
+ "value_type": "string",
+ "edited": True,
+ "visible": True,
+ }
+ )
+ assert marshal(sys_var, _WORKFLOW_DRAFT_VARIABLE_WITHOUT_VALUE_FIELDS) == expected_without_value
+ expected_with_value = expected_without_value.copy()
+ expected_with_value["value"] = "a"
+ assert marshal(sys_var, _WORKFLOW_DRAFT_VARIABLE_FIELDS) == expected_with_value
+
+ def test_node_variable(self):
+ node_var = WorkflowDraftVariable.new_node_variable(
+ app_id=_TEST_APP_ID,
+ node_id="test_node",
+ name="node_var",
+ value=build_segment([1, "a"]),
+ visible=False,
+ node_execution_id=_TEST_NODE_EXEC_ID,
+ )
+
+ node_var.id = str(uuid.uuid4())
+ node_var.last_edited_at = datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
+
+ expected_without_value: OrderedDict[str, Any] = OrderedDict(
+ {
+ "id": str(node_var.id),
+ "type": node_var.get_variable_type().value,
+ "name": "node_var",
+ "description": "",
+ "selector": ["test_node", "node_var"],
+ "value_type": "array[any]",
+ "edited": True,
+ "visible": False,
+ }
+ )
+
+ assert marshal(node_var, _WORKFLOW_DRAFT_VARIABLE_WITHOUT_VALUE_FIELDS) == expected_without_value
+ expected_with_value = expected_without_value.copy()
+ expected_with_value["value"] = [1, "a"]
+ assert marshal(node_var, _WORKFLOW_DRAFT_VARIABLE_FIELDS) == expected_with_value
+
+
+class TestWorkflowDraftVariableList:
+ def test_workflow_draft_variable_list(self):
+ class TestCase(NamedTuple):
+ name: str
+ var_list: WorkflowDraftVariableList
+ expected: dict
+
+ node_var = WorkflowDraftVariable.new_node_variable(
+ app_id=_TEST_APP_ID,
+ node_id="test_node",
+ name="test_var",
+ value=build_segment("a"),
+ visible=True,
+ node_execution_id=_TEST_NODE_EXEC_ID,
+ )
+ node_var.id = str(uuid.uuid4())
+ node_var_dict = OrderedDict(
+ {
+ "id": str(node_var.id),
+ "type": node_var.get_variable_type().value,
+ "name": "test_var",
+ "description": "",
+ "selector": ["test_node", "test_var"],
+ "value_type": "string",
+ "edited": False,
+ "visible": True,
+ }
+ )
+
+ cases = [
+ TestCase(
+ name="empty variable list",
+ var_list=WorkflowDraftVariableList(variables=[]),
+ expected=OrderedDict(
+ {
+ "items": [],
+ "total": None,
+ }
+ ),
+ ),
+ TestCase(
+ name="empty variable list with total",
+ var_list=WorkflowDraftVariableList(variables=[], total=10),
+ expected=OrderedDict(
+ {
+ "items": [],
+ "total": 10,
+ }
+ ),
+ ),
+ TestCase(
+ name="non-empty variable list",
+ var_list=WorkflowDraftVariableList(variables=[node_var], total=None),
+ expected=OrderedDict(
+ {
+ "items": [node_var_dict],
+ "total": None,
+ }
+ ),
+ ),
+ TestCase(
+ name="non-empty variable list with total",
+ var_list=WorkflowDraftVariableList(variables=[node_var], total=10),
+ expected=OrderedDict(
+ {
+ "items": [node_var_dict],
+ "total": 10,
+ }
+ ),
+ ),
+ ]
+
+ for idx, case in enumerate(cases, 1):
+ assert marshal(case.var_list, _WORKFLOW_DRAFT_VARIABLE_LIST_WITHOUT_VALUE_FIELDS) == case.expected, (
+ f"Test case {idx} failed, {case.name=}"
+ )
+
+
+def test_workflow_node_variables_fields():
+ conv_var = WorkflowDraftVariable.new_conversation_variable(
+ app_id=_TEST_APP_ID, name="conv_var", value=build_segment(1)
+ )
+ resp = marshal(WorkflowDraftVariableList(variables=[conv_var]), _WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS)
+ assert isinstance(resp, dict)
+ assert len(resp["items"]) == 1
+ item_dict = resp["items"][0]
+ assert item_dict["name"] == "conv_var"
+ assert item_dict["value"] == 1
+
+
+def test_workflow_file_variable_with_signed_url():
+ """Test that File type variables include signed URLs in API responses."""
+ from core.file.enums import FileTransferMethod, FileType
+ from core.file.models import File
+
+ # Create a File object with LOCAL_FILE transfer method (which generates signed URLs)
+ test_file = File(
+ id="test_file_id",
+ tenant_id="test_tenant_id",
+ type=FileType.IMAGE,
+ transfer_method=FileTransferMethod.LOCAL_FILE,
+ related_id="test_upload_file_id",
+ filename="test.jpg",
+ extension=".jpg",
+ mime_type="image/jpeg",
+ size=12345,
+ )
+
+ # Create a WorkflowDraftVariable with the File
+ file_var = WorkflowDraftVariable.new_node_variable(
+ app_id=_TEST_APP_ID,
+ node_id="test_node",
+ name="file_var",
+ value=build_segment(test_file),
+ node_execution_id=_TEST_NODE_EXEC_ID,
+ )
+
+ # Marshal the variable using the API fields
+ resp = marshal(WorkflowDraftVariableList(variables=[file_var]), _WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS)
+
+ # Verify the response structure
+ assert isinstance(resp, dict)
+ assert len(resp["items"]) == 1
+ item_dict = resp["items"][0]
+ assert item_dict["name"] == "file_var"
+
+ # Verify the value is a dict (File.to_dict() result) and contains expected fields
+ value = item_dict["value"]
+ assert isinstance(value, dict)
+
+ # Verify the File fields are preserved
+ assert value["id"] == test_file.id
+ assert value["filename"] == test_file.filename
+ assert value["type"] == test_file.type.value
+ assert value["transfer_method"] == test_file.transfer_method.value
+ assert value["size"] == test_file.size
+
+ # Verify the URL is present (it should be a signed URL for LOCAL_FILE transfer method)
+ remote_url = value["remote_url"]
+ assert remote_url is not None
+
+ assert isinstance(remote_url, str)
+ # For LOCAL_FILE, the URL should contain signature parameters
+ assert "timestamp=" in remote_url
+ assert "nonce=" in remote_url
+ assert "sign=" in remote_url
+
+
+def test_workflow_file_variable_remote_url():
+ """Test that File type variables with REMOTE_URL transfer method return the remote URL."""
+ from core.file.enums import FileTransferMethod, FileType
+ from core.file.models import File
+
+ # Create a File object with REMOTE_URL transfer method
+ test_file = File(
+ id="test_file_id",
+ tenant_id="test_tenant_id",
+ type=FileType.IMAGE,
+ transfer_method=FileTransferMethod.REMOTE_URL,
+ remote_url="https://example.com/test.jpg",
+ filename="test.jpg",
+ extension=".jpg",
+ mime_type="image/jpeg",
+ size=12345,
+ )
+
+ # Create a WorkflowDraftVariable with the File
+ file_var = WorkflowDraftVariable.new_node_variable(
+ app_id=_TEST_APP_ID,
+ node_id="test_node",
+ name="file_var",
+ value=build_segment(test_file),
+ node_execution_id=_TEST_NODE_EXEC_ID,
+ )
+
+ # Marshal the variable using the API fields
+ resp = marshal(WorkflowDraftVariableList(variables=[file_var]), _WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS)
+
+ # Verify the response structure
+ assert isinstance(resp, dict)
+ assert len(resp["items"]) == 1
+ item_dict = resp["items"][0]
+ assert item_dict["name"] == "file_var"
+
+ # Verify the value is a dict (File.to_dict() result) and contains expected fields
+ value = item_dict["value"]
+ assert isinstance(value, dict)
+ remote_url = value["remote_url"]
+
+ # For REMOTE_URL, the URL should be the original remote URL
+ assert remote_url == test_file.remote_url
diff --git a/api/tests/unit_tests/controllers/console/auth/test_oauth.py b/api/tests/unit_tests/controllers/console/auth/test_oauth.py
new file mode 100644
index 0000000000..037c9f2745
--- /dev/null
+++ b/api/tests/unit_tests/controllers/console/auth/test_oauth.py
@@ -0,0 +1,496 @@
+from unittest.mock import MagicMock, patch
+
+import pytest
+from flask import Flask
+
+from controllers.console.auth.oauth import (
+ OAuthCallback,
+ OAuthLogin,
+ _generate_account,
+ _get_account_by_openid_or_email,
+ get_oauth_providers,
+)
+from libs.oauth import OAuthUserInfo
+from models.account import AccountStatus
+from services.errors.account import AccountNotFoundError
+
+
+class TestGetOAuthProviders:
+ @pytest.fixture
+ def app(self):
+ app = Flask(__name__)
+ app.config["TESTING"] = True
+ return app
+
+ @pytest.mark.parametrize(
+ ("github_config", "google_config", "expected_github", "expected_google"),
+ [
+ # Both providers configured
+ (
+ {"id": "github_id", "secret": "github_secret"},
+ {"id": "google_id", "secret": "google_secret"},
+ True,
+ True,
+ ),
+ # Only GitHub configured
+ ({"id": "github_id", "secret": "github_secret"}, {"id": None, "secret": None}, True, False),
+ # Only Google configured
+ ({"id": None, "secret": None}, {"id": "google_id", "secret": "google_secret"}, False, True),
+ # No providers configured
+ ({"id": None, "secret": None}, {"id": None, "secret": None}, False, False),
+ ],
+ )
+ @patch("controllers.console.auth.oauth.dify_config")
+ def test_should_configure_oauth_providers_correctly(
+ self, mock_config, app, github_config, google_config, expected_github, expected_google
+ ):
+ mock_config.GITHUB_CLIENT_ID = github_config["id"]
+ mock_config.GITHUB_CLIENT_SECRET = github_config["secret"]
+ mock_config.GOOGLE_CLIENT_ID = google_config["id"]
+ mock_config.GOOGLE_CLIENT_SECRET = google_config["secret"]
+ mock_config.CONSOLE_API_URL = "http://localhost"
+
+ with app.app_context():
+ providers = get_oauth_providers()
+
+ assert (providers["github"] is not None) == expected_github
+ assert (providers["google"] is not None) == expected_google
+
+
+class TestOAuthLogin:
+ @pytest.fixture
+ def resource(self):
+ return OAuthLogin()
+
+ @pytest.fixture
+ def app(self):
+ app = Flask(__name__)
+ app.config["TESTING"] = True
+ return app
+
+ @pytest.fixture
+ def mock_oauth_provider(self):
+ provider = MagicMock()
+ provider.get_authorization_url.return_value = "https://github.com/login/oauth/authorize?..."
+ return provider
+
+ @pytest.mark.parametrize(
+ ("invite_token", "expected_token"),
+ [
+ (None, None),
+ ("test_invite_token", "test_invite_token"),
+ ("", None),
+ ],
+ )
+ @patch("controllers.console.auth.oauth.get_oauth_providers")
+ @patch("controllers.console.auth.oauth.redirect")
+ def test_should_handle_oauth_login_with_various_tokens(
+ self,
+ mock_redirect,
+ mock_get_providers,
+ resource,
+ app,
+ mock_oauth_provider,
+ invite_token,
+ expected_token,
+ ):
+ mock_get_providers.return_value = {"github": mock_oauth_provider, "google": None}
+
+ query_string = f"invite_token={invite_token}" if invite_token else ""
+ with app.test_request_context(f"/auth/oauth/github?{query_string}"):
+ resource.get("github")
+
+ mock_oauth_provider.get_authorization_url.assert_called_once_with(invite_token=expected_token)
+ mock_redirect.assert_called_once_with("https://github.com/login/oauth/authorize?...")
+
+ @pytest.mark.parametrize(
+ ("provider", "expected_error"),
+ [
+ ("invalid_provider", "Invalid provider"),
+ ("github", "Invalid provider"), # When GitHub is not configured
+ ("google", "Invalid provider"), # When Google is not configured
+ ],
+ )
+ @patch("controllers.console.auth.oauth.get_oauth_providers")
+ def test_should_return_error_for_invalid_providers(
+ self, mock_get_providers, resource, app, provider, expected_error
+ ):
+ mock_get_providers.return_value = {"github": None, "google": None}
+
+ with app.test_request_context(f"/auth/oauth/{provider}"):
+ response, status_code = resource.get(provider)
+
+ assert status_code == 400
+ assert response["error"] == expected_error
+
+
+class TestOAuthCallback:
+ @pytest.fixture
+ def resource(self):
+ return OAuthCallback()
+
+ @pytest.fixture
+ def app(self):
+ app = Flask(__name__)
+ app.config["TESTING"] = True
+ return app
+
+ @pytest.fixture
+ def oauth_setup(self):
+ """Common OAuth setup for callback tests"""
+ oauth_provider = MagicMock()
+ oauth_provider.get_access_token.return_value = "access_token"
+ oauth_provider.get_user_info.return_value = OAuthUserInfo(id="123", name="Test User", email="test@example.com")
+
+ account = MagicMock()
+ account.status = AccountStatus.ACTIVE.value
+
+ token_pair = MagicMock()
+ token_pair.access_token = "jwt_access_token"
+ token_pair.refresh_token = "jwt_refresh_token"
+
+ return {"provider": oauth_provider, "account": account, "token_pair": token_pair}
+
+ @patch("controllers.console.auth.oauth.dify_config")
+ @patch("controllers.console.auth.oauth.get_oauth_providers")
+ @patch("controllers.console.auth.oauth._generate_account")
+ @patch("controllers.console.auth.oauth.AccountService")
+ @patch("controllers.console.auth.oauth.TenantService")
+ @patch("controllers.console.auth.oauth.redirect")
+ def test_should_handle_successful_oauth_callback(
+ self,
+ mock_redirect,
+ mock_tenant_service,
+ mock_account_service,
+ mock_generate_account,
+ mock_get_providers,
+ mock_config,
+ resource,
+ app,
+ oauth_setup,
+ ):
+ mock_config.CONSOLE_WEB_URL = "http://localhost:3000"
+ mock_get_providers.return_value = {"github": oauth_setup["provider"]}
+ mock_generate_account.return_value = oauth_setup["account"]
+ mock_account_service.login.return_value = oauth_setup["token_pair"]
+
+ with app.test_request_context("/auth/oauth/github/callback?code=test_code"):
+ resource.get("github")
+
+ oauth_setup["provider"].get_access_token.assert_called_once_with("test_code")
+ oauth_setup["provider"].get_user_info.assert_called_once_with("access_token")
+ mock_redirect.assert_called_once_with(
+ "http://localhost:3000?access_token=jwt_access_token&refresh_token=jwt_refresh_token"
+ )
+
+ @pytest.mark.parametrize(
+ ("exception", "expected_error"),
+ [
+ (Exception("OAuth error"), "OAuth process failed"),
+ (ValueError("Invalid token"), "OAuth process failed"),
+ (KeyError("Missing key"), "OAuth process failed"),
+ ],
+ )
+ @patch("controllers.console.auth.oauth.db")
+ @patch("controllers.console.auth.oauth.get_oauth_providers")
+ def test_should_handle_oauth_exceptions(
+ self, mock_get_providers, mock_db, resource, app, exception, expected_error
+ ):
+ # Mock database session
+ mock_db.session = MagicMock()
+ mock_db.session.rollback = MagicMock()
+
+ # Import the real requests module to create a proper exception
+ import requests
+
+ request_exception = requests.exceptions.RequestException("OAuth error")
+ request_exception.response = MagicMock()
+ request_exception.response.text = str(exception)
+
+ mock_oauth_provider = MagicMock()
+ mock_oauth_provider.get_access_token.side_effect = request_exception
+ mock_get_providers.return_value = {"github": mock_oauth_provider}
+
+ with app.test_request_context("/auth/oauth/github/callback?code=test_code"):
+ response, status_code = resource.get("github")
+
+ assert status_code == 400
+ assert response["error"] == expected_error
+
+ @pytest.mark.parametrize(
+ ("account_status", "expected_redirect"),
+ [
+ (AccountStatus.BANNED.value, "http://localhost:3000/signin?message=Account is banned."),
+ # CLOSED status: Currently NOT handled, will proceed to login (security issue)
+ # This documents actual behavior. See test_defensive_check_for_closed_account_status for details
+ (
+ AccountStatus.CLOSED.value,
+ "http://localhost:3000?access_token=jwt_access_token&refresh_token=jwt_refresh_token",
+ ),
+ ],
+ )
+ @patch("controllers.console.auth.oauth.AccountService")
+ @patch("controllers.console.auth.oauth.TenantService")
+ @patch("controllers.console.auth.oauth.db")
+ @patch("controllers.console.auth.oauth.dify_config")
+ @patch("controllers.console.auth.oauth.get_oauth_providers")
+ @patch("controllers.console.auth.oauth._generate_account")
+ @patch("controllers.console.auth.oauth.redirect")
+ def test_should_redirect_based_on_account_status(
+ self,
+ mock_redirect,
+ mock_generate_account,
+ mock_get_providers,
+ mock_config,
+ mock_db,
+ mock_tenant_service,
+ mock_account_service,
+ resource,
+ app,
+ oauth_setup,
+ account_status,
+ expected_redirect,
+ ):
+ # Mock database session
+ mock_db.session = MagicMock()
+ mock_db.session.rollback = MagicMock()
+ mock_db.session.commit = MagicMock()
+
+ mock_config.CONSOLE_WEB_URL = "http://localhost:3000"
+ mock_get_providers.return_value = {"github": oauth_setup["provider"]}
+
+ account = MagicMock()
+ account.status = account_status
+ account.id = "123"
+ mock_generate_account.return_value = account
+
+ # Mock login for CLOSED status
+ mock_token_pair = MagicMock()
+ mock_token_pair.access_token = "jwt_access_token"
+ mock_token_pair.refresh_token = "jwt_refresh_token"
+ mock_account_service.login.return_value = mock_token_pair
+
+ with app.test_request_context("/auth/oauth/github/callback?code=test_code"):
+ resource.get("github")
+
+ mock_redirect.assert_called_once_with(expected_redirect)
+
+ @patch("controllers.console.auth.oauth.dify_config")
+ @patch("controllers.console.auth.oauth.get_oauth_providers")
+ @patch("controllers.console.auth.oauth._generate_account")
+ @patch("controllers.console.auth.oauth.db")
+ @patch("controllers.console.auth.oauth.TenantService")
+ @patch("controllers.console.auth.oauth.AccountService")
+ def test_should_activate_pending_account(
+ self,
+ mock_account_service,
+ mock_tenant_service,
+ mock_db,
+ mock_generate_account,
+ mock_get_providers,
+ mock_config,
+ resource,
+ app,
+ oauth_setup,
+ ):
+ mock_get_providers.return_value = {"github": oauth_setup["provider"]}
+
+ mock_account = MagicMock()
+ mock_account.status = AccountStatus.PENDING.value
+ mock_generate_account.return_value = mock_account
+
+ with app.test_request_context("/auth/oauth/github/callback?code=test_code"):
+ resource.get("github")
+
+ assert mock_account.status == AccountStatus.ACTIVE.value
+ assert mock_account.initialized_at is not None
+ mock_db.session.commit.assert_called_once()
+
+ @patch("controllers.console.auth.oauth.dify_config")
+ @patch("controllers.console.auth.oauth.get_oauth_providers")
+ @patch("controllers.console.auth.oauth._generate_account")
+ @patch("controllers.console.auth.oauth.db")
+ @patch("controllers.console.auth.oauth.TenantService")
+ @patch("controllers.console.auth.oauth.AccountService")
+ @patch("controllers.console.auth.oauth.redirect")
+ def test_defensive_check_for_closed_account_status(
+ self,
+ mock_redirect,
+ mock_account_service,
+ mock_tenant_service,
+ mock_db,
+ mock_generate_account,
+ mock_get_providers,
+ mock_config,
+ resource,
+ app,
+ oauth_setup,
+ ):
+ """Defensive test for CLOSED account status handling in OAuth callback.
+
+ This is a defensive test documenting expected security behavior for CLOSED accounts.
+
+ Current behavior: CLOSED status is NOT checked, allowing closed accounts to login.
+ Expected behavior: CLOSED accounts should be rejected like BANNED accounts.
+
+ Context:
+ - AccountStatus.CLOSED is defined in the enum but never used in production
+ - The close_account() method exists but is never called
+ - Account deletion uses external service instead of status change
+ - All authentication services (OAuth, password, email) don't check CLOSED status
+
+ TODO: If CLOSED status is implemented in the future:
+ 1. Update OAuth callback to check for CLOSED status
+ 2. Add similar checks to all authentication services for consistency
+ 3. Update this test to verify the rejection behavior
+
+ Security consideration: Until properly implemented, CLOSED status provides no protection.
+ """
+ # Setup
+ mock_config.CONSOLE_WEB_URL = "http://localhost:3000"
+ mock_get_providers.return_value = {"github": oauth_setup["provider"]}
+
+ # Create account with CLOSED status
+ closed_account = MagicMock()
+ closed_account.status = AccountStatus.CLOSED.value
+ closed_account.id = "123"
+ closed_account.name = "Closed Account"
+ mock_generate_account.return_value = closed_account
+
+ # Mock successful login (current behavior)
+ mock_token_pair = MagicMock()
+ mock_token_pair.access_token = "jwt_access_token"
+ mock_token_pair.refresh_token = "jwt_refresh_token"
+ mock_account_service.login.return_value = mock_token_pair
+
+ # Execute OAuth callback
+ with app.test_request_context("/auth/oauth/github/callback?code=test_code"):
+ resource.get("github")
+
+ # Verify current behavior: login succeeds (this is NOT ideal)
+ mock_redirect.assert_called_once_with(
+ "http://localhost:3000?access_token=jwt_access_token&refresh_token=jwt_refresh_token"
+ )
+ mock_account_service.login.assert_called_once()
+
+ # Document expected behavior in comments:
+ # Expected: mock_redirect.assert_called_once_with(
+ # "http://localhost:3000/signin?message=Account is closed."
+ # )
+ # Expected: mock_account_service.login.assert_not_called()
+
+
+class TestAccountGeneration:
+ @pytest.fixture
+ def user_info(self):
+ return OAuthUserInfo(id="123", name="Test User", email="test@example.com")
+
+ @pytest.fixture
+ def mock_account(self):
+ account = MagicMock()
+ account.name = "Test User"
+ return account
+
+ @patch("controllers.console.auth.oauth.db")
+ @patch("controllers.console.auth.oauth.Account")
+ @patch("controllers.console.auth.oauth.Session")
+ @patch("controllers.console.auth.oauth.select")
+ def test_should_get_account_by_openid_or_email(
+ self, mock_select, mock_session, mock_account_model, mock_db, user_info, mock_account
+ ):
+ # Mock db.engine for Session creation
+ mock_db.engine = MagicMock()
+
+ # Test OpenID found
+ mock_account_model.get_by_openid.return_value = mock_account
+ result = _get_account_by_openid_or_email("github", user_info)
+ assert result == mock_account
+ mock_account_model.get_by_openid.assert_called_once_with("github", "123")
+
+ # Test fallback to email
+ mock_account_model.get_by_openid.return_value = None
+ mock_session_instance = MagicMock()
+ mock_session_instance.execute.return_value.scalar_one_or_none.return_value = mock_account
+ mock_session.return_value.__enter__.return_value = mock_session_instance
+
+ result = _get_account_by_openid_or_email("github", user_info)
+ assert result == mock_account
+
+ @pytest.mark.parametrize(
+ ("allow_register", "existing_account", "should_create"),
+ [
+ (True, None, True), # New account creation allowed
+ (True, "existing", False), # Existing account
+ (False, None, False), # Registration not allowed
+ ],
+ )
+ @patch("controllers.console.auth.oauth._get_account_by_openid_or_email")
+ @patch("controllers.console.auth.oauth.FeatureService")
+ @patch("controllers.console.auth.oauth.RegisterService")
+ @patch("controllers.console.auth.oauth.AccountService")
+ @patch("controllers.console.auth.oauth.TenantService")
+ @patch("controllers.console.auth.oauth.db")
+ def test_should_handle_account_generation_scenarios(
+ self,
+ mock_db,
+ mock_tenant_service,
+ mock_account_service,
+ mock_register_service,
+ mock_feature_service,
+ mock_get_account,
+ app,
+ user_info,
+ mock_account,
+ allow_register,
+ existing_account,
+ should_create,
+ ):
+ mock_get_account.return_value = mock_account if existing_account else None
+ mock_feature_service.get_system_features.return_value.is_allow_register = allow_register
+ mock_register_service.register.return_value = mock_account
+
+ with app.test_request_context(headers={"Accept-Language": "en-US,en;q=0.9"}):
+ if not allow_register and not existing_account:
+ with pytest.raises(AccountNotFoundError):
+ _generate_account("github", user_info)
+ else:
+ result = _generate_account("github", user_info)
+ assert result == mock_account
+
+ if should_create:
+ mock_register_service.register.assert_called_once_with(
+ email="test@example.com", name="Test User", password=None, open_id="123", provider="github"
+ )
+
+ @patch("controllers.console.auth.oauth._get_account_by_openid_or_email")
+ @patch("controllers.console.auth.oauth.TenantService")
+ @patch("controllers.console.auth.oauth.FeatureService")
+ @patch("controllers.console.auth.oauth.AccountService")
+ @patch("controllers.console.auth.oauth.tenant_was_created")
+ def test_should_create_workspace_for_account_without_tenant(
+ self,
+ mock_event,
+ mock_account_service,
+ mock_feature_service,
+ mock_tenant_service,
+ mock_get_account,
+ app,
+ user_info,
+ mock_account,
+ ):
+ mock_get_account.return_value = mock_account
+ mock_tenant_service.get_join_tenants.return_value = []
+ mock_feature_service.get_system_features.return_value.is_allow_create_workspace = True
+
+ mock_new_tenant = MagicMock()
+ mock_tenant_service.create_tenant.return_value = mock_new_tenant
+
+ with app.test_request_context(headers={"Accept-Language": "en-US,en;q=0.9"}):
+ result = _generate_account("github", user_info)
+
+ assert result == mock_account
+ mock_tenant_service.create_tenant.assert_called_once_with("Test User's Workspace")
+ mock_tenant_service.create_tenant_member.assert_called_once_with(
+ mock_new_tenant, mock_account, role="owner"
+ )
+ mock_event.send.assert_called_once_with(mock_new_tenant)
diff --git a/api/tests/unit_tests/controllers/console/test_wraps.py b/api/tests/unit_tests/controllers/console/test_wraps.py
new file mode 100644
index 0000000000..9742368f04
--- /dev/null
+++ b/api/tests/unit_tests/controllers/console/test_wraps.py
@@ -0,0 +1,380 @@
+from unittest.mock import MagicMock, patch
+
+import pytest
+from flask import Flask
+from flask_login import LoginManager, UserMixin
+
+from controllers.console.error import NotInitValidateError, NotSetupError, UnauthorizedAndForceLogout
+from controllers.console.workspace.error import AccountNotInitializedError
+from controllers.console.wraps import (
+ account_initialization_required,
+ cloud_edition_billing_rate_limit_check,
+ cloud_edition_billing_resource_check,
+ enterprise_license_required,
+ only_edition_cloud,
+ only_edition_enterprise,
+ only_edition_self_hosted,
+ setup_required,
+)
+from models.account import AccountStatus
+from services.feature_service import LicenseStatus
+
+
+class MockUser(UserMixin):
+ """Simple User class for testing."""
+
+ def __init__(self, user_id: str):
+ self.id = user_id
+ self.current_tenant_id = "tenant123"
+
+ def get_id(self) -> str:
+ return self.id
+
+
+def create_app_with_login():
+ """Create a Flask app with LoginManager configured."""
+ app = Flask(__name__)
+ app.config["SECRET_KEY"] = "test-secret-key"
+
+ login_manager = LoginManager()
+ login_manager.init_app(app)
+
+ @login_manager.user_loader
+ def load_user(user_id: str):
+ return MockUser(user_id)
+
+ return app
+
+
+class TestAccountInitialization:
+ """Test account initialization decorator"""
+
+ def test_should_allow_initialized_account(self):
+ """Test that initialized accounts can access protected views"""
+ # Arrange
+ mock_user = MagicMock()
+ mock_user.status = AccountStatus.ACTIVE
+
+ @account_initialization_required
+ def protected_view():
+ return "success"
+
+ # Act
+ with patch("controllers.console.wraps.current_user", mock_user):
+ result = protected_view()
+
+ # Assert
+ assert result == "success"
+
+ def test_should_reject_uninitialized_account(self):
+ """Test that uninitialized accounts raise AccountNotInitializedError"""
+ # Arrange
+ mock_user = MagicMock()
+ mock_user.status = AccountStatus.UNINITIALIZED
+
+ @account_initialization_required
+ def protected_view():
+ return "success"
+
+ # Act & Assert
+ with patch("controllers.console.wraps.current_user", mock_user):
+ with pytest.raises(AccountNotInitializedError):
+ protected_view()
+
+
+class TestEditionChecks:
+ """Test edition-specific decorators"""
+
+ def test_only_edition_cloud_allows_cloud_edition(self):
+ """Test cloud edition decorator allows CLOUD edition"""
+
+ # Arrange
+ @only_edition_cloud
+ def cloud_view():
+ return "cloud_success"
+
+ # Act
+ with patch("controllers.console.wraps.dify_config.EDITION", "CLOUD"):
+ result = cloud_view()
+
+ # Assert
+ assert result == "cloud_success"
+
+ def test_only_edition_cloud_rejects_other_editions(self):
+ """Test cloud edition decorator rejects non-CLOUD editions"""
+ # Arrange
+ app = Flask(__name__)
+
+ @only_edition_cloud
+ def cloud_view():
+ return "cloud_success"
+
+ # Act & Assert
+ with app.test_request_context():
+ with patch("controllers.console.wraps.dify_config.EDITION", "SELF_HOSTED"):
+ with pytest.raises(Exception) as exc_info:
+ cloud_view()
+ assert exc_info.value.code == 404
+
+ def test_only_edition_enterprise_allows_when_enabled(self):
+ """Test enterprise edition decorator allows when ENTERPRISE_ENABLED is True"""
+
+ # Arrange
+ @only_edition_enterprise
+ def enterprise_view():
+ return "enterprise_success"
+
+ # Act
+ with patch("controllers.console.wraps.dify_config.ENTERPRISE_ENABLED", True):
+ result = enterprise_view()
+
+ # Assert
+ assert result == "enterprise_success"
+
+ def test_only_edition_self_hosted_allows_self_hosted(self):
+ """Test self-hosted edition decorator allows SELF_HOSTED edition"""
+
+ # Arrange
+ @only_edition_self_hosted
+ def self_hosted_view():
+ return "self_hosted_success"
+
+ # Act
+ with patch("controllers.console.wraps.dify_config.EDITION", "SELF_HOSTED"):
+ result = self_hosted_view()
+
+ # Assert
+ assert result == "self_hosted_success"
+
+
+class TestBillingResourceLimits:
+ """Test billing resource limit decorators"""
+
+ def test_should_allow_when_under_resource_limit(self):
+ """Test that requests are allowed when under resource limits"""
+ # Arrange
+ mock_features = MagicMock()
+ mock_features.billing.enabled = True
+ mock_features.members.limit = 10
+ mock_features.members.size = 5
+
+ @cloud_edition_billing_resource_check("members")
+ def add_member():
+ return "member_added"
+
+ # Act
+ with patch("controllers.console.wraps.current_user"):
+ with patch("controllers.console.wraps.FeatureService.get_features", return_value=mock_features):
+ result = add_member()
+
+ # Assert
+ assert result == "member_added"
+
+ def test_should_reject_when_over_resource_limit(self):
+ """Test that requests are rejected when over resource limits"""
+ # Arrange
+ app = create_app_with_login()
+ mock_features = MagicMock()
+ mock_features.billing.enabled = True
+ mock_features.members.limit = 10
+ mock_features.members.size = 10
+
+ @cloud_edition_billing_resource_check("members")
+ def add_member():
+ return "member_added"
+
+ # Act & Assert
+ with app.test_request_context():
+ with patch("controllers.console.wraps.current_user", MockUser("test_user")):
+ with patch("controllers.console.wraps.FeatureService.get_features", return_value=mock_features):
+ with pytest.raises(Exception) as exc_info:
+ add_member()
+ assert exc_info.value.code == 403
+ assert "members has reached the limit" in str(exc_info.value.description)
+
+ def test_should_check_source_for_documents_limit(self):
+ """Test document limit checks request source"""
+ # Arrange
+ app = create_app_with_login()
+ mock_features = MagicMock()
+ mock_features.billing.enabled = True
+ mock_features.documents_upload_quota.limit = 100
+ mock_features.documents_upload_quota.size = 100
+
+ @cloud_edition_billing_resource_check("documents")
+ def upload_document():
+ return "document_uploaded"
+
+ # Test 1: Should reject when source is datasets
+ with app.test_request_context("/?source=datasets"):
+ with patch("controllers.console.wraps.current_user", MockUser("test_user")):
+ with patch("controllers.console.wraps.FeatureService.get_features", return_value=mock_features):
+ with pytest.raises(Exception) as exc_info:
+ upload_document()
+ assert exc_info.value.code == 403
+
+ # Test 2: Should allow when source is not datasets
+ with app.test_request_context("/?source=other"):
+ with patch("controllers.console.wraps.current_user", MockUser("test_user")):
+ with patch("controllers.console.wraps.FeatureService.get_features", return_value=mock_features):
+ result = upload_document()
+ assert result == "document_uploaded"
+
+
+class TestRateLimiting:
+ """Test rate limiting decorator"""
+
+ @patch("controllers.console.wraps.redis_client")
+ @patch("controllers.console.wraps.db")
+ def test_should_allow_requests_within_rate_limit(self, mock_db, mock_redis):
+ """Test that requests within rate limit are allowed"""
+ # Arrange
+ mock_rate_limit = MagicMock()
+ mock_rate_limit.enabled = True
+ mock_rate_limit.limit = 10
+ mock_redis.zcard.return_value = 5 # 5 requests in window
+
+ @cloud_edition_billing_rate_limit_check("knowledge")
+ def knowledge_request():
+ return "knowledge_success"
+
+ # Act
+ with patch("controllers.console.wraps.current_user"):
+ with patch(
+ "controllers.console.wraps.FeatureService.get_knowledge_rate_limit", return_value=mock_rate_limit
+ ):
+ result = knowledge_request()
+
+ # Assert
+ assert result == "knowledge_success"
+ mock_redis.zadd.assert_called_once()
+ mock_redis.zremrangebyscore.assert_called_once()
+
+ @patch("controllers.console.wraps.redis_client")
+ @patch("controllers.console.wraps.db")
+ def test_should_reject_requests_over_rate_limit(self, mock_db, mock_redis):
+ """Test that requests over rate limit are rejected and logged"""
+ # Arrange
+ app = create_app_with_login()
+ mock_rate_limit = MagicMock()
+ mock_rate_limit.enabled = True
+ mock_rate_limit.limit = 10
+ mock_rate_limit.subscription_plan = "pro"
+ mock_redis.zcard.return_value = 11 # Over limit
+
+ mock_session = MagicMock()
+ mock_db.session = mock_session
+
+ @cloud_edition_billing_rate_limit_check("knowledge")
+ def knowledge_request():
+ return "knowledge_success"
+
+ # Act & Assert
+ with app.test_request_context():
+ with patch("controllers.console.wraps.current_user", MockUser("test_user")):
+ with patch(
+ "controllers.console.wraps.FeatureService.get_knowledge_rate_limit", return_value=mock_rate_limit
+ ):
+ with pytest.raises(Exception) as exc_info:
+ knowledge_request()
+
+ # Verify error
+ assert exc_info.value.code == 403
+ assert "rate limit" in str(exc_info.value.description)
+
+ # Verify rate limit log was created
+ mock_session.add.assert_called_once()
+ mock_session.commit.assert_called_once()
+
+
+class TestSystemSetup:
+ """Test system setup decorator"""
+
+ @patch("controllers.console.wraps.db")
+ def test_should_allow_when_setup_complete(self, mock_db):
+ """Test that requests are allowed when setup is complete"""
+ # Arrange
+ mock_db.session.query.return_value.first.return_value = MagicMock() # Setup exists
+
+ @setup_required
+ def admin_view():
+ return "admin_success"
+
+ # Act
+ with patch("controllers.console.wraps.dify_config.EDITION", "SELF_HOSTED"):
+ result = admin_view()
+
+ # Assert
+ assert result == "admin_success"
+
+ @patch("controllers.console.wraps.db")
+ @patch("controllers.console.wraps.os.environ.get")
+ def test_should_raise_not_init_validate_error_with_init_password(self, mock_environ_get, mock_db):
+ """Test NotInitValidateError when INIT_PASSWORD is set but setup not complete"""
+ # Arrange
+ mock_db.session.query.return_value.first.return_value = None # No setup
+ mock_environ_get.return_value = "some_password"
+
+ @setup_required
+ def admin_view():
+ return "admin_success"
+
+ # Act & Assert
+ with patch("controllers.console.wraps.dify_config.EDITION", "SELF_HOSTED"):
+ with pytest.raises(NotInitValidateError):
+ admin_view()
+
+ @patch("controllers.console.wraps.db")
+ @patch("controllers.console.wraps.os.environ.get")
+ def test_should_raise_not_setup_error_without_init_password(self, mock_environ_get, mock_db):
+ """Test NotSetupError when no INIT_PASSWORD and setup not complete"""
+ # Arrange
+ mock_db.session.query.return_value.first.return_value = None # No setup
+ mock_environ_get.return_value = None # No INIT_PASSWORD
+
+ @setup_required
+ def admin_view():
+ return "admin_success"
+
+ # Act & Assert
+ with patch("controllers.console.wraps.dify_config.EDITION", "SELF_HOSTED"):
+ with pytest.raises(NotSetupError):
+ admin_view()
+
+
+class TestEnterpriseLicense:
+ """Test enterprise license decorator"""
+
+ def test_should_allow_with_valid_license(self):
+ """Test that valid licenses allow access"""
+ # Arrange
+ mock_settings = MagicMock()
+ mock_settings.license.status = LicenseStatus.ACTIVE
+
+ @enterprise_license_required
+ def enterprise_feature():
+ return "enterprise_success"
+
+ # Act
+ with patch("controllers.console.wraps.FeatureService.get_system_features", return_value=mock_settings):
+ result = enterprise_feature()
+
+ # Assert
+ assert result == "enterprise_success"
+
+ @pytest.mark.parametrize("invalid_status", [LicenseStatus.INACTIVE, LicenseStatus.EXPIRED, LicenseStatus.LOST])
+ def test_should_reject_with_invalid_license(self, invalid_status):
+ """Test that invalid licenses raise UnauthorizedAndForceLogout"""
+ # Arrange
+ mock_settings = MagicMock()
+ mock_settings.license.status = invalid_status
+
+ @enterprise_license_required
+ def enterprise_feature():
+ return "enterprise_success"
+
+ # Act & Assert
+ with patch("controllers.console.wraps.FeatureService.get_system_features", return_value=mock_settings):
+ with pytest.raises(UnauthorizedAndForceLogout) as exc_info:
+ enterprise_feature()
+ assert "license is invalid" in str(exc_info.value)
diff --git a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter.py b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter.py
new file mode 100644
index 0000000000..b88a57bfd4
--- /dev/null
+++ b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter.py
@@ -0,0 +1,259 @@
+from collections.abc import Mapping, Sequence
+
+from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
+from core.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType
+from core.variables.segments import ArrayFileSegment, FileSegment
+
+
+class TestWorkflowResponseConverterFetchFilesFromVariableValue:
+ """Test class for WorkflowResponseConverter._fetch_files_from_variable_value method"""
+
+ def create_test_file(self, file_id: str = "test_file_1") -> File:
+ """Create a test File object"""
+ return File(
+ id=file_id,
+ tenant_id="test_tenant",
+ type=FileType.DOCUMENT,
+ transfer_method=FileTransferMethod.LOCAL_FILE,
+ related_id="related_123",
+ filename=f"{file_id}.txt",
+ extension=".txt",
+ mime_type="text/plain",
+ size=1024,
+ storage_key="storage_key_123",
+ )
+
+ def create_file_dict(self, file_id: str = "test_file_dict") -> dict:
+ """Create a file dictionary with correct dify_model_identity"""
+ return {
+ "dify_model_identity": FILE_MODEL_IDENTITY,
+ "id": file_id,
+ "tenant_id": "test_tenant",
+ "type": "document",
+ "transfer_method": "local_file",
+ "related_id": "related_456",
+ "filename": f"{file_id}.txt",
+ "extension": ".txt",
+ "mime_type": "text/plain",
+ "size": 2048,
+ "url": "http://example.com/file.txt",
+ }
+
+ def test_fetch_files_from_variable_value_with_none(self):
+ """Test with None input"""
+ # The method signature expects Union[dict, list, Segment], but implementation handles None
+ # We'll test the actual behavior by passing an empty dict instead
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(None) # type: ignore
+ assert result == []
+
+ def test_fetch_files_from_variable_value_with_empty_dict(self):
+ """Test with empty dictionary"""
+ result = WorkflowResponseConverter._fetch_files_from_variable_value({})
+ assert result == []
+
+ def test_fetch_files_from_variable_value_with_empty_list(self):
+ """Test with empty list"""
+ result = WorkflowResponseConverter._fetch_files_from_variable_value([])
+ assert result == []
+
+ def test_fetch_files_from_variable_value_with_file_segment(self):
+ """Test with valid FileSegment"""
+ test_file = self.create_test_file("segment_file")
+ file_segment = FileSegment(value=test_file)
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(file_segment)
+
+ assert len(result) == 1
+ assert isinstance(result[0], dict)
+ assert result[0]["id"] == "segment_file"
+ assert result[0]["dify_model_identity"] == FILE_MODEL_IDENTITY
+
+ def test_fetch_files_from_variable_value_with_array_file_segment_single(self):
+ """Test with ArrayFileSegment containing single file"""
+ test_file = self.create_test_file("array_file_1")
+ array_segment = ArrayFileSegment(value=[test_file])
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(array_segment)
+
+ assert len(result) == 1
+ assert isinstance(result[0], dict)
+ assert result[0]["id"] == "array_file_1"
+
+ def test_fetch_files_from_variable_value_with_array_file_segment_multiple(self):
+ """Test with ArrayFileSegment containing multiple files"""
+ test_file_1 = self.create_test_file("array_file_1")
+ test_file_2 = self.create_test_file("array_file_2")
+ array_segment = ArrayFileSegment(value=[test_file_1, test_file_2])
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(array_segment)
+
+ assert len(result) == 2
+ assert result[0]["id"] == "array_file_1"
+ assert result[1]["id"] == "array_file_2"
+
+ def test_fetch_files_from_variable_value_with_array_file_segment_empty(self):
+ """Test with ArrayFileSegment containing empty array"""
+ array_segment = ArrayFileSegment(value=[])
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(array_segment)
+
+ assert result == []
+
+ def test_fetch_files_from_variable_value_with_list_of_file_dicts(self):
+ """Test with list containing file dictionaries"""
+ file_dict_1 = self.create_file_dict("list_file_1")
+ file_dict_2 = self.create_file_dict("list_file_2")
+ test_list = [file_dict_1, file_dict_2]
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(test_list)
+
+ assert len(result) == 2
+ assert result[0]["id"] == "list_file_1"
+ assert result[1]["id"] == "list_file_2"
+
+ def test_fetch_files_from_variable_value_with_list_of_file_objects(self):
+ """Test with list containing File objects"""
+ file_obj_1 = self.create_test_file("list_obj_1")
+ file_obj_2 = self.create_test_file("list_obj_2")
+ test_list = [file_obj_1, file_obj_2]
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(test_list)
+
+ assert len(result) == 2
+ assert result[0]["id"] == "list_obj_1"
+ assert result[1]["id"] == "list_obj_2"
+
+ def test_fetch_files_from_variable_value_with_list_mixed_valid_invalid(self):
+ """Test with list containing mix of valid files and invalid items"""
+ file_dict = self.create_file_dict("mixed_file")
+ invalid_dict = {"not_a_file": "value"}
+ test_list = [file_dict, invalid_dict, "string_item", 123]
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(test_list)
+
+ assert len(result) == 1
+ assert result[0]["id"] == "mixed_file"
+
+ def test_fetch_files_from_variable_value_with_list_nested_structures(self):
+ """Test with list containing nested structures"""
+ file_dict = self.create_file_dict("nested_file")
+ nested_list = [file_dict, ["inner_list"]]
+ test_list = [nested_list, {"nested": "dict"}]
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(test_list)
+
+ # Should not process nested structures in list items
+ assert result == []
+
+ def test_fetch_files_from_variable_value_with_dict_incorrect_identity(self):
+ """Test with dictionary having incorrect dify_model_identity"""
+ invalid_dict = {"dify_model_identity": "wrong_identity", "id": "invalid_file", "filename": "test.txt"}
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(invalid_dict)
+
+ assert result == []
+
+ def test_fetch_files_from_variable_value_with_dict_missing_identity(self):
+ """Test with dictionary missing dify_model_identity"""
+ invalid_dict = {"id": "no_identity_file", "filename": "test.txt"}
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(invalid_dict)
+
+ assert result == []
+
+ def test_fetch_files_from_variable_value_with_dict_file_object(self):
+ """Test with dictionary containing File object"""
+ file_obj = self.create_test_file("dict_obj_file")
+ test_dict = {"file_key": file_obj}
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(test_dict)
+
+ # Should not extract File objects from dict values
+ assert result == []
+
+ def test_fetch_files_from_variable_value_with_mixed_data_types(self):
+ """Test with various mixed data types"""
+ mixed_data = {"string": "text", "number": 42, "boolean": True, "null": None, "dify_model_identity": "wrong"}
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(mixed_data)
+
+ assert result == []
+
+ def test_fetch_files_from_variable_value_with_invalid_objects(self):
+ """Test with invalid objects that are not supported types"""
+ # Test with an invalid dict that doesn't match expected patterns
+ invalid_dict = {"custom_key": "custom_value"}
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(invalid_dict)
+
+ assert result == []
+
+ def test_fetch_files_from_variable_value_with_string_input(self):
+ """Test with string input (unsupported type)"""
+ # Since method expects Union[dict, list, Segment], test with empty list instead
+ result = WorkflowResponseConverter._fetch_files_from_variable_value([])
+
+ assert result == []
+
+ def test_fetch_files_from_variable_value_with_number_input(self):
+ """Test with number input (unsupported type)"""
+ # Test with list containing numbers (should be ignored)
+ result = WorkflowResponseConverter._fetch_files_from_variable_value([42, "string", None])
+
+ assert result == []
+
+ def test_fetch_files_from_variable_value_return_type_is_sequence(self):
+ """Test that return type is Sequence[Mapping[str, Any]]"""
+ file_dict = self.create_file_dict("type_test_file")
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(file_dict)
+
+ assert isinstance(result, Sequence)
+ assert len(result) == 1
+ assert isinstance(result[0], Mapping)
+ assert all(isinstance(key, str) for key in result[0])
+
+ def test_fetch_files_from_variable_value_preserves_file_properties(self):
+ """Test that all file properties are preserved in the result"""
+ original_file = self.create_test_file("property_test")
+ file_segment = FileSegment(value=original_file)
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(file_segment)
+
+ assert len(result) == 1
+ file_dict = result[0]
+ assert file_dict["id"] == "property_test"
+ assert file_dict["tenant_id"] == "test_tenant"
+ assert file_dict["type"] == "document"
+ assert file_dict["transfer_method"] == "local_file"
+ assert file_dict["filename"] == "property_test.txt"
+ assert file_dict["extension"] == ".txt"
+ assert file_dict["mime_type"] == "text/plain"
+ assert file_dict["size"] == 1024
+
+ def test_fetch_files_from_variable_value_with_complex_nested_scenario(self):
+ """Test complex scenario with nested valid and invalid data"""
+ file_dict = self.create_file_dict("complex_file")
+ file_obj = self.create_test_file("complex_obj")
+
+ # Complex nested structure
+ complex_data = [
+ file_dict, # Valid file dict
+ file_obj, # Valid file object
+ { # Invalid dict
+ "not_file": "data",
+ "nested": {"deep": "value"},
+ },
+ [ # Nested list (should be ignored)
+ self.create_file_dict("nested_file")
+ ],
+ "string", # Invalid string
+ None, # None value
+ 42, # Invalid number
+ ]
+
+ result = WorkflowResponseConverter._fetch_files_from_variable_value(complex_data)
+
+ assert len(result) == 2
+ assert result[0]["id"] == "complex_file"
+ assert result[1]["id"] == "complex_obj"
diff --git a/api/tests/unit_tests/core/app/segments/test_factory.py b/api/tests/unit_tests/core/app/segments/test_factory.py
deleted file mode 100644
index e6e289c12a..0000000000
--- a/api/tests/unit_tests/core/app/segments/test_factory.py
+++ /dev/null
@@ -1,165 +0,0 @@
-from uuid import uuid4
-
-import pytest
-
-from core.variables import (
- ArrayNumberVariable,
- ArrayObjectVariable,
- ArrayStringVariable,
- FloatVariable,
- IntegerVariable,
- ObjectSegment,
- SecretVariable,
- StringVariable,
-)
-from core.variables.exc import VariableError
-from core.variables.segments import ArrayAnySegment
-from factories import variable_factory
-
-
-def test_string_variable():
- test_data = {"value_type": "string", "name": "test_text", "value": "Hello, World!"}
- result = variable_factory.build_conversation_variable_from_mapping(test_data)
- assert isinstance(result, StringVariable)
-
-
-def test_integer_variable():
- test_data = {"value_type": "number", "name": "test_int", "value": 42}
- result = variable_factory.build_conversation_variable_from_mapping(test_data)
- assert isinstance(result, IntegerVariable)
-
-
-def test_float_variable():
- test_data = {"value_type": "number", "name": "test_float", "value": 3.14}
- result = variable_factory.build_conversation_variable_from_mapping(test_data)
- assert isinstance(result, FloatVariable)
-
-
-def test_secret_variable():
- test_data = {"value_type": "secret", "name": "test_secret", "value": "secret_value"}
- result = variable_factory.build_conversation_variable_from_mapping(test_data)
- assert isinstance(result, SecretVariable)
-
-
-def test_invalid_value_type():
- test_data = {"value_type": "unknown", "name": "test_invalid", "value": "value"}
- with pytest.raises(VariableError):
- variable_factory.build_conversation_variable_from_mapping(test_data)
-
-
-def test_build_a_blank_string():
- result = variable_factory.build_conversation_variable_from_mapping(
- {
- "value_type": "string",
- "name": "blank",
- "value": "",
- }
- )
- assert isinstance(result, StringVariable)
- assert result.value == ""
-
-
-def test_build_a_object_variable_with_none_value():
- var = variable_factory.build_segment(
- {
- "key1": None,
- }
- )
- assert isinstance(var, ObjectSegment)
- assert var.value["key1"] is None
-
-
-def test_object_variable():
- mapping = {
- "id": str(uuid4()),
- "value_type": "object",
- "name": "test_object",
- "description": "Description of the variable.",
- "value": {
- "key1": "text",
- "key2": 2,
- },
- }
- variable = variable_factory.build_conversation_variable_from_mapping(mapping)
- assert isinstance(variable, ObjectSegment)
- assert isinstance(variable.value["key1"], str)
- assert isinstance(variable.value["key2"], int)
-
-
-def test_array_string_variable():
- mapping = {
- "id": str(uuid4()),
- "value_type": "array[string]",
- "name": "test_array",
- "description": "Description of the variable.",
- "value": [
- "text",
- "text",
- ],
- }
- variable = variable_factory.build_conversation_variable_from_mapping(mapping)
- assert isinstance(variable, ArrayStringVariable)
- assert isinstance(variable.value[0], str)
- assert isinstance(variable.value[1], str)
-
-
-def test_array_number_variable():
- mapping = {
- "id": str(uuid4()),
- "value_type": "array[number]",
- "name": "test_array",
- "description": "Description of the variable.",
- "value": [
- 1,
- 2.0,
- ],
- }
- variable = variable_factory.build_conversation_variable_from_mapping(mapping)
- assert isinstance(variable, ArrayNumberVariable)
- assert isinstance(variable.value[0], int)
- assert isinstance(variable.value[1], float)
-
-
-def test_array_object_variable():
- mapping = {
- "id": str(uuid4()),
- "value_type": "array[object]",
- "name": "test_array",
- "description": "Description of the variable.",
- "value": [
- {
- "key1": "text",
- "key2": 1,
- },
- {
- "key1": "text",
- "key2": 1,
- },
- ],
- }
- variable = variable_factory.build_conversation_variable_from_mapping(mapping)
- assert isinstance(variable, ArrayObjectVariable)
- assert isinstance(variable.value[0], dict)
- assert isinstance(variable.value[1], dict)
- assert isinstance(variable.value[0]["key1"], str)
- assert isinstance(variable.value[0]["key2"], int)
- assert isinstance(variable.value[1]["key1"], str)
- assert isinstance(variable.value[1]["key2"], int)
-
-
-def test_variable_cannot_large_than_200_kb():
- with pytest.raises(VariableError):
- variable_factory.build_conversation_variable_from_mapping(
- {
- "id": str(uuid4()),
- "value_type": "string",
- "name": "test_text",
- "value": "a" * 1024 * 201,
- }
- )
-
-
-def test_array_none_variable():
- var = variable_factory.build_segment([None, None, None, None])
- assert isinstance(var, ArrayAnySegment)
- assert var.value == [None, None, None, None]
diff --git a/api/tests/unit_tests/core/app/segments/test_segment.py b/api/tests/unit_tests/core/app/segments/test_segment.py
deleted file mode 100644
index 1b035d01a7..0000000000
--- a/api/tests/unit_tests/core/app/segments/test_segment.py
+++ /dev/null
@@ -1,58 +0,0 @@
-from core.helper import encrypter
-from core.variables import SecretVariable, StringVariable
-from core.workflow.entities.variable_pool import VariablePool
-from core.workflow.enums import SystemVariableKey
-
-
-def test_segment_group_to_text():
- variable_pool = VariablePool(
- system_variables={
- SystemVariableKey("user_id"): "fake-user-id",
- },
- user_inputs={},
- environment_variables=[
- SecretVariable(name="secret_key", value="fake-secret-key"),
- ],
- conversation_variables=[],
- )
- variable_pool.add(("node_id", "custom_query"), "fake-user-query")
- template = (
- "Hello, {{#sys.user_id#}}! Your query is {{#node_id.custom_query#}}. And your key is {{#env.secret_key#}}."
- )
- segments_group = variable_pool.convert_template(template)
-
- assert segments_group.text == "Hello, fake-user-id! Your query is fake-user-query. And your key is fake-secret-key."
- assert segments_group.log == (
- f"Hello, fake-user-id! Your query is fake-user-query."
- f" And your key is {encrypter.obfuscated_token('fake-secret-key')}."
- )
-
-
-def test_convert_constant_to_segment_group():
- variable_pool = VariablePool(
- system_variables={},
- user_inputs={},
- environment_variables=[],
- conversation_variables=[],
- )
- template = "Hello, world!"
- segments_group = variable_pool.convert_template(template)
- assert segments_group.text == "Hello, world!"
- assert segments_group.log == "Hello, world!"
-
-
-def test_convert_variable_to_segment_group():
- variable_pool = VariablePool(
- system_variables={
- SystemVariableKey("user_id"): "fake-user-id",
- },
- user_inputs={},
- environment_variables=[],
- conversation_variables=[],
- )
- template = "{{#sys.user_id#}}"
- segments_group = variable_pool.convert_template(template)
- assert segments_group.text == "fake-user-id"
- assert segments_group.log == "fake-user-id"
- assert isinstance(segments_group.value[0], StringVariable)
- assert segments_group.value[0].value == "fake-user-id"
diff --git a/api/tests/unit_tests/core/file/test_models.py b/api/tests/unit_tests/core/file/test_models.py
new file mode 100644
index 0000000000..3ada2087c6
--- /dev/null
+++ b/api/tests/unit_tests/core/file/test_models.py
@@ -0,0 +1,25 @@
+from core.file import File, FileTransferMethod, FileType
+
+
+def test_file():
+ file = File(
+ id="test-file",
+ tenant_id="test-tenant-id",
+ type=FileType.IMAGE,
+ transfer_method=FileTransferMethod.TOOL_FILE,
+ related_id="test-related-id",
+ filename="image.png",
+ extension=".png",
+ mime_type="image/png",
+ size=67,
+ storage_key="test-storage-key",
+ url="https://example.com/image.png",
+ )
+ assert file.tenant_id == "test-tenant-id"
+ assert file.type == FileType.IMAGE
+ assert file.transfer_method == FileTransferMethod.TOOL_FILE
+ assert file.related_id == "test-related-id"
+ assert file.filename == "image.png"
+ assert file.extension == ".png"
+ assert file.mime_type == "image/png"
+ assert file.size == 67
diff --git a/api/tests/unit_tests/core/helper/test_encrypter.py b/api/tests/unit_tests/core/helper/test_encrypter.py
new file mode 100644
index 0000000000..61cf8f255d
--- /dev/null
+++ b/api/tests/unit_tests/core/helper/test_encrypter.py
@@ -0,0 +1,280 @@
+import base64
+import binascii
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from core.helper.encrypter import (
+ batch_decrypt_token,
+ decrypt_token,
+ encrypt_token,
+ get_decrypt_decoding,
+ obfuscated_token,
+)
+from libs.rsa import PrivkeyNotFoundError
+
+
+class TestObfuscatedToken:
+ @pytest.mark.parametrize(
+ ("token", "expected"),
+ [
+ ("", ""), # Empty token
+ ("1234567", "*" * 20), # Short token (<8 chars)
+ ("12345678", "*" * 20), # Boundary case (8 chars)
+ ("123456789abcdef", "123456" + "*" * 12 + "ef"), # Long token
+ ("abc!@#$%^&*()def", "abc!@#" + "*" * 12 + "ef"), # Special chars
+ ],
+ )
+ def test_obfuscation_logic(self, token, expected):
+ """Test core obfuscation logic for various token lengths"""
+ assert obfuscated_token(token) == expected
+
+ def test_sensitive_data_protection(self):
+ """Ensure obfuscation never reveals full sensitive data"""
+ token = "api_key_secret_12345"
+ obfuscated = obfuscated_token(token)
+ assert token not in obfuscated
+ assert "*" * 12 in obfuscated
+
+
+class TestEncryptToken:
+ @patch("models.engine.db.session.query")
+ @patch("libs.rsa.encrypt")
+ def test_successful_encryption(self, mock_encrypt, mock_query):
+ """Test successful token encryption"""
+ mock_tenant = MagicMock()
+ mock_tenant.encrypt_public_key = "mock_public_key"
+ mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+ mock_encrypt.return_value = b"encrypted_data"
+
+ result = encrypt_token("tenant-123", "test_token")
+
+ assert result == base64.b64encode(b"encrypted_data").decode()
+ mock_encrypt.assert_called_with("test_token", "mock_public_key")
+
+ @patch("models.engine.db.session.query")
+ def test_tenant_not_found(self, mock_query):
+ """Test error when tenant doesn't exist"""
+ mock_query.return_value.filter.return_value.first.return_value = None
+
+ with pytest.raises(ValueError) as exc_info:
+ encrypt_token("invalid-tenant", "test_token")
+
+ assert "Tenant with id invalid-tenant not found" in str(exc_info.value)
+
+
+class TestDecryptToken:
+ @patch("libs.rsa.decrypt")
+ def test_successful_decryption(self, mock_decrypt):
+ """Test successful token decryption"""
+ mock_decrypt.return_value = "decrypted_token"
+ encrypted_data = base64.b64encode(b"encrypted_data").decode()
+
+ result = decrypt_token("tenant-123", encrypted_data)
+
+ assert result == "decrypted_token"
+ mock_decrypt.assert_called_once_with(b"encrypted_data", "tenant-123")
+
+ def test_invalid_base64(self):
+ """Test handling of invalid base64 input"""
+ with pytest.raises(binascii.Error):
+ decrypt_token("tenant-123", "invalid_base64!!!")
+
+
+class TestBatchDecryptToken:
+ @patch("libs.rsa.get_decrypt_decoding")
+ @patch("libs.rsa.decrypt_token_with_decoding")
+ def test_batch_decryption(self, mock_decrypt_with_decoding, mock_get_decoding):
+ """Test batch decryption functionality"""
+ mock_rsa_key = MagicMock()
+ mock_cipher_rsa = MagicMock()
+ mock_get_decoding.return_value = (mock_rsa_key, mock_cipher_rsa)
+
+ # Test multiple tokens
+ mock_decrypt_with_decoding.side_effect = ["token1", "token2", "token3"]
+ tokens = [
+ base64.b64encode(b"encrypted1").decode(),
+ base64.b64encode(b"encrypted2").decode(),
+ base64.b64encode(b"encrypted3").decode(),
+ ]
+ result = batch_decrypt_token("tenant-123", tokens)
+
+ assert result == ["token1", "token2", "token3"]
+ # Key should only be loaded once
+ mock_get_decoding.assert_called_once_with("tenant-123")
+
+
+class TestGetDecryptDecoding:
+ @patch("extensions.ext_redis.redis_client.get")
+ @patch("extensions.ext_storage.storage.load")
+ def test_private_key_not_found(self, mock_storage_load, mock_redis_get):
+ """Test error when private key file doesn't exist"""
+ mock_redis_get.return_value = None
+ mock_storage_load.side_effect = FileNotFoundError()
+
+ with pytest.raises(PrivkeyNotFoundError) as exc_info:
+ get_decrypt_decoding("tenant-123")
+
+ assert "Private key not found, tenant_id: tenant-123" in str(exc_info.value)
+
+
+class TestEncryptDecryptIntegration:
+ @patch("models.engine.db.session.query")
+ @patch("libs.rsa.encrypt")
+ @patch("libs.rsa.decrypt")
+ def test_should_encrypt_and_decrypt_consistently(self, mock_decrypt, mock_encrypt, mock_query):
+ """Test that encryption and decryption are consistent"""
+ # Setup mock tenant
+ mock_tenant = MagicMock()
+ mock_tenant.encrypt_public_key = "mock_public_key"
+ mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+
+ # Setup mock encryption/decryption
+ original_token = "test_token_123"
+ mock_encrypt.return_value = b"encrypted_data"
+ mock_decrypt.return_value = original_token
+
+ # Test encryption
+ encrypted = encrypt_token("tenant-123", original_token)
+
+ # Test decryption
+ decrypted = decrypt_token("tenant-123", encrypted)
+
+ assert decrypted == original_token
+
+
+class TestSecurity:
+ """Critical security tests for encryption system"""
+
+ @patch("models.engine.db.session.query")
+ @patch("libs.rsa.encrypt")
+ def test_cross_tenant_isolation(self, mock_encrypt, mock_query):
+ """Ensure tokens encrypted for one tenant cannot be used by another"""
+ # Setup mock tenant
+ mock_tenant = MagicMock()
+ mock_tenant.encrypt_public_key = "tenant1_public_key"
+ mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+ mock_encrypt.return_value = b"encrypted_for_tenant1"
+
+ # Encrypt token for tenant1
+ encrypted = encrypt_token("tenant-123", "sensitive_data")
+
+ # Attempt to decrypt with different tenant should fail
+ with patch("libs.rsa.decrypt") as mock_decrypt:
+ mock_decrypt.side_effect = Exception("Invalid tenant key")
+
+ with pytest.raises(Exception, match="Invalid tenant key"):
+ decrypt_token("different-tenant", encrypted)
+
+ @patch("libs.rsa.decrypt")
+ def test_tampered_ciphertext_rejection(self, mock_decrypt):
+ """Detect and reject tampered ciphertext"""
+ valid_encrypted = base64.b64encode(b"valid_data").decode()
+
+ # Tamper with ciphertext
+ tampered_bytes = bytearray(base64.b64decode(valid_encrypted))
+ tampered_bytes[0] ^= 0xFF
+ tampered = base64.b64encode(bytes(tampered_bytes)).decode()
+
+ mock_decrypt.side_effect = Exception("Decryption error")
+
+ with pytest.raises(Exception, match="Decryption error"):
+ decrypt_token("tenant-123", tampered)
+
+ @patch("models.engine.db.session.query")
+ @patch("libs.rsa.encrypt")
+ def test_encryption_randomness(self, mock_encrypt, mock_query):
+ """Ensure same plaintext produces different ciphertext"""
+ mock_tenant = MagicMock(encrypt_public_key="key")
+ mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+
+ # Different outputs for same input
+ mock_encrypt.side_effect = [b"enc1", b"enc2", b"enc3"]
+
+ results = [encrypt_token("tenant-123", "token") for _ in range(3)]
+
+ # All results should be different
+ assert len(set(results)) == 3
+
+
+class TestEdgeCases:
+ """Additional security-focused edge case tests"""
+
+ def test_should_handle_empty_string_in_obfuscation(self):
+ """Test handling of empty string in obfuscation"""
+ # Test empty string (which is a valid str type)
+ assert obfuscated_token("") == ""
+
+ @patch("models.engine.db.session.query")
+ @patch("libs.rsa.encrypt")
+ def test_should_handle_empty_token_encryption(self, mock_encrypt, mock_query):
+ """Test encryption of empty token"""
+ mock_tenant = MagicMock()
+ mock_tenant.encrypt_public_key = "mock_public_key"
+ mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+ mock_encrypt.return_value = b"encrypted_empty"
+
+ result = encrypt_token("tenant-123", "")
+
+ assert result == base64.b64encode(b"encrypted_empty").decode()
+ mock_encrypt.assert_called_with("", "mock_public_key")
+
+ @patch("models.engine.db.session.query")
+ @patch("libs.rsa.encrypt")
+ def test_should_handle_special_characters_in_token(self, mock_encrypt, mock_query):
+ """Test tokens containing special/unicode characters"""
+ mock_tenant = MagicMock()
+ mock_tenant.encrypt_public_key = "mock_public_key"
+ mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+ mock_encrypt.return_value = b"encrypted_special"
+
+ # Test various special characters
+ special_tokens = [
+ "token\x00with\x00null", # Null bytes
+ "token_with_emoji_😀🎉", # Unicode emoji
+ "token\nwith\nnewlines", # Newlines
+ "token\twith\ttabs", # Tabs
+ "token_with_中文字符", # Chinese characters
+ ]
+
+ for token in special_tokens:
+ result = encrypt_token("tenant-123", token)
+ assert result == base64.b64encode(b"encrypted_special").decode()
+ mock_encrypt.assert_called_with(token, "mock_public_key")
+
+ @patch("models.engine.db.session.query")
+ @patch("libs.rsa.encrypt")
+ def test_should_handle_rsa_size_limits(self, mock_encrypt, mock_query):
+ """Test behavior when token exceeds RSA encryption limits"""
+ mock_tenant = MagicMock()
+ mock_tenant.encrypt_public_key = "mock_public_key"
+ mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+
+ # RSA 2048-bit can only encrypt ~245 bytes
+ # The actual limit depends on padding scheme
+ mock_encrypt.side_effect = ValueError("Message too long for RSA key size")
+
+ # Create a token that would exceed RSA limits
+ long_token = "x" * 300
+
+ with pytest.raises(ValueError, match="Message too long for RSA key size"):
+ encrypt_token("tenant-123", long_token)
+
+ @patch("libs.rsa.get_decrypt_decoding")
+ @patch("libs.rsa.decrypt_token_with_decoding")
+ def test_batch_decrypt_loads_key_only_once(self, mock_decrypt_with_decoding, mock_get_decoding):
+ """Verify batch decryption optimization - loads key only once"""
+ mock_rsa_key = MagicMock()
+ mock_cipher_rsa = MagicMock()
+ mock_get_decoding.return_value = (mock_rsa_key, mock_cipher_rsa)
+
+ # Test with multiple tokens
+ mock_decrypt_with_decoding.side_effect = ["token1", "token2", "token3", "token4", "token5"]
+ tokens = [base64.b64encode(f"encrypted{i}".encode()).decode() for i in range(5)]
+
+ result = batch_decrypt_token("tenant-123", tokens)
+
+ assert result == ["token1", "token2", "token3", "token4", "token5"]
+ # Key should only be loaded once regardless of token count
+ mock_get_decoding.assert_called_once_with("tenant-123")
+ assert mock_decrypt_with_decoding.call_count == 5
diff --git a/api/tests/unit_tests/core/mcp/client/test_session.py b/api/tests/unit_tests/core/mcp/client/test_session.py
new file mode 100644
index 0000000000..c84169bf15
--- /dev/null
+++ b/api/tests/unit_tests/core/mcp/client/test_session.py
@@ -0,0 +1,471 @@
+import queue
+import threading
+from typing import Any
+
+from core.mcp import types
+from core.mcp.entities import RequestContext
+from core.mcp.session.base_session import RequestResponder
+from core.mcp.session.client_session import DEFAULT_CLIENT_INFO, ClientSession
+from core.mcp.types import (
+ LATEST_PROTOCOL_VERSION,
+ ClientNotification,
+ ClientRequest,
+ Implementation,
+ InitializedNotification,
+ InitializeRequest,
+ InitializeResult,
+ JSONRPCMessage,
+ JSONRPCNotification,
+ JSONRPCRequest,
+ JSONRPCResponse,
+ ServerCapabilities,
+ ServerResult,
+ SessionMessage,
+)
+
+
+def test_client_session_initialize():
+ # Create synchronous queues to replace async streams
+ client_to_server: queue.Queue[SessionMessage] = queue.Queue()
+ server_to_client: queue.Queue[SessionMessage] = queue.Queue()
+
+ initialized_notification = None
+
+ def mock_server():
+ nonlocal initialized_notification
+
+ # Receive initialization request
+ session_message = client_to_server.get(timeout=5.0)
+ jsonrpc_request = session_message.message
+ assert isinstance(jsonrpc_request.root, JSONRPCRequest)
+ request = ClientRequest.model_validate(
+ jsonrpc_request.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+ )
+ assert isinstance(request.root, InitializeRequest)
+
+ # Create response
+ result = ServerResult(
+ InitializeResult(
+ protocolVersion=LATEST_PROTOCOL_VERSION,
+ capabilities=ServerCapabilities(
+ logging=None,
+ resources=None,
+ tools=None,
+ experimental=None,
+ prompts=None,
+ ),
+ serverInfo=Implementation(name="mock-server", version="0.1.0"),
+ instructions="The server instructions.",
+ )
+ )
+
+ # Send response
+ server_to_client.put(
+ SessionMessage(
+ message=JSONRPCMessage(
+ JSONRPCResponse(
+ jsonrpc="2.0",
+ id=jsonrpc_request.root.id,
+ result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
+ )
+ )
+ )
+ )
+
+ # Receive initialized notification
+ session_notification = client_to_server.get(timeout=5.0)
+ jsonrpc_notification = session_notification.message
+ assert isinstance(jsonrpc_notification.root, JSONRPCNotification)
+ initialized_notification = ClientNotification.model_validate(
+ jsonrpc_notification.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+ )
+
+ # Create message handler
+ def message_handler(
+ message: RequestResponder[types.ServerRequest, types.ClientResult] | types.ServerNotification | Exception,
+ ) -> None:
+ if isinstance(message, Exception):
+ raise message
+
+ # Start mock server thread
+ server_thread = threading.Thread(target=mock_server, daemon=True)
+ server_thread.start()
+
+ # Create and use client session
+ with ClientSession(
+ server_to_client,
+ client_to_server,
+ message_handler=message_handler,
+ ) as session:
+ result = session.initialize()
+
+ # Wait for server thread to complete
+ server_thread.join(timeout=10.0)
+
+ # Assert results
+ assert isinstance(result, InitializeResult)
+ assert result.protocolVersion == LATEST_PROTOCOL_VERSION
+ assert isinstance(result.capabilities, ServerCapabilities)
+ assert result.serverInfo == Implementation(name="mock-server", version="0.1.0")
+ assert result.instructions == "The server instructions."
+
+ # Check that client sent initialized notification
+ assert initialized_notification
+ assert isinstance(initialized_notification.root, InitializedNotification)
+
+
+def test_client_session_custom_client_info():
+ # Create synchronous queues to replace async streams
+ client_to_server: queue.Queue[SessionMessage] = queue.Queue()
+ server_to_client: queue.Queue[SessionMessage] = queue.Queue()
+
+ custom_client_info = Implementation(name="test-client", version="1.2.3")
+ received_client_info = None
+
+ def mock_server():
+ nonlocal received_client_info
+
+ session_message = client_to_server.get(timeout=5.0)
+ jsonrpc_request = session_message.message
+ assert isinstance(jsonrpc_request.root, JSONRPCRequest)
+ request = ClientRequest.model_validate(
+ jsonrpc_request.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+ )
+ assert isinstance(request.root, InitializeRequest)
+ received_client_info = request.root.params.clientInfo
+
+ result = ServerResult(
+ InitializeResult(
+ protocolVersion=LATEST_PROTOCOL_VERSION,
+ capabilities=ServerCapabilities(),
+ serverInfo=Implementation(name="mock-server", version="0.1.0"),
+ )
+ )
+
+ server_to_client.put(
+ SessionMessage(
+ message=JSONRPCMessage(
+ JSONRPCResponse(
+ jsonrpc="2.0",
+ id=jsonrpc_request.root.id,
+ result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
+ )
+ )
+ )
+ )
+ # Receive initialized notification
+ client_to_server.get(timeout=5.0)
+
+ # Start mock server thread
+ server_thread = threading.Thread(target=mock_server, daemon=True)
+ server_thread.start()
+
+ with ClientSession(
+ server_to_client,
+ client_to_server,
+ client_info=custom_client_info,
+ ) as session:
+ session.initialize()
+
+ # Wait for server thread to complete
+ server_thread.join(timeout=10.0)
+
+ # Assert that custom client info was sent
+ assert received_client_info == custom_client_info
+
+
+def test_client_session_default_client_info():
+ # Create synchronous queues to replace async streams
+ client_to_server: queue.Queue[SessionMessage] = queue.Queue()
+ server_to_client: queue.Queue[SessionMessage] = queue.Queue()
+
+ received_client_info = None
+
+ def mock_server():
+ nonlocal received_client_info
+
+ session_message = client_to_server.get(timeout=5.0)
+ jsonrpc_request = session_message.message
+ assert isinstance(jsonrpc_request.root, JSONRPCRequest)
+ request = ClientRequest.model_validate(
+ jsonrpc_request.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+ )
+ assert isinstance(request.root, InitializeRequest)
+ received_client_info = request.root.params.clientInfo
+
+ result = ServerResult(
+ InitializeResult(
+ protocolVersion=LATEST_PROTOCOL_VERSION,
+ capabilities=ServerCapabilities(),
+ serverInfo=Implementation(name="mock-server", version="0.1.0"),
+ )
+ )
+
+ server_to_client.put(
+ SessionMessage(
+ message=JSONRPCMessage(
+ JSONRPCResponse(
+ jsonrpc="2.0",
+ id=jsonrpc_request.root.id,
+ result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
+ )
+ )
+ )
+ )
+ # Receive initialized notification
+ client_to_server.get(timeout=5.0)
+
+ # Start mock server thread
+ server_thread = threading.Thread(target=mock_server, daemon=True)
+ server_thread.start()
+
+ with ClientSession(
+ server_to_client,
+ client_to_server,
+ ) as session:
+ session.initialize()
+
+ # Wait for server thread to complete
+ server_thread.join(timeout=10.0)
+
+ # Assert that default client info was used
+ assert received_client_info == DEFAULT_CLIENT_INFO
+
+
+def test_client_session_version_negotiation_success():
+ # Create synchronous queues to replace async streams
+ client_to_server: queue.Queue[SessionMessage] = queue.Queue()
+ server_to_client: queue.Queue[SessionMessage] = queue.Queue()
+
+ def mock_server():
+ session_message = client_to_server.get(timeout=5.0)
+ jsonrpc_request = session_message.message
+ assert isinstance(jsonrpc_request.root, JSONRPCRequest)
+ request = ClientRequest.model_validate(
+ jsonrpc_request.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+ )
+ assert isinstance(request.root, InitializeRequest)
+
+ # Send supported protocol version
+ result = ServerResult(
+ InitializeResult(
+ protocolVersion=LATEST_PROTOCOL_VERSION,
+ capabilities=ServerCapabilities(),
+ serverInfo=Implementation(name="mock-server", version="0.1.0"),
+ )
+ )
+
+ server_to_client.put(
+ SessionMessage(
+ message=JSONRPCMessage(
+ JSONRPCResponse(
+ jsonrpc="2.0",
+ id=jsonrpc_request.root.id,
+ result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
+ )
+ )
+ )
+ )
+ # Receive initialized notification
+ client_to_server.get(timeout=5.0)
+
+ # Start mock server thread
+ server_thread = threading.Thread(target=mock_server, daemon=True)
+ server_thread.start()
+
+ with ClientSession(
+ server_to_client,
+ client_to_server,
+ ) as session:
+ result = session.initialize()
+
+ # Wait for server thread to complete
+ server_thread.join(timeout=10.0)
+
+ # Should successfully initialize
+ assert isinstance(result, InitializeResult)
+ assert result.protocolVersion == LATEST_PROTOCOL_VERSION
+
+
+def test_client_session_version_negotiation_failure():
+ # Create synchronous queues to replace async streams
+ client_to_server: queue.Queue[SessionMessage] = queue.Queue()
+ server_to_client: queue.Queue[SessionMessage] = queue.Queue()
+
+ def mock_server():
+ session_message = client_to_server.get(timeout=5.0)
+ jsonrpc_request = session_message.message
+ assert isinstance(jsonrpc_request.root, JSONRPCRequest)
+ request = ClientRequest.model_validate(
+ jsonrpc_request.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+ )
+ assert isinstance(request.root, InitializeRequest)
+
+ # Send unsupported protocol version
+ result = ServerResult(
+ InitializeResult(
+ protocolVersion="99.99.99", # Unsupported version
+ capabilities=ServerCapabilities(),
+ serverInfo=Implementation(name="mock-server", version="0.1.0"),
+ )
+ )
+
+ server_to_client.put(
+ SessionMessage(
+ message=JSONRPCMessage(
+ JSONRPCResponse(
+ jsonrpc="2.0",
+ id=jsonrpc_request.root.id,
+ result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
+ )
+ )
+ )
+ )
+
+ # Start mock server thread
+ server_thread = threading.Thread(target=mock_server, daemon=True)
+ server_thread.start()
+
+ with ClientSession(
+ server_to_client,
+ client_to_server,
+ ) as session:
+ import pytest
+
+ with pytest.raises(RuntimeError, match="Unsupported protocol version"):
+ session.initialize()
+
+ # Wait for server thread to complete
+ server_thread.join(timeout=10.0)
+
+
+def test_client_capabilities_default():
+ # Create synchronous queues to replace async streams
+ client_to_server: queue.Queue[SessionMessage] = queue.Queue()
+ server_to_client: queue.Queue[SessionMessage] = queue.Queue()
+
+ received_capabilities = None
+
+ def mock_server():
+ nonlocal received_capabilities
+
+ session_message = client_to_server.get(timeout=5.0)
+ jsonrpc_request = session_message.message
+ assert isinstance(jsonrpc_request.root, JSONRPCRequest)
+ request = ClientRequest.model_validate(
+ jsonrpc_request.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+ )
+ assert isinstance(request.root, InitializeRequest)
+ received_capabilities = request.root.params.capabilities
+
+ result = ServerResult(
+ InitializeResult(
+ protocolVersion=LATEST_PROTOCOL_VERSION,
+ capabilities=ServerCapabilities(),
+ serverInfo=Implementation(name="mock-server", version="0.1.0"),
+ )
+ )
+
+ server_to_client.put(
+ SessionMessage(
+ message=JSONRPCMessage(
+ JSONRPCResponse(
+ jsonrpc="2.0",
+ id=jsonrpc_request.root.id,
+ result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
+ )
+ )
+ )
+ )
+ # Receive initialized notification
+ client_to_server.get(timeout=5.0)
+
+ # Start mock server thread
+ server_thread = threading.Thread(target=mock_server, daemon=True)
+ server_thread.start()
+
+ with ClientSession(
+ server_to_client,
+ client_to_server,
+ ) as session:
+ session.initialize()
+
+ # Wait for server thread to complete
+ server_thread.join(timeout=10.0)
+
+ # Assert default capabilities
+ assert received_capabilities is not None
+ assert received_capabilities.sampling is not None
+ assert received_capabilities.roots is not None
+ assert received_capabilities.roots.listChanged is True
+
+
+def test_client_capabilities_with_custom_callbacks():
+ # Create synchronous queues to replace async streams
+ client_to_server: queue.Queue[SessionMessage] = queue.Queue()
+ server_to_client: queue.Queue[SessionMessage] = queue.Queue()
+
+ def custom_sampling_callback(
+ context: RequestContext["ClientSession", Any],
+ params: types.CreateMessageRequestParams,
+ ) -> types.CreateMessageResult | types.ErrorData:
+ return types.CreateMessageResult(
+ model="test-model",
+ role="assistant",
+ content=types.TextContent(type="text", text="Custom response"),
+ )
+
+ def custom_list_roots_callback(
+ context: RequestContext["ClientSession", Any],
+ ) -> types.ListRootsResult | types.ErrorData:
+ return types.ListRootsResult(roots=[])
+
+ def mock_server():
+ session_message = client_to_server.get(timeout=5.0)
+ jsonrpc_request = session_message.message
+ assert isinstance(jsonrpc_request.root, JSONRPCRequest)
+ request = ClientRequest.model_validate(
+ jsonrpc_request.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+ )
+ assert isinstance(request.root, InitializeRequest)
+
+ result = ServerResult(
+ InitializeResult(
+ protocolVersion=LATEST_PROTOCOL_VERSION,
+ capabilities=ServerCapabilities(),
+ serverInfo=Implementation(name="mock-server", version="0.1.0"),
+ )
+ )
+
+ server_to_client.put(
+ SessionMessage(
+ message=JSONRPCMessage(
+ JSONRPCResponse(
+ jsonrpc="2.0",
+ id=jsonrpc_request.root.id,
+ result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
+ )
+ )
+ )
+ )
+ # Receive initialized notification
+ client_to_server.get(timeout=5.0)
+
+ # Start mock server thread
+ server_thread = threading.Thread(target=mock_server, daemon=True)
+ server_thread.start()
+
+ with ClientSession(
+ server_to_client,
+ client_to_server,
+ sampling_callback=custom_sampling_callback,
+ list_roots_callback=custom_list_roots_callback,
+ ) as session:
+ result = session.initialize()
+
+ # Wait for server thread to complete
+ server_thread.join(timeout=10.0)
+
+ # Verify initialization succeeded
+ assert isinstance(result, InitializeResult)
+ assert result.protocolVersion == LATEST_PROTOCOL_VERSION
diff --git a/api/tests/unit_tests/core/mcp/client/test_sse.py b/api/tests/unit_tests/core/mcp/client/test_sse.py
new file mode 100644
index 0000000000..8122cd08eb
--- /dev/null
+++ b/api/tests/unit_tests/core/mcp/client/test_sse.py
@@ -0,0 +1,349 @@
+import json
+import queue
+import threading
+import time
+from typing import Any
+from unittest.mock import Mock, patch
+
+import httpx
+import pytest
+
+from core.mcp import types
+from core.mcp.client.sse_client import sse_client
+from core.mcp.error import MCPAuthError, MCPConnectionError
+
+SERVER_NAME = "test_server_for_SSE"
+
+
+def test_sse_message_id_coercion():
+ """Test that string message IDs that look like integers are parsed as integers.
+
+ See for more details.
+ """
+ json_message = '{"jsonrpc": "2.0", "id": "123", "method": "ping", "params": null}'
+ msg = types.JSONRPCMessage.model_validate_json(json_message)
+ expected = types.JSONRPCMessage(root=types.JSONRPCRequest(method="ping", jsonrpc="2.0", id=123))
+
+ # Check if both are JSONRPCRequest instances
+ assert isinstance(msg.root, types.JSONRPCRequest)
+ assert isinstance(expected.root, types.JSONRPCRequest)
+
+ assert msg.root.id == expected.root.id
+ assert msg.root.method == expected.root.method
+ assert msg.root.jsonrpc == expected.root.jsonrpc
+
+
+class MockSSEClient:
+ """Mock SSE client for testing."""
+
+ def __init__(self, url: str, headers: dict[str, Any] | None = None):
+ self.url = url
+ self.headers = headers or {}
+ self.connected = False
+ self.read_queue: queue.Queue = queue.Queue()
+ self.write_queue: queue.Queue = queue.Queue()
+
+ def connect(self):
+ """Simulate connection establishment."""
+ self.connected = True
+
+ # Send endpoint event
+ endpoint_data = "/messages/?session_id=test-session-123"
+ self.read_queue.put(("endpoint", endpoint_data))
+
+ return self.read_queue, self.write_queue
+
+ def send_initialize_response(self):
+ """Send a mock initialize response."""
+ response = {
+ "jsonrpc": "2.0",
+ "id": 1,
+ "result": {
+ "protocolVersion": types.LATEST_PROTOCOL_VERSION,
+ "capabilities": {
+ "logging": None,
+ "resources": None,
+ "tools": None,
+ "experimental": None,
+ "prompts": None,
+ },
+ "serverInfo": {"name": SERVER_NAME, "version": "0.1.0"},
+ "instructions": "Test server instructions.",
+ },
+ }
+ self.read_queue.put(("message", json.dumps(response)))
+
+
+def test_sse_client_message_id_handling():
+ """Test SSE client properly handles message ID coercion."""
+ mock_client = MockSSEClient("http://test.example/sse")
+ read_queue, write_queue = mock_client.connect()
+
+ # Send a message with string ID that should be coerced to int
+ message_data = {
+ "jsonrpc": "2.0",
+ "id": "456", # String ID
+ "result": {"test": "data"},
+ }
+ read_queue.put(("message", json.dumps(message_data)))
+ read_queue.get(timeout=1.0)
+ # Get the message from queue
+ event_type, data = read_queue.get(timeout=1.0)
+ assert event_type == "message"
+
+ # Parse the message
+ parsed_message = types.JSONRPCMessage.model_validate_json(data)
+ # Check that it's a JSONRPCResponse and verify the ID
+ assert isinstance(parsed_message.root, types.JSONRPCResponse)
+ assert parsed_message.root.id == 456 # Should be converted to int
+
+
+def test_sse_client_connection_validation():
+ """Test SSE client validates endpoint URLs properly."""
+ test_url = "http://test.example/sse"
+
+ with patch("core.mcp.client.sse_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+ with patch("core.mcp.client.sse_client.ssrf_proxy_sse_connect") as mock_sse_connect:
+ # Mock the HTTP client
+ mock_client = Mock()
+ mock_client_factory.return_value.__enter__.return_value = mock_client
+
+ # Mock the SSE connection
+ mock_event_source = Mock()
+ mock_event_source.response.raise_for_status.return_value = None
+ mock_sse_connect.return_value.__enter__.return_value = mock_event_source
+
+ # Mock SSE events
+ class MockSSEEvent:
+ def __init__(self, event_type: str, data: str):
+ self.event = event_type
+ self.data = data
+
+ # Simulate endpoint event
+ endpoint_event = MockSSEEvent("endpoint", "/messages/?session_id=test-123")
+ mock_event_source.iter_sse.return_value = [endpoint_event]
+
+ # Test connection
+ try:
+ with sse_client(test_url) as (read_queue, write_queue):
+ assert read_queue is not None
+ assert write_queue is not None
+ except Exception as e:
+ # Connection might fail due to mocking, but we're testing the validation logic
+ pass
+
+
+def test_sse_client_error_handling():
+ """Test SSE client properly handles various error conditions."""
+ test_url = "http://test.example/sse"
+
+ # Test 401 error handling
+ with patch("core.mcp.client.sse_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+ with patch("core.mcp.client.sse_client.ssrf_proxy_sse_connect") as mock_sse_connect:
+ # Mock 401 HTTP error
+ mock_error = httpx.HTTPStatusError("Unauthorized", request=Mock(), response=Mock(status_code=401))
+ mock_sse_connect.side_effect = mock_error
+
+ with pytest.raises(MCPAuthError):
+ with sse_client(test_url):
+ pass
+
+ # Test other HTTP errors
+ with patch("core.mcp.client.sse_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+ with patch("core.mcp.client.sse_client.ssrf_proxy_sse_connect") as mock_sse_connect:
+ # Mock other HTTP error
+ mock_error = httpx.HTTPStatusError("Server Error", request=Mock(), response=Mock(status_code=500))
+ mock_sse_connect.side_effect = mock_error
+
+ with pytest.raises(MCPConnectionError):
+ with sse_client(test_url):
+ pass
+
+
+def test_sse_client_timeout_configuration():
+ """Test SSE client timeout configuration."""
+ test_url = "http://test.example/sse"
+ custom_timeout = 10.0
+ custom_sse_timeout = 300.0
+ custom_headers = {"Authorization": "Bearer test-token"}
+
+ with patch("core.mcp.client.sse_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+ with patch("core.mcp.client.sse_client.ssrf_proxy_sse_connect") as mock_sse_connect:
+ # Mock successful connection
+ mock_client = Mock()
+ mock_client_factory.return_value.__enter__.return_value = mock_client
+
+ mock_event_source = Mock()
+ mock_event_source.response.raise_for_status.return_value = None
+ mock_event_source.iter_sse.return_value = []
+ mock_sse_connect.return_value.__enter__.return_value = mock_event_source
+
+ try:
+ with sse_client(
+ test_url, headers=custom_headers, timeout=custom_timeout, sse_read_timeout=custom_sse_timeout
+ ) as (read_queue, write_queue):
+ # Verify the configuration was passed correctly
+ mock_client_factory.assert_called_with(headers=custom_headers)
+
+ # Check that timeout was configured
+ call_args = mock_sse_connect.call_args
+ assert call_args is not None
+ timeout_arg = call_args[1]["timeout"]
+ assert timeout_arg.read == custom_sse_timeout
+ except Exception:
+ # Connection might fail due to mocking, but we tested the configuration
+ pass
+
+
+def test_sse_transport_endpoint_validation():
+ """Test SSE transport validates endpoint URLs correctly."""
+ from core.mcp.client.sse_client import SSETransport
+
+ transport = SSETransport("http://example.com/sse")
+
+ # Valid endpoint (same origin)
+ valid_endpoint = "http://example.com/messages/session123"
+ assert transport._validate_endpoint_url(valid_endpoint) == True
+
+ # Invalid endpoint (different origin)
+ invalid_endpoint = "http://malicious.com/messages/session123"
+ assert transport._validate_endpoint_url(invalid_endpoint) == False
+
+ # Invalid endpoint (different scheme)
+ invalid_scheme = "https://example.com/messages/session123"
+ assert transport._validate_endpoint_url(invalid_scheme) == False
+
+
+def test_sse_transport_message_parsing():
+ """Test SSE transport properly parses different message types."""
+ from core.mcp.client.sse_client import SSETransport
+
+ transport = SSETransport("http://example.com/sse")
+ read_queue: queue.Queue = queue.Queue()
+
+ # Test valid JSON-RPC message
+ valid_message = '{"jsonrpc": "2.0", "id": 1, "method": "ping"}'
+ transport._handle_message_event(valid_message, read_queue)
+
+ # Should have a SessionMessage in the queue
+ message = read_queue.get(timeout=1.0)
+ assert message is not None
+ assert hasattr(message, "message")
+
+ # Test invalid JSON
+ invalid_json = '{"invalid": json}'
+ transport._handle_message_event(invalid_json, read_queue)
+
+ # Should have an exception in the queue
+ error = read_queue.get(timeout=1.0)
+ assert isinstance(error, Exception)
+
+
+def test_sse_client_queue_cleanup():
+ """Test that SSE client properly cleans up queues on exit."""
+ test_url = "http://test.example/sse"
+
+ read_queue = None
+ write_queue = None
+
+ with patch("core.mcp.client.sse_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+ with patch("core.mcp.client.sse_client.ssrf_proxy_sse_connect") as mock_sse_connect:
+ # Mock connection that raises an exception
+ mock_sse_connect.side_effect = Exception("Connection failed")
+
+ try:
+ with sse_client(test_url) as (rq, wq):
+ read_queue = rq
+ write_queue = wq
+ except Exception:
+ pass # Expected to fail
+
+ # Queues should be cleaned up even on exception
+ # Note: In real implementation, cleanup should put None to signal shutdown
+
+
+def test_sse_client_url_processing():
+ """Test SSE client URL processing functions."""
+ from core.mcp.client.sse_client import remove_request_params
+
+ # Test URL with parameters
+ url_with_params = "http://example.com/sse?param1=value1¶m2=value2"
+ cleaned_url = remove_request_params(url_with_params)
+ assert cleaned_url == "http://example.com/sse"
+
+ # Test URL without parameters
+ url_without_params = "http://example.com/sse"
+ cleaned_url = remove_request_params(url_without_params)
+ assert cleaned_url == "http://example.com/sse"
+
+ # Test URL with path and parameters
+ complex_url = "http://example.com/path/to/sse?session=123&token=abc"
+ cleaned_url = remove_request_params(complex_url)
+ assert cleaned_url == "http://example.com/path/to/sse"
+
+
+def test_sse_client_headers_propagation():
+ """Test that custom headers are properly propagated in SSE client."""
+ test_url = "http://test.example/sse"
+ custom_headers = {
+ "Authorization": "Bearer test-token",
+ "X-Custom-Header": "test-value",
+ "User-Agent": "test-client/1.0",
+ }
+
+ with patch("core.mcp.client.sse_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+ with patch("core.mcp.client.sse_client.ssrf_proxy_sse_connect") as mock_sse_connect:
+ # Mock the client factory to capture headers
+ mock_client = Mock()
+ mock_client_factory.return_value.__enter__.return_value = mock_client
+
+ # Mock the SSE connection
+ mock_event_source = Mock()
+ mock_event_source.response.raise_for_status.return_value = None
+ mock_event_source.iter_sse.return_value = []
+ mock_sse_connect.return_value.__enter__.return_value = mock_event_source
+
+ try:
+ with sse_client(test_url, headers=custom_headers):
+ pass
+ except Exception:
+ pass # Expected due to mocking
+
+ # Verify headers were passed to client factory
+ mock_client_factory.assert_called_with(headers=custom_headers)
+
+
+def test_sse_client_concurrent_access():
+ """Test SSE client behavior with concurrent queue access."""
+ test_read_queue: queue.Queue = queue.Queue()
+
+ # Simulate concurrent producers and consumers
+ def producer():
+ for i in range(10):
+ test_read_queue.put(f"message_{i}")
+ time.sleep(0.01) # Small delay to simulate real conditions
+
+ def consumer():
+ received = []
+ for _ in range(10):
+ try:
+ msg = test_read_queue.get(timeout=2.0)
+ received.append(msg)
+ except queue.Empty:
+ break
+ return received
+
+ # Start producer in separate thread
+ producer_thread = threading.Thread(target=producer, daemon=True)
+ producer_thread.start()
+
+ # Consume messages
+ received_messages = consumer()
+
+ # Wait for producer to finish
+ producer_thread.join(timeout=5.0)
+
+ # Verify all messages were received
+ assert len(received_messages) == 10
+ for i in range(10):
+ assert f"message_{i}" in received_messages
diff --git a/api/tests/unit_tests/core/mcp/client/test_streamable_http.py b/api/tests/unit_tests/core/mcp/client/test_streamable_http.py
new file mode 100644
index 0000000000..9a30a35a49
--- /dev/null
+++ b/api/tests/unit_tests/core/mcp/client/test_streamable_http.py
@@ -0,0 +1,450 @@
+"""
+Tests for the StreamableHTTP client transport.
+
+Contains tests for only the client side of the StreamableHTTP transport.
+"""
+
+import queue
+import threading
+import time
+from typing import Any
+from unittest.mock import Mock, patch
+
+from core.mcp import types
+from core.mcp.client.streamable_client import streamablehttp_client
+
+# Test constants
+SERVER_NAME = "test_streamable_http_server"
+TEST_SESSION_ID = "test-session-id-12345"
+INIT_REQUEST = {
+ "jsonrpc": "2.0",
+ "method": "initialize",
+ "params": {
+ "clientInfo": {"name": "test-client", "version": "1.0"},
+ "protocolVersion": "2025-03-26",
+ "capabilities": {},
+ },
+ "id": "init-1",
+}
+
+
+class MockStreamableHTTPClient:
+ """Mock StreamableHTTP client for testing."""
+
+ def __init__(self, url: str, headers: dict[str, Any] | None = None):
+ self.url = url
+ self.headers = headers or {}
+ self.connected = False
+ self.read_queue: queue.Queue = queue.Queue()
+ self.write_queue: queue.Queue = queue.Queue()
+ self.session_id = TEST_SESSION_ID
+
+ def connect(self):
+ """Simulate connection establishment."""
+ self.connected = True
+ return self.read_queue, self.write_queue, lambda: self.session_id
+
+ def send_initialize_response(self):
+ """Send a mock initialize response."""
+ session_message = types.SessionMessage(
+ message=types.JSONRPCMessage(
+ root=types.JSONRPCResponse(
+ jsonrpc="2.0",
+ id="init-1",
+ result={
+ "protocolVersion": types.LATEST_PROTOCOL_VERSION,
+ "capabilities": {
+ "logging": None,
+ "resources": None,
+ "tools": None,
+ "experimental": None,
+ "prompts": None,
+ },
+ "serverInfo": {"name": SERVER_NAME, "version": "0.1.0"},
+ "instructions": "Test server instructions.",
+ },
+ )
+ )
+ )
+ self.read_queue.put(session_message)
+
+ def send_tools_response(self):
+ """Send a mock tools list response."""
+ session_message = types.SessionMessage(
+ message=types.JSONRPCMessage(
+ root=types.JSONRPCResponse(
+ jsonrpc="2.0",
+ id="tools-1",
+ result={
+ "tools": [
+ {
+ "name": "test_tool",
+ "description": "A test tool",
+ "inputSchema": {"type": "object", "properties": {}},
+ }
+ ],
+ },
+ )
+ )
+ )
+ self.read_queue.put(session_message)
+
+
+def test_streamablehttp_client_message_id_handling():
+ """Test StreamableHTTP client properly handles message ID coercion."""
+ mock_client = MockStreamableHTTPClient("http://test.example/mcp")
+ read_queue, write_queue, get_session_id = mock_client.connect()
+
+ # Send a message with string ID that should be coerced to int
+ response_message = types.SessionMessage(
+ message=types.JSONRPCMessage(root=types.JSONRPCResponse(jsonrpc="2.0", id="789", result={"test": "data"}))
+ )
+ read_queue.put(response_message)
+
+ # Get the message from queue
+ message = read_queue.get(timeout=1.0)
+ assert message is not None
+ assert isinstance(message, types.SessionMessage)
+
+ # Check that the ID was properly handled
+ assert isinstance(message.message.root, types.JSONRPCResponse)
+ assert message.message.root.id == 789 # ID should be coerced to int due to union_mode="left_to_right"
+
+
+def test_streamablehttp_client_connection_validation():
+ """Test StreamableHTTP client validates connections properly."""
+ test_url = "http://test.example/mcp"
+
+ with patch("core.mcp.client.streamable_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+ # Mock the HTTP client
+ mock_client = Mock()
+ mock_client_factory.return_value.__enter__.return_value = mock_client
+
+ # Mock successful response
+ mock_response = Mock()
+ mock_response.status_code = 200
+ mock_response.headers = {"content-type": "application/json"}
+ mock_response.raise_for_status.return_value = None
+ mock_client.post.return_value = mock_response
+
+ # Test connection
+ try:
+ with streamablehttp_client(test_url) as (read_queue, write_queue, get_session_id):
+ assert read_queue is not None
+ assert write_queue is not None
+ assert get_session_id is not None
+ except Exception:
+ # Connection might fail due to mocking, but we're testing the validation logic
+ pass
+
+
+def test_streamablehttp_client_timeout_configuration():
+ """Test StreamableHTTP client timeout configuration."""
+ test_url = "http://test.example/mcp"
+ custom_headers = {"Authorization": "Bearer test-token"}
+
+ with patch("core.mcp.client.streamable_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+ # Mock successful connection
+ mock_client = Mock()
+ mock_client_factory.return_value.__enter__.return_value = mock_client
+
+ mock_response = Mock()
+ mock_response.status_code = 200
+ mock_response.headers = {"content-type": "application/json"}
+ mock_response.raise_for_status.return_value = None
+ mock_client.post.return_value = mock_response
+
+ try:
+ with streamablehttp_client(test_url, headers=custom_headers) as (read_queue, write_queue, get_session_id):
+ # Verify the configuration was passed correctly
+ mock_client_factory.assert_called_with(headers=custom_headers)
+ except Exception:
+ # Connection might fail due to mocking, but we tested the configuration
+ pass
+
+
+def test_streamablehttp_client_session_id_handling():
+ """Test StreamableHTTP client properly handles session IDs."""
+ mock_client = MockStreamableHTTPClient("http://test.example/mcp")
+ read_queue, write_queue, get_session_id = mock_client.connect()
+
+ # Test that session ID is available
+ session_id = get_session_id()
+ assert session_id == TEST_SESSION_ID
+
+ # Test that we can use the session ID in subsequent requests
+ assert session_id is not None
+ assert len(session_id) > 0
+
+
+def test_streamablehttp_client_message_parsing():
+ """Test StreamableHTTP client properly parses different message types."""
+ mock_client = MockStreamableHTTPClient("http://test.example/mcp")
+ read_queue, write_queue, get_session_id = mock_client.connect()
+
+ # Test valid initialization response
+ mock_client.send_initialize_response()
+
+ # Should have a SessionMessage in the queue
+ message = read_queue.get(timeout=1.0)
+ assert message is not None
+ assert isinstance(message, types.SessionMessage)
+ assert isinstance(message.message.root, types.JSONRPCResponse)
+
+ # Test tools response
+ mock_client.send_tools_response()
+
+ tools_message = read_queue.get(timeout=1.0)
+ assert tools_message is not None
+ assert isinstance(tools_message, types.SessionMessage)
+
+
+def test_streamablehttp_client_queue_cleanup():
+ """Test that StreamableHTTP client properly cleans up queues on exit."""
+ test_url = "http://test.example/mcp"
+
+ read_queue = None
+ write_queue = None
+
+ with patch("core.mcp.client.streamable_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+ # Mock connection that raises an exception
+ mock_client_factory.side_effect = Exception("Connection failed")
+
+ try:
+ with streamablehttp_client(test_url) as (rq, wq, get_session_id):
+ read_queue = rq
+ write_queue = wq
+ except Exception:
+ pass # Expected to fail
+
+ # Queues should be cleaned up even on exception
+ # Note: In real implementation, cleanup should put None to signal shutdown
+
+
+def test_streamablehttp_client_headers_propagation():
+ """Test that custom headers are properly propagated in StreamableHTTP client."""
+ test_url = "http://test.example/mcp"
+ custom_headers = {
+ "Authorization": "Bearer test-token",
+ "X-Custom-Header": "test-value",
+ "User-Agent": "test-client/1.0",
+ }
+
+ with patch("core.mcp.client.streamable_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+ # Mock the client factory to capture headers
+ mock_client = Mock()
+ mock_client_factory.return_value.__enter__.return_value = mock_client
+
+ mock_response = Mock()
+ mock_response.status_code = 200
+ mock_response.headers = {"content-type": "application/json"}
+ mock_response.raise_for_status.return_value = None
+ mock_client.post.return_value = mock_response
+
+ try:
+ with streamablehttp_client(test_url, headers=custom_headers):
+ pass
+ except Exception:
+ pass # Expected due to mocking
+
+ # Verify headers were passed to client factory
+ # Check that the call was made with headers that include our custom headers
+ mock_client_factory.assert_called_once()
+ call_args = mock_client_factory.call_args
+ assert "headers" in call_args.kwargs
+ passed_headers = call_args.kwargs["headers"]
+
+ # Verify all custom headers are present
+ for key, value in custom_headers.items():
+ assert key in passed_headers
+ assert passed_headers[key] == value
+
+
+def test_streamablehttp_client_concurrent_access():
+ """Test StreamableHTTP client behavior with concurrent queue access."""
+ test_read_queue: queue.Queue = queue.Queue()
+ test_write_queue: queue.Queue = queue.Queue()
+
+ # Simulate concurrent producers and consumers
+ def producer():
+ for i in range(10):
+ test_read_queue.put(f"message_{i}")
+ time.sleep(0.01) # Small delay to simulate real conditions
+
+ def consumer():
+ received = []
+ for _ in range(10):
+ try:
+ msg = test_read_queue.get(timeout=2.0)
+ received.append(msg)
+ except queue.Empty:
+ break
+ return received
+
+ # Start producer in separate thread
+ producer_thread = threading.Thread(target=producer, daemon=True)
+ producer_thread.start()
+
+ # Consume messages
+ received_messages = consumer()
+
+ # Wait for producer to finish
+ producer_thread.join(timeout=5.0)
+
+ # Verify all messages were received
+ assert len(received_messages) == 10
+ for i in range(10):
+ assert f"message_{i}" in received_messages
+
+
+def test_streamablehttp_client_json_vs_sse_mode():
+ """Test StreamableHTTP client handling of JSON vs SSE response modes."""
+ test_url = "http://test.example/mcp"
+
+ with patch("core.mcp.client.streamable_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+ mock_client = Mock()
+ mock_client_factory.return_value.__enter__.return_value = mock_client
+
+ # Mock JSON response
+ mock_json_response = Mock()
+ mock_json_response.status_code = 200
+ mock_json_response.headers = {"content-type": "application/json"}
+ mock_json_response.json.return_value = {"result": "json_mode"}
+ mock_json_response.raise_for_status.return_value = None
+
+ # Mock SSE response
+ mock_sse_response = Mock()
+ mock_sse_response.status_code = 200
+ mock_sse_response.headers = {"content-type": "text/event-stream"}
+ mock_sse_response.raise_for_status.return_value = None
+
+ # Test JSON mode
+ mock_client.post.return_value = mock_json_response
+
+ try:
+ with streamablehttp_client(test_url) as (read_queue, write_queue, get_session_id):
+ # Should handle JSON responses
+ assert read_queue is not None
+ assert write_queue is not None
+ except Exception:
+ pass # Expected due to mocking
+
+ # Test SSE mode
+ mock_client.post.return_value = mock_sse_response
+
+ try:
+ with streamablehttp_client(test_url) as (read_queue, write_queue, get_session_id):
+ # Should handle SSE responses
+ assert read_queue is not None
+ assert write_queue is not None
+ except Exception:
+ pass # Expected due to mocking
+
+
+def test_streamablehttp_client_terminate_on_close():
+ """Test StreamableHTTP client terminate_on_close parameter."""
+ test_url = "http://test.example/mcp"
+
+ with patch("core.mcp.client.streamable_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+ mock_client = Mock()
+ mock_client_factory.return_value.__enter__.return_value = mock_client
+
+ mock_response = Mock()
+ mock_response.status_code = 200
+ mock_response.headers = {"content-type": "application/json"}
+ mock_response.raise_for_status.return_value = None
+ mock_client.post.return_value = mock_response
+ mock_client.delete.return_value = mock_response
+
+ # Test with terminate_on_close=True (default)
+ try:
+ with streamablehttp_client(test_url, terminate_on_close=True) as (read_queue, write_queue, get_session_id):
+ pass
+ except Exception:
+ pass # Expected due to mocking
+
+ # Test with terminate_on_close=False
+ try:
+ with streamablehttp_client(test_url, terminate_on_close=False) as (read_queue, write_queue, get_session_id):
+ pass
+ except Exception:
+ pass # Expected due to mocking
+
+
+def test_streamablehttp_client_protocol_version_handling():
+ """Test StreamableHTTP client protocol version handling."""
+ mock_client = MockStreamableHTTPClient("http://test.example/mcp")
+ read_queue, write_queue, get_session_id = mock_client.connect()
+
+ # Send initialize response with specific protocol version
+
+ session_message = types.SessionMessage(
+ message=types.JSONRPCMessage(
+ root=types.JSONRPCResponse(
+ jsonrpc="2.0",
+ id="init-1",
+ result={
+ "protocolVersion": "2024-11-05",
+ "capabilities": {},
+ "serverInfo": {"name": SERVER_NAME, "version": "0.1.0"},
+ },
+ )
+ )
+ )
+ read_queue.put(session_message)
+
+ # Get the message and verify protocol version
+ message = read_queue.get(timeout=1.0)
+ assert message is not None
+ assert isinstance(message.message.root, types.JSONRPCResponse)
+ result = message.message.root.result
+ assert result["protocolVersion"] == "2024-11-05"
+
+
+def test_streamablehttp_client_error_response_handling():
+ """Test StreamableHTTP client handling of error responses."""
+ mock_client = MockStreamableHTTPClient("http://test.example/mcp")
+ read_queue, write_queue, get_session_id = mock_client.connect()
+
+ # Send an error response
+ session_message = types.SessionMessage(
+ message=types.JSONRPCMessage(
+ root=types.JSONRPCError(
+ jsonrpc="2.0",
+ id="test-1",
+ error=types.ErrorData(code=-32601, message="Method not found", data=None),
+ )
+ )
+ )
+ read_queue.put(session_message)
+
+ # Get the error message
+ message = read_queue.get(timeout=1.0)
+ assert message is not None
+ assert isinstance(message.message.root, types.JSONRPCError)
+ assert message.message.root.error.code == -32601
+ assert message.message.root.error.message == "Method not found"
+
+
+def test_streamablehttp_client_resumption_token_handling():
+ """Test StreamableHTTP client resumption token functionality."""
+ test_url = "http://test.example/mcp"
+ test_resumption_token = "resume-token-123"
+
+ with patch("core.mcp.client.streamable_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+ mock_client = Mock()
+ mock_client_factory.return_value.__enter__.return_value = mock_client
+
+ mock_response = Mock()
+ mock_response.status_code = 200
+ mock_response.headers = {"content-type": "application/json", "last-event-id": test_resumption_token}
+ mock_response.raise_for_status.return_value = None
+ mock_client.post.return_value = mock_response
+
+ try:
+ with streamablehttp_client(test_url) as (read_queue, write_queue, get_session_id):
+ # Test that resumption token can be captured from headers
+ assert read_queue is not None
+ assert write_queue is not None
+ except Exception:
+ pass # Expected due to mocking
diff --git a/api/tests/unit_tests/core/ops/__init__.py b/api/tests/unit_tests/core/ops/__init__.py
new file mode 100644
index 0000000000..bb92ccdec7
--- /dev/null
+++ b/api/tests/unit_tests/core/ops/__init__.py
@@ -0,0 +1 @@
+# Unit tests for core ops module
diff --git a/api/tests/unit_tests/core/ops/test_config_entity.py b/api/tests/unit_tests/core/ops/test_config_entity.py
new file mode 100644
index 0000000000..81cb04548d
--- /dev/null
+++ b/api/tests/unit_tests/core/ops/test_config_entity.py
@@ -0,0 +1,385 @@
+import pytest
+from pydantic import ValidationError
+
+from core.ops.entities.config_entity import (
+ AliyunConfig,
+ ArizeConfig,
+ LangfuseConfig,
+ LangSmithConfig,
+ OpikConfig,
+ PhoenixConfig,
+ TracingProviderEnum,
+ WeaveConfig,
+)
+
+
+class TestTracingProviderEnum:
+ """Test cases for TracingProviderEnum"""
+
+ def test_enum_values(self):
+ """Test that all expected enum values are present"""
+ assert TracingProviderEnum.ARIZE == "arize"
+ assert TracingProviderEnum.PHOENIX == "phoenix"
+ assert TracingProviderEnum.LANGFUSE == "langfuse"
+ assert TracingProviderEnum.LANGSMITH == "langsmith"
+ assert TracingProviderEnum.OPIK == "opik"
+ assert TracingProviderEnum.WEAVE == "weave"
+ assert TracingProviderEnum.ALIYUN == "aliyun"
+
+
+class TestArizeConfig:
+ """Test cases for ArizeConfig"""
+
+ def test_valid_config(self):
+ """Test valid Arize configuration"""
+ config = ArizeConfig(
+ api_key="test_key", space_id="test_space", project="test_project", endpoint="https://custom.arize.com"
+ )
+ assert config.api_key == "test_key"
+ assert config.space_id == "test_space"
+ assert config.project == "test_project"
+ assert config.endpoint == "https://custom.arize.com"
+
+ def test_default_values(self):
+ """Test default values are set correctly"""
+ config = ArizeConfig()
+ assert config.api_key is None
+ assert config.space_id is None
+ assert config.project is None
+ assert config.endpoint == "https://otlp.arize.com"
+
+ def test_project_validation_empty(self):
+ """Test project validation with empty value"""
+ config = ArizeConfig(project="")
+ assert config.project == "default"
+
+ def test_project_validation_none(self):
+ """Test project validation with None value"""
+ config = ArizeConfig(project=None)
+ assert config.project == "default"
+
+ def test_endpoint_validation_empty(self):
+ """Test endpoint validation with empty value"""
+ config = ArizeConfig(endpoint="")
+ assert config.endpoint == "https://otlp.arize.com"
+
+ def test_endpoint_validation_with_path(self):
+ """Test endpoint validation normalizes URL by removing path"""
+ config = ArizeConfig(endpoint="https://custom.arize.com/api/v1")
+ assert config.endpoint == "https://custom.arize.com"
+
+ def test_endpoint_validation_invalid_scheme(self):
+ """Test endpoint validation rejects invalid schemes"""
+ with pytest.raises(ValidationError, match="URL scheme must be one of"):
+ ArizeConfig(endpoint="ftp://invalid.com")
+
+ def test_endpoint_validation_no_scheme(self):
+ """Test endpoint validation rejects URLs without scheme"""
+ with pytest.raises(ValidationError, match="URL scheme must be one of"):
+ ArizeConfig(endpoint="invalid.com")
+
+
+class TestPhoenixConfig:
+ """Test cases for PhoenixConfig"""
+
+ def test_valid_config(self):
+ """Test valid Phoenix configuration"""
+ config = PhoenixConfig(api_key="test_key", project="test_project", endpoint="https://custom.phoenix.com")
+ assert config.api_key == "test_key"
+ assert config.project == "test_project"
+ assert config.endpoint == "https://custom.phoenix.com"
+
+ def test_default_values(self):
+ """Test default values are set correctly"""
+ config = PhoenixConfig()
+ assert config.api_key is None
+ assert config.project is None
+ assert config.endpoint == "https://app.phoenix.arize.com"
+
+ def test_project_validation_empty(self):
+ """Test project validation with empty value"""
+ config = PhoenixConfig(project="")
+ assert config.project == "default"
+
+ def test_endpoint_validation_with_path(self):
+ """Test endpoint validation normalizes URL by removing path"""
+ config = PhoenixConfig(endpoint="https://custom.phoenix.com/api/v1")
+ assert config.endpoint == "https://custom.phoenix.com"
+
+
+class TestLangfuseConfig:
+ """Test cases for LangfuseConfig"""
+
+ def test_valid_config(self):
+ """Test valid Langfuse configuration"""
+ config = LangfuseConfig(public_key="public_key", secret_key="secret_key", host="https://custom.langfuse.com")
+ assert config.public_key == "public_key"
+ assert config.secret_key == "secret_key"
+ assert config.host == "https://custom.langfuse.com"
+
+ def test_default_values(self):
+ """Test default values are set correctly"""
+ config = LangfuseConfig(public_key="public", secret_key="secret")
+ assert config.host == "https://api.langfuse.com"
+
+ def test_missing_required_fields(self):
+ """Test that required fields are enforced"""
+ with pytest.raises(ValidationError):
+ LangfuseConfig()
+
+ with pytest.raises(ValidationError):
+ LangfuseConfig(public_key="public")
+
+ with pytest.raises(ValidationError):
+ LangfuseConfig(secret_key="secret")
+
+ def test_host_validation_empty(self):
+ """Test host validation with empty value"""
+ config = LangfuseConfig(public_key="public", secret_key="secret", host="")
+ assert config.host == "https://api.langfuse.com"
+
+
+class TestLangSmithConfig:
+ """Test cases for LangSmithConfig"""
+
+ def test_valid_config(self):
+ """Test valid LangSmith configuration"""
+ config = LangSmithConfig(api_key="test_key", project="test_project", endpoint="https://custom.smith.com")
+ assert config.api_key == "test_key"
+ assert config.project == "test_project"
+ assert config.endpoint == "https://custom.smith.com"
+
+ def test_default_values(self):
+ """Test default values are set correctly"""
+ config = LangSmithConfig(api_key="key", project="project")
+ assert config.endpoint == "https://api.smith.langchain.com"
+
+ def test_missing_required_fields(self):
+ """Test that required fields are enforced"""
+ with pytest.raises(ValidationError):
+ LangSmithConfig()
+
+ with pytest.raises(ValidationError):
+ LangSmithConfig(api_key="key")
+
+ with pytest.raises(ValidationError):
+ LangSmithConfig(project="project")
+
+ def test_endpoint_validation_https_only(self):
+ """Test endpoint validation only allows HTTPS"""
+ with pytest.raises(ValidationError, match="URL scheme must be one of"):
+ LangSmithConfig(api_key="key", project="project", endpoint="http://insecure.com")
+
+
+class TestOpikConfig:
+ """Test cases for OpikConfig"""
+
+ def test_valid_config(self):
+ """Test valid Opik configuration"""
+ config = OpikConfig(
+ api_key="test_key",
+ project="test_project",
+ workspace="test_workspace",
+ url="https://custom.comet.com/opik/api/",
+ )
+ assert config.api_key == "test_key"
+ assert config.project == "test_project"
+ assert config.workspace == "test_workspace"
+ assert config.url == "https://custom.comet.com/opik/api/"
+
+ def test_default_values(self):
+ """Test default values are set correctly"""
+ config = OpikConfig()
+ assert config.api_key is None
+ assert config.project is None
+ assert config.workspace is None
+ assert config.url == "https://www.comet.com/opik/api/"
+
+ def test_project_validation_empty(self):
+ """Test project validation with empty value"""
+ config = OpikConfig(project="")
+ assert config.project == "Default Project"
+
+ def test_url_validation_empty(self):
+ """Test URL validation with empty value"""
+ config = OpikConfig(url="")
+ assert config.url == "https://www.comet.com/opik/api/"
+
+ def test_url_validation_missing_suffix(self):
+ """Test URL validation requires /api/ suffix"""
+ with pytest.raises(ValidationError, match="URL should end with /api/"):
+ OpikConfig(url="https://custom.comet.com/opik/")
+
+ def test_url_validation_invalid_scheme(self):
+ """Test URL validation rejects invalid schemes"""
+ with pytest.raises(ValidationError, match="URL must start with https:// or http://"):
+ OpikConfig(url="ftp://custom.comet.com/opik/api/")
+
+
+class TestWeaveConfig:
+ """Test cases for WeaveConfig"""
+
+ def test_valid_config(self):
+ """Test valid Weave configuration"""
+ config = WeaveConfig(
+ api_key="test_key",
+ entity="test_entity",
+ project="test_project",
+ endpoint="https://custom.wandb.ai",
+ host="https://custom.host.com",
+ )
+ assert config.api_key == "test_key"
+ assert config.entity == "test_entity"
+ assert config.project == "test_project"
+ assert config.endpoint == "https://custom.wandb.ai"
+ assert config.host == "https://custom.host.com"
+
+ def test_default_values(self):
+ """Test default values are set correctly"""
+ config = WeaveConfig(api_key="key", project="project")
+ assert config.entity is None
+ assert config.endpoint == "https://trace.wandb.ai"
+ assert config.host is None
+
+ def test_missing_required_fields(self):
+ """Test that required fields are enforced"""
+ with pytest.raises(ValidationError):
+ WeaveConfig()
+
+ with pytest.raises(ValidationError):
+ WeaveConfig(api_key="key")
+
+ with pytest.raises(ValidationError):
+ WeaveConfig(project="project")
+
+ def test_endpoint_validation_https_only(self):
+ """Test endpoint validation only allows HTTPS"""
+ with pytest.raises(ValidationError, match="URL scheme must be one of"):
+ WeaveConfig(api_key="key", project="project", endpoint="http://insecure.wandb.ai")
+
+ def test_host_validation_optional(self):
+ """Test host validation is optional but validates when provided"""
+ config = WeaveConfig(api_key="key", project="project", host=None)
+ assert config.host is None
+
+ config = WeaveConfig(api_key="key", project="project", host="")
+ assert config.host == ""
+
+ config = WeaveConfig(api_key="key", project="project", host="https://valid.host.com")
+ assert config.host == "https://valid.host.com"
+
+ def test_host_validation_invalid_scheme(self):
+ """Test host validation rejects invalid schemes when provided"""
+ with pytest.raises(ValidationError, match="URL scheme must be one of"):
+ WeaveConfig(api_key="key", project="project", host="ftp://invalid.host.com")
+
+
+class TestAliyunConfig:
+ """Test cases for AliyunConfig"""
+
+ def test_valid_config(self):
+ """Test valid Aliyun configuration"""
+ config = AliyunConfig(
+ app_name="test_app",
+ license_key="test_license_key",
+ endpoint="https://custom.tracing-analysis-dc-hz.aliyuncs.com",
+ )
+ assert config.app_name == "test_app"
+ assert config.license_key == "test_license_key"
+ assert config.endpoint == "https://custom.tracing-analysis-dc-hz.aliyuncs.com"
+
+ def test_default_values(self):
+ """Test default values are set correctly"""
+ config = AliyunConfig(license_key="test_license", endpoint="https://tracing-analysis-dc-hz.aliyuncs.com")
+ assert config.app_name == "dify_app"
+
+ def test_missing_required_fields(self):
+ """Test that required fields are enforced"""
+ with pytest.raises(ValidationError):
+ AliyunConfig()
+
+ with pytest.raises(ValidationError):
+ AliyunConfig(license_key="test_license")
+
+ with pytest.raises(ValidationError):
+ AliyunConfig(endpoint="https://tracing-analysis-dc-hz.aliyuncs.com")
+
+ def test_app_name_validation_empty(self):
+ """Test app_name validation with empty value"""
+ config = AliyunConfig(
+ license_key="test_license", endpoint="https://tracing-analysis-dc-hz.aliyuncs.com", app_name=""
+ )
+ assert config.app_name == "dify_app"
+
+ def test_endpoint_validation_empty(self):
+ """Test endpoint validation with empty value"""
+ config = AliyunConfig(license_key="test_license", endpoint="")
+ assert config.endpoint == "https://tracing-analysis-dc-hz.aliyuncs.com"
+
+ def test_endpoint_validation_with_path(self):
+ """Test endpoint validation normalizes URL by removing path"""
+ config = AliyunConfig(
+ license_key="test_license", endpoint="https://tracing-analysis-dc-hz.aliyuncs.com/api/v1/traces"
+ )
+ assert config.endpoint == "https://tracing-analysis-dc-hz.aliyuncs.com"
+
+ def test_endpoint_validation_invalid_scheme(self):
+ """Test endpoint validation rejects invalid schemes"""
+ with pytest.raises(ValidationError, match="URL scheme must be one of"):
+ AliyunConfig(license_key="test_license", endpoint="ftp://invalid.tracing-analysis-dc-hz.aliyuncs.com")
+
+ def test_endpoint_validation_no_scheme(self):
+ """Test endpoint validation rejects URLs without scheme"""
+ with pytest.raises(ValidationError, match="URL scheme must be one of"):
+ AliyunConfig(license_key="test_license", endpoint="invalid.tracing-analysis-dc-hz.aliyuncs.com")
+
+ def test_license_key_required(self):
+ """Test that license_key is required and cannot be empty"""
+ with pytest.raises(ValidationError):
+ AliyunConfig(license_key="", endpoint="https://tracing-analysis-dc-hz.aliyuncs.com")
+
+
+class TestConfigIntegration:
+ """Integration tests for configuration classes"""
+
+ def test_all_configs_can_be_instantiated(self):
+ """Test that all config classes can be instantiated with valid data"""
+ configs = [
+ ArizeConfig(api_key="key"),
+ PhoenixConfig(api_key="key"),
+ LangfuseConfig(public_key="public", secret_key="secret"),
+ LangSmithConfig(api_key="key", project="project"),
+ OpikConfig(api_key="key"),
+ WeaveConfig(api_key="key", project="project"),
+ AliyunConfig(license_key="test_license", endpoint="https://tracing-analysis-dc-hz.aliyuncs.com"),
+ ]
+
+ for config in configs:
+ assert config is not None
+
+ def test_url_normalization_consistency(self):
+ """Test that URL normalization works consistently across configs"""
+ # Test that paths are removed from endpoints
+ arize_config = ArizeConfig(endpoint="https://arize.com/api/v1/test")
+ phoenix_config = PhoenixConfig(endpoint="https://phoenix.com/api/v2/")
+ aliyun_config = AliyunConfig(
+ license_key="test_license", endpoint="https://tracing-analysis-dc-hz.aliyuncs.com/api/v1/traces"
+ )
+
+ assert arize_config.endpoint == "https://arize.com"
+ assert phoenix_config.endpoint == "https://phoenix.com"
+ assert aliyun_config.endpoint == "https://tracing-analysis-dc-hz.aliyuncs.com"
+
+ def test_project_default_values(self):
+ """Test that project default values are set correctly"""
+ arize_config = ArizeConfig(project="")
+ phoenix_config = PhoenixConfig(project="")
+ opik_config = OpikConfig(project="")
+ aliyun_config = AliyunConfig(
+ license_key="test_license", endpoint="https://tracing-analysis-dc-hz.aliyuncs.com", app_name=""
+ )
+
+ assert arize_config.project == "default"
+ assert phoenix_config.project == "default"
+ assert opik_config.project == "Default Project"
+ assert aliyun_config.app_name == "dify_app"
diff --git a/api/tests/unit_tests/core/ops/test_utils.py b/api/tests/unit_tests/core/ops/test_utils.py
new file mode 100644
index 0000000000..7cc2772acf
--- /dev/null
+++ b/api/tests/unit_tests/core/ops/test_utils.py
@@ -0,0 +1,138 @@
+import pytest
+
+from core.ops.utils import validate_project_name, validate_url, validate_url_with_path
+
+
+class TestValidateUrl:
+ """Test cases for validate_url function"""
+
+ def test_valid_https_url(self):
+ """Test valid HTTPS URL"""
+ result = validate_url("https://example.com", "https://default.com")
+ assert result == "https://example.com"
+
+ def test_valid_http_url(self):
+ """Test valid HTTP URL"""
+ result = validate_url("http://example.com", "https://default.com")
+ assert result == "http://example.com"
+
+ def test_url_with_path_removed(self):
+ """Test that URL path is removed during normalization"""
+ result = validate_url("https://example.com/api/v1/test", "https://default.com")
+ assert result == "https://example.com"
+
+ def test_url_with_query_removed(self):
+ """Test that URL query parameters are removed"""
+ result = validate_url("https://example.com?param=value", "https://default.com")
+ assert result == "https://example.com"
+
+ def test_url_with_fragment_removed(self):
+ """Test that URL fragments are removed"""
+ result = validate_url("https://example.com#section", "https://default.com")
+ assert result == "https://example.com"
+
+ def test_empty_url_returns_default(self):
+ """Test empty URL returns default"""
+ result = validate_url("", "https://default.com")
+ assert result == "https://default.com"
+
+ def test_none_url_returns_default(self):
+ """Test None URL returns default"""
+ result = validate_url(None, "https://default.com")
+ assert result == "https://default.com"
+
+ def test_whitespace_url_returns_default(self):
+ """Test whitespace URL returns default"""
+ result = validate_url(" ", "https://default.com")
+ assert result == "https://default.com"
+
+ def test_invalid_scheme_raises_error(self):
+ """Test invalid scheme raises ValueError"""
+ with pytest.raises(ValueError, match="URL scheme must be one of"):
+ validate_url("ftp://example.com", "https://default.com")
+
+ def test_no_scheme_raises_error(self):
+ """Test URL without scheme raises ValueError"""
+ with pytest.raises(ValueError, match="URL scheme must be one of"):
+ validate_url("example.com", "https://default.com")
+
+ def test_custom_allowed_schemes(self):
+ """Test custom allowed schemes"""
+ result = validate_url("https://example.com", "https://default.com", allowed_schemes=("https",))
+ assert result == "https://example.com"
+
+ with pytest.raises(ValueError, match="URL scheme must be one of"):
+ validate_url("http://example.com", "https://default.com", allowed_schemes=("https",))
+
+
+class TestValidateUrlWithPath:
+ """Test cases for validate_url_with_path function"""
+
+ def test_valid_url_with_path(self):
+ """Test valid URL with path"""
+ result = validate_url_with_path("https://example.com/api/v1", "https://default.com")
+ assert result == "https://example.com/api/v1"
+
+ def test_valid_url_with_required_suffix(self):
+ """Test valid URL with required suffix"""
+ result = validate_url_with_path("https://example.com/api/", "https://default.com", required_suffix="/api/")
+ assert result == "https://example.com/api/"
+
+ def test_url_without_required_suffix_raises_error(self):
+ """Test URL without required suffix raises error"""
+ with pytest.raises(ValueError, match="URL should end with /api/"):
+ validate_url_with_path("https://example.com/api", "https://default.com", required_suffix="/api/")
+
+ def test_empty_url_returns_default(self):
+ """Test empty URL returns default"""
+ result = validate_url_with_path("", "https://default.com")
+ assert result == "https://default.com"
+
+ def test_none_url_returns_default(self):
+ """Test None URL returns default"""
+ result = validate_url_with_path(None, "https://default.com")
+ assert result == "https://default.com"
+
+ def test_invalid_scheme_raises_error(self):
+ """Test invalid scheme raises ValueError"""
+ with pytest.raises(ValueError, match="URL must start with https:// or http://"):
+ validate_url_with_path("ftp://example.com", "https://default.com")
+
+ def test_no_scheme_raises_error(self):
+ """Test URL without scheme raises ValueError"""
+ with pytest.raises(ValueError, match="URL must start with https:// or http://"):
+ validate_url_with_path("example.com", "https://default.com")
+
+
+class TestValidateProjectName:
+ """Test cases for validate_project_name function"""
+
+ def test_valid_project_name(self):
+ """Test valid project name"""
+ result = validate_project_name("my-project", "default")
+ assert result == "my-project"
+
+ def test_empty_project_name_returns_default(self):
+ """Test empty project name returns default"""
+ result = validate_project_name("", "default")
+ assert result == "default"
+
+ def test_none_project_name_returns_default(self):
+ """Test None project name returns default"""
+ result = validate_project_name(None, "default")
+ assert result == "default"
+
+ def test_whitespace_project_name_returns_default(self):
+ """Test whitespace project name returns default"""
+ result = validate_project_name(" ", "default")
+ assert result == "default"
+
+ def test_project_name_with_whitespace_trimmed(self):
+ """Test project name with whitespace is trimmed"""
+ result = validate_project_name(" my-project ", "default")
+ assert result == "my-project"
+
+ def test_custom_default_name(self):
+ """Test custom default name"""
+ result = validate_project_name("", "Custom Default")
+ assert result == "Custom Default"
diff --git a/api/tests/unit_tests/core/rag/extractor/test_markdown_extractor.py b/api/tests/unit_tests/core/rag/extractor/test_markdown_extractor.py
new file mode 100644
index 0000000000..d4cf534c56
--- /dev/null
+++ b/api/tests/unit_tests/core/rag/extractor/test_markdown_extractor.py
@@ -0,0 +1,22 @@
+from core.rag.extractor.markdown_extractor import MarkdownExtractor
+
+
+def test_markdown_to_tups():
+ markdown = """
+this is some text without header
+
+# title 1
+this is balabala text
+
+## title 2
+this is more specific text.
+ """
+ extractor = MarkdownExtractor(file_path="dummy_path")
+ updated_output = extractor.markdown_to_tups(markdown)
+ assert len(updated_output) == 3
+ key, header_value = updated_output[0]
+ assert key == None
+ assert header_value.strip() == "this is some text without header"
+ title_1, value = updated_output[1]
+ assert title_1.strip() == "title 1"
+ assert value.strip() == "this is balabala text"
diff --git a/api/tests/unit_tests/core/repositories/__init__.py b/api/tests/unit_tests/core/repositories/__init__.py
new file mode 100644
index 0000000000..c65d7da61d
--- /dev/null
+++ b/api/tests/unit_tests/core/repositories/__init__.py
@@ -0,0 +1 @@
+# Unit tests for core repositories module
diff --git a/api/tests/unit_tests/core/repositories/test_factory.py b/api/tests/unit_tests/core/repositories/test_factory.py
new file mode 100644
index 0000000000..fce4a6fb6b
--- /dev/null
+++ b/api/tests/unit_tests/core/repositories/test_factory.py
@@ -0,0 +1,455 @@
+"""
+Unit tests for the RepositoryFactory.
+
+This module tests the factory pattern implementation for creating repository instances
+based on configuration, including error handling and validation.
+"""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+from pytest_mock import MockerFixture
+from sqlalchemy.engine import Engine
+from sqlalchemy.orm import sessionmaker
+
+from core.repositories.factory import DifyCoreRepositoryFactory, RepositoryImportError
+from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
+from core.workflow.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
+from models import Account, EndUser
+from models.enums import WorkflowRunTriggeredFrom
+from models.workflow import WorkflowNodeExecutionTriggeredFrom
+
+
+class TestRepositoryFactory:
+ """Test cases for RepositoryFactory."""
+
+ def test_import_class_success(self):
+ """Test successful class import."""
+ # Test importing a real class
+ class_path = "unittest.mock.MagicMock"
+ result = DifyCoreRepositoryFactory._import_class(class_path)
+ assert result is MagicMock
+
+ def test_import_class_invalid_path(self):
+ """Test import with invalid module path."""
+ with pytest.raises(RepositoryImportError) as exc_info:
+ DifyCoreRepositoryFactory._import_class("invalid.module.path")
+ assert "Cannot import repository class" in str(exc_info.value)
+
+ def test_import_class_invalid_class_name(self):
+ """Test import with invalid class name."""
+ with pytest.raises(RepositoryImportError) as exc_info:
+ DifyCoreRepositoryFactory._import_class("unittest.mock.NonExistentClass")
+ assert "Cannot import repository class" in str(exc_info.value)
+
+ def test_import_class_malformed_path(self):
+ """Test import with malformed path (no dots)."""
+ with pytest.raises(RepositoryImportError) as exc_info:
+ DifyCoreRepositoryFactory._import_class("invalidpath")
+ assert "Cannot import repository class" in str(exc_info.value)
+
+ def test_validate_repository_interface_success(self):
+ """Test successful interface validation."""
+
+ # Create a mock class that implements the required methods
+ class MockRepository:
+ def save(self):
+ pass
+
+ def get_by_id(self):
+ pass
+
+ # Create a mock interface with the same methods
+ class MockInterface:
+ def save(self):
+ pass
+
+ def get_by_id(self):
+ pass
+
+ # Should not raise an exception
+ DifyCoreRepositoryFactory._validate_repository_interface(MockRepository, MockInterface)
+
+ def test_validate_repository_interface_missing_methods(self):
+ """Test interface validation with missing methods."""
+
+ # Create a mock class that doesn't implement all required methods
+ class IncompleteRepository:
+ def save(self):
+ pass
+
+ # Missing get_by_id method
+
+ # Create a mock interface with required methods
+ class MockInterface:
+ def save(self):
+ pass
+
+ def get_by_id(self):
+ pass
+
+ with pytest.raises(RepositoryImportError) as exc_info:
+ DifyCoreRepositoryFactory._validate_repository_interface(IncompleteRepository, MockInterface)
+ assert "does not implement required methods" in str(exc_info.value)
+ assert "get_by_id" in str(exc_info.value)
+
+ def test_validate_constructor_signature_success(self):
+ """Test successful constructor signature validation."""
+
+ class MockRepository:
+ def __init__(self, session_factory, user, app_id, triggered_from):
+ pass
+
+ # Should not raise an exception
+ DifyCoreRepositoryFactory._validate_constructor_signature(
+ MockRepository, ["session_factory", "user", "app_id", "triggered_from"]
+ )
+
+ def test_validate_constructor_signature_missing_params(self):
+ """Test constructor validation with missing parameters."""
+
+ class IncompleteRepository:
+ def __init__(self, session_factory, user):
+ # Missing app_id and triggered_from parameters
+ pass
+
+ with pytest.raises(RepositoryImportError) as exc_info:
+ DifyCoreRepositoryFactory._validate_constructor_signature(
+ IncompleteRepository, ["session_factory", "user", "app_id", "triggered_from"]
+ )
+ assert "does not accept required parameters" in str(exc_info.value)
+ assert "app_id" in str(exc_info.value)
+ assert "triggered_from" in str(exc_info.value)
+
+ def test_validate_constructor_signature_inspection_error(self, mocker: MockerFixture):
+ """Test constructor validation when inspection fails."""
+ # Mock inspect.signature to raise an exception
+ mocker.patch("inspect.signature", side_effect=Exception("Inspection failed"))
+
+ class MockRepository:
+ def __init__(self, session_factory):
+ pass
+
+ with pytest.raises(RepositoryImportError) as exc_info:
+ DifyCoreRepositoryFactory._validate_constructor_signature(MockRepository, ["session_factory"])
+ assert "Failed to validate constructor signature" in str(exc_info.value)
+
+ @patch("core.repositories.factory.dify_config")
+ def test_create_workflow_execution_repository_success(self, mock_config, mocker: MockerFixture):
+ """Test successful creation of WorkflowExecutionRepository."""
+ # Setup mock configuration
+ mock_config.WORKFLOW_EXECUTION_REPOSITORY = "unittest.mock.MagicMock"
+
+ # Create mock dependencies
+ mock_session_factory = MagicMock(spec=sessionmaker)
+ mock_user = MagicMock(spec=Account)
+ app_id = "test-app-id"
+ triggered_from = WorkflowRunTriggeredFrom.APP_RUN
+
+ # Mock the imported class to be a valid repository
+ mock_repository_class = MagicMock()
+ mock_repository_instance = MagicMock(spec=WorkflowExecutionRepository)
+ mock_repository_class.return_value = mock_repository_instance
+
+ # Mock the validation methods
+ with (
+ patch.object(DifyCoreRepositoryFactory, "_import_class", return_value=mock_repository_class),
+ patch.object(DifyCoreRepositoryFactory, "_validate_repository_interface"),
+ patch.object(DifyCoreRepositoryFactory, "_validate_constructor_signature"),
+ ):
+ result = DifyCoreRepositoryFactory.create_workflow_execution_repository(
+ session_factory=mock_session_factory,
+ user=mock_user,
+ app_id=app_id,
+ triggered_from=triggered_from,
+ )
+
+ # Verify the repository was created with correct parameters
+ mock_repository_class.assert_called_once_with(
+ session_factory=mock_session_factory,
+ user=mock_user,
+ app_id=app_id,
+ triggered_from=triggered_from,
+ )
+ assert result is mock_repository_instance
+
+ @patch("core.repositories.factory.dify_config")
+ def test_create_workflow_execution_repository_import_error(self, mock_config):
+ """Test WorkflowExecutionRepository creation with import error."""
+ # Setup mock configuration with invalid class path
+ mock_config.WORKFLOW_EXECUTION_REPOSITORY = "invalid.module.InvalidClass"
+
+ mock_session_factory = MagicMock(spec=sessionmaker)
+ mock_user = MagicMock(spec=Account)
+
+ with pytest.raises(RepositoryImportError) as exc_info:
+ DifyCoreRepositoryFactory.create_workflow_execution_repository(
+ session_factory=mock_session_factory,
+ user=mock_user,
+ app_id="test-app-id",
+ triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
+ )
+ assert "Cannot import repository class" in str(exc_info.value)
+
+ @patch("core.repositories.factory.dify_config")
+ def test_create_workflow_execution_repository_validation_error(self, mock_config, mocker: MockerFixture):
+ """Test WorkflowExecutionRepository creation with validation error."""
+ # Setup mock configuration
+ mock_config.WORKFLOW_EXECUTION_REPOSITORY = "unittest.mock.MagicMock"
+
+ mock_session_factory = MagicMock(spec=sessionmaker)
+ mock_user = MagicMock(spec=Account)
+
+ # Mock import to succeed but validation to fail
+ mock_repository_class = MagicMock()
+ with (
+ patch.object(DifyCoreRepositoryFactory, "_import_class", return_value=mock_repository_class),
+ patch.object(
+ DifyCoreRepositoryFactory,
+ "_validate_repository_interface",
+ side_effect=RepositoryImportError("Interface validation failed"),
+ ),
+ ):
+ with pytest.raises(RepositoryImportError) as exc_info:
+ DifyCoreRepositoryFactory.create_workflow_execution_repository(
+ session_factory=mock_session_factory,
+ user=mock_user,
+ app_id="test-app-id",
+ triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
+ )
+ assert "Interface validation failed" in str(exc_info.value)
+
+ @patch("core.repositories.factory.dify_config")
+ def test_create_workflow_execution_repository_instantiation_error(self, mock_config, mocker: MockerFixture):
+ """Test WorkflowExecutionRepository creation with instantiation error."""
+ # Setup mock configuration
+ mock_config.WORKFLOW_EXECUTION_REPOSITORY = "unittest.mock.MagicMock"
+
+ mock_session_factory = MagicMock(spec=sessionmaker)
+ mock_user = MagicMock(spec=Account)
+
+ # Mock import and validation to succeed but instantiation to fail
+ mock_repository_class = MagicMock(side_effect=Exception("Instantiation failed"))
+ with (
+ patch.object(DifyCoreRepositoryFactory, "_import_class", return_value=mock_repository_class),
+ patch.object(DifyCoreRepositoryFactory, "_validate_repository_interface"),
+ patch.object(DifyCoreRepositoryFactory, "_validate_constructor_signature"),
+ ):
+ with pytest.raises(RepositoryImportError) as exc_info:
+ DifyCoreRepositoryFactory.create_workflow_execution_repository(
+ session_factory=mock_session_factory,
+ user=mock_user,
+ app_id="test-app-id",
+ triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
+ )
+ assert "Failed to create WorkflowExecutionRepository" in str(exc_info.value)
+
+ @patch("core.repositories.factory.dify_config")
+ def test_create_workflow_node_execution_repository_success(self, mock_config, mocker: MockerFixture):
+ """Test successful creation of WorkflowNodeExecutionRepository."""
+ # Setup mock configuration
+ mock_config.WORKFLOW_NODE_EXECUTION_REPOSITORY = "unittest.mock.MagicMock"
+
+ # Create mock dependencies
+ mock_session_factory = MagicMock(spec=sessionmaker)
+ mock_user = MagicMock(spec=EndUser)
+ app_id = "test-app-id"
+ triggered_from = WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN
+
+ # Mock the imported class to be a valid repository
+ mock_repository_class = MagicMock()
+ mock_repository_instance = MagicMock(spec=WorkflowNodeExecutionRepository)
+ mock_repository_class.return_value = mock_repository_instance
+
+ # Mock the validation methods
+ with (
+ patch.object(DifyCoreRepositoryFactory, "_import_class", return_value=mock_repository_class),
+ patch.object(DifyCoreRepositoryFactory, "_validate_repository_interface"),
+ patch.object(DifyCoreRepositoryFactory, "_validate_constructor_signature"),
+ ):
+ result = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
+ session_factory=mock_session_factory,
+ user=mock_user,
+ app_id=app_id,
+ triggered_from=triggered_from,
+ )
+
+ # Verify the repository was created with correct parameters
+ mock_repository_class.assert_called_once_with(
+ session_factory=mock_session_factory,
+ user=mock_user,
+ app_id=app_id,
+ triggered_from=triggered_from,
+ )
+ assert result is mock_repository_instance
+
+ @patch("core.repositories.factory.dify_config")
+ def test_create_workflow_node_execution_repository_import_error(self, mock_config):
+ """Test WorkflowNodeExecutionRepository creation with import error."""
+ # Setup mock configuration with invalid class path
+ mock_config.WORKFLOW_NODE_EXECUTION_REPOSITORY = "invalid.module.InvalidClass"
+
+ mock_session_factory = MagicMock(spec=sessionmaker)
+ mock_user = MagicMock(spec=EndUser)
+
+ with pytest.raises(RepositoryImportError) as exc_info:
+ DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
+ session_factory=mock_session_factory,
+ user=mock_user,
+ app_id="test-app-id",
+ triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
+ )
+ assert "Cannot import repository class" in str(exc_info.value)
+
+ def test_repository_import_error_exception(self):
+ """Test RepositoryImportError exception."""
+ error_message = "Test error message"
+ exception = RepositoryImportError(error_message)
+ assert str(exception) == error_message
+ assert isinstance(exception, Exception)
+
+ @patch("core.repositories.factory.dify_config")
+ def test_create_with_engine_instead_of_sessionmaker(self, mock_config, mocker: MockerFixture):
+ """Test repository creation with Engine instead of sessionmaker."""
+ # Setup mock configuration
+ mock_config.WORKFLOW_EXECUTION_REPOSITORY = "unittest.mock.MagicMock"
+
+ # Create mock dependencies with Engine instead of sessionmaker
+ mock_engine = MagicMock(spec=Engine)
+ mock_user = MagicMock(spec=Account)
+
+ # Mock the imported class to be a valid repository
+ mock_repository_class = MagicMock()
+ mock_repository_instance = MagicMock(spec=WorkflowExecutionRepository)
+ mock_repository_class.return_value = mock_repository_instance
+
+ # Mock the validation methods
+ with (
+ patch.object(DifyCoreRepositoryFactory, "_import_class", return_value=mock_repository_class),
+ patch.object(DifyCoreRepositoryFactory, "_validate_repository_interface"),
+ patch.object(DifyCoreRepositoryFactory, "_validate_constructor_signature"),
+ ):
+ result = DifyCoreRepositoryFactory.create_workflow_execution_repository(
+ session_factory=mock_engine, # Using Engine instead of sessionmaker
+ user=mock_user,
+ app_id="test-app-id",
+ triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
+ )
+
+ # Verify the repository was created with the Engine
+ mock_repository_class.assert_called_once_with(
+ session_factory=mock_engine,
+ user=mock_user,
+ app_id="test-app-id",
+ triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
+ )
+ assert result is mock_repository_instance
+
+ @patch("core.repositories.factory.dify_config")
+ def test_create_workflow_node_execution_repository_validation_error(self, mock_config):
+ """Test WorkflowNodeExecutionRepository creation with validation error."""
+ # Setup mock configuration
+ mock_config.WORKFLOW_NODE_EXECUTION_REPOSITORY = "unittest.mock.MagicMock"
+
+ mock_session_factory = MagicMock(spec=sessionmaker)
+ mock_user = MagicMock(spec=EndUser)
+
+ # Mock import to succeed but validation to fail
+ mock_repository_class = MagicMock()
+ with (
+ patch.object(DifyCoreRepositoryFactory, "_import_class", return_value=mock_repository_class),
+ patch.object(
+ DifyCoreRepositoryFactory,
+ "_validate_repository_interface",
+ side_effect=RepositoryImportError("Interface validation failed"),
+ ),
+ ):
+ with pytest.raises(RepositoryImportError) as exc_info:
+ DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
+ session_factory=mock_session_factory,
+ user=mock_user,
+ app_id="test-app-id",
+ triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
+ )
+ assert "Interface validation failed" in str(exc_info.value)
+
+ @patch("core.repositories.factory.dify_config")
+ def test_create_workflow_node_execution_repository_instantiation_error(self, mock_config):
+ """Test WorkflowNodeExecutionRepository creation with instantiation error."""
+ # Setup mock configuration
+ mock_config.WORKFLOW_NODE_EXECUTION_REPOSITORY = "unittest.mock.MagicMock"
+
+ mock_session_factory = MagicMock(spec=sessionmaker)
+ mock_user = MagicMock(spec=EndUser)
+
+ # Mock import and validation to succeed but instantiation to fail
+ mock_repository_class = MagicMock(side_effect=Exception("Instantiation failed"))
+ with (
+ patch.object(DifyCoreRepositoryFactory, "_import_class", return_value=mock_repository_class),
+ patch.object(DifyCoreRepositoryFactory, "_validate_repository_interface"),
+ patch.object(DifyCoreRepositoryFactory, "_validate_constructor_signature"),
+ ):
+ with pytest.raises(RepositoryImportError) as exc_info:
+ DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
+ session_factory=mock_session_factory,
+ user=mock_user,
+ app_id="test-app-id",
+ triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
+ )
+ assert "Failed to create WorkflowNodeExecutionRepository" in str(exc_info.value)
+
+ def test_validate_repository_interface_with_private_methods(self):
+ """Test interface validation ignores private methods."""
+
+ # Create a mock class with private methods
+ class MockRepository:
+ def save(self):
+ pass
+
+ def get_by_id(self):
+ pass
+
+ def _private_method(self):
+ pass
+
+ # Create a mock interface with private methods
+ class MockInterface:
+ def save(self):
+ pass
+
+ def get_by_id(self):
+ pass
+
+ def _private_method(self):
+ pass
+
+ # Should not raise an exception (private methods are ignored)
+ DifyCoreRepositoryFactory._validate_repository_interface(MockRepository, MockInterface)
+
+ def test_validate_constructor_signature_with_extra_params(self):
+ """Test constructor validation with extra parameters (should pass)."""
+
+ class MockRepository:
+ def __init__(self, session_factory, user, app_id, triggered_from, extra_param=None):
+ pass
+
+ # Should not raise an exception (extra parameters are allowed)
+ DifyCoreRepositoryFactory._validate_constructor_signature(
+ MockRepository, ["session_factory", "user", "app_id", "triggered_from"]
+ )
+
+ def test_validate_constructor_signature_with_kwargs(self):
+ """Test constructor validation with **kwargs (current implementation doesn't support this)."""
+
+ class MockRepository:
+ def __init__(self, session_factory, user, **kwargs):
+ pass
+
+ # Current implementation doesn't handle **kwargs, so this should raise an exception
+ with pytest.raises(RepositoryImportError) as exc_info:
+ DifyCoreRepositoryFactory._validate_constructor_signature(
+ MockRepository, ["session_factory", "user", "app_id", "triggered_from"]
+ )
+ assert "does not accept required parameters" in str(exc_info.value)
+ assert "app_id" in str(exc_info.value)
+ assert "triggered_from" in str(exc_info.value)
diff --git a/api/tests/unit_tests/core/tools/utils/__init__.py b/api/tests/unit_tests/core/tools/utils/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api/tests/unit_tests/core/tools/utils/test_parser.py b/api/tests/unit_tests/core/tools/utils/test_parser.py
new file mode 100644
index 0000000000..8e07293ce0
--- /dev/null
+++ b/api/tests/unit_tests/core/tools/utils/test_parser.py
@@ -0,0 +1,56 @@
+import pytest
+from flask import Flask
+
+from core.tools.utils.parser import ApiBasedToolSchemaParser
+
+
+@pytest.fixture
+def app():
+ app = Flask(__name__)
+ return app
+
+
+def test_parse_openapi_to_tool_bundle_operation_id(app):
+ openapi = {
+ "openapi": "3.0.0",
+ "info": {"title": "Simple API", "version": "1.0.0"},
+ "servers": [{"url": "http://localhost:3000"}],
+ "paths": {
+ "/": {
+ "get": {
+ "summary": "Root endpoint",
+ "responses": {
+ "200": {
+ "description": "Successful response",
+ }
+ },
+ }
+ },
+ "/api/resources": {
+ "get": {
+ "summary": "Non-root endpoint without an operationId",
+ "responses": {
+ "200": {
+ "description": "Successful response",
+ }
+ },
+ },
+ "post": {
+ "summary": "Non-root endpoint with an operationId",
+ "operationId": "createResource",
+ "responses": {
+ "201": {
+ "description": "Resource created",
+ }
+ },
+ },
+ },
+ },
+ }
+ with app.test_request_context():
+ tool_bundles = ApiBasedToolSchemaParser.parse_openapi_to_tool_bundle(openapi)
+
+ assert len(tool_bundles) == 3
+ assert tool_bundles[0].operation_id == "_get"
+ assert tool_bundles[1].operation_id == "apiresources_get"
+ assert tool_bundles[2].operation_id == "createResource"
diff --git a/api/tests/unit_tests/core/variables/test_segment.py b/api/tests/unit_tests/core/variables/test_segment.py
new file mode 100644
index 0000000000..4c8d983d20
--- /dev/null
+++ b/api/tests/unit_tests/core/variables/test_segment.py
@@ -0,0 +1,385 @@
+import dataclasses
+
+from pydantic import BaseModel
+
+from core.file import File, FileTransferMethod, FileType
+from core.helper import encrypter
+from core.variables.segments import (
+ ArrayAnySegment,
+ ArrayFileSegment,
+ ArrayNumberSegment,
+ ArrayObjectSegment,
+ ArrayStringSegment,
+ FileSegment,
+ FloatSegment,
+ IntegerSegment,
+ NoneSegment,
+ ObjectSegment,
+ Segment,
+ SegmentUnion,
+ StringSegment,
+ get_segment_discriminator,
+)
+from core.variables.types import SegmentType
+from core.variables.variables import (
+ ArrayAnyVariable,
+ ArrayFileVariable,
+ ArrayNumberVariable,
+ ArrayObjectVariable,
+ ArrayStringVariable,
+ FileVariable,
+ FloatVariable,
+ IntegerVariable,
+ NoneVariable,
+ ObjectVariable,
+ SecretVariable,
+ StringVariable,
+ Variable,
+ VariableUnion,
+)
+from core.workflow.entities.variable_pool import VariablePool
+from core.workflow.system_variable import SystemVariable
+
+
+def test_segment_group_to_text():
+ variable_pool = VariablePool(
+ system_variables=SystemVariable(user_id="fake-user-id"),
+ user_inputs={},
+ environment_variables=[
+ SecretVariable(name="secret_key", value="fake-secret-key"),
+ ],
+ conversation_variables=[],
+ )
+ variable_pool.add(("node_id", "custom_query"), "fake-user-query")
+ template = (
+ "Hello, {{#sys.user_id#}}! Your query is {{#node_id.custom_query#}}. And your key is {{#env.secret_key#}}."
+ )
+ segments_group = variable_pool.convert_template(template)
+
+ assert segments_group.text == "Hello, fake-user-id! Your query is fake-user-query. And your key is fake-secret-key."
+ assert segments_group.log == (
+ f"Hello, fake-user-id! Your query is fake-user-query."
+ f" And your key is {encrypter.obfuscated_token('fake-secret-key')}."
+ )
+
+
+def test_convert_constant_to_segment_group():
+ variable_pool = VariablePool(
+ system_variables=SystemVariable(user_id="1", app_id="1", workflow_id="1"),
+ user_inputs={},
+ environment_variables=[],
+ conversation_variables=[],
+ )
+ template = "Hello, world!"
+ segments_group = variable_pool.convert_template(template)
+ assert segments_group.text == "Hello, world!"
+ assert segments_group.log == "Hello, world!"
+
+
+def test_convert_variable_to_segment_group():
+ variable_pool = VariablePool(
+ system_variables=SystemVariable(user_id="fake-user-id"),
+ user_inputs={},
+ environment_variables=[],
+ conversation_variables=[],
+ )
+ template = "{{#sys.user_id#}}"
+ segments_group = variable_pool.convert_template(template)
+ assert segments_group.text == "fake-user-id"
+ assert segments_group.log == "fake-user-id"
+ assert isinstance(segments_group.value[0], StringVariable)
+ assert segments_group.value[0].value == "fake-user-id"
+
+
+class _Segments(BaseModel):
+ segments: list[SegmentUnion]
+
+
+class _Variables(BaseModel):
+ variables: list[VariableUnion]
+
+
+def create_test_file(
+ file_type: FileType = FileType.DOCUMENT,
+ transfer_method: FileTransferMethod = FileTransferMethod.LOCAL_FILE,
+ filename: str = "test.txt",
+ extension: str = ".txt",
+ mime_type: str = "text/plain",
+ size: int = 1024,
+) -> File:
+ """Factory function to create File objects for testing"""
+ return File(
+ tenant_id="test-tenant",
+ type=file_type,
+ transfer_method=transfer_method,
+ filename=filename,
+ extension=extension,
+ mime_type=mime_type,
+ size=size,
+ related_id="test-file-id" if transfer_method != FileTransferMethod.REMOTE_URL else None,
+ remote_url="https://example.com/file.txt" if transfer_method == FileTransferMethod.REMOTE_URL else None,
+ storage_key="test-storage-key",
+ )
+
+
+class TestSegmentDumpAndLoad:
+ """Test suite for segment and variable serialization/deserialization"""
+
+ def test_segments(self):
+ """Test basic segment serialization compatibility"""
+ model = _Segments(segments=[IntegerSegment(value=1), StringSegment(value="a")])
+ json = model.model_dump_json()
+ print("Json: ", json)
+ loaded = _Segments.model_validate_json(json)
+ assert loaded == model
+
+ def test_segment_number(self):
+ """Test number segment serialization compatibility"""
+ model = _Segments(segments=[IntegerSegment(value=1), FloatSegment(value=1.0)])
+ json = model.model_dump_json()
+ print("Json: ", json)
+ loaded = _Segments.model_validate_json(json)
+ assert loaded == model
+
+ def test_variables(self):
+ """Test variable serialization compatibility"""
+ model = _Variables(variables=[IntegerVariable(value=1, name="int"), StringVariable(value="a", name="str")])
+ json = model.model_dump_json()
+ print("Json: ", json)
+ restored = _Variables.model_validate_json(json)
+ assert restored == model
+
+ def test_all_segments_serialization(self):
+ """Test serialization/deserialization of all segment types"""
+ # Create one instance of each segment type
+ test_file = create_test_file()
+
+ all_segments: list[SegmentUnion] = [
+ NoneSegment(),
+ StringSegment(value="test string"),
+ IntegerSegment(value=42),
+ FloatSegment(value=3.14),
+ ObjectSegment(value={"key": "value", "number": 123}),
+ FileSegment(value=test_file),
+ ArrayAnySegment(value=[1, "string", 3.14, {"key": "value"}]),
+ ArrayStringSegment(value=["hello", "world"]),
+ ArrayNumberSegment(value=[1, 2.5, 3]),
+ ArrayObjectSegment(value=[{"id": 1}, {"id": 2}]),
+ ArrayFileSegment(value=[]), # Empty array to avoid file complexity
+ ]
+
+ # Test serialization and deserialization
+ model = _Segments(segments=all_segments)
+ json_str = model.model_dump_json()
+ loaded = _Segments.model_validate_json(json_str)
+
+ # Verify all segments are preserved
+ assert len(loaded.segments) == len(all_segments)
+
+ for original, loaded_segment in zip(all_segments, loaded.segments):
+ assert type(loaded_segment) == type(original)
+ assert loaded_segment.value_type == original.value_type
+
+ # For file segments, compare key properties instead of exact equality
+ if isinstance(original, FileSegment) and isinstance(loaded_segment, FileSegment):
+ orig_file = original.value
+ loaded_file = loaded_segment.value
+ assert isinstance(orig_file, File)
+ assert isinstance(loaded_file, File)
+ assert loaded_file.tenant_id == orig_file.tenant_id
+ assert loaded_file.type == orig_file.type
+ assert loaded_file.filename == orig_file.filename
+ else:
+ assert loaded_segment.value == original.value
+
+ def test_all_variables_serialization(self):
+ """Test serialization/deserialization of all variable types"""
+ # Create one instance of each variable type
+ test_file = create_test_file()
+
+ all_variables: list[VariableUnion] = [
+ NoneVariable(name="none_var"),
+ StringVariable(value="test string", name="string_var"),
+ IntegerVariable(value=42, name="int_var"),
+ FloatVariable(value=3.14, name="float_var"),
+ ObjectVariable(value={"key": "value", "number": 123}, name="object_var"),
+ FileVariable(value=test_file, name="file_var"),
+ ArrayAnyVariable(value=[1, "string", 3.14, {"key": "value"}], name="array_any_var"),
+ ArrayStringVariable(value=["hello", "world"], name="array_string_var"),
+ ArrayNumberVariable(value=[1, 2.5, 3], name="array_number_var"),
+ ArrayObjectVariable(value=[{"id": 1}, {"id": 2}], name="array_object_var"),
+ ArrayFileVariable(value=[], name="array_file_var"), # Empty array to avoid file complexity
+ ]
+
+ # Test serialization and deserialization
+ model = _Variables(variables=all_variables)
+ json_str = model.model_dump_json()
+ loaded = _Variables.model_validate_json(json_str)
+
+ # Verify all variables are preserved
+ assert len(loaded.variables) == len(all_variables)
+
+ for original, loaded_variable in zip(all_variables, loaded.variables):
+ assert type(loaded_variable) == type(original)
+ assert loaded_variable.value_type == original.value_type
+ assert loaded_variable.name == original.name
+
+ # For file variables, compare key properties instead of exact equality
+ if isinstance(original, FileVariable) and isinstance(loaded_variable, FileVariable):
+ orig_file = original.value
+ loaded_file = loaded_variable.value
+ assert isinstance(orig_file, File)
+ assert isinstance(loaded_file, File)
+ assert loaded_file.tenant_id == orig_file.tenant_id
+ assert loaded_file.type == orig_file.type
+ assert loaded_file.filename == orig_file.filename
+ else:
+ assert loaded_variable.value == original.value
+
+ def test_segment_discriminator_function_for_segment_types(self):
+ """Test the segment discriminator function"""
+
+ @dataclasses.dataclass
+ class TestCase:
+ segment: Segment
+ expected_segment_type: SegmentType
+
+ file1 = create_test_file()
+ file2 = create_test_file(filename="test2.txt")
+
+ cases = [
+ TestCase(
+ NoneSegment(),
+ SegmentType.NONE,
+ ),
+ TestCase(
+ StringSegment(value=""),
+ SegmentType.STRING,
+ ),
+ TestCase(
+ FloatSegment(value=0.0),
+ SegmentType.FLOAT,
+ ),
+ TestCase(
+ IntegerSegment(value=0),
+ SegmentType.INTEGER,
+ ),
+ TestCase(
+ ObjectSegment(value={}),
+ SegmentType.OBJECT,
+ ),
+ TestCase(
+ FileSegment(value=file1),
+ SegmentType.FILE,
+ ),
+ TestCase(
+ ArrayAnySegment(value=[0, 0.0, ""]),
+ SegmentType.ARRAY_ANY,
+ ),
+ TestCase(
+ ArrayStringSegment(value=[""]),
+ SegmentType.ARRAY_STRING,
+ ),
+ TestCase(
+ ArrayNumberSegment(value=[0, 0.0]),
+ SegmentType.ARRAY_NUMBER,
+ ),
+ TestCase(
+ ArrayObjectSegment(value=[{}]),
+ SegmentType.ARRAY_OBJECT,
+ ),
+ TestCase(
+ ArrayFileSegment(value=[file1, file2]),
+ SegmentType.ARRAY_FILE,
+ ),
+ ]
+
+ for test_case in cases:
+ segment = test_case.segment
+ assert get_segment_discriminator(segment) == test_case.expected_segment_type, (
+ f"get_segment_discriminator failed for type {type(segment)}"
+ )
+ model_dict = segment.model_dump(mode="json")
+ assert get_segment_discriminator(model_dict) == test_case.expected_segment_type, (
+ f"get_segment_discriminator failed for serialized form of type {type(segment)}"
+ )
+
+ def test_variable_discriminator_function_for_variable_types(self):
+ """Test the variable discriminator function"""
+
+ @dataclasses.dataclass
+ class TestCase:
+ variable: Variable
+ expected_segment_type: SegmentType
+
+ file1 = create_test_file()
+ file2 = create_test_file(filename="test2.txt")
+
+ cases = [
+ TestCase(
+ NoneVariable(name="none_var"),
+ SegmentType.NONE,
+ ),
+ TestCase(
+ StringVariable(value="test", name="string_var"),
+ SegmentType.STRING,
+ ),
+ TestCase(
+ FloatVariable(value=0.0, name="float_var"),
+ SegmentType.FLOAT,
+ ),
+ TestCase(
+ IntegerVariable(value=0, name="int_var"),
+ SegmentType.INTEGER,
+ ),
+ TestCase(
+ ObjectVariable(value={}, name="object_var"),
+ SegmentType.OBJECT,
+ ),
+ TestCase(
+ FileVariable(value=file1, name="file_var"),
+ SegmentType.FILE,
+ ),
+ TestCase(
+ SecretVariable(value="secret", name="secret_var"),
+ SegmentType.SECRET,
+ ),
+ TestCase(
+ ArrayAnyVariable(value=[0, 0.0, ""], name="array_any_var"),
+ SegmentType.ARRAY_ANY,
+ ),
+ TestCase(
+ ArrayStringVariable(value=[""], name="array_string_var"),
+ SegmentType.ARRAY_STRING,
+ ),
+ TestCase(
+ ArrayNumberVariable(value=[0, 0.0], name="array_number_var"),
+ SegmentType.ARRAY_NUMBER,
+ ),
+ TestCase(
+ ArrayObjectVariable(value=[{}], name="array_object_var"),
+ SegmentType.ARRAY_OBJECT,
+ ),
+ TestCase(
+ ArrayFileVariable(value=[file1, file2], name="array_file_var"),
+ SegmentType.ARRAY_FILE,
+ ),
+ ]
+
+ for test_case in cases:
+ variable = test_case.variable
+ assert get_segment_discriminator(variable) == test_case.expected_segment_type, (
+ f"get_segment_discriminator failed for type {type(variable)}"
+ )
+ model_dict = variable.model_dump(mode="json")
+ assert get_segment_discriminator(model_dict) == test_case.expected_segment_type, (
+ f"get_segment_discriminator failed for serialized form of type {type(variable)}"
+ )
+
+ def test_invalid_value_for_discriminator(self):
+ # Test invalid cases
+ assert get_segment_discriminator({"value_type": "invalid"}) is None
+ assert get_segment_discriminator({}) is None
+ assert get_segment_discriminator("not_a_dict") is None
+ assert get_segment_discriminator(42) is None
+ assert get_segment_discriminator(object) is None
diff --git a/api/tests/unit_tests/core/variables/test_segment_type.py b/api/tests/unit_tests/core/variables/test_segment_type.py
new file mode 100644
index 0000000000..64d0d8c7e7
--- /dev/null
+++ b/api/tests/unit_tests/core/variables/test_segment_type.py
@@ -0,0 +1,60 @@
+from core.variables.types import SegmentType
+
+
+class TestSegmentTypeIsArrayType:
+ """
+ Test class for SegmentType.is_array_type method.
+
+ Provides comprehensive coverage of all SegmentType values to ensure
+ correct identification of array and non-array types.
+ """
+
+ def test_is_array_type(self):
+ """
+ Test that all SegmentType enum values are covered in our test cases.
+
+ Ensures comprehensive coverage by verifying that every SegmentType
+ value is tested for the is_array_type method.
+ """
+ # Arrange
+ all_segment_types = set(SegmentType)
+ expected_array_types = [
+ SegmentType.ARRAY_ANY,
+ SegmentType.ARRAY_STRING,
+ SegmentType.ARRAY_NUMBER,
+ SegmentType.ARRAY_OBJECT,
+ SegmentType.ARRAY_FILE,
+ ]
+ expected_non_array_types = [
+ SegmentType.INTEGER,
+ SegmentType.FLOAT,
+ SegmentType.NUMBER,
+ SegmentType.STRING,
+ SegmentType.OBJECT,
+ SegmentType.SECRET,
+ SegmentType.FILE,
+ SegmentType.NONE,
+ SegmentType.GROUP,
+ ]
+
+ for seg_type in expected_array_types:
+ assert seg_type.is_array_type()
+
+ for seg_type in expected_non_array_types:
+ assert not seg_type.is_array_type()
+
+ # Act & Assert
+ covered_types = set(expected_array_types) | set(expected_non_array_types)
+ assert covered_types == set(SegmentType), "All SegmentType values should be covered in tests"
+
+ def test_all_enum_values_are_supported(self):
+ """
+ Test that all enum values are supported and return boolean values.
+
+ Validates that every SegmentType enum value can be processed by
+ is_array_type method and returns a boolean value.
+ """
+ enum_values: list[SegmentType] = list(SegmentType)
+ for seg_type in enum_values:
+ is_array = seg_type.is_array_type()
+ assert isinstance(is_array, bool), f"is_array_type does not return a boolean for segment type {seg_type}"
diff --git a/api/tests/unit_tests/core/app/segments/test_variables.py b/api/tests/unit_tests/core/variables/test_variables.py
similarity index 95%
rename from api/tests/unit_tests/core/app/segments/test_variables.py
rename to api/tests/unit_tests/core/variables/test_variables.py
index 426557c716..925142892c 100644
--- a/api/tests/unit_tests/core/app/segments/test_variables.py
+++ b/api/tests/unit_tests/core/variables/test_variables.py
@@ -11,6 +11,7 @@ from core.variables import (
SegmentType,
StringVariable,
)
+from core.variables.variables import Variable
def test_frozen_variables():
@@ -75,7 +76,7 @@ def test_object_variable_to_object():
def test_variable_to_object():
- var = StringVariable(name="text", value="text")
+ var: Variable = StringVariable(name="text", value="text")
assert var.to_object() == "text"
var = IntegerVariable(name="integer", value=42)
assert var.to_object() == 42
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/entities/test_graph_runtime_state.py b/api/tests/unit_tests/core/workflow/graph_engine/entities/test_graph_runtime_state.py
new file mode 100644
index 0000000000..cf7cee8710
--- /dev/null
+++ b/api/tests/unit_tests/core/workflow/graph_engine/entities/test_graph_runtime_state.py
@@ -0,0 +1,146 @@
+import time
+from decimal import Decimal
+
+from core.model_runtime.entities.llm_entities import LLMUsage
+from core.workflow.entities.variable_pool import VariablePool
+from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
+from core.workflow.graph_engine.entities.runtime_route_state import RuntimeRouteState
+from core.workflow.system_variable import SystemVariable
+
+
+def create_test_graph_runtime_state() -> GraphRuntimeState:
+ """Factory function to create a GraphRuntimeState with non-empty values for testing."""
+ # Create a variable pool with system variables
+ system_vars = SystemVariable(
+ user_id="test_user_123",
+ app_id="test_app_456",
+ workflow_id="test_workflow_789",
+ workflow_execution_id="test_execution_001",
+ query="test query",
+ conversation_id="test_conv_123",
+ dialogue_count=5,
+ )
+ variable_pool = VariablePool(system_variables=system_vars)
+
+ # Add some variables to the variable pool
+ variable_pool.add(["test_node", "test_var"], "test_value")
+ variable_pool.add(["another_node", "another_var"], 42)
+
+ # Create LLM usage with realistic values
+ llm_usage = LLMUsage(
+ prompt_tokens=150,
+ prompt_unit_price=Decimal("0.001"),
+ prompt_price_unit=Decimal(1000),
+ prompt_price=Decimal("0.15"),
+ completion_tokens=75,
+ completion_unit_price=Decimal("0.002"),
+ completion_price_unit=Decimal(1000),
+ completion_price=Decimal("0.15"),
+ total_tokens=225,
+ total_price=Decimal("0.30"),
+ currency="USD",
+ latency=1.25,
+ )
+
+ # Create runtime route state with some node states
+ node_run_state = RuntimeRouteState()
+ node_state = node_run_state.create_node_state("test_node_1")
+ node_run_state.add_route(node_state.id, "target_node_id")
+
+ return GraphRuntimeState(
+ variable_pool=variable_pool,
+ start_at=time.perf_counter(),
+ total_tokens=100,
+ llm_usage=llm_usage,
+ outputs={
+ "string_output": "test result",
+ "int_output": 42,
+ "float_output": 3.14,
+ "list_output": ["item1", "item2", "item3"],
+ "dict_output": {"key1": "value1", "key2": 123},
+ "nested_dict": {"level1": {"level2": ["nested", "list", 456]}},
+ },
+ node_run_steps=5,
+ node_run_state=node_run_state,
+ )
+
+
+def test_basic_round_trip_serialization():
+ """Test basic round-trip serialization ensures GraphRuntimeState values remain unchanged."""
+ # Create a state with non-empty values
+ original_state = create_test_graph_runtime_state()
+
+ # Serialize to JSON and deserialize back
+ json_data = original_state.model_dump_json()
+ deserialized_state = GraphRuntimeState.model_validate_json(json_data)
+
+ # Core test: ensure the round-trip preserves all values
+ assert deserialized_state == original_state
+
+ # Serialize to JSON and deserialize back
+ dict_data = original_state.model_dump(mode="python")
+ deserialized_state = GraphRuntimeState.model_validate(dict_data)
+ assert deserialized_state == original_state
+
+ # Serialize to JSON and deserialize back
+ dict_data = original_state.model_dump(mode="json")
+ deserialized_state = GraphRuntimeState.model_validate(dict_data)
+ assert deserialized_state == original_state
+
+
+def test_outputs_field_round_trip():
+ """Test the problematic outputs field maintains values through round-trip serialization."""
+ original_state = create_test_graph_runtime_state()
+
+ # Serialize and deserialize
+ json_data = original_state.model_dump_json()
+ deserialized_state = GraphRuntimeState.model_validate_json(json_data)
+
+ # Verify the outputs field specifically maintains its values
+ assert deserialized_state.outputs == original_state.outputs
+ assert deserialized_state == original_state
+
+
+def test_empty_outputs_round_trip():
+ """Test round-trip serialization with empty outputs field."""
+ variable_pool = VariablePool.empty()
+ original_state = GraphRuntimeState(
+ variable_pool=variable_pool,
+ start_at=time.perf_counter(),
+ outputs={}, # Empty outputs
+ )
+
+ json_data = original_state.model_dump_json()
+ deserialized_state = GraphRuntimeState.model_validate_json(json_data)
+
+ assert deserialized_state == original_state
+
+
+def test_llm_usage_round_trip():
+ # Create LLM usage with specific decimal values
+ llm_usage = LLMUsage(
+ prompt_tokens=100,
+ prompt_unit_price=Decimal("0.0015"),
+ prompt_price_unit=Decimal(1000),
+ prompt_price=Decimal("0.15"),
+ completion_tokens=50,
+ completion_unit_price=Decimal("0.003"),
+ completion_price_unit=Decimal(1000),
+ completion_price=Decimal("0.15"),
+ total_tokens=150,
+ total_price=Decimal("0.30"),
+ currency="USD",
+ latency=2.5,
+ )
+
+ json_data = llm_usage.model_dump_json()
+ deserialized = LLMUsage.model_validate_json(json_data)
+ assert deserialized == llm_usage
+
+ dict_data = llm_usage.model_dump(mode="python")
+ deserialized = LLMUsage.model_validate(dict_data)
+ assert deserialized == llm_usage
+
+ dict_data = llm_usage.model_dump(mode="json")
+ deserialized = LLMUsage.model_validate(dict_data)
+ assert deserialized == llm_usage
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/entities/test_node_run_state.py b/api/tests/unit_tests/core/workflow/graph_engine/entities/test_node_run_state.py
new file mode 100644
index 0000000000..f3de42479a
--- /dev/null
+++ b/api/tests/unit_tests/core/workflow/graph_engine/entities/test_node_run_state.py
@@ -0,0 +1,401 @@
+import json
+import uuid
+from datetime import UTC, datetime
+
+import pytest
+from pydantic import ValidationError
+
+from core.workflow.entities.node_entities import NodeRunResult
+from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
+from core.workflow.graph_engine.entities.runtime_route_state import RouteNodeState, RuntimeRouteState
+
+_TEST_DATETIME = datetime(2024, 1, 15, 10, 30, 45)
+
+
+class TestRouteNodeStateSerialization:
+ """Test cases for RouteNodeState Pydantic serialization/deserialization."""
+
+ def _test_route_node_state(self):
+ """Test comprehensive RouteNodeState serialization with all core fields validation."""
+
+ node_run_result = NodeRunResult(
+ status=WorkflowNodeExecutionStatus.SUCCEEDED,
+ inputs={"input_key": "input_value"},
+ outputs={"output_key": "output_value"},
+ )
+
+ node_state = RouteNodeState(
+ node_id="comprehensive_test_node",
+ start_at=_TEST_DATETIME,
+ finished_at=_TEST_DATETIME,
+ status=RouteNodeState.Status.SUCCESS,
+ node_run_result=node_run_result,
+ index=5,
+ paused_at=_TEST_DATETIME,
+ paused_by="user_123",
+ failed_reason="test_reason",
+ )
+ return node_state
+
+ def test_route_node_state_comprehensive_field_validation(self):
+ """Test comprehensive RouteNodeState serialization with all core fields validation."""
+ node_state = self._test_route_node_state()
+ serialized = node_state.model_dump()
+
+ # Comprehensive validation of all RouteNodeState fields
+ assert serialized["node_id"] == "comprehensive_test_node"
+ assert serialized["status"] == RouteNodeState.Status.SUCCESS
+ assert serialized["start_at"] == _TEST_DATETIME
+ assert serialized["finished_at"] == _TEST_DATETIME
+ assert serialized["paused_at"] == _TEST_DATETIME
+ assert serialized["paused_by"] == "user_123"
+ assert serialized["failed_reason"] == "test_reason"
+ assert serialized["index"] == 5
+ assert "id" in serialized
+ assert isinstance(serialized["id"], str)
+ uuid.UUID(serialized["id"]) # Validate UUID format
+
+ # Validate nested NodeRunResult structure
+ assert serialized["node_run_result"] is not None
+ assert serialized["node_run_result"]["status"] == WorkflowNodeExecutionStatus.SUCCEEDED
+ assert serialized["node_run_result"]["inputs"] == {"input_key": "input_value"}
+ assert serialized["node_run_result"]["outputs"] == {"output_key": "output_value"}
+
+ def test_route_node_state_minimal_required_fields(self):
+ """Test RouteNodeState with only required fields, focusing on defaults."""
+ node_state = RouteNodeState(node_id="minimal_node", start_at=_TEST_DATETIME)
+
+ serialized = node_state.model_dump()
+
+ # Focus on required fields and default values (not re-testing all fields)
+ assert serialized["node_id"] == "minimal_node"
+ assert serialized["start_at"] == _TEST_DATETIME
+ assert serialized["status"] == RouteNodeState.Status.RUNNING # Default status
+ assert serialized["index"] == 1 # Default index
+ assert serialized["node_run_result"] is None # Default None
+ json = node_state.model_dump_json()
+ deserialized = RouteNodeState.model_validate_json(json)
+ assert deserialized == node_state
+
+ def test_route_node_state_deserialization_from_dict(self):
+ """Test RouteNodeState deserialization from dictionary data."""
+ test_datetime = datetime(2024, 1, 15, 10, 30, 45)
+ test_id = str(uuid.uuid4())
+
+ dict_data = {
+ "id": test_id,
+ "node_id": "deserialized_node",
+ "start_at": test_datetime,
+ "status": "success",
+ "finished_at": test_datetime,
+ "index": 3,
+ }
+
+ node_state = RouteNodeState.model_validate(dict_data)
+
+ # Focus on deserialization accuracy
+ assert node_state.id == test_id
+ assert node_state.node_id == "deserialized_node"
+ assert node_state.start_at == test_datetime
+ assert node_state.status == RouteNodeState.Status.SUCCESS
+ assert node_state.finished_at == test_datetime
+ assert node_state.index == 3
+
+ def test_route_node_state_round_trip_consistency(self):
+ node_states = (
+ self._test_route_node_state(),
+ RouteNodeState(node_id="minimal_node", start_at=_TEST_DATETIME),
+ )
+ for node_state in node_states:
+ json = node_state.model_dump_json()
+ deserialized = RouteNodeState.model_validate_json(json)
+ assert deserialized == node_state
+
+ dict_ = node_state.model_dump(mode="python")
+ deserialized = RouteNodeState.model_validate(dict_)
+ assert deserialized == node_state
+
+ dict_ = node_state.model_dump(mode="json")
+ deserialized = RouteNodeState.model_validate(dict_)
+ assert deserialized == node_state
+
+
+class TestRouteNodeStateEnumSerialization:
+ """Dedicated tests for RouteNodeState Status enum serialization behavior."""
+
+ def test_status_enum_model_dump_behavior(self):
+ """Test Status enum serialization in model_dump() returns enum objects."""
+
+ for status_enum in RouteNodeState.Status:
+ node_state = RouteNodeState(node_id="enum_test", start_at=_TEST_DATETIME, status=status_enum)
+ serialized = node_state.model_dump(mode="python")
+ assert serialized["status"] == status_enum
+ serialized = node_state.model_dump(mode="json")
+ assert serialized["status"] == status_enum.value
+
+ def test_status_enum_json_serialization_behavior(self):
+ """Test Status enum serialization in JSON returns string values."""
+ test_datetime = datetime(2024, 1, 15, 10, 30, 45)
+
+ enum_to_string_mapping = {
+ RouteNodeState.Status.RUNNING: "running",
+ RouteNodeState.Status.SUCCESS: "success",
+ RouteNodeState.Status.FAILED: "failed",
+ RouteNodeState.Status.PAUSED: "paused",
+ RouteNodeState.Status.EXCEPTION: "exception",
+ }
+
+ for status_enum, expected_string in enum_to_string_mapping.items():
+ node_state = RouteNodeState(node_id="json_enum_test", start_at=test_datetime, status=status_enum)
+
+ json_data = json.loads(node_state.model_dump_json())
+ assert json_data["status"] == expected_string
+
+ def test_status_enum_deserialization_from_string(self):
+ """Test Status enum deserialization from string values."""
+ test_datetime = datetime(2024, 1, 15, 10, 30, 45)
+
+ string_to_enum_mapping = {
+ "running": RouteNodeState.Status.RUNNING,
+ "success": RouteNodeState.Status.SUCCESS,
+ "failed": RouteNodeState.Status.FAILED,
+ "paused": RouteNodeState.Status.PAUSED,
+ "exception": RouteNodeState.Status.EXCEPTION,
+ }
+
+ for status_string, expected_enum in string_to_enum_mapping.items():
+ dict_data = {
+ "node_id": "enum_deserialize_test",
+ "start_at": test_datetime,
+ "status": status_string,
+ }
+
+ node_state = RouteNodeState.model_validate(dict_data)
+ assert node_state.status == expected_enum
+
+
+class TestRuntimeRouteStateSerialization:
+ """Test cases for RuntimeRouteState Pydantic serialization/deserialization."""
+
+ _NODE1_ID = "node_1"
+ _ROUTE_STATE1_ID = str(uuid.uuid4())
+ _NODE2_ID = "node_2"
+ _ROUTE_STATE2_ID = str(uuid.uuid4())
+ _NODE3_ID = "node_3"
+ _ROUTE_STATE3_ID = str(uuid.uuid4())
+
+ def _get_runtime_route_state(self):
+ # Create node states with different configurations
+ node_state_1 = RouteNodeState(
+ id=self._ROUTE_STATE1_ID,
+ node_id=self._NODE1_ID,
+ start_at=_TEST_DATETIME,
+ index=1,
+ )
+ node_state_2 = RouteNodeState(
+ id=self._ROUTE_STATE2_ID,
+ node_id=self._NODE2_ID,
+ start_at=_TEST_DATETIME,
+ status=RouteNodeState.Status.SUCCESS,
+ finished_at=_TEST_DATETIME,
+ index=2,
+ )
+ node_state_3 = RouteNodeState(
+ id=self._ROUTE_STATE3_ID,
+ node_id=self._NODE3_ID,
+ start_at=_TEST_DATETIME,
+ status=RouteNodeState.Status.FAILED,
+ failed_reason="Test failure",
+ index=3,
+ )
+
+ runtime_state = RuntimeRouteState(
+ routes={node_state_1.id: [node_state_2.id, node_state_3.id], node_state_2.id: [node_state_3.id]},
+ node_state_mapping={
+ node_state_1.id: node_state_1,
+ node_state_2.id: node_state_2,
+ node_state_3.id: node_state_3,
+ },
+ )
+
+ return runtime_state
+
+ def test_runtime_route_state_comprehensive_structure_validation(self):
+ """Test comprehensive RuntimeRouteState serialization with full structure validation."""
+
+ runtime_state = self._get_runtime_route_state()
+ serialized = runtime_state.model_dump()
+
+ # Comprehensive validation of RuntimeRouteState structure
+ assert "routes" in serialized
+ assert "node_state_mapping" in serialized
+ assert isinstance(serialized["routes"], dict)
+ assert isinstance(serialized["node_state_mapping"], dict)
+
+ # Validate routes dictionary structure and content
+ assert len(serialized["routes"]) == 2
+ assert self._ROUTE_STATE1_ID in serialized["routes"]
+ assert self._ROUTE_STATE2_ID in serialized["routes"]
+ assert serialized["routes"][self._ROUTE_STATE1_ID] == [self._ROUTE_STATE2_ID, self._ROUTE_STATE3_ID]
+ assert serialized["routes"][self._ROUTE_STATE2_ID] == [self._ROUTE_STATE3_ID]
+
+ # Validate node_state_mapping dictionary structure and content
+ assert len(serialized["node_state_mapping"]) == 3
+ for state_id in [
+ self._ROUTE_STATE1_ID,
+ self._ROUTE_STATE2_ID,
+ self._ROUTE_STATE3_ID,
+ ]:
+ assert state_id in serialized["node_state_mapping"]
+ node_data = serialized["node_state_mapping"][state_id]
+ node_state = runtime_state.node_state_mapping[state_id]
+ assert node_data["node_id"] == node_state.node_id
+ assert node_data["status"] == node_state.status
+ assert node_data["index"] == node_state.index
+
+ def test_runtime_route_state_empty_collections(self):
+ """Test RuntimeRouteState with empty collections, focusing on default behavior."""
+ runtime_state = RuntimeRouteState()
+ serialized = runtime_state.model_dump()
+
+ # Focus on default empty collection behavior
+ assert serialized["routes"] == {}
+ assert serialized["node_state_mapping"] == {}
+ assert isinstance(serialized["routes"], dict)
+ assert isinstance(serialized["node_state_mapping"], dict)
+
+ def test_runtime_route_state_json_serialization_structure(self):
+ """Test RuntimeRouteState JSON serialization structure."""
+ node_state = RouteNodeState(node_id="json_node", start_at=_TEST_DATETIME)
+
+ runtime_state = RuntimeRouteState(
+ routes={"source": ["target1", "target2"]}, node_state_mapping={node_state.id: node_state}
+ )
+
+ json_str = runtime_state.model_dump_json()
+ json_data = json.loads(json_str)
+
+ # Focus on JSON structure validation
+ assert isinstance(json_str, str)
+ assert isinstance(json_data, dict)
+ assert "routes" in json_data
+ assert "node_state_mapping" in json_data
+ assert json_data["routes"]["source"] == ["target1", "target2"]
+ assert node_state.id in json_data["node_state_mapping"]
+
+ def test_runtime_route_state_deserialization_from_dict(self):
+ """Test RuntimeRouteState deserialization from dictionary data."""
+ node_id = str(uuid.uuid4())
+
+ dict_data = {
+ "routes": {"source_node": ["target_node_1", "target_node_2"]},
+ "node_state_mapping": {
+ node_id: {
+ "id": node_id,
+ "node_id": "test_node",
+ "start_at": _TEST_DATETIME,
+ "status": "running",
+ "index": 1,
+ }
+ },
+ }
+
+ runtime_state = RuntimeRouteState.model_validate(dict_data)
+
+ # Focus on deserialization accuracy
+ assert runtime_state.routes == {"source_node": ["target_node_1", "target_node_2"]}
+ assert len(runtime_state.node_state_mapping) == 1
+ assert node_id in runtime_state.node_state_mapping
+
+ deserialized_node = runtime_state.node_state_mapping[node_id]
+ assert deserialized_node.node_id == "test_node"
+ assert deserialized_node.status == RouteNodeState.Status.RUNNING
+ assert deserialized_node.index == 1
+
+ def test_runtime_route_state_round_trip_consistency(self):
+ """Test RuntimeRouteState round-trip serialization consistency."""
+ original = self._get_runtime_route_state()
+
+ # Dictionary round trip
+ dict_data = original.model_dump(mode="python")
+ reconstructed = RuntimeRouteState.model_validate(dict_data)
+ assert reconstructed == original
+
+ dict_data = original.model_dump(mode="json")
+ reconstructed = RuntimeRouteState.model_validate(dict_data)
+ assert reconstructed == original
+
+ # JSON round trip
+ json_str = original.model_dump_json()
+ json_reconstructed = RuntimeRouteState.model_validate_json(json_str)
+ assert json_reconstructed == original
+
+
+class TestSerializationEdgeCases:
+ """Test edge cases and error conditions for serialization/deserialization."""
+
+ def test_invalid_status_deserialization(self):
+ """Test deserialization with invalid status values."""
+ test_datetime = _TEST_DATETIME
+ invalid_data = {
+ "node_id": "invalid_test",
+ "start_at": test_datetime,
+ "status": "invalid_status",
+ }
+
+ with pytest.raises(ValidationError) as exc_info:
+ RouteNodeState.model_validate(invalid_data)
+ assert "status" in str(exc_info.value)
+
+ def test_missing_required_fields_deserialization(self):
+ """Test deserialization with missing required fields."""
+ incomplete_data = {"id": str(uuid.uuid4())}
+
+ with pytest.raises(ValidationError) as exc_info:
+ RouteNodeState.model_validate(incomplete_data)
+ error_str = str(exc_info.value)
+ assert "node_id" in error_str or "start_at" in error_str
+
+ def test_invalid_datetime_deserialization(self):
+ """Test deserialization with invalid datetime values."""
+ invalid_data = {
+ "node_id": "datetime_test",
+ "start_at": "invalid_datetime",
+ "status": "running",
+ }
+
+ with pytest.raises(ValidationError) as exc_info:
+ RouteNodeState.model_validate(invalid_data)
+ assert "start_at" in str(exc_info.value)
+
+ def test_invalid_routes_structure_deserialization(self):
+ """Test RuntimeRouteState deserialization with invalid routes structure."""
+ invalid_data = {
+ "routes": "invalid_routes_structure", # Should be dict
+ "node_state_mapping": {},
+ }
+
+ with pytest.raises(ValidationError) as exc_info:
+ RuntimeRouteState.model_validate(invalid_data)
+ assert "routes" in str(exc_info.value)
+
+ def test_timezone_handling_in_datetime_fields(self):
+ """Test timezone handling in datetime field serialization."""
+ utc_datetime = datetime.now(UTC)
+ naive_datetime = utc_datetime.replace(tzinfo=None)
+
+ node_state = RouteNodeState(node_id="timezone_test", start_at=naive_datetime)
+ dict_ = node_state.model_dump()
+
+ assert dict_["start_at"] == naive_datetime
+
+ # Test round trip
+ reconstructed = RouteNodeState.model_validate(dict_)
+ assert reconstructed.start_at == naive_datetime
+ assert reconstructed.start_at.tzinfo is None
+
+ json = node_state.model_dump_json()
+
+ reconstructed = RouteNodeState.model_validate_json(json)
+ assert reconstructed.start_at == naive_datetime
+ assert reconstructed.start_at.tzinfo is None
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_graph_engine.py b/api/tests/unit_tests/core/workflow/graph_engine/test_graph_engine.py
index 7535ec4866..ed4e42425e 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_graph_engine.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_graph_engine.py
@@ -1,3 +1,4 @@
+import time
from unittest.mock import patch
import pytest
@@ -7,7 +8,6 @@ from core.app.entities.app_invoke_entities import InvokeFrom
from core.workflow.entities.node_entities import NodeRunResult, WorkflowNodeExecutionMetadataKey
from core.workflow.entities.variable_pool import VariablePool
from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.event import (
BaseNodeEvent,
GraphRunFailedEvent,
@@ -19,12 +19,14 @@ from core.workflow.graph_engine.entities.event import (
NodeRunSucceededEvent,
)
from core.workflow.graph_engine.entities.graph import Graph
+from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
from core.workflow.graph_engine.entities.runtime_route_state import RouteNodeState
from core.workflow.graph_engine.graph_engine import GraphEngine
from core.workflow.nodes.code.code_node import CodeNode
from core.workflow.nodes.event import RunCompletedEvent, RunStreamChunkEvent
from core.workflow.nodes.llm.node import LLMNode
from core.workflow.nodes.question_classifier.question_classifier_node import QuestionClassifierNode
+from core.workflow.system_variable import SystemVariable
from models.enums import UserFrom
from models.workflow import WorkflowType
@@ -169,9 +171,11 @@ def test_run_parallel_in_workflow(mock_close, mock_remove):
graph = Graph.init(graph_config=graph_config)
variable_pool = VariablePool(
- system_variables={SystemVariableKey.FILES: [], SystemVariableKey.USER_ID: "aaa"}, user_inputs={"query": "hi"}
+ system_variables=SystemVariable(user_id="aaa", app_id="1", workflow_id="1", files=[]),
+ user_inputs={"query": "hi"},
)
+ graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
graph_engine = GraphEngine(
tenant_id="111",
app_id="222",
@@ -183,7 +187,7 @@ def test_run_parallel_in_workflow(mock_close, mock_remove):
invoke_from=InvokeFrom.WEB_APP,
call_depth=0,
graph=graph,
- variable_pool=variable_pool,
+ graph_runtime_state=graph_runtime_state,
max_execution_steps=500,
max_execution_time=1200,
)
@@ -290,15 +294,16 @@ def test_run_parallel_in_chatflow(mock_close, mock_remove):
graph = Graph.init(graph_config=graph_config)
variable_pool = VariablePool(
- system_variables={
- SystemVariableKey.QUERY: "what's the weather in SF",
- SystemVariableKey.FILES: [],
- SystemVariableKey.CONVERSATION_ID: "abababa",
- SystemVariableKey.USER_ID: "aaa",
- },
+ system_variables=SystemVariable(
+ user_id="aaa",
+ files=[],
+ query="what's the weather in SF",
+ conversation_id="abababa",
+ ),
user_inputs={},
)
+ graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
graph_engine = GraphEngine(
tenant_id="111",
app_id="222",
@@ -310,7 +315,7 @@ def test_run_parallel_in_chatflow(mock_close, mock_remove):
invoke_from=InvokeFrom.WEB_APP,
call_depth=0,
graph=graph,
- variable_pool=variable_pool,
+ graph_runtime_state=graph_runtime_state,
max_execution_steps=500,
max_execution_time=1200,
)
@@ -470,15 +475,16 @@ def test_run_branch(mock_close, mock_remove):
graph = Graph.init(graph_config=graph_config)
variable_pool = VariablePool(
- system_variables={
- SystemVariableKey.QUERY: "hi",
- SystemVariableKey.FILES: [],
- SystemVariableKey.CONVERSATION_ID: "abababa",
- SystemVariableKey.USER_ID: "aaa",
- },
+ system_variables=SystemVariable(
+ user_id="aaa",
+ files=[],
+ query="hi",
+ conversation_id="abababa",
+ ),
user_inputs={"uid": "takato"},
)
+ graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
graph_engine = GraphEngine(
tenant_id="111",
app_id="222",
@@ -490,7 +496,7 @@ def test_run_branch(mock_close, mock_remove):
invoke_from=InvokeFrom.WEB_APP,
call_depth=0,
graph=graph,
- variable_pool=variable_pool,
+ graph_runtime_state=graph_runtime_state,
max_execution_steps=500,
max_execution_time=1200,
)
@@ -799,20 +805,25 @@ def test_condition_parallel_correct_output(mock_close, mock_remove, app):
# construct variable pool
pool = VariablePool(
- system_variables={
- SystemVariableKey.QUERY: "dify",
- SystemVariableKey.FILES: [],
- SystemVariableKey.CONVERSATION_ID: "abababa",
- SystemVariableKey.USER_ID: "1",
- },
+ system_variables=SystemVariable(
+ user_id="1",
+ files=[],
+ query="dify",
+ conversation_id="abababa",
+ ),
user_inputs={},
environment_variables=[],
)
pool.add(["pe", "list_output"], ["dify-1", "dify-2"])
variable_pool = VariablePool(
- system_variables={SystemVariableKey.FILES: [], SystemVariableKey.USER_ID: "aaa"}, user_inputs={"query": "hi"}
+ system_variables=SystemVariable(
+ user_id="aaa",
+ files=[],
+ ),
+ user_inputs={"query": "hi"},
)
+ graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
graph_engine = GraphEngine(
tenant_id="111",
app_id="222",
@@ -824,7 +835,7 @@ def test_condition_parallel_correct_output(mock_close, mock_remove, app):
invoke_from=InvokeFrom.WEB_APP,
call_depth=0,
graph=graph,
- variable_pool=variable_pool,
+ graph_runtime_state=graph_runtime_state,
max_execution_steps=500,
max_execution_time=1200,
)
diff --git a/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py b/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py
index b7f78d91fa..1ef024f46b 100644
--- a/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py
+++ b/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py
@@ -5,11 +5,11 @@ from unittest.mock import MagicMock
from core.app.entities.app_invoke_entities import InvokeFrom
from core.workflow.entities.variable_pool import VariablePool
from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.graph import Graph
from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
from core.workflow.nodes.answer.answer_node import AnswerNode
+from core.workflow.system_variable import SystemVariable
from extensions.ext_database import db
from models.enums import UserFrom
from models.workflow import WorkflowType
@@ -51,28 +51,33 @@ def test_execute_answer():
# construct variable pool
pool = VariablePool(
- system_variables={SystemVariableKey.FILES: [], SystemVariableKey.USER_ID: "aaa"},
+ system_variables=SystemVariable(user_id="aaa", files=[]),
user_inputs={},
environment_variables=[],
)
pool.add(["start", "weather"], "sunny")
pool.add(["llm", "text"], "You are a helpful AI.")
+ node_config = {
+ "id": "answer",
+ "data": {
+ "title": "123",
+ "type": "answer",
+ "answer": "Today's weather is {{#start.weather#}}\n{{#llm.text#}}\n{{img}}\nFin.",
+ },
+ }
+
node = AnswerNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=pool, start_at=time.perf_counter()),
- config={
- "id": "answer",
- "data": {
- "title": "123",
- "type": "answer",
- "answer": "Today's weather is {{#start.weather#}}\n{{#llm.text#}}\n{{img}}\nFin.",
- },
- },
+ config=node_config,
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+
# Mock db.session.close()
db.session.close = MagicMock()
diff --git a/api/tests/unit_tests/core/workflow/nodes/answer/test_answer_stream_processor.py b/api/tests/unit_tests/core/workflow/nodes/answer/test_answer_stream_processor.py
index c3a3818655..137e8b889d 100644
--- a/api/tests/unit_tests/core/workflow/nodes/answer/test_answer_stream_processor.py
+++ b/api/tests/unit_tests/core/workflow/nodes/answer/test_answer_stream_processor.py
@@ -3,7 +3,6 @@ from collections.abc import Generator
from datetime import UTC, datetime
from core.workflow.entities.variable_pool import VariablePool
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.event import (
GraphEngineEvent,
NodeRunStartedEvent,
@@ -15,6 +14,7 @@ from core.workflow.graph_engine.entities.runtime_route_state import RouteNodeSta
from core.workflow.nodes.answer.answer_stream_processor import AnswerStreamProcessor
from core.workflow.nodes.enums import NodeType
from core.workflow.nodes.start.entities import StartNodeData
+from core.workflow.system_variable import SystemVariable
def _recursive_process(graph: Graph, next_node_id: str) -> Generator[GraphEngineEvent, None, None]:
@@ -180,12 +180,12 @@ def test_process():
graph = Graph.init(graph_config=graph_config)
variable_pool = VariablePool(
- system_variables={
- SystemVariableKey.QUERY: "what's the weather in SF",
- SystemVariableKey.FILES: [],
- SystemVariableKey.CONVERSATION_ID: "abababa",
- SystemVariableKey.USER_ID: "aaa",
- },
+ system_variables=SystemVariable(
+ user_id="aaa",
+ files=[],
+ query="what's the weather in SF",
+ conversation_id="abababa",
+ ),
user_inputs={},
)
diff --git a/api/tests/unit_tests/core/workflow/nodes/base/test_base_node.py b/api/tests/unit_tests/core/workflow/nodes/base/test_base_node.py
new file mode 100644
index 0000000000..8712b61a23
--- /dev/null
+++ b/api/tests/unit_tests/core/workflow/nodes/base/test_base_node.py
@@ -0,0 +1,36 @@
+from core.workflow.nodes.base.node import BaseNode
+from core.workflow.nodes.enums import NodeType
+
+# Ensures that all node classes are imported.
+from core.workflow.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
+
+_ = NODE_TYPE_CLASSES_MAPPING
+
+
+def _get_all_subclasses(root: type[BaseNode]) -> list[type[BaseNode]]:
+ subclasses = []
+ queue = [root]
+ while queue:
+ cls = queue.pop()
+
+ subclasses.extend(cls.__subclasses__())
+ queue.extend(cls.__subclasses__())
+
+ return subclasses
+
+
+def test_ensure_subclasses_of_base_node_has_node_type_and_version_method_defined():
+ classes = _get_all_subclasses(BaseNode) # type: ignore
+ type_version_set: set[tuple[NodeType, str]] = set()
+
+ for cls in classes:
+ # Validate that 'version' is directly defined in the class (not inherited) by checking the class's __dict__
+ assert "version" in cls.__dict__, f"class {cls} should have version method defined (NOT INHERITED.)"
+ node_type = cls._node_type
+ node_version = cls.version()
+
+ assert isinstance(cls._node_type, NodeType)
+ assert isinstance(node_version, str)
+ node_type_and_version = (node_type, node_version)
+ assert node_type_and_version not in type_version_set
+ type_version_set.add(node_type_and_version)
diff --git a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py
index d066fc1e33..bb6d72f51e 100644
--- a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py
+++ b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py
@@ -7,12 +7,13 @@ from core.workflow.nodes.http_request import (
)
from core.workflow.nodes.http_request.entities import HttpRequestNodeTimeout
from core.workflow.nodes.http_request.executor import Executor
+from core.workflow.system_variable import SystemVariable
def test_executor_with_json_body_and_number_variable():
# Prepare the variable pool
variable_pool = VariablePool(
- system_variables={},
+ system_variables=SystemVariable.empty(),
user_inputs={},
)
variable_pool.add(["pre_node_id", "number"], 42)
@@ -65,7 +66,7 @@ def test_executor_with_json_body_and_number_variable():
def test_executor_with_json_body_and_object_variable():
# Prepare the variable pool
variable_pool = VariablePool(
- system_variables={},
+ system_variables=SystemVariable.empty(),
user_inputs={},
)
variable_pool.add(["pre_node_id", "object"], {"name": "John Doe", "age": 30, "email": "john@example.com"})
@@ -120,7 +121,7 @@ def test_executor_with_json_body_and_object_variable():
def test_executor_with_json_body_and_nested_object_variable():
# Prepare the variable pool
variable_pool = VariablePool(
- system_variables={},
+ system_variables=SystemVariable.empty(),
user_inputs={},
)
variable_pool.add(["pre_node_id", "object"], {"name": "John Doe", "age": 30, "email": "john@example.com"})
@@ -174,7 +175,7 @@ def test_executor_with_json_body_and_nested_object_variable():
def test_extract_selectors_from_template_with_newline():
- variable_pool = VariablePool()
+ variable_pool = VariablePool(system_variables=SystemVariable.empty())
variable_pool.add(("node_id", "custom_query"), "line1\nline2")
node_data = HttpRequestNodeData(
title="Test JSON Body with Nested Object Variable",
@@ -201,7 +202,7 @@ def test_extract_selectors_from_template_with_newline():
def test_executor_with_form_data():
# Prepare the variable pool
variable_pool = VariablePool(
- system_variables={},
+ system_variables=SystemVariable.empty(),
user_inputs={},
)
variable_pool.add(["pre_node_id", "text_field"], "Hello, World!")
@@ -280,7 +281,11 @@ def test_init_headers():
authorization=HttpRequestNodeAuthorization(type="no-auth"),
)
timeout = HttpRequestNodeTimeout(connect=10, read=30, write=30)
- return Executor(node_data=node_data, timeout=timeout, variable_pool=VariablePool())
+ return Executor(
+ node_data=node_data,
+ timeout=timeout,
+ variable_pool=VariablePool(system_variables=SystemVariable.empty()),
+ )
executor = create_executor("aa\n cc:")
executor._init_headers()
@@ -310,7 +315,11 @@ def test_init_params():
authorization=HttpRequestNodeAuthorization(type="no-auth"),
)
timeout = HttpRequestNodeTimeout(connect=10, read=30, write=30)
- return Executor(node_data=node_data, timeout=timeout, variable_pool=VariablePool())
+ return Executor(
+ node_data=node_data,
+ timeout=timeout,
+ variable_pool=VariablePool(system_variables=SystemVariable.empty()),
+ )
# Test basic key-value pairs
executor = create_executor("key1:value1\nkey2:value2")
diff --git a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
index 7fd32a4826..71b3a8f7d8 100644
--- a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
@@ -15,6 +15,7 @@ from core.workflow.nodes.http_request import (
HttpRequestNodeBody,
HttpRequestNodeData,
)
+from core.workflow.system_variable import SystemVariable
from models.enums import UserFrom
from models.workflow import WorkflowType
@@ -40,7 +41,7 @@ def test_http_request_node_binary_file(monkeypatch):
),
)
variable_pool = VariablePool(
- system_variables={},
+ system_variables=SystemVariable.empty(),
user_inputs={},
)
variable_pool.add(
@@ -56,12 +57,15 @@ def test_http_request_node_binary_file(monkeypatch):
),
),
)
+
+ node_config = {
+ "id": "1",
+ "data": data.model_dump(),
+ }
+
node = HttpRequestNode(
id="1",
- config={
- "id": "1",
- "data": data.model_dump(),
- },
+ config=node_config,
graph_init_params=GraphInitParams(
tenant_id="1",
app_id="1",
@@ -89,6 +93,9 @@ def test_http_request_node_binary_file(monkeypatch):
start_at=0,
),
)
+
+ # Initialize node data
+ node.init_node_data(node_config["data"])
monkeypatch.setattr(
"core.workflow.nodes.http_request.executor.file_manager.download",
lambda *args, **kwargs: b"test",
@@ -128,7 +135,7 @@ def test_http_request_node_form_with_file(monkeypatch):
),
)
variable_pool = VariablePool(
- system_variables={},
+ system_variables=SystemVariable.empty(),
user_inputs={},
)
variable_pool.add(
@@ -144,12 +151,15 @@ def test_http_request_node_form_with_file(monkeypatch):
),
),
)
+
+ node_config = {
+ "id": "1",
+ "data": data.model_dump(),
+ }
+
node = HttpRequestNode(
id="1",
- config={
- "id": "1",
- "data": data.model_dump(),
- },
+ config=node_config,
graph_init_params=GraphInitParams(
tenant_id="1",
app_id="1",
@@ -177,6 +187,10 @@ def test_http_request_node_form_with_file(monkeypatch):
start_at=0,
),
)
+
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+
monkeypatch.setattr(
"core.workflow.nodes.http_request.executor.file_manager.download",
lambda *args, **kwargs: b"test",
@@ -223,7 +237,7 @@ def test_http_request_node_form_with_multiple_files(monkeypatch):
)
variable_pool = VariablePool(
- system_variables={},
+ system_variables=SystemVariable.empty(),
user_inputs={},
)
@@ -256,12 +270,14 @@ def test_http_request_node_form_with_multiple_files(monkeypatch):
),
)
+ node_config = {
+ "id": "1",
+ "data": data.model_dump(),
+ }
+
node = HttpRequestNode(
id="1",
- config={
- "id": "1",
- "data": data.model_dump(),
- },
+ config=node_config,
graph_init_params=GraphInitParams(
tenant_id="1",
app_id="1",
@@ -290,6 +306,9 @@ def test_http_request_node_form_with_multiple_files(monkeypatch):
),
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+
monkeypatch.setattr(
"core.workflow.nodes.http_request.executor.file_manager.download",
lambda file: b"test_image_data" if file.mime_type == "image/jpeg" else b"test_pdf_data",
diff --git a/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration.py b/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration.py
index 6d854c950d..f53f391433 100644
--- a/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration.py
+++ b/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration.py
@@ -3,10 +3,10 @@ import uuid
from unittest.mock import patch
from core.app.entities.app_invoke_entities import InvokeFrom
+from core.variables.segments import ArrayAnySegment, ArrayStringSegment
from core.workflow.entities.node_entities import NodeRunResult
from core.workflow.entities.variable_pool import VariablePool
from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.graph import Graph
from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
@@ -14,6 +14,7 @@ from core.workflow.nodes.event import RunCompletedEvent
from core.workflow.nodes.iteration.entities import ErrorHandleMode
from core.workflow.nodes.iteration.iteration_node import IterationNode
from core.workflow.nodes.template_transform.template_transform_node import TemplateTransformNode
+from core.workflow.system_variable import SystemVariable
from models.enums import UserFrom
from models.workflow import WorkflowType
@@ -150,36 +151,41 @@ def test_run():
# construct variable pool
pool = VariablePool(
- system_variables={
- SystemVariableKey.QUERY: "dify",
- SystemVariableKey.FILES: [],
- SystemVariableKey.CONVERSATION_ID: "abababa",
- SystemVariableKey.USER_ID: "1",
- },
+ system_variables=SystemVariable(
+ user_id="1",
+ files=[],
+ query="dify",
+ conversation_id="abababa",
+ ),
user_inputs={},
environment_variables=[],
)
pool.add(["pe", "list_output"], ["dify-1", "dify-2"])
+ node_config = {
+ "data": {
+ "iterator_selector": ["pe", "list_output"],
+ "output_selector": ["tt", "output"],
+ "output_type": "array[string]",
+ "startNodeType": "template-transform",
+ "start_node_id": "tt",
+ "title": "迭代",
+ "type": "iteration",
+ },
+ "id": "iteration-1",
+ }
+
iteration_node = IterationNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=pool, start_at=time.perf_counter()),
- config={
- "data": {
- "iterator_selector": ["pe", "list_output"],
- "output_selector": ["tt", "output"],
- "output_type": "array[string]",
- "startNodeType": "template-transform",
- "start_node_id": "tt",
- "title": "迭代",
- "type": "iteration",
- },
- "id": "iteration-1",
- },
+ config=node_config,
)
+ # Initialize node data
+ iteration_node.init_node_data(node_config["data"])
+
def tt_generator(self):
return NodeRunResult(
status=WorkflowNodeExecutionStatus.SUCCEEDED,
@@ -197,7 +203,7 @@ def test_run():
count += 1
if isinstance(item, RunCompletedEvent):
assert item.run_result.status == WorkflowNodeExecutionStatus.SUCCEEDED
- assert item.run_result.outputs == {"output": ["dify 123", "dify 123"]}
+ assert item.run_result.outputs == {"output": ArrayStringSegment(value=["dify 123", "dify 123"])}
assert count == 20
@@ -367,36 +373,41 @@ def test_run_parallel():
# construct variable pool
pool = VariablePool(
- system_variables={
- SystemVariableKey.QUERY: "dify",
- SystemVariableKey.FILES: [],
- SystemVariableKey.CONVERSATION_ID: "abababa",
- SystemVariableKey.USER_ID: "1",
- },
+ system_variables=SystemVariable(
+ user_id="1",
+ files=[],
+ query="dify",
+ conversation_id="abababa",
+ ),
user_inputs={},
environment_variables=[],
)
pool.add(["pe", "list_output"], ["dify-1", "dify-2"])
+ node_config = {
+ "data": {
+ "iterator_selector": ["pe", "list_output"],
+ "output_selector": ["tt", "output"],
+ "output_type": "array[string]",
+ "startNodeType": "template-transform",
+ "start_node_id": "iteration-start",
+ "title": "迭代",
+ "type": "iteration",
+ },
+ "id": "iteration-1",
+ }
+
iteration_node = IterationNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=pool, start_at=time.perf_counter()),
- config={
- "data": {
- "iterator_selector": ["pe", "list_output"],
- "output_selector": ["tt", "output"],
- "output_type": "array[string]",
- "startNodeType": "template-transform",
- "start_node_id": "iteration-start",
- "title": "迭代",
- "type": "iteration",
- },
- "id": "iteration-1",
- },
+ config=node_config,
)
+ # Initialize node data
+ iteration_node.init_node_data(node_config["data"])
+
def tt_generator(self):
return NodeRunResult(
status=WorkflowNodeExecutionStatus.SUCCEEDED,
@@ -413,7 +424,7 @@ def test_run_parallel():
count += 1
if isinstance(item, RunCompletedEvent):
assert item.run_result.status == WorkflowNodeExecutionStatus.SUCCEEDED
- assert item.run_result.outputs == {"output": ["dify 123", "dify 123"]}
+ assert item.run_result.outputs == {"output": ArrayStringSegment(value=["dify 123", "dify 123"])}
assert count == 32
@@ -583,56 +594,66 @@ def test_iteration_run_in_parallel_mode():
# construct variable pool
pool = VariablePool(
- system_variables={
- SystemVariableKey.QUERY: "dify",
- SystemVariableKey.FILES: [],
- SystemVariableKey.CONVERSATION_ID: "abababa",
- SystemVariableKey.USER_ID: "1",
- },
+ system_variables=SystemVariable(
+ user_id="1",
+ files=[],
+ query="dify",
+ conversation_id="abababa",
+ ),
user_inputs={},
environment_variables=[],
)
pool.add(["pe", "list_output"], ["dify-1", "dify-2"])
+ parallel_node_config = {
+ "data": {
+ "iterator_selector": ["pe", "list_output"],
+ "output_selector": ["tt", "output"],
+ "output_type": "array[string]",
+ "startNodeType": "template-transform",
+ "start_node_id": "iteration-start",
+ "title": "迭代",
+ "type": "iteration",
+ "is_parallel": True,
+ },
+ "id": "iteration-1",
+ }
+
parallel_iteration_node = IterationNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=pool, start_at=time.perf_counter()),
- config={
- "data": {
- "iterator_selector": ["pe", "list_output"],
- "output_selector": ["tt", "output"],
- "output_type": "array[string]",
- "startNodeType": "template-transform",
- "start_node_id": "iteration-start",
- "title": "迭代",
- "type": "iteration",
- "is_parallel": True,
- },
- "id": "iteration-1",
- },
+ config=parallel_node_config,
)
+
+ # Initialize node data
+ parallel_iteration_node.init_node_data(parallel_node_config["data"])
+ sequential_node_config = {
+ "data": {
+ "iterator_selector": ["pe", "list_output"],
+ "output_selector": ["tt", "output"],
+ "output_type": "array[string]",
+ "startNodeType": "template-transform",
+ "start_node_id": "iteration-start",
+ "title": "迭代",
+ "type": "iteration",
+ "is_parallel": True,
+ },
+ "id": "iteration-1",
+ }
+
sequential_iteration_node = IterationNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=pool, start_at=time.perf_counter()),
- config={
- "data": {
- "iterator_selector": ["pe", "list_output"],
- "output_selector": ["tt", "output"],
- "output_type": "array[string]",
- "startNodeType": "template-transform",
- "start_node_id": "iteration-start",
- "title": "迭代",
- "type": "iteration",
- "is_parallel": True,
- },
- "id": "iteration-1",
- },
+ config=sequential_node_config,
)
+ # Initialize node data
+ sequential_iteration_node.init_node_data(sequential_node_config["data"])
+
def tt_generator(self):
return NodeRunResult(
status=WorkflowNodeExecutionStatus.SUCCEEDED,
@@ -644,8 +665,8 @@ def test_iteration_run_in_parallel_mode():
# execute node
parallel_result = parallel_iteration_node._run()
sequential_result = sequential_iteration_node._run()
- assert parallel_iteration_node.node_data.parallel_nums == 10
- assert parallel_iteration_node.node_data.error_handle_mode == ErrorHandleMode.TERMINATED
+ assert parallel_iteration_node._node_data.parallel_nums == 10
+ assert parallel_iteration_node._node_data.error_handle_mode == ErrorHandleMode.TERMINATED
count = 0
parallel_arr = []
sequential_arr = []
@@ -654,7 +675,7 @@ def test_iteration_run_in_parallel_mode():
parallel_arr.append(item)
if isinstance(item, RunCompletedEvent):
assert item.run_result.status == WorkflowNodeExecutionStatus.SUCCEEDED
- assert item.run_result.outputs == {"output": ["dify 123", "dify 123"]}
+ assert item.run_result.outputs == {"output": ArrayStringSegment(value=["dify 123", "dify 123"])}
assert count == 32
for item in sequential_result:
@@ -662,7 +683,7 @@ def test_iteration_run_in_parallel_mode():
count += 1
if isinstance(item, RunCompletedEvent):
assert item.run_result.status == WorkflowNodeExecutionStatus.SUCCEEDED
- assert item.run_result.outputs == {"output": ["dify 123", "dify 123"]}
+ assert item.run_result.outputs == {"output": ArrayStringSegment(value=["dify 123", "dify 123"])}
assert count == 64
@@ -807,36 +828,41 @@ def test_iteration_run_error_handle():
# construct variable pool
pool = VariablePool(
- system_variables={
- SystemVariableKey.QUERY: "dify",
- SystemVariableKey.FILES: [],
- SystemVariableKey.CONVERSATION_ID: "abababa",
- SystemVariableKey.USER_ID: "1",
- },
+ system_variables=SystemVariable(
+ user_id="1",
+ files=[],
+ query="dify",
+ conversation_id="abababa",
+ ),
user_inputs={},
environment_variables=[],
)
pool.add(["pe", "list_output"], ["1", "1"])
+ error_node_config = {
+ "data": {
+ "iterator_selector": ["pe", "list_output"],
+ "output_selector": ["tt", "output"],
+ "output_type": "array[string]",
+ "startNodeType": "template-transform",
+ "start_node_id": "iteration-start",
+ "title": "iteration",
+ "type": "iteration",
+ "is_parallel": True,
+ "error_handle_mode": ErrorHandleMode.CONTINUE_ON_ERROR,
+ },
+ "id": "iteration-1",
+ }
+
iteration_node = IterationNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=pool, start_at=time.perf_counter()),
- config={
- "data": {
- "iterator_selector": ["pe", "list_output"],
- "output_selector": ["tt", "output"],
- "output_type": "array[string]",
- "startNodeType": "template-transform",
- "start_node_id": "iteration-start",
- "title": "iteration",
- "type": "iteration",
- "is_parallel": True,
- "error_handle_mode": ErrorHandleMode.CONTINUE_ON_ERROR,
- },
- "id": "iteration-1",
- },
+ config=error_node_config,
)
+
+ # Initialize node data
+ iteration_node.init_node_data(error_node_config["data"])
# execute continue on error node
result = iteration_node._run()
result_arr = []
@@ -846,16 +872,16 @@ def test_iteration_run_error_handle():
count += 1
if isinstance(item, RunCompletedEvent):
assert item.run_result.status == WorkflowNodeExecutionStatus.SUCCEEDED
- assert item.run_result.outputs == {"output": [None, None]}
+ assert item.run_result.outputs == {"output": ArrayAnySegment(value=[None, None])}
assert count == 14
# execute remove abnormal output
- iteration_node.node_data.error_handle_mode = ErrorHandleMode.REMOVE_ABNORMAL_OUTPUT
+ iteration_node._node_data.error_handle_mode = ErrorHandleMode.REMOVE_ABNORMAL_OUTPUT
result = iteration_node._run()
count = 0
for item in result:
count += 1
if isinstance(item, RunCompletedEvent):
assert item.run_result.status == WorkflowNodeExecutionStatus.SUCCEEDED
- assert item.run_result.outputs == {"output": []}
+ assert item.run_result.outputs == {"output": ArrayAnySegment(value=[])}
assert count == 14
diff --git a/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py b/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py
index 336c2befcc..23a7fab7cf 100644
--- a/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py
@@ -36,6 +36,7 @@ from core.workflow.nodes.llm.entities import (
)
from core.workflow.nodes.llm.file_saver import LLMFileSaver
from core.workflow.nodes.llm.node import LLMNode
+from core.workflow.system_variable import SystemVariable
from models.enums import UserFrom
from models.provider import ProviderType
from models.workflow import WorkflowType
@@ -104,7 +105,7 @@ def graph() -> Graph:
@pytest.fixture
def graph_runtime_state() -> GraphRuntimeState:
variable_pool = VariablePool(
- system_variables={},
+ system_variables=SystemVariable.empty(),
user_inputs={},
)
return GraphRuntimeState(
@@ -118,17 +119,20 @@ def llm_node(
llm_node_data: LLMNodeData, graph_init_params: GraphInitParams, graph: Graph, graph_runtime_state: GraphRuntimeState
) -> LLMNode:
mock_file_saver = mock.MagicMock(spec=LLMFileSaver)
+ node_config = {
+ "id": "1",
+ "data": llm_node_data.model_dump(),
+ }
node = LLMNode(
id="1",
- config={
- "id": "1",
- "data": llm_node_data.model_dump(),
- },
+ config=node_config,
graph_init_params=graph_init_params,
graph=graph,
graph_runtime_state=graph_runtime_state,
llm_file_saver=mock_file_saver,
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
return node
@@ -181,7 +185,7 @@ def test_fetch_files_with_file_segment():
related_id="1",
storage_key="",
)
- variable_pool = VariablePool()
+ variable_pool = VariablePool.empty()
variable_pool.add(["sys", "files"], file)
result = llm_utils.fetch_files(variable_pool=variable_pool, selector=["sys", "files"])
@@ -209,7 +213,7 @@ def test_fetch_files_with_array_file_segment():
storage_key="",
),
]
- variable_pool = VariablePool()
+ variable_pool = VariablePool.empty()
variable_pool.add(["sys", "files"], ArrayFileSegment(value=files))
result = llm_utils.fetch_files(variable_pool=variable_pool, selector=["sys", "files"])
@@ -217,7 +221,7 @@ def test_fetch_files_with_array_file_segment():
def test_fetch_files_with_none_segment():
- variable_pool = VariablePool()
+ variable_pool = VariablePool.empty()
variable_pool.add(["sys", "files"], NoneSegment())
result = llm_utils.fetch_files(variable_pool=variable_pool, selector=["sys", "files"])
@@ -225,7 +229,7 @@ def test_fetch_files_with_none_segment():
def test_fetch_files_with_array_any_segment():
- variable_pool = VariablePool()
+ variable_pool = VariablePool.empty()
variable_pool.add(["sys", "files"], ArrayAnySegment(value=[]))
result = llm_utils.fetch_files(variable_pool=variable_pool, selector=["sys", "files"])
@@ -233,7 +237,7 @@ def test_fetch_files_with_array_any_segment():
def test_fetch_files_with_non_existent_variable():
- variable_pool = VariablePool()
+ variable_pool = VariablePool.empty()
result = llm_utils.fetch_files(variable_pool=variable_pool, selector=["sys", "files"])
assert result == []
@@ -487,7 +491,7 @@ def test_handle_list_messages_basic(llm_node):
variable_pool = llm_node.graph_runtime_state.variable_pool
vision_detail_config = ImagePromptMessageContent.DETAIL.HIGH
- result = llm_node._handle_list_messages(
+ result = llm_node.handle_list_messages(
messages=messages,
context=context,
jinja2_variables=jinja2_variables,
@@ -505,17 +509,20 @@ def llm_node_for_multimodal(
llm_node_data, graph_init_params, graph, graph_runtime_state
) -> tuple[LLMNode, LLMFileSaver]:
mock_file_saver: LLMFileSaver = mock.MagicMock(spec=LLMFileSaver)
+ node_config = {
+ "id": "1",
+ "data": llm_node_data.model_dump(),
+ }
node = LLMNode(
id="1",
- config={
- "id": "1",
- "data": llm_node_data.model_dump(),
- },
+ config=node_config,
graph_init_params=graph_init_params,
graph=graph,
graph_runtime_state=graph_runtime_state,
llm_file_saver=mock_file_saver,
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
return node, mock_file_saver
@@ -539,7 +546,12 @@ class TestLLMNodeSaveMultiModalImageOutput:
size=9,
)
mock_file_saver.save_binary_string.return_value = mock_file
- file = llm_node._save_multimodal_image_output(content=content)
+ file = llm_node.save_multimodal_image_output(
+ content=content,
+ file_saver=mock_file_saver,
+ )
+ # Manually append to _file_outputs since the static method doesn't do it
+ llm_node._file_outputs.append(file)
assert llm_node._file_outputs == [mock_file]
assert file == mock_file
mock_file_saver.save_binary_string.assert_called_once_with(
@@ -565,7 +577,12 @@ class TestLLMNodeSaveMultiModalImageOutput:
size=9,
)
mock_file_saver.save_remote_url.return_value = mock_file
- file = llm_node._save_multimodal_image_output(content=content)
+ file = llm_node.save_multimodal_image_output(
+ content=content,
+ file_saver=mock_file_saver,
+ )
+ # Manually append to _file_outputs since the static method doesn't do it
+ llm_node._file_outputs.append(file)
assert llm_node._file_outputs == [mock_file]
assert file == mock_file
mock_file_saver.save_remote_url.assert_called_once_with(content.url, FileType.IMAGE)
@@ -581,7 +598,9 @@ def test_llm_node_image_file_to_markdown(llm_node: LLMNode):
class TestSaveMultimodalOutputAndConvertResultToMarkdown:
def test_str_content(self, llm_node_for_multimodal):
llm_node, mock_file_saver = llm_node_for_multimodal
- gen = llm_node._save_multimodal_output_and_convert_result_to_markdown("hello world")
+ gen = llm_node._save_multimodal_output_and_convert_result_to_markdown(
+ contents="hello world", file_saver=mock_file_saver, file_outputs=[]
+ )
assert list(gen) == ["hello world"]
mock_file_saver.save_binary_string.assert_not_called()
mock_file_saver.save_remote_url.assert_not_called()
@@ -589,7 +608,7 @@ class TestSaveMultimodalOutputAndConvertResultToMarkdown:
def test_text_prompt_message_content(self, llm_node_for_multimodal):
llm_node, mock_file_saver = llm_node_for_multimodal
gen = llm_node._save_multimodal_output_and_convert_result_to_markdown(
- [TextPromptMessageContent(data="hello world")]
+ contents=[TextPromptMessageContent(data="hello world")], file_saver=mock_file_saver, file_outputs=[]
)
assert list(gen) == ["hello world"]
mock_file_saver.save_binary_string.assert_not_called()
@@ -615,13 +634,15 @@ class TestSaveMultimodalOutputAndConvertResultToMarkdown:
)
mock_file_saver.save_binary_string.return_value = mock_saved_file
gen = llm_node._save_multimodal_output_and_convert_result_to_markdown(
- [
+ contents=[
ImagePromptMessageContent(
format="png",
base64_data=image_b64_data,
mime_type="image/png",
)
- ]
+ ],
+ file_saver=mock_file_saver,
+ file_outputs=llm_node._file_outputs,
)
yielded_strs = list(gen)
assert len(yielded_strs) == 1
@@ -644,21 +665,27 @@ class TestSaveMultimodalOutputAndConvertResultToMarkdown:
def test_unknown_content_type(self, llm_node_for_multimodal):
llm_node, mock_file_saver = llm_node_for_multimodal
- gen = llm_node._save_multimodal_output_and_convert_result_to_markdown(frozenset(["hello world"]))
+ gen = llm_node._save_multimodal_output_and_convert_result_to_markdown(
+ contents=frozenset(["hello world"]), file_saver=mock_file_saver, file_outputs=[]
+ )
assert list(gen) == ["frozenset({'hello world'})"]
mock_file_saver.save_binary_string.assert_not_called()
mock_file_saver.save_remote_url.assert_not_called()
def test_unknown_item_type(self, llm_node_for_multimodal):
llm_node, mock_file_saver = llm_node_for_multimodal
- gen = llm_node._save_multimodal_output_and_convert_result_to_markdown([frozenset(["hello world"])])
+ gen = llm_node._save_multimodal_output_and_convert_result_to_markdown(
+ contents=[frozenset(["hello world"])], file_saver=mock_file_saver, file_outputs=[]
+ )
assert list(gen) == ["frozenset({'hello world'})"]
mock_file_saver.save_binary_string.assert_not_called()
mock_file_saver.save_remote_url.assert_not_called()
def test_none_content(self, llm_node_for_multimodal):
llm_node, mock_file_saver = llm_node_for_multimodal
- gen = llm_node._save_multimodal_output_and_convert_result_to_markdown(None)
+ gen = llm_node._save_multimodal_output_and_convert_result_to_markdown(
+ contents=None, file_saver=mock_file_saver, file_outputs=[]
+ )
assert list(gen) == []
mock_file_saver.save_binary_string.assert_not_called()
mock_file_saver.save_remote_url.assert_not_called()
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_answer.py b/api/tests/unit_tests/core/workflow/nodes/test_answer.py
index abc822e98b..466d7bad06 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_answer.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_answer.py
@@ -5,11 +5,11 @@ from unittest.mock import MagicMock
from core.app.entities.app_invoke_entities import InvokeFrom
from core.workflow.entities.variable_pool import VariablePool
from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.graph import Graph
from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
from core.workflow.nodes.answer.answer_node import AnswerNode
+from core.workflow.system_variable import SystemVariable
from extensions.ext_database import db
from models.enums import UserFrom
from models.workflow import WorkflowType
@@ -53,7 +53,7 @@ def test_execute_answer():
# construct variable pool
variable_pool = VariablePool(
- system_variables={SystemVariableKey.FILES: [], SystemVariableKey.USER_ID: "aaa"},
+ system_variables=SystemVariable(user_id="aaa", files=[]),
user_inputs={},
environment_variables=[],
conversation_variables=[],
@@ -61,21 +61,26 @@ def test_execute_answer():
variable_pool.add(["start", "weather"], "sunny")
variable_pool.add(["llm", "text"], "You are a helpful AI.")
+ node_config = {
+ "id": "answer",
+ "data": {
+ "title": "123",
+ "type": "answer",
+ "answer": "Today's weather is {{#start.weather#}}\n{{#llm.text#}}\n{{img}}\nFin.",
+ },
+ }
+
node = AnswerNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter()),
- config={
- "id": "answer",
- "data": {
- "title": "123",
- "type": "answer",
- "answer": "Today's weather is {{#start.weather#}}\n{{#llm.text#}}\n{{img}}\nFin.",
- },
- },
+ config=node_config,
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+
# Mock db.session.close()
db.session.close = MagicMock()
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_continue_on_error.py b/api/tests/unit_tests/core/workflow/nodes/test_continue_on_error.py
index ff60d5974b..3f83428834 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_continue_on_error.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_continue_on_error.py
@@ -1,9 +1,10 @@
+import time
from unittest.mock import patch
from core.app.entities.app_invoke_entities import InvokeFrom
from core.workflow.entities.node_entities import NodeRunResult, WorkflowNodeExecutionMetadataKey
+from core.workflow.entities.variable_pool import VariablePool
from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.event import (
GraphRunPartialSucceededEvent,
NodeRunExceptionEvent,
@@ -11,9 +12,11 @@ from core.workflow.graph_engine.entities.event import (
NodeRunStreamChunkEvent,
)
from core.workflow.graph_engine.entities.graph import Graph
+from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
from core.workflow.graph_engine.graph_engine import GraphEngine
from core.workflow.nodes.event.event import RunCompletedEvent, RunStreamChunkEvent
from core.workflow.nodes.llm.node import LLMNode
+from core.workflow.system_variable import SystemVariable
from models.enums import UserFrom
from models.workflow import WorkflowType
@@ -163,15 +166,16 @@ class ContinueOnErrorTestHelper:
def create_test_graph_engine(graph_config: dict, user_inputs: dict | None = None):
"""Helper method to create a graph engine instance for testing"""
graph = Graph.init(graph_config=graph_config)
- variable_pool = {
- "system_variables": {
- SystemVariableKey.QUERY: "clear",
- SystemVariableKey.FILES: [],
- SystemVariableKey.CONVERSATION_ID: "abababa",
- SystemVariableKey.USER_ID: "aaa",
- },
- "user_inputs": user_inputs or {"uid": "takato"},
- }
+ variable_pool = VariablePool(
+ system_variables=SystemVariable(
+ user_id="aaa",
+ files=[],
+ query="clear",
+ conversation_id="abababa",
+ ),
+ user_inputs=user_inputs or {"uid": "takato"},
+ )
+ graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
return GraphEngine(
tenant_id="111",
@@ -184,7 +188,7 @@ class ContinueOnErrorTestHelper:
invoke_from=InvokeFrom.WEB_APP,
call_depth=0,
graph=graph,
- variable_pool=variable_pool,
+ graph_runtime_state=graph_runtime_state,
max_execution_steps=500,
max_execution_time=1200,
)
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py b/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py
index 4cb1aa93f9..486ae51e5f 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py
@@ -7,6 +7,7 @@ from docx.oxml.text.paragraph import CT_P
from core.file import File, FileTransferMethod
from core.variables import ArrayFileSegment
+from core.variables.segments import ArrayStringSegment
from core.variables.variables import StringVariable
from core.workflow.entities.node_entities import NodeRunResult
from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
@@ -26,13 +27,17 @@ def document_extractor_node():
title="Test Document Extractor",
variable_selector=["node_id", "variable_name"],
)
- return DocumentExtractorNode(
+ node_config = {"id": "test_node_id", "data": node_data.model_dump()}
+ node = DocumentExtractorNode(
id="test_node_id",
- config={"id": "test_node_id", "data": node_data.model_dump()},
+ config=node_config,
graph_init_params=Mock(),
graph=Mock(),
graph_runtime_state=Mock(),
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+ return node
@pytest.fixture
@@ -69,7 +74,13 @@ def test_run_invalid_variable_type(document_extractor_node, mock_graph_runtime_s
@pytest.mark.parametrize(
("mime_type", "file_content", "expected_text", "transfer_method", "extension"),
[
- ("text/plain", b"Hello, world!", ["Hello, world!"], FileTransferMethod.LOCAL_FILE, ".txt"),
+ (
+ "text/plain",
+ b"Hello, world!",
+ ["Hello, world!"],
+ FileTransferMethod.LOCAL_FILE,
+ ".txt",
+ ),
(
"application/pdf",
b"%PDF-1.5\n%Test PDF content",
@@ -84,7 +95,13 @@ def test_run_invalid_variable_type(document_extractor_node, mock_graph_runtime_s
FileTransferMethod.REMOTE_URL,
"",
),
- ("text/plain", b"Remote content", ["Remote content"], FileTransferMethod.REMOTE_URL, None),
+ (
+ "text/plain",
+ b"Remote content",
+ ["Remote content"],
+ FileTransferMethod.REMOTE_URL,
+ None,
+ ),
],
)
def test_run_extract_text(
@@ -131,7 +148,7 @@ def test_run_extract_text(
assert isinstance(result, NodeRunResult)
assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED, result.error
assert result.outputs is not None
- assert result.outputs["text"] == expected_text
+ assert result.outputs["text"] == ArrayStringSegment(value=expected_text)
if transfer_method == FileTransferMethod.REMOTE_URL:
mock_ssrf_proxy_get.assert_called_once_with("https://example.com/file.txt")
@@ -329,3 +346,26 @@ def test_extract_text_from_excel_all_sheets_fail(mock_excel_file):
assert result == ""
assert mock_excel_instance.parse.call_count == 2
+
+
+@patch("pandas.ExcelFile")
+def test_extract_text_from_excel_numeric_type_column(mock_excel_file):
+ """Test extracting text from Excel file with numeric column names."""
+
+ # Test numeric type column
+ data = {1: ["Test"], 1.1: ["Test"]}
+
+ df = pd.DataFrame(data)
+
+ # Mock ExcelFile
+ mock_excel_instance = Mock()
+ mock_excel_instance.sheet_names = ["Sheet1"]
+ mock_excel_instance.parse.return_value = df
+ mock_excel_file.return_value = mock_excel_instance
+
+ file_content = b"fake_excel_content"
+ result = _extract_text_from_excel(file_content)
+
+ expected_manual = "| 1.0 | 1.1 |\n| --- | --- |\n| Test | Test |\n\n"
+
+ assert expected_manual == result
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_if_else.py b/api/tests/unit_tests/core/workflow/nodes/test_if_else.py
index c4e411f9d6..8383aee0e4 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_if_else.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_if_else.py
@@ -7,12 +7,12 @@ from core.file import File, FileTransferMethod, FileType
from core.variables import ArrayFileSegment
from core.workflow.entities.variable_pool import VariablePool
from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.graph import Graph
from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
from core.workflow.nodes.if_else.entities import IfElseNodeData
from core.workflow.nodes.if_else.if_else_node import IfElseNode
+from core.workflow.system_variable import SystemVariable
from core.workflow.utils.condition.entities import Condition, SubCondition, SubVariableCondition
from extensions.ext_database import db
from models.enums import UserFrom
@@ -37,9 +37,7 @@ def test_execute_if_else_result_true():
)
# construct variable pool
- pool = VariablePool(
- system_variables={SystemVariableKey.FILES: [], SystemVariableKey.USER_ID: "aaa"}, user_inputs={}
- )
+ pool = VariablePool(system_variables=SystemVariable(user_id="aaa", files=[]), user_inputs={})
pool.add(["start", "array_contains"], ["ab", "def"])
pool.add(["start", "array_not_contains"], ["ac", "def"])
pool.add(["start", "contains"], "cabcde")
@@ -59,57 +57,62 @@ def test_execute_if_else_result_true():
pool.add(["start", "null"], None)
pool.add(["start", "not_null"], "1212")
+ node_config = {
+ "id": "if-else",
+ "data": {
+ "title": "123",
+ "type": "if-else",
+ "logical_operator": "and",
+ "conditions": [
+ {
+ "comparison_operator": "contains",
+ "variable_selector": ["start", "array_contains"],
+ "value": "ab",
+ },
+ {
+ "comparison_operator": "not contains",
+ "variable_selector": ["start", "array_not_contains"],
+ "value": "ab",
+ },
+ {"comparison_operator": "contains", "variable_selector": ["start", "contains"], "value": "ab"},
+ {
+ "comparison_operator": "not contains",
+ "variable_selector": ["start", "not_contains"],
+ "value": "ab",
+ },
+ {"comparison_operator": "start with", "variable_selector": ["start", "start_with"], "value": "ab"},
+ {"comparison_operator": "end with", "variable_selector": ["start", "end_with"], "value": "ab"},
+ {"comparison_operator": "is", "variable_selector": ["start", "is"], "value": "ab"},
+ {"comparison_operator": "is not", "variable_selector": ["start", "is_not"], "value": "ab"},
+ {"comparison_operator": "empty", "variable_selector": ["start", "empty"], "value": "ab"},
+ {"comparison_operator": "not empty", "variable_selector": ["start", "not_empty"], "value": "ab"},
+ {"comparison_operator": "=", "variable_selector": ["start", "equals"], "value": "22"},
+ {"comparison_operator": "≠", "variable_selector": ["start", "not_equals"], "value": "22"},
+ {"comparison_operator": ">", "variable_selector": ["start", "greater_than"], "value": "22"},
+ {"comparison_operator": "<", "variable_selector": ["start", "less_than"], "value": "22"},
+ {
+ "comparison_operator": "≥",
+ "variable_selector": ["start", "greater_than_or_equal"],
+ "value": "22",
+ },
+ {"comparison_operator": "≤", "variable_selector": ["start", "less_than_or_equal"], "value": "22"},
+ {"comparison_operator": "null", "variable_selector": ["start", "null"]},
+ {"comparison_operator": "not null", "variable_selector": ["start", "not_null"]},
+ ],
+ },
+ }
+
node = IfElseNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=pool, start_at=time.perf_counter()),
- config={
- "id": "if-else",
- "data": {
- "title": "123",
- "type": "if-else",
- "logical_operator": "and",
- "conditions": [
- {
- "comparison_operator": "contains",
- "variable_selector": ["start", "array_contains"],
- "value": "ab",
- },
- {
- "comparison_operator": "not contains",
- "variable_selector": ["start", "array_not_contains"],
- "value": "ab",
- },
- {"comparison_operator": "contains", "variable_selector": ["start", "contains"], "value": "ab"},
- {
- "comparison_operator": "not contains",
- "variable_selector": ["start", "not_contains"],
- "value": "ab",
- },
- {"comparison_operator": "start with", "variable_selector": ["start", "start_with"], "value": "ab"},
- {"comparison_operator": "end with", "variable_selector": ["start", "end_with"], "value": "ab"},
- {"comparison_operator": "is", "variable_selector": ["start", "is"], "value": "ab"},
- {"comparison_operator": "is not", "variable_selector": ["start", "is_not"], "value": "ab"},
- {"comparison_operator": "empty", "variable_selector": ["start", "empty"], "value": "ab"},
- {"comparison_operator": "not empty", "variable_selector": ["start", "not_empty"], "value": "ab"},
- {"comparison_operator": "=", "variable_selector": ["start", "equals"], "value": "22"},
- {"comparison_operator": "≠", "variable_selector": ["start", "not_equals"], "value": "22"},
- {"comparison_operator": ">", "variable_selector": ["start", "greater_than"], "value": "22"},
- {"comparison_operator": "<", "variable_selector": ["start", "less_than"], "value": "22"},
- {
- "comparison_operator": "≥",
- "variable_selector": ["start", "greater_than_or_equal"],
- "value": "22",
- },
- {"comparison_operator": "≤", "variable_selector": ["start", "less_than_or_equal"], "value": "22"},
- {"comparison_operator": "null", "variable_selector": ["start", "null"]},
- {"comparison_operator": "not null", "variable_selector": ["start", "not_null"]},
- ],
- },
- },
+ config=node_config,
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+
# Mock db.session.close()
db.session.close = MagicMock()
@@ -157,40 +160,45 @@ def test_execute_if_else_result_false():
# construct variable pool
pool = VariablePool(
- system_variables={SystemVariableKey.FILES: [], SystemVariableKey.USER_ID: "aaa"},
+ system_variables=SystemVariable(user_id="aaa", files=[]),
user_inputs={},
environment_variables=[],
)
pool.add(["start", "array_contains"], ["1ab", "def"])
pool.add(["start", "array_not_contains"], ["ab", "def"])
+ node_config = {
+ "id": "if-else",
+ "data": {
+ "title": "123",
+ "type": "if-else",
+ "logical_operator": "or",
+ "conditions": [
+ {
+ "comparison_operator": "contains",
+ "variable_selector": ["start", "array_contains"],
+ "value": "ab",
+ },
+ {
+ "comparison_operator": "not contains",
+ "variable_selector": ["start", "array_not_contains"],
+ "value": "ab",
+ },
+ ],
+ },
+ }
+
node = IfElseNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=pool, start_at=time.perf_counter()),
- config={
- "id": "if-else",
- "data": {
- "title": "123",
- "type": "if-else",
- "logical_operator": "or",
- "conditions": [
- {
- "comparison_operator": "contains",
- "variable_selector": ["start", "array_contains"],
- "value": "ab",
- },
- {
- "comparison_operator": "not contains",
- "variable_selector": ["start", "array_not_contains"],
- "value": "ab",
- },
- ],
- },
- },
+ config=node_config,
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+
# Mock db.session.close()
db.session.close = MagicMock()
@@ -230,17 +238,22 @@ def test_array_file_contains_file_name():
],
)
+ node_config = {
+ "id": "if-else",
+ "data": node_data.model_dump(),
+ }
+
node = IfElseNode(
id=str(uuid.uuid4()),
graph_init_params=Mock(),
graph=Mock(),
graph_runtime_state=Mock(),
- config={
- "id": "if-else",
- "data": node_data.model_dump(),
- },
+ config=node_config,
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+
node.graph_runtime_state.variable_pool.get.return_value = ArrayFileSegment(
value=[
File(
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py b/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py
index 77d42e2692..5fc9eab2df 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py
@@ -33,16 +33,19 @@ def list_operator_node():
"title": "Test Title",
}
node_data = ListOperatorNodeData(**config)
+ node_config = {
+ "id": "test_node_id",
+ "data": node_data.model_dump(),
+ }
node = ListOperatorNode(
id="test_node_id",
- config={
- "id": "test_node_id",
- "data": node_data.model_dump(),
- },
+ config=node_config,
graph_init_params=MagicMock(),
graph=MagicMock(),
graph_runtime_state=MagicMock(),
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
node.graph_runtime_state = MagicMock()
node.graph_runtime_state.variable_pool = MagicMock()
return node
@@ -115,7 +118,7 @@ def test_filter_files_by_type(list_operator_node):
},
]
assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
- for expected_file, result_file in zip(expected_files, result.outputs["result"]):
+ for expected_file, result_file in zip(expected_files, result.outputs["result"].value):
assert expected_file["filename"] == result_file.filename
assert expected_file["type"] == result_file.type
assert expected_file["tenant_id"] == result_file.tenant_id
diff --git a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
index e121f6338c..0eaabd0c40 100644
--- a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
@@ -15,6 +15,7 @@ from core.workflow.nodes.enums import ErrorStrategy
from core.workflow.nodes.event import RunCompletedEvent
from core.workflow.nodes.tool import ToolNode
from core.workflow.nodes.tool.entities import ToolNodeData
+from core.workflow.system_variable import SystemVariable
from models import UserFrom, WorkflowType
@@ -34,15 +35,16 @@ def _create_tool_node():
version="1",
)
variable_pool = VariablePool(
- system_variables={},
+ system_variables=SystemVariable.empty(),
user_inputs={},
)
+ node_config = {
+ "id": "1",
+ "data": data.model_dump(),
+ }
node = ToolNode(
id="1",
- config={
- "id": "1",
- "data": data.model_dump(),
- },
+ config=node_config,
graph_init_params=GraphInitParams(
tenant_id="1",
app_id="1",
@@ -70,6 +72,8 @@ def _create_tool_node():
start_at=0,
),
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
return node
diff --git a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py
index 9793da129d..ee51339427 100644
--- a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py
+++ b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py
@@ -5,13 +5,14 @@ from uuid import uuid4
from core.app.entities.app_invoke_entities import InvokeFrom
from core.variables import ArrayStringVariable, StringVariable
+from core.workflow.conversation_variable_updater import ConversationVariableUpdater
from core.workflow.entities.variable_pool import VariablePool
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.graph import Graph
from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
from core.workflow.nodes.variable_assigner.v1 import VariableAssignerNode
from core.workflow.nodes.variable_assigner.v1.node_data import WriteMode
+from core.workflow.system_variable import SystemVariable
from models.enums import UserFrom
from models.workflow import WorkflowType
@@ -63,10 +64,11 @@ def test_overwrite_string_variable():
name="test_string_variable",
value="the second value",
)
+ conversation_id = str(uuid.uuid4())
# construct variable pool
variable_pool = VariablePool(
- system_variables={SystemVariableKey.CONVERSATION_ID: "conversation_id"},
+ system_variables=SystemVariable(conversation_id=conversation_id),
user_inputs={},
environment_variables=[],
conversation_variables=[conversation_variable],
@@ -77,25 +79,42 @@ def test_overwrite_string_variable():
input_variable,
)
+ mock_conv_var_updater = mock.Mock(spec=ConversationVariableUpdater)
+ mock_conv_var_updater_factory = mock.Mock(return_value=mock_conv_var_updater)
+
+ node_config = {
+ "id": "node_id",
+ "data": {
+ "title": "test",
+ "assigned_variable_selector": ["conversation", conversation_variable.name],
+ "write_mode": WriteMode.OVER_WRITE.value,
+ "input_variable_selector": [DEFAULT_NODE_ID, input_variable.name],
+ },
+ }
+
node = VariableAssignerNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter()),
- config={
- "id": "node_id",
- "data": {
- "title": "test",
- "assigned_variable_selector": ["conversation", conversation_variable.name],
- "write_mode": WriteMode.OVER_WRITE.value,
- "input_variable_selector": [DEFAULT_NODE_ID, input_variable.name],
- },
- },
+ config=node_config,
+ conv_var_updater_factory=mock_conv_var_updater_factory,
)
- with mock.patch("core.workflow.nodes.variable_assigner.common.helpers.update_conversation_variable") as mock_run:
- list(node.run())
- mock_run.assert_called_once()
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+
+ list(node.run())
+ expected_var = StringVariable(
+ id=conversation_variable.id,
+ name=conversation_variable.name,
+ description=conversation_variable.description,
+ selector=conversation_variable.selector,
+ value_type=conversation_variable.value_type,
+ value=input_variable.value,
+ )
+ mock_conv_var_updater.update.assert_called_once_with(conversation_id=conversation_id, variable=expected_var)
+ mock_conv_var_updater.flush.assert_called_once()
got = variable_pool.get(["conversation", conversation_variable.name])
assert got is not None
@@ -148,9 +167,10 @@ def test_append_variable_to_array():
name="test_string_variable",
value="the second value",
)
+ conversation_id = str(uuid.uuid4())
variable_pool = VariablePool(
- system_variables={SystemVariableKey.CONVERSATION_ID: "conversation_id"},
+ system_variables=SystemVariable(conversation_id=conversation_id),
user_inputs={},
environment_variables=[],
conversation_variables=[conversation_variable],
@@ -160,25 +180,44 @@ def test_append_variable_to_array():
input_variable,
)
+ mock_conv_var_updater = mock.Mock(spec=ConversationVariableUpdater)
+ mock_conv_var_updater_factory = mock.Mock(return_value=mock_conv_var_updater)
+
+ node_config = {
+ "id": "node_id",
+ "data": {
+ "title": "test",
+ "assigned_variable_selector": ["conversation", conversation_variable.name],
+ "write_mode": WriteMode.APPEND.value,
+ "input_variable_selector": [DEFAULT_NODE_ID, input_variable.name],
+ },
+ }
+
node = VariableAssignerNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter()),
- config={
- "id": "node_id",
- "data": {
- "title": "test",
- "assigned_variable_selector": ["conversation", conversation_variable.name],
- "write_mode": WriteMode.APPEND.value,
- "input_variable_selector": [DEFAULT_NODE_ID, input_variable.name],
- },
- },
+ config=node_config,
+ conv_var_updater_factory=mock_conv_var_updater_factory,
)
- with mock.patch("core.workflow.nodes.variable_assigner.common.helpers.update_conversation_variable") as mock_run:
- list(node.run())
- mock_run.assert_called_once()
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+
+ list(node.run())
+ expected_value = list(conversation_variable.value)
+ expected_value.append(input_variable.value)
+ expected_var = ArrayStringVariable(
+ id=conversation_variable.id,
+ name=conversation_variable.name,
+ description=conversation_variable.description,
+ selector=conversation_variable.selector,
+ value_type=conversation_variable.value_type,
+ value=expected_value,
+ )
+ mock_conv_var_updater.update.assert_called_once_with(conversation_id=conversation_id, variable=expected_var)
+ mock_conv_var_updater.flush.assert_called_once()
got = variable_pool.get(["conversation", conversation_variable.name])
assert got is not None
@@ -225,32 +264,50 @@ def test_clear_array():
value=["the first value"],
)
+ conversation_id = str(uuid.uuid4())
variable_pool = VariablePool(
- system_variables={SystemVariableKey.CONVERSATION_ID: "conversation_id"},
+ system_variables=SystemVariable(conversation_id=conversation_id),
user_inputs={},
environment_variables=[],
conversation_variables=[conversation_variable],
)
+ mock_conv_var_updater = mock.Mock(spec=ConversationVariableUpdater)
+ mock_conv_var_updater_factory = mock.Mock(return_value=mock_conv_var_updater)
+
+ node_config = {
+ "id": "node_id",
+ "data": {
+ "title": "test",
+ "assigned_variable_selector": ["conversation", conversation_variable.name],
+ "write_mode": WriteMode.CLEAR.value,
+ "input_variable_selector": [],
+ },
+ }
+
node = VariableAssignerNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter()),
- config={
- "id": "node_id",
- "data": {
- "title": "test",
- "assigned_variable_selector": ["conversation", conversation_variable.name],
- "write_mode": WriteMode.CLEAR.value,
- "input_variable_selector": [],
- },
- },
+ config=node_config,
+ conv_var_updater_factory=mock_conv_var_updater_factory,
)
- with mock.patch("core.workflow.nodes.variable_assigner.common.helpers.update_conversation_variable") as mock_run:
- list(node.run())
- mock_run.assert_called_once()
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+
+ list(node.run())
+ expected_var = ArrayStringVariable(
+ id=conversation_variable.id,
+ name=conversation_variable.name,
+ description=conversation_variable.description,
+ selector=conversation_variable.selector,
+ value_type=conversation_variable.value_type,
+ value=[],
+ )
+ mock_conv_var_updater.update.assert_called_once_with(conversation_id=conversation_id, variable=expected_var)
+ mock_conv_var_updater.flush.assert_called_once()
got = variable_pool.get(["conversation", conversation_variable.name])
assert got is not None
diff --git a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_variable_assigner_v2.py b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_variable_assigner_v2.py
index 7c5597dd89..987eaf7534 100644
--- a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_variable_assigner_v2.py
+++ b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_variable_assigner_v2.py
@@ -5,12 +5,12 @@ from uuid import uuid4
from core.app.entities.app_invoke_entities import InvokeFrom
from core.variables import ArrayStringVariable
from core.workflow.entities.variable_pool import VariablePool
-from core.workflow.enums import SystemVariableKey
from core.workflow.graph_engine.entities.graph import Graph
from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
from core.workflow.nodes.variable_assigner.v2 import VariableAssignerNode
from core.workflow.nodes.variable_assigner.v2.enums import InputType, Operation
+from core.workflow.system_variable import SystemVariable
from models.enums import UserFrom
from models.workflow import WorkflowType
@@ -109,34 +109,39 @@ def test_remove_first_from_array():
)
variable_pool = VariablePool(
- system_variables={SystemVariableKey.CONVERSATION_ID: "conversation_id"},
+ system_variables=SystemVariable(conversation_id="conversation_id"),
user_inputs={},
environment_variables=[],
conversation_variables=[conversation_variable],
)
+ node_config = {
+ "id": "node_id",
+ "data": {
+ "title": "test",
+ "version": "2",
+ "items": [
+ {
+ "variable_selector": ["conversation", conversation_variable.name],
+ "input_type": InputType.VARIABLE,
+ "operation": Operation.REMOVE_FIRST,
+ "value": None,
+ }
+ ],
+ },
+ }
+
node = VariableAssignerNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter()),
- config={
- "id": "node_id",
- "data": {
- "title": "test",
- "version": "2",
- "items": [
- {
- "variable_selector": ["conversation", conversation_variable.name],
- "input_type": InputType.VARIABLE,
- "operation": Operation.REMOVE_FIRST,
- "value": None,
- }
- ],
- },
- },
+ config=node_config,
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+
# Skip the mock assertion since we're in a test environment
# Print the variable before running
print(f"Before: {variable_pool.get(['conversation', conversation_variable.name]).to_object()}")
@@ -196,34 +201,39 @@ def test_remove_last_from_array():
)
variable_pool = VariablePool(
- system_variables={SystemVariableKey.CONVERSATION_ID: "conversation_id"},
+ system_variables=SystemVariable(conversation_id="conversation_id"),
user_inputs={},
environment_variables=[],
conversation_variables=[conversation_variable],
)
+ node_config = {
+ "id": "node_id",
+ "data": {
+ "title": "test",
+ "version": "2",
+ "items": [
+ {
+ "variable_selector": ["conversation", conversation_variable.name],
+ "input_type": InputType.VARIABLE,
+ "operation": Operation.REMOVE_LAST,
+ "value": None,
+ }
+ ],
+ },
+ }
+
node = VariableAssignerNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter()),
- config={
- "id": "node_id",
- "data": {
- "title": "test",
- "version": "2",
- "items": [
- {
- "variable_selector": ["conversation", conversation_variable.name],
- "input_type": InputType.VARIABLE,
- "operation": Operation.REMOVE_LAST,
- "value": None,
- }
- ],
- },
- },
+ config=node_config,
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+
# Skip the mock assertion since we're in a test environment
list(node.run())
@@ -275,34 +285,39 @@ def test_remove_first_from_empty_array():
)
variable_pool = VariablePool(
- system_variables={SystemVariableKey.CONVERSATION_ID: "conversation_id"},
+ system_variables=SystemVariable(conversation_id="conversation_id"),
user_inputs={},
environment_variables=[],
conversation_variables=[conversation_variable],
)
+ node_config = {
+ "id": "node_id",
+ "data": {
+ "title": "test",
+ "version": "2",
+ "items": [
+ {
+ "variable_selector": ["conversation", conversation_variable.name],
+ "input_type": InputType.VARIABLE,
+ "operation": Operation.REMOVE_FIRST,
+ "value": None,
+ }
+ ],
+ },
+ }
+
node = VariableAssignerNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter()),
- config={
- "id": "node_id",
- "data": {
- "title": "test",
- "version": "2",
- "items": [
- {
- "variable_selector": ["conversation", conversation_variable.name],
- "input_type": InputType.VARIABLE,
- "operation": Operation.REMOVE_FIRST,
- "value": None,
- }
- ],
- },
- },
+ config=node_config,
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+
# Skip the mock assertion since we're in a test environment
list(node.run())
@@ -354,34 +369,39 @@ def test_remove_last_from_empty_array():
)
variable_pool = VariablePool(
- system_variables={SystemVariableKey.CONVERSATION_ID: "conversation_id"},
+ system_variables=SystemVariable(conversation_id="conversation_id"),
user_inputs={},
environment_variables=[],
conversation_variables=[conversation_variable],
)
+ node_config = {
+ "id": "node_id",
+ "data": {
+ "title": "test",
+ "version": "2",
+ "items": [
+ {
+ "variable_selector": ["conversation", conversation_variable.name],
+ "input_type": InputType.VARIABLE,
+ "operation": Operation.REMOVE_LAST,
+ "value": None,
+ }
+ ],
+ },
+ }
+
node = VariableAssignerNode(
id=str(uuid.uuid4()),
graph_init_params=init_params,
graph=graph,
graph_runtime_state=GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter()),
- config={
- "id": "node_id",
- "data": {
- "title": "test",
- "version": "2",
- "items": [
- {
- "variable_selector": ["conversation", conversation_variable.name],
- "input_type": InputType.VARIABLE,
- "operation": Operation.REMOVE_LAST,
- "value": None,
- }
- ],
- },
- },
+ config=node_config,
)
+ # Initialize node data
+ node.init_node_data(node_config["data"])
+
# Skip the mock assertion since we're in a test environment
list(node.run())
diff --git a/api/tests/unit_tests/core/workflow/test_system_variable.py b/api/tests/unit_tests/core/workflow/test_system_variable.py
new file mode 100644
index 0000000000..11d788ed79
--- /dev/null
+++ b/api/tests/unit_tests/core/workflow/test_system_variable.py
@@ -0,0 +1,251 @@
+import json
+from typing import Any
+
+import pytest
+from pydantic import ValidationError
+
+from core.file.enums import FileTransferMethod, FileType
+from core.file.models import File
+from core.workflow.system_variable import SystemVariable
+
+# Test data constants for SystemVariable serialization tests
+VALID_BASE_DATA: dict[str, Any] = {
+ "user_id": "a20f06b1-8703-45ab-937c-860a60072113",
+ "app_id": "661bed75-458d-49c9-b487-fda0762677b9",
+ "workflow_id": "d31f2136-b292-4ae0-96d4-1e77894a4f43",
+}
+
+COMPLETE_VALID_DATA: dict[str, Any] = {
+ **VALID_BASE_DATA,
+ "query": "test query",
+ "files": [],
+ "conversation_id": "91f1eb7d-69f4-4d7b-b82f-4003d51744b9",
+ "dialogue_count": 5,
+ "workflow_run_id": "eb4704b5-2274-47f2-bfcd-0452daa82cb5",
+}
+
+
+def create_test_file() -> File:
+ """Create a test File object for serialization tests."""
+ return File(
+ tenant_id="test-tenant-id",
+ type=FileType.DOCUMENT,
+ transfer_method=FileTransferMethod.LOCAL_FILE,
+ related_id="test-file-id",
+ filename="test.txt",
+ extension=".txt",
+ mime_type="text/plain",
+ size=1024,
+ storage_key="test-storage-key",
+ )
+
+
+class TestSystemVariableSerialization:
+ """Focused tests for SystemVariable serialization/deserialization logic."""
+
+ def test_basic_deserialization(self):
+ """Test successful deserialization from JSON structure with all fields correctly mapped."""
+ # Test with complete data
+ system_var = SystemVariable(**COMPLETE_VALID_DATA)
+
+ # Verify all fields are correctly mapped
+ assert system_var.user_id == COMPLETE_VALID_DATA["user_id"]
+ assert system_var.app_id == COMPLETE_VALID_DATA["app_id"]
+ assert system_var.workflow_id == COMPLETE_VALID_DATA["workflow_id"]
+ assert system_var.query == COMPLETE_VALID_DATA["query"]
+ assert system_var.conversation_id == COMPLETE_VALID_DATA["conversation_id"]
+ assert system_var.dialogue_count == COMPLETE_VALID_DATA["dialogue_count"]
+ assert system_var.workflow_execution_id == COMPLETE_VALID_DATA["workflow_run_id"]
+ assert system_var.files == []
+
+ # Test with minimal data (only required fields)
+ minimal_var = SystemVariable(**VALID_BASE_DATA)
+ assert minimal_var.user_id == VALID_BASE_DATA["user_id"]
+ assert minimal_var.app_id == VALID_BASE_DATA["app_id"]
+ assert minimal_var.workflow_id == VALID_BASE_DATA["workflow_id"]
+ assert minimal_var.query is None
+ assert minimal_var.conversation_id is None
+ assert minimal_var.dialogue_count is None
+ assert minimal_var.workflow_execution_id is None
+ assert minimal_var.files == []
+
+ def test_alias_handling(self):
+ """Test workflow_execution_id vs workflow_run_id alias resolution - core deserialization logic."""
+ workflow_id = "eb4704b5-2274-47f2-bfcd-0452daa82cb5"
+
+ # Test workflow_run_id only (preferred alias)
+ data_run_id = {**VALID_BASE_DATA, "workflow_run_id": workflow_id}
+ system_var1 = SystemVariable(**data_run_id)
+ assert system_var1.workflow_execution_id == workflow_id
+
+ # Test workflow_execution_id only (direct field name)
+ data_execution_id = {**VALID_BASE_DATA, "workflow_execution_id": workflow_id}
+ system_var2 = SystemVariable(**data_execution_id)
+ assert system_var2.workflow_execution_id == workflow_id
+
+ # Test both present - workflow_run_id should take precedence
+ data_both = {
+ **VALID_BASE_DATA,
+ "workflow_execution_id": "should-be-ignored",
+ "workflow_run_id": workflow_id,
+ }
+ system_var3 = SystemVariable(**data_both)
+ assert system_var3.workflow_execution_id == workflow_id
+
+ # Test neither present - should be None
+ system_var4 = SystemVariable(**VALID_BASE_DATA)
+ assert system_var4.workflow_execution_id is None
+
+ def test_serialization_round_trip(self):
+ """Test that serialize → deserialize produces the same result with alias handling."""
+ # Create original SystemVariable
+ original = SystemVariable(**COMPLETE_VALID_DATA)
+
+ # Serialize to dict
+ serialized = original.model_dump(mode="json")
+
+ # Verify alias is used in serialization (workflow_run_id, not workflow_execution_id)
+ assert "workflow_run_id" in serialized
+ assert "workflow_execution_id" not in serialized
+ assert serialized["workflow_run_id"] == COMPLETE_VALID_DATA["workflow_run_id"]
+
+ # Deserialize back
+ deserialized = SystemVariable(**serialized)
+
+ # Verify all fields match after round-trip
+ assert deserialized.user_id == original.user_id
+ assert deserialized.app_id == original.app_id
+ assert deserialized.workflow_id == original.workflow_id
+ assert deserialized.query == original.query
+ assert deserialized.conversation_id == original.conversation_id
+ assert deserialized.dialogue_count == original.dialogue_count
+ assert deserialized.workflow_execution_id == original.workflow_execution_id
+ assert list(deserialized.files) == list(original.files)
+
+ def test_json_round_trip(self):
+ """Test JSON serialization/deserialization consistency with proper structure."""
+ # Create original SystemVariable
+ original = SystemVariable(**COMPLETE_VALID_DATA)
+
+ # Serialize to JSON string
+ json_str = original.model_dump_json()
+
+ # Parse JSON and verify structure
+ json_data = json.loads(json_str)
+ assert "workflow_run_id" in json_data
+ assert "workflow_execution_id" not in json_data
+ assert json_data["workflow_run_id"] == COMPLETE_VALID_DATA["workflow_run_id"]
+
+ # Deserialize from JSON data
+ deserialized = SystemVariable(**json_data)
+
+ # Verify key fields match after JSON round-trip
+ assert deserialized.workflow_execution_id == original.workflow_execution_id
+ assert deserialized.user_id == original.user_id
+ assert deserialized.app_id == original.app_id
+ assert deserialized.workflow_id == original.workflow_id
+
+ def test_files_field_deserialization(self):
+ """Test deserialization with File objects in the files field - SystemVariable specific logic."""
+ # Test with empty files list
+ data_empty = {**VALID_BASE_DATA, "files": []}
+ system_var_empty = SystemVariable(**data_empty)
+ assert system_var_empty.files == []
+
+ # Test with single File object
+ test_file = create_test_file()
+ data_single = {**VALID_BASE_DATA, "files": [test_file]}
+ system_var_single = SystemVariable(**data_single)
+ assert len(system_var_single.files) == 1
+ assert system_var_single.files[0].filename == "test.txt"
+ assert system_var_single.files[0].tenant_id == "test-tenant-id"
+
+ # Test with multiple File objects
+ file1 = File(
+ tenant_id="tenant1",
+ type=FileType.DOCUMENT,
+ transfer_method=FileTransferMethod.LOCAL_FILE,
+ related_id="file1",
+ filename="doc1.txt",
+ storage_key="key1",
+ )
+ file2 = File(
+ tenant_id="tenant2",
+ type=FileType.IMAGE,
+ transfer_method=FileTransferMethod.REMOTE_URL,
+ remote_url="https://example.com/image.jpg",
+ filename="image.jpg",
+ storage_key="key2",
+ )
+
+ data_multiple = {**VALID_BASE_DATA, "files": [file1, file2]}
+ system_var_multiple = SystemVariable(**data_multiple)
+ assert len(system_var_multiple.files) == 2
+ assert system_var_multiple.files[0].filename == "doc1.txt"
+ assert system_var_multiple.files[1].filename == "image.jpg"
+
+ # Verify files field serialization/deserialization
+ serialized = system_var_multiple.model_dump(mode="json")
+ deserialized = SystemVariable(**serialized)
+ assert len(deserialized.files) == 2
+ assert deserialized.files[0].filename == "doc1.txt"
+ assert deserialized.files[1].filename == "image.jpg"
+
+ def test_alias_serialization_consistency(self):
+ """Test that alias handling works consistently in both serialization directions."""
+ workflow_id = "test-workflow-id"
+
+ # Create with workflow_run_id (alias)
+ data_with_alias = {**VALID_BASE_DATA, "workflow_run_id": workflow_id}
+ system_var = SystemVariable(**data_with_alias)
+
+ # Serialize and verify alias is used
+ serialized = system_var.model_dump()
+ assert serialized["workflow_run_id"] == workflow_id
+ assert "workflow_execution_id" not in serialized
+
+ # Deserialize and verify field mapping
+ deserialized = SystemVariable(**serialized)
+ assert deserialized.workflow_execution_id == workflow_id
+
+ # Test JSON serialization path
+ json_serialized = json.loads(system_var.model_dump_json())
+ assert json_serialized["workflow_run_id"] == workflow_id
+ assert "workflow_execution_id" not in json_serialized
+
+ json_deserialized = SystemVariable(**json_serialized)
+ assert json_deserialized.workflow_execution_id == workflow_id
+
+ def test_model_validator_serialization_logic(self):
+ """Test the custom model validator behavior for serialization scenarios."""
+ workflow_id = "test-workflow-execution-id"
+
+ # Test direct instantiation with workflow_execution_id (should work)
+ data1 = {**VALID_BASE_DATA, "workflow_execution_id": workflow_id}
+ system_var1 = SystemVariable(**data1)
+ assert system_var1.workflow_execution_id == workflow_id
+
+ # Test serialization of the above (should use alias)
+ serialized1 = system_var1.model_dump()
+ assert "workflow_run_id" in serialized1
+ assert serialized1["workflow_run_id"] == workflow_id
+
+ # Test both present - workflow_run_id takes precedence (validator logic)
+ data2 = {
+ **VALID_BASE_DATA,
+ "workflow_execution_id": "should-be-removed",
+ "workflow_run_id": workflow_id,
+ }
+ system_var2 = SystemVariable(**data2)
+ assert system_var2.workflow_execution_id == workflow_id
+
+ # Verify serialization consistency
+ serialized2 = system_var2.model_dump()
+ assert serialized2["workflow_run_id"] == workflow_id
+
+
+def test_constructor_with_extra_key():
+ # Test that SystemVariable should forbid extra keys
+ with pytest.raises(ValidationError):
+ # This should fail because there is an unexpected key.
+ SystemVariable(invalid_key=1) # type: ignore
diff --git a/api/tests/unit_tests/core/workflow/test_variable_pool.py b/api/tests/unit_tests/core/workflow/test_variable_pool.py
index efbcdc760c..c65b60cb4d 100644
--- a/api/tests/unit_tests/core/workflow/test_variable_pool.py
+++ b/api/tests/unit_tests/core/workflow/test_variable_pool.py
@@ -1,13 +1,43 @@
+import uuid
+from collections import defaultdict
+
import pytest
from core.file import File, FileTransferMethod, FileType
from core.variables import FileSegment, StringSegment
+from core.variables.segments import (
+ ArrayAnySegment,
+ ArrayFileSegment,
+ ArrayNumberSegment,
+ ArrayObjectSegment,
+ ArrayStringSegment,
+ FloatSegment,
+ IntegerSegment,
+ NoneSegment,
+ ObjectSegment,
+)
+from core.variables.variables import (
+ ArrayNumberVariable,
+ ArrayObjectVariable,
+ ArrayStringVariable,
+ FloatVariable,
+ IntegerVariable,
+ ObjectVariable,
+ StringVariable,
+ VariableUnion,
+)
+from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
from core.workflow.entities.variable_pool import VariablePool
+from core.workflow.system_variable import SystemVariable
+from factories.variable_factory import build_segment, segment_to_variable
@pytest.fixture
def pool():
- return VariablePool(system_variables={}, user_inputs={})
+ return VariablePool(
+ system_variables=SystemVariable(user_id="test_user_id", app_id="test_app_id", workflow_id="test_workflow_id"),
+ user_inputs={},
+ )
@pytest.fixture
@@ -44,3 +74,365 @@ def test_use_long_selector(pool):
result = pool.get(("node_1", "part_1", "part_2"))
assert result is not None
assert result.value == "test_value"
+
+
+class TestVariablePool:
+ def test_constructor(self):
+ # Test with minimal required SystemVariable
+ minimal_system_vars = SystemVariable(
+ user_id="test_user_id", app_id="test_app_id", workflow_id="test_workflow_id"
+ )
+ pool = VariablePool(system_variables=minimal_system_vars)
+
+ # Test with all parameters
+ pool = VariablePool(
+ variable_dictionary={},
+ user_inputs={},
+ system_variables=minimal_system_vars,
+ environment_variables=[],
+ conversation_variables=[],
+ )
+
+ # Test with more complex SystemVariable
+ complex_system_vars = SystemVariable(
+ user_id="test_user_id", app_id="test_app_id", workflow_id="test_workflow_id"
+ )
+ pool = VariablePool(
+ user_inputs={"key": "value"},
+ system_variables=complex_system_vars,
+ environment_variables=[
+ segment_to_variable(
+ segment=build_segment(1),
+ selector=[ENVIRONMENT_VARIABLE_NODE_ID, "env_var_1"],
+ name="env_var_1",
+ )
+ ],
+ conversation_variables=[
+ segment_to_variable(
+ segment=build_segment("1"),
+ selector=[CONVERSATION_VARIABLE_NODE_ID, "conv_var_1"],
+ name="conv_var_1",
+ )
+ ],
+ )
+
+ def test_get_system_variables(self):
+ sys_var = SystemVariable(
+ user_id="test_user_id",
+ app_id="test_app_id",
+ workflow_id="test_workflow_id",
+ workflow_execution_id="test_execution_123",
+ query="test query",
+ conversation_id="test_conv_id",
+ dialogue_count=5,
+ )
+ pool = VariablePool(system_variables=sys_var)
+
+ kv = [
+ ("user_id", sys_var.user_id),
+ ("app_id", sys_var.app_id),
+ ("workflow_id", sys_var.workflow_id),
+ ("workflow_run_id", sys_var.workflow_execution_id),
+ ("query", sys_var.query),
+ ("conversation_id", sys_var.conversation_id),
+ ("dialogue_count", sys_var.dialogue_count),
+ ]
+ for key, expected_value in kv:
+ segment = pool.get([SYSTEM_VARIABLE_NODE_ID, key])
+ assert segment is not None
+ assert segment.value == expected_value
+
+
+class TestVariablePoolSerialization:
+ """Test cases for VariablePool serialization and deserialization using Pydantic's built-in methods.
+
+ These tests focus exclusively on serialization/deserialization logic to ensure that
+ VariablePool data can be properly serialized to dictionaries/JSON and reconstructed
+ while preserving all data integrity.
+ """
+
+ _NODE1_ID = "node_1"
+ _NODE2_ID = "node_2"
+ _NODE3_ID = "node_3"
+
+ def _create_pool_without_file(self):
+ # Create comprehensive system variables
+ system_vars = SystemVariable(
+ user_id="test_user_id",
+ app_id="test_app_id",
+ workflow_id="test_workflow_id",
+ workflow_execution_id="test_execution_123",
+ query="test query",
+ conversation_id="test_conv_id",
+ dialogue_count=5,
+ )
+
+ # Create environment variables with all types including ArrayFileVariable
+ env_vars: list[VariableUnion] = [
+ StringVariable(
+ id="env_string_id",
+ name="env_string",
+ value="env_string_value",
+ selector=[ENVIRONMENT_VARIABLE_NODE_ID, "env_string"],
+ ),
+ IntegerVariable(
+ id="env_integer_id",
+ name="env_integer",
+ value=1,
+ selector=[ENVIRONMENT_VARIABLE_NODE_ID, "env_integer"],
+ ),
+ FloatVariable(
+ id="env_float_id",
+ name="env_float",
+ value=1.0,
+ selector=[ENVIRONMENT_VARIABLE_NODE_ID, "env_float"],
+ ),
+ ]
+
+ # Create conversation variables with complex data
+ conv_vars: list[VariableUnion] = [
+ StringVariable(
+ id="conv_string_id",
+ name="conv_string",
+ value="conv_string_value",
+ selector=[CONVERSATION_VARIABLE_NODE_ID, "conv_string"],
+ ),
+ IntegerVariable(
+ id="conv_integer_id",
+ name="conv_integer",
+ value=1,
+ selector=[CONVERSATION_VARIABLE_NODE_ID, "conv_integer"],
+ ),
+ FloatVariable(
+ id="conv_float_id",
+ name="conv_float",
+ value=1.0,
+ selector=[CONVERSATION_VARIABLE_NODE_ID, "conv_float"],
+ ),
+ ObjectVariable(
+ id="conv_object_id",
+ name="conv_object",
+ value={"key": "value", "nested": {"data": 123}},
+ selector=[CONVERSATION_VARIABLE_NODE_ID, "conv_object"],
+ ),
+ ArrayStringVariable(
+ id="conv_array_string_id",
+ name="conv_array_string",
+ value=["conv_array_string_value"],
+ selector=[CONVERSATION_VARIABLE_NODE_ID, "conv_array_string"],
+ ),
+ ArrayNumberVariable(
+ id="conv_array_number_id",
+ name="conv_array_number",
+ value=[1, 1.0],
+ selector=[CONVERSATION_VARIABLE_NODE_ID, "conv_array_number"],
+ ),
+ ArrayObjectVariable(
+ id="conv_array_object_id",
+ name="conv_array_object",
+ value=[{"a": 1}, {"b": "2"}],
+ selector=[CONVERSATION_VARIABLE_NODE_ID, "conv_array_object"],
+ ),
+ ]
+
+ # Create comprehensive user inputs
+ user_inputs = {
+ "string_input": "test_value",
+ "number_input": 42,
+ "object_input": {"nested": {"key": "value"}},
+ "array_input": ["item1", "item2", "item3"],
+ }
+
+ # Create VariablePool
+ pool = VariablePool(
+ system_variables=system_vars,
+ user_inputs=user_inputs,
+ environment_variables=env_vars,
+ conversation_variables=conv_vars,
+ )
+ return pool
+
+ def _add_node_data_to_pool(self, pool: VariablePool, with_file=False):
+ test_file = File(
+ tenant_id="test_tenant_id",
+ type=FileType.DOCUMENT,
+ transfer_method=FileTransferMethod.LOCAL_FILE,
+ related_id="test_related_id",
+ remote_url="test_url",
+ filename="test_file.txt",
+ storage_key="test_storage_key",
+ )
+
+ # Add various segment types to variable dictionary
+ pool.add((self._NODE1_ID, "string_var"), StringSegment(value="test_string"))
+ pool.add((self._NODE1_ID, "int_var"), IntegerSegment(value=123))
+ pool.add((self._NODE1_ID, "float_var"), FloatSegment(value=45.67))
+ pool.add((self._NODE1_ID, "object_var"), ObjectSegment(value={"test": "data"}))
+ if with_file:
+ pool.add((self._NODE1_ID, "file_var"), FileSegment(value=test_file))
+ pool.add((self._NODE1_ID, "none_var"), NoneSegment())
+
+ # Add array segments including ArrayFileVariable
+ pool.add((self._NODE2_ID, "array_string"), ArrayStringSegment(value=["a", "b", "c"]))
+ pool.add((self._NODE2_ID, "array_number"), ArrayNumberSegment(value=[1, 2, 3]))
+ pool.add((self._NODE2_ID, "array_object"), ArrayObjectSegment(value=[{"a": 1}, {"b": 2}]))
+ if with_file:
+ pool.add((self._NODE2_ID, "array_file"), ArrayFileSegment(value=[test_file]))
+ pool.add((self._NODE2_ID, "array_any"), ArrayAnySegment(value=["mixed", 123, {"key": "value"}]))
+
+ # Add nested variables
+ pool.add((self._NODE3_ID, "nested", "deep", "var"), StringSegment(value="deep_value"))
+
+ def test_system_variables(self):
+ sys_vars = SystemVariable(
+ user_id="test_user_id",
+ app_id="test_app_id",
+ workflow_id="test_workflow_id",
+ workflow_execution_id="test_execution_123",
+ query="test query",
+ conversation_id="test_conv_id",
+ dialogue_count=5,
+ )
+ pool = VariablePool(system_variables=sys_vars)
+ json = pool.model_dump_json()
+ pool2 = VariablePool.model_validate_json(json)
+ assert pool2.system_variables == sys_vars
+
+ for mode in ["json", "python"]:
+ dict_ = pool.model_dump(mode=mode)
+ pool2 = VariablePool.model_validate(dict_)
+ assert pool2.system_variables == sys_vars
+
+ def test_pool_without_file_vars(self):
+ pool = self._create_pool_without_file()
+ json = pool.model_dump_json()
+ pool2 = pool.model_validate_json(json)
+ assert pool2.system_variables == pool.system_variables
+ assert pool2.conversation_variables == pool.conversation_variables
+ assert pool2.environment_variables == pool.environment_variables
+ assert pool2.user_inputs == pool.user_inputs
+ assert pool2.variable_dictionary == pool.variable_dictionary
+ assert pool2 == pool
+
+ def test_basic_dictionary_round_trip(self):
+ """Test basic round-trip serialization: model_dump() → model_validate()"""
+ # Create a comprehensive VariablePool with all data types
+ original_pool = self._create_pool_without_file()
+ self._add_node_data_to_pool(original_pool)
+
+ # Serialize to dictionary using Pydantic's model_dump()
+ serialized_data = original_pool.model_dump()
+
+ # Verify serialized data structure
+ assert isinstance(serialized_data, dict)
+ assert "system_variables" in serialized_data
+ assert "user_inputs" in serialized_data
+ assert "environment_variables" in serialized_data
+ assert "conversation_variables" in serialized_data
+ assert "variable_dictionary" in serialized_data
+
+ # Deserialize back using Pydantic's model_validate()
+ reconstructed_pool = VariablePool.model_validate(serialized_data)
+
+ # Verify data integrity is preserved
+ self._assert_pools_equal(original_pool, reconstructed_pool)
+
+ def test_json_round_trip(self):
+ """Test JSON round-trip serialization: model_dump_json() → model_validate_json()"""
+ # Create a comprehensive VariablePool with all data types
+ original_pool = self._create_pool_without_file()
+ self._add_node_data_to_pool(original_pool)
+
+ # Serialize to JSON string using Pydantic's model_dump_json()
+ json_data = original_pool.model_dump_json()
+
+ # Verify JSON is valid string
+ assert isinstance(json_data, str)
+ assert len(json_data) > 0
+
+ # Deserialize back using Pydantic's model_validate_json()
+ reconstructed_pool = VariablePool.model_validate_json(json_data)
+
+ # Verify data integrity is preserved
+ self._assert_pools_equal(original_pool, reconstructed_pool)
+
+ def test_complex_data_serialization(self):
+ """Test serialization of complex data structures including ArrayFileVariable"""
+ original_pool = self._create_pool_without_file()
+ self._add_node_data_to_pool(original_pool, with_file=True)
+
+ # Test dictionary round-trip
+ dict_data = original_pool.model_dump()
+ reconstructed_dict = VariablePool.model_validate(dict_data)
+
+ # Test JSON round-trip
+ json_data = original_pool.model_dump_json()
+ reconstructed_json = VariablePool.model_validate_json(json_data)
+
+ # Verify both reconstructed pools are equivalent
+ self._assert_pools_equal(reconstructed_dict, reconstructed_json)
+ # TODO: assert the data for file object...
+
+ def _assert_pools_equal(self, pool1: VariablePool, pool2: VariablePool) -> None:
+ """Assert that two VariablePools contain equivalent data"""
+
+ # Compare system variables
+ assert pool1.system_variables == pool2.system_variables
+
+ # Compare user inputs
+ assert dict(pool1.user_inputs) == dict(pool2.user_inputs)
+
+ # Compare environment variables count
+ assert pool1.environment_variables == pool2.environment_variables
+
+ # Compare conversation variables count
+ assert pool1.conversation_variables == pool2.conversation_variables
+
+ # Test key variable retrievals to ensure functionality is preserved
+ test_selectors = [
+ (SYSTEM_VARIABLE_NODE_ID, "user_id"),
+ (SYSTEM_VARIABLE_NODE_ID, "app_id"),
+ (ENVIRONMENT_VARIABLE_NODE_ID, "env_string"),
+ (ENVIRONMENT_VARIABLE_NODE_ID, "env_number"),
+ (CONVERSATION_VARIABLE_NODE_ID, "conv_string"),
+ (self._NODE1_ID, "string_var"),
+ (self._NODE1_ID, "int_var"),
+ (self._NODE1_ID, "float_var"),
+ (self._NODE2_ID, "array_string"),
+ (self._NODE2_ID, "array_number"),
+ (self._NODE3_ID, "nested", "deep", "var"),
+ ]
+
+ for selector in test_selectors:
+ val1 = pool1.get(selector)
+ val2 = pool2.get(selector)
+
+ # Both should exist or both should be None
+ assert (val1 is None) == (val2 is None)
+
+ if val1 is not None and val2 is not None:
+ # Values should be equal
+ assert val1.value == val2.value
+ # Value types should be the same (more important than exact class type)
+ assert val1.value_type == val2.value_type
+
+ def test_variable_pool_deserialization_default_dict(self):
+ variable_pool = VariablePool(
+ user_inputs={"a": 1, "b": "2"},
+ system_variables=SystemVariable(workflow_id=str(uuid.uuid4())),
+ environment_variables=[
+ StringVariable(name="str_var", value="a"),
+ ],
+ conversation_variables=[IntegerVariable(name="int_var", value=1)],
+ )
+ assert isinstance(variable_pool.variable_dictionary, defaultdict)
+ json = variable_pool.model_dump_json()
+ loaded = VariablePool.model_validate_json(json)
+ assert isinstance(loaded.variable_dictionary, defaultdict)
+
+ loaded.add(["non_exist_node", "a"], 1)
+
+ pool_dict = variable_pool.model_dump()
+ loaded = VariablePool.model_validate(pool_dict)
+ assert isinstance(loaded.variable_dictionary, defaultdict)
+ loaded.add(["non_exist_node", "a"], 1)
diff --git a/api/tests/unit_tests/core/workflow/test_workflow_cycle_manager.py b/api/tests/unit_tests/core/workflow/test_workflow_cycle_manager.py
index fddc182594..4866db1fdb 100644
--- a/api/tests/unit_tests/core/workflow/test_workflow_cycle_manager.py
+++ b/api/tests/unit_tests/core/workflow/test_workflow_cycle_manager.py
@@ -18,10 +18,10 @@ from core.workflow.entities.workflow_node_execution import (
WorkflowNodeExecutionMetadataKey,
WorkflowNodeExecutionStatus,
)
-from core.workflow.enums import SystemVariableKey
from core.workflow.nodes import NodeType
from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
from core.workflow.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
+from core.workflow.system_variable import SystemVariable
from core.workflow.workflow_cycle_manager import CycleManagerWorkflowInfo, WorkflowCycleManager
from models.enums import CreatorUserRole
from models.model import AppMode
@@ -67,28 +67,25 @@ def real_app_generate_entity():
@pytest.fixture
def real_workflow_system_variables():
- return {
- SystemVariableKey.QUERY: "test query",
- SystemVariableKey.CONVERSATION_ID: "test-conversation-id",
- SystemVariableKey.USER_ID: "test-user-id",
- SystemVariableKey.APP_ID: "test-app-id",
- SystemVariableKey.WORKFLOW_ID: "test-workflow-id",
- SystemVariableKey.WORKFLOW_EXECUTION_ID: "test-workflow-run-id",
- }
+ return SystemVariable(
+ query="test query",
+ conversation_id="test-conversation-id",
+ user_id="test-user-id",
+ app_id="test-app-id",
+ workflow_id="test-workflow-id",
+ workflow_execution_id="test-workflow-run-id",
+ )
@pytest.fixture
def mock_node_execution_repository():
repo = MagicMock(spec=WorkflowNodeExecutionRepository)
- repo.get_by_node_execution_id.return_value = None
- repo.get_running_executions.return_value = []
return repo
@pytest.fixture
def mock_workflow_execution_repository():
repo = MagicMock(spec=WorkflowExecutionRepository)
- repo.get.return_value = None
return repo
@@ -163,7 +160,6 @@ def real_workflow_run():
workflow_run.tenant_id = "test-tenant-id"
workflow_run.app_id = "test-app-id"
workflow_run.workflow_id = "test-workflow-id"
- workflow_run.sequence_number = 1
workflow_run.type = "chat"
workflow_run.triggered_from = "app-run"
workflow_run.version = "1.0"
@@ -218,8 +214,8 @@ def test_handle_workflow_run_success(workflow_cycle_manager, mock_workflow_execu
started_at=datetime.now(UTC).replace(tzinfo=None),
)
- # Mock _get_workflow_execution_or_raise_error to return the real workflow_execution
- workflow_cycle_manager._workflow_execution_repository.get.return_value = workflow_execution
+ # Pre-populate the cache with the workflow execution
+ workflow_cycle_manager._workflow_execution_cache[workflow_execution.id_] = workflow_execution
# Call the method
result = workflow_cycle_manager.handle_workflow_run_success(
@@ -252,11 +248,10 @@ def test_handle_workflow_run_failed(workflow_cycle_manager, mock_workflow_execut
started_at=datetime.now(UTC).replace(tzinfo=None),
)
- # Mock _get_workflow_execution_or_raise_error to return the real workflow_execution
- workflow_cycle_manager._workflow_execution_repository.get.return_value = workflow_execution
+ # Pre-populate the cache with the workflow execution
+ workflow_cycle_manager._workflow_execution_cache[workflow_execution.id_] = workflow_execution
- # Mock get_running_executions to return an empty list
- workflow_cycle_manager._workflow_node_execution_repository.get_running_executions.return_value = []
+ # No running node executions in cache (empty cache)
# Call the method
result = workflow_cycle_manager.handle_workflow_run_failed(
@@ -290,8 +285,8 @@ def test_handle_node_execution_start(workflow_cycle_manager, mock_workflow_execu
started_at=datetime.now(UTC).replace(tzinfo=None),
)
- # Mock _get_workflow_execution_or_raise_error to return the real workflow_execution
- workflow_cycle_manager._workflow_execution_repository.get.return_value = workflow_execution
+ # Pre-populate the cache with the workflow execution
+ workflow_cycle_manager._workflow_execution_cache[workflow_execution.id_] = workflow_execution
# Create a mock event
event = MagicMock(spec=QueueNodeStartedEvent)
@@ -343,8 +338,8 @@ def test_get_workflow_execution_or_raise_error(workflow_cycle_manager, mock_work
started_at=datetime.now(UTC).replace(tzinfo=None),
)
- # Mock the repository get method to return the real execution
- workflow_cycle_manager._workflow_execution_repository.get.return_value = workflow_execution
+ # Pre-populate the cache with the workflow execution
+ workflow_cycle_manager._workflow_execution_cache["test-workflow-run-id"] = workflow_execution
# Call the method
result = workflow_cycle_manager._get_workflow_execution_or_raise_error("test-workflow-run-id")
@@ -352,11 +347,13 @@ def test_get_workflow_execution_or_raise_error(workflow_cycle_manager, mock_work
# Verify the result
assert result == workflow_execution
- # Test error case
- workflow_cycle_manager._workflow_execution_repository.get.return_value = None
+ # Test error case - clear cache
+ workflow_cycle_manager._workflow_execution_cache.clear()
# Expect an error when execution is not found
- with pytest.raises(ValueError):
+ from core.app.task_pipeline.exc import WorkflowRunNotFoundError
+
+ with pytest.raises(WorkflowRunNotFoundError):
workflow_cycle_manager._get_workflow_execution_or_raise_error("non-existent-id")
@@ -385,8 +382,8 @@ def test_handle_workflow_node_execution_success(workflow_cycle_manager):
created_at=datetime.now(UTC).replace(tzinfo=None),
)
- # Mock the repository to return the node execution
- workflow_cycle_manager._workflow_node_execution_repository.get_by_node_execution_id.return_value = node_execution
+ # Pre-populate the cache with the node execution
+ workflow_cycle_manager._node_execution_cache["test-node-execution-id"] = node_execution
# Call the method
result = workflow_cycle_manager.handle_workflow_node_execution_success(
@@ -415,8 +412,8 @@ def test_handle_workflow_run_partial_success(workflow_cycle_manager, mock_workfl
started_at=datetime.now(UTC).replace(tzinfo=None),
)
- # Mock _get_workflow_execution_or_raise_error to return the real workflow_execution
- workflow_cycle_manager._workflow_execution_repository.get.return_value = workflow_execution
+ # Pre-populate the cache with the workflow execution
+ workflow_cycle_manager._workflow_execution_cache[workflow_execution.id_] = workflow_execution
# Call the method
result = workflow_cycle_manager.handle_workflow_run_partial_success(
@@ -463,8 +460,8 @@ def test_handle_workflow_node_execution_failed(workflow_cycle_manager):
created_at=datetime.now(UTC).replace(tzinfo=None),
)
- # Mock the repository to return the node execution
- workflow_cycle_manager._workflow_node_execution_repository.get_by_node_execution_id.return_value = node_execution
+ # Pre-populate the cache with the node execution
+ workflow_cycle_manager._node_execution_cache["test-node-execution-id"] = node_execution
# Call the method
result = workflow_cycle_manager.handle_workflow_node_execution_failed(
diff --git a/api/tests/unit_tests/core/workflow/utils/test_variable_template_parser.py b/api/tests/unit_tests/core/workflow/utils/test_variable_template_parser.py
index 2f90afcf89..28ef05edde 100644
--- a/api/tests/unit_tests/core/workflow/utils/test_variable_template_parser.py
+++ b/api/tests/unit_tests/core/workflow/utils/test_variable_template_parser.py
@@ -1,22 +1,10 @@
-from core.variables import SecretVariable
+import dataclasses
+
from core.workflow.entities.variable_entities import VariableSelector
-from core.workflow.entities.variable_pool import VariablePool
-from core.workflow.enums import SystemVariableKey
from core.workflow.utils import variable_template_parser
def test_extract_selectors_from_template():
- variable_pool = VariablePool(
- system_variables={
- SystemVariableKey("user_id"): "fake-user-id",
- },
- user_inputs={},
- environment_variables=[
- SecretVariable(name="secret_key", value="fake-secret-key"),
- ],
- conversation_variables=[],
- )
- variable_pool.add(("node_id", "custom_query"), "fake-user-query")
template = (
"Hello, {{#sys.user_id#}}! Your query is {{#node_id.custom_query#}}. And your key is {{#env.secret_key#}}."
)
@@ -26,3 +14,35 @@ def test_extract_selectors_from_template():
VariableSelector(variable="#node_id.custom_query#", value_selector=["node_id", "custom_query"]),
VariableSelector(variable="#env.secret_key#", value_selector=["env", "secret_key"]),
]
+
+
+def test_invalid_references():
+ @dataclasses.dataclass
+ class TestCase:
+ name: str
+ template: str
+
+ cases = [
+ TestCase(
+ name="lack of closing brace",
+ template="Hello, {{#sys.user_id#",
+ ),
+ TestCase(
+ name="lack of opening brace",
+ template="Hello, #sys.user_id#}}",
+ ),
+ TestCase(
+ name="lack selector name",
+ template="Hello, {{#sys#}}",
+ ),
+ TestCase(
+ name="empty node name part",
+ template="Hello, {{#.user_id#}}",
+ ),
+ ]
+ for idx, c in enumerate(cases, 1):
+ fail_msg = f"Test case {c.name} failed, index={idx}"
+ selectors = variable_template_parser.extract_selectors_from_template(c.template)
+ assert selectors == [], fail_msg
+ parser = variable_template_parser.VariableTemplateParser(c.template)
+ assert parser.extract_variable_selectors() == [], fail_msg
diff --git a/api/tests/unit_tests/core/workflow/utils/test_variable_utils.py b/api/tests/unit_tests/core/workflow/utils/test_variable_utils.py
new file mode 100644
index 0000000000..54bf6558bf
--- /dev/null
+++ b/api/tests/unit_tests/core/workflow/utils/test_variable_utils.py
@@ -0,0 +1,148 @@
+from typing import Any
+
+from core.variables.segments import ObjectSegment, StringSegment
+from core.workflow.entities.variable_pool import VariablePool
+from core.workflow.utils.variable_utils import append_variables_recursively
+
+
+class TestAppendVariablesRecursively:
+ """Test cases for append_variables_recursively function"""
+
+ def test_append_simple_dict_value(self):
+ """Test appending a simple dictionary value"""
+ pool = VariablePool.empty()
+ node_id = "test_node"
+ variable_key_list = ["output"]
+ variable_value = {"name": "John", "age": 30}
+
+ append_variables_recursively(pool, node_id, variable_key_list, variable_value)
+
+ # Check that the main variable is added
+ main_var = pool.get([node_id] + variable_key_list)
+ assert main_var is not None
+ assert main_var.value == variable_value
+
+ # Check that nested variables are added recursively
+ name_var = pool.get([node_id] + variable_key_list + ["name"])
+ assert name_var is not None
+ assert name_var.value == "John"
+
+ age_var = pool.get([node_id] + variable_key_list + ["age"])
+ assert age_var is not None
+ assert age_var.value == 30
+
+ def test_append_object_segment_value(self):
+ """Test appending an ObjectSegment value"""
+ pool = VariablePool.empty()
+ node_id = "test_node"
+ variable_key_list = ["result"]
+
+ # Create an ObjectSegment
+ obj_data = {"status": "success", "code": 200}
+ variable_value = ObjectSegment(value=obj_data)
+
+ append_variables_recursively(pool, node_id, variable_key_list, variable_value)
+
+ # Check that the main variable is added
+ main_var = pool.get([node_id] + variable_key_list)
+ assert main_var is not None
+ assert isinstance(main_var, ObjectSegment)
+ assert main_var.value == obj_data
+
+ # Check that nested variables are added recursively
+ status_var = pool.get([node_id] + variable_key_list + ["status"])
+ assert status_var is not None
+ assert status_var.value == "success"
+
+ code_var = pool.get([node_id] + variable_key_list + ["code"])
+ assert code_var is not None
+ assert code_var.value == 200
+
+ def test_append_nested_dict_value(self):
+ """Test appending a nested dictionary value"""
+ pool = VariablePool.empty()
+ node_id = "test_node"
+ variable_key_list = ["data"]
+
+ variable_value = {
+ "user": {
+ "profile": {"name": "Alice", "email": "alice@example.com"},
+ "settings": {"theme": "dark", "notifications": True},
+ },
+ "metadata": {"version": "1.0", "timestamp": 1234567890},
+ }
+
+ append_variables_recursively(pool, node_id, variable_key_list, variable_value)
+
+ # Check deeply nested variables
+ name_var = pool.get([node_id] + variable_key_list + ["user", "profile", "name"])
+ assert name_var is not None
+ assert name_var.value == "Alice"
+
+ email_var = pool.get([node_id] + variable_key_list + ["user", "profile", "email"])
+ assert email_var is not None
+ assert email_var.value == "alice@example.com"
+
+ theme_var = pool.get([node_id] + variable_key_list + ["user", "settings", "theme"])
+ assert theme_var is not None
+ assert theme_var.value == "dark"
+
+ notifications_var = pool.get([node_id] + variable_key_list + ["user", "settings", "notifications"])
+ assert notifications_var is not None
+ assert notifications_var.value == 1 # Boolean True is converted to integer 1
+
+ version_var = pool.get([node_id] + variable_key_list + ["metadata", "version"])
+ assert version_var is not None
+ assert version_var.value == "1.0"
+
+ def test_append_non_dict_value(self):
+ """Test appending a non-dictionary value (should not recurse)"""
+ pool = VariablePool.empty()
+ node_id = "test_node"
+ variable_key_list = ["simple"]
+ variable_value = "simple_string"
+
+ append_variables_recursively(pool, node_id, variable_key_list, variable_value)
+
+ # Check that only the main variable is added
+ main_var = pool.get([node_id] + variable_key_list)
+ assert main_var is not None
+ assert main_var.value == variable_value
+
+ # Ensure no additional variables are created
+ assert len(pool.variable_dictionary[node_id]) == 1
+
+ def test_append_segment_non_object_value(self):
+ """Test appending a Segment that is not ObjectSegment (should not recurse)"""
+ pool = VariablePool.empty()
+ node_id = "test_node"
+ variable_key_list = ["text"]
+ variable_value = StringSegment(value="Hello World")
+
+ append_variables_recursively(pool, node_id, variable_key_list, variable_value)
+
+ # Check that only the main variable is added
+ main_var = pool.get([node_id] + variable_key_list)
+ assert main_var is not None
+ assert isinstance(main_var, StringSegment)
+ assert main_var.value == "Hello World"
+
+ # Ensure no additional variables are created
+ assert len(pool.variable_dictionary[node_id]) == 1
+
+ def test_append_empty_dict_value(self):
+ """Test appending an empty dictionary value"""
+ pool = VariablePool.empty()
+ node_id = "test_node"
+ variable_key_list = ["empty"]
+ variable_value: dict[str, Any] = {}
+
+ append_variables_recursively(pool, node_id, variable_key_list, variable_value)
+
+ # Check that the main variable is added
+ main_var = pool.get([node_id] + variable_key_list)
+ assert main_var is not None
+ assert main_var.value == {}
+
+ # Ensure only the main variable is created (no recursion for empty dict)
+ assert len(pool.variable_dictionary[node_id]) == 1
diff --git a/api/tests/unit_tests/extensions/test_redis.py b/api/tests/unit_tests/extensions/test_redis.py
new file mode 100644
index 0000000000..933fa32894
--- /dev/null
+++ b/api/tests/unit_tests/extensions/test_redis.py
@@ -0,0 +1,53 @@
+from redis import RedisError
+
+from extensions.ext_redis import redis_fallback
+
+
+def test_redis_fallback_success():
+ @redis_fallback(default_return=None)
+ def test_func():
+ return "success"
+
+ assert test_func() == "success"
+
+
+def test_redis_fallback_error():
+ @redis_fallback(default_return="fallback")
+ def test_func():
+ raise RedisError("Redis error")
+
+ assert test_func() == "fallback"
+
+
+def test_redis_fallback_none_default():
+ @redis_fallback()
+ def test_func():
+ raise RedisError("Redis error")
+
+ assert test_func() is None
+
+
+def test_redis_fallback_with_args():
+ @redis_fallback(default_return=0)
+ def test_func(x, y):
+ raise RedisError("Redis error")
+
+ assert test_func(1, 2) == 0
+
+
+def test_redis_fallback_with_kwargs():
+ @redis_fallback(default_return={})
+ def test_func(x=None, y=None):
+ raise RedisError("Redis error")
+
+ assert test_func(x=1, y=2) == {}
+
+
+def test_redis_fallback_preserves_function_metadata():
+ @redis_fallback(default_return=None)
+ def test_func():
+ """Test function docstring"""
+ pass
+
+ assert test_func.__name__ == "test_func"
+ assert test_func.__doc__ == "Test function docstring"
diff --git a/api/tests/unit_tests/factories/test_variable_factory.py b/api/tests/unit_tests/factories/test_variable_factory.py
new file mode 100644
index 0000000000..4f2542a323
--- /dev/null
+++ b/api/tests/unit_tests/factories/test_variable_factory.py
@@ -0,0 +1,861 @@
+import math
+from dataclasses import dataclass
+from typing import Any
+from uuid import uuid4
+
+import pytest
+from hypothesis import given
+from hypothesis import strategies as st
+
+from core.file import File, FileTransferMethod, FileType
+from core.variables import (
+ ArrayNumberVariable,
+ ArrayObjectVariable,
+ ArrayStringVariable,
+ FloatVariable,
+ IntegerVariable,
+ SecretVariable,
+ StringVariable,
+)
+from core.variables.exc import VariableError
+from core.variables.segments import (
+ ArrayAnySegment,
+ ArrayFileSegment,
+ ArrayNumberSegment,
+ ArrayObjectSegment,
+ ArrayStringSegment,
+ FileSegment,
+ FloatSegment,
+ IntegerSegment,
+ NoneSegment,
+ ObjectSegment,
+ StringSegment,
+)
+from core.variables.types import SegmentType
+from factories import variable_factory
+from factories.variable_factory import TypeMismatchError, build_segment_with_type
+
+
+def test_string_variable():
+ test_data = {"value_type": "string", "name": "test_text", "value": "Hello, World!"}
+ result = variable_factory.build_conversation_variable_from_mapping(test_data)
+ assert isinstance(result, StringVariable)
+
+
+def test_integer_variable():
+ test_data = {"value_type": "number", "name": "test_int", "value": 42}
+ result = variable_factory.build_conversation_variable_from_mapping(test_data)
+ assert isinstance(result, IntegerVariable)
+
+
+def test_float_variable():
+ test_data = {"value_type": "number", "name": "test_float", "value": 3.14}
+ result = variable_factory.build_conversation_variable_from_mapping(test_data)
+ assert isinstance(result, FloatVariable)
+
+
+def test_secret_variable():
+ test_data = {"value_type": "secret", "name": "test_secret", "value": "secret_value"}
+ result = variable_factory.build_conversation_variable_from_mapping(test_data)
+ assert isinstance(result, SecretVariable)
+
+
+def test_invalid_value_type():
+ test_data = {"value_type": "unknown", "name": "test_invalid", "value": "value"}
+ with pytest.raises(VariableError):
+ variable_factory.build_conversation_variable_from_mapping(test_data)
+
+
+def test_build_a_blank_string():
+ result = variable_factory.build_conversation_variable_from_mapping(
+ {
+ "value_type": "string",
+ "name": "blank",
+ "value": "",
+ }
+ )
+ assert isinstance(result, StringVariable)
+ assert result.value == ""
+
+
+def test_build_a_object_variable_with_none_value():
+ var = variable_factory.build_segment(
+ {
+ "key1": None,
+ }
+ )
+ assert isinstance(var, ObjectSegment)
+ assert var.value["key1"] is None
+
+
+def test_object_variable():
+ mapping = {
+ "id": str(uuid4()),
+ "value_type": "object",
+ "name": "test_object",
+ "description": "Description of the variable.",
+ "value": {
+ "key1": "text",
+ "key2": 2,
+ },
+ }
+ variable = variable_factory.build_conversation_variable_from_mapping(mapping)
+ assert isinstance(variable, ObjectSegment)
+ assert isinstance(variable.value["key1"], str)
+ assert isinstance(variable.value["key2"], int)
+
+
+def test_array_string_variable():
+ mapping = {
+ "id": str(uuid4()),
+ "value_type": "array[string]",
+ "name": "test_array",
+ "description": "Description of the variable.",
+ "value": [
+ "text",
+ "text",
+ ],
+ }
+ variable = variable_factory.build_conversation_variable_from_mapping(mapping)
+ assert isinstance(variable, ArrayStringVariable)
+ assert isinstance(variable.value[0], str)
+ assert isinstance(variable.value[1], str)
+
+
+def test_array_number_variable():
+ mapping = {
+ "id": str(uuid4()),
+ "value_type": "array[number]",
+ "name": "test_array",
+ "description": "Description of the variable.",
+ "value": [
+ 1,
+ 2.0,
+ ],
+ }
+ variable = variable_factory.build_conversation_variable_from_mapping(mapping)
+ assert isinstance(variable, ArrayNumberVariable)
+ assert isinstance(variable.value[0], int)
+ assert isinstance(variable.value[1], float)
+
+
+def test_array_object_variable():
+ mapping = {
+ "id": str(uuid4()),
+ "value_type": "array[object]",
+ "name": "test_array",
+ "description": "Description of the variable.",
+ "value": [
+ {
+ "key1": "text",
+ "key2": 1,
+ },
+ {
+ "key1": "text",
+ "key2": 1,
+ },
+ ],
+ }
+ variable = variable_factory.build_conversation_variable_from_mapping(mapping)
+ assert isinstance(variable, ArrayObjectVariable)
+ assert isinstance(variable.value[0], dict)
+ assert isinstance(variable.value[1], dict)
+ assert isinstance(variable.value[0]["key1"], str)
+ assert isinstance(variable.value[0]["key2"], int)
+ assert isinstance(variable.value[1]["key1"], str)
+ assert isinstance(variable.value[1]["key2"], int)
+
+
+def test_variable_cannot_large_than_200_kb():
+ with pytest.raises(VariableError):
+ variable_factory.build_conversation_variable_from_mapping(
+ {
+ "id": str(uuid4()),
+ "value_type": "string",
+ "name": "test_text",
+ "value": "a" * 1024 * 201,
+ }
+ )
+
+
+def test_array_none_variable():
+ var = variable_factory.build_segment([None, None, None, None])
+ assert isinstance(var, ArrayAnySegment)
+ assert var.value == [None, None, None, None]
+
+
+def test_build_segment_none_type():
+ """Test building NoneSegment from None value."""
+ segment = variable_factory.build_segment(None)
+ assert isinstance(segment, NoneSegment)
+ assert segment.value is None
+ assert segment.value_type == SegmentType.NONE
+
+
+def test_build_segment_none_type_properties():
+ """Test NoneSegment properties and methods."""
+ segment = variable_factory.build_segment(None)
+ assert segment.text == ""
+ assert segment.log == ""
+ assert segment.markdown == ""
+ assert segment.to_object() is None
+
+
+def test_build_segment_array_file_single_file():
+ """Test building ArrayFileSegment from list with single file."""
+ file = File(
+ id="test_file_id",
+ tenant_id="test_tenant_id",
+ type=FileType.IMAGE,
+ transfer_method=FileTransferMethod.REMOTE_URL,
+ remote_url="https://test.example.com/test-file.png",
+ filename="test-file",
+ extension=".png",
+ mime_type="image/png",
+ size=1000,
+ )
+ segment = variable_factory.build_segment([file])
+ assert isinstance(segment, ArrayFileSegment)
+ assert len(segment.value) == 1
+ assert segment.value[0] == file
+ assert segment.value_type == SegmentType.ARRAY_FILE
+
+
+def test_build_segment_array_file_multiple_files():
+ """Test building ArrayFileSegment from list with multiple files."""
+ file1 = File(
+ id="test_file_id_1",
+ tenant_id="test_tenant_id",
+ type=FileType.IMAGE,
+ transfer_method=FileTransferMethod.REMOTE_URL,
+ remote_url="https://test.example.com/test-file1.png",
+ filename="test-file1",
+ extension=".png",
+ mime_type="image/png",
+ size=1000,
+ )
+ file2 = File(
+ id="test_file_id_2",
+ tenant_id="test_tenant_id",
+ type=FileType.DOCUMENT,
+ transfer_method=FileTransferMethod.LOCAL_FILE,
+ related_id="test_relation_id",
+ filename="test-file2",
+ extension=".txt",
+ mime_type="text/plain",
+ size=500,
+ )
+ segment = variable_factory.build_segment([file1, file2])
+ assert isinstance(segment, ArrayFileSegment)
+ assert len(segment.value) == 2
+ assert segment.value[0] == file1
+ assert segment.value[1] == file2
+ assert segment.value_type == SegmentType.ARRAY_FILE
+
+
+def test_build_segment_array_file_empty_list():
+ """Test building ArrayFileSegment from empty list should create ArrayAnySegment."""
+ segment = variable_factory.build_segment([])
+ assert isinstance(segment, ArrayAnySegment)
+ assert segment.value == []
+ assert segment.value_type == SegmentType.ARRAY_ANY
+
+
+def test_build_segment_array_any_mixed_types():
+ """Test building ArrayAnySegment from list with mixed types."""
+ mixed_values = ["string", 42, 3.14, {"key": "value"}, None]
+ segment = variable_factory.build_segment(mixed_values)
+ assert isinstance(segment, ArrayAnySegment)
+ assert segment.value == mixed_values
+ assert segment.value_type == SegmentType.ARRAY_ANY
+
+
+def test_build_segment_array_any_with_nested_arrays():
+ """Test building ArrayAnySegment from list containing arrays."""
+ nested_values = [["nested", "array"], [1, 2, 3], "string"]
+ segment = variable_factory.build_segment(nested_values)
+ assert isinstance(segment, ArrayAnySegment)
+ assert segment.value == nested_values
+ assert segment.value_type == SegmentType.ARRAY_ANY
+
+
+def test_build_segment_array_any_mixed_with_files():
+ """Test building ArrayAnySegment from list with files and other types."""
+ file = File(
+ id="test_file_id",
+ tenant_id="test_tenant_id",
+ type=FileType.IMAGE,
+ transfer_method=FileTransferMethod.REMOTE_URL,
+ remote_url="https://test.example.com/test-file.png",
+ filename="test-file",
+ extension=".png",
+ mime_type="image/png",
+ size=1000,
+ )
+ mixed_values = [file, "string", 42]
+ segment = variable_factory.build_segment(mixed_values)
+ assert isinstance(segment, ArrayAnySegment)
+ assert segment.value == mixed_values
+ assert segment.value_type == SegmentType.ARRAY_ANY
+
+
+def test_build_segment_array_any_all_none_values():
+ """Test building ArrayAnySegment from list with all None values."""
+ none_values = [None, None, None]
+ segment = variable_factory.build_segment(none_values)
+ assert isinstance(segment, ArrayAnySegment)
+ assert segment.value == none_values
+ assert segment.value_type == SegmentType.ARRAY_ANY
+
+
+def test_build_segment_array_file_properties():
+ """Test ArrayFileSegment properties and methods."""
+ file1 = File(
+ id="test_file_id_1",
+ tenant_id="test_tenant_id",
+ type=FileType.IMAGE,
+ transfer_method=FileTransferMethod.REMOTE_URL,
+ remote_url="https://test.example.com/test-file1.png",
+ filename="test-file1",
+ extension=".png",
+ mime_type="image/png",
+ size=1000,
+ )
+ file2 = File(
+ id="test_file_id_2",
+ tenant_id="test_tenant_id",
+ type=FileType.DOCUMENT,
+ transfer_method=FileTransferMethod.REMOTE_URL,
+ remote_url="https://test.example.com/test-file2.txt",
+ filename="test-file2",
+ extension=".txt",
+ mime_type="text/plain",
+ size=500,
+ )
+ segment = variable_factory.build_segment([file1, file2])
+
+ # Test properties
+ assert segment.text == "" # ArrayFileSegment text property returns empty string
+ assert segment.log == "" # ArrayFileSegment log property returns empty string
+ assert segment.markdown == f"{file1.markdown}\n{file2.markdown}"
+ assert segment.to_object() == [file1, file2]
+
+
+def test_build_segment_array_any_properties():
+ """Test ArrayAnySegment properties and methods."""
+ mixed_values = ["string", 42, None]
+ segment = variable_factory.build_segment(mixed_values)
+
+ # Test properties
+ assert segment.text == str(mixed_values)
+ assert segment.log == str(mixed_values)
+ assert segment.markdown == "string\n42\nNone"
+ assert segment.to_object() == mixed_values
+
+
+def test_build_segment_edge_cases():
+ """Test edge cases for build_segment function."""
+ # Test with complex nested structures
+ complex_structure = [{"nested": {"deep": [1, 2, 3]}}, [{"inner": "value"}], "mixed"]
+ segment = variable_factory.build_segment(complex_structure)
+ assert isinstance(segment, ArrayAnySegment)
+ assert segment.value == complex_structure
+
+ # Test with single None in list
+ single_none = [None]
+ segment = variable_factory.build_segment(single_none)
+ assert isinstance(segment, ArrayAnySegment)
+ assert segment.value == single_none
+
+
+def test_build_segment_file_array_with_different_file_types():
+ """Test ArrayFileSegment with different file types."""
+ image_file = File(
+ id="image_id",
+ tenant_id="test_tenant_id",
+ type=FileType.IMAGE,
+ transfer_method=FileTransferMethod.REMOTE_URL,
+ remote_url="https://test.example.com/image.png",
+ filename="image",
+ extension=".png",
+ mime_type="image/png",
+ size=1000,
+ )
+
+ video_file = File(
+ id="video_id",
+ tenant_id="test_tenant_id",
+ type=FileType.VIDEO,
+ transfer_method=FileTransferMethod.LOCAL_FILE,
+ related_id="video_relation_id",
+ filename="video",
+ extension=".mp4",
+ mime_type="video/mp4",
+ size=5000,
+ )
+
+ audio_file = File(
+ id="audio_id",
+ tenant_id="test_tenant_id",
+ type=FileType.AUDIO,
+ transfer_method=FileTransferMethod.LOCAL_FILE,
+ related_id="audio_relation_id",
+ filename="audio",
+ extension=".mp3",
+ mime_type="audio/mpeg",
+ size=3000,
+ )
+
+ segment = variable_factory.build_segment([image_file, video_file, audio_file])
+ assert isinstance(segment, ArrayFileSegment)
+ assert len(segment.value) == 3
+ assert segment.value[0].type == FileType.IMAGE
+ assert segment.value[1].type == FileType.VIDEO
+ assert segment.value[2].type == FileType.AUDIO
+
+
+@st.composite
+def _generate_file(draw) -> File:
+ file_type, mime_type, extension = draw(
+ st.sampled_from(
+ [
+ (FileType.IMAGE, "image/png", ".png"),
+ (FileType.VIDEO, "video/mp4", ".mp4"),
+ (FileType.DOCUMENT, "text/plain", ".txt"),
+ (FileType.AUDIO, "audio/mpeg", ".mp3"),
+ ]
+ )
+ )
+ filename = "test-file"
+ size = draw(st.integers(min_value=0, max_value=1024 * 1024))
+
+ transfer_method = draw(st.sampled_from(list(FileTransferMethod)))
+ if transfer_method == FileTransferMethod.REMOTE_URL:
+ url = "https://test.example.com/test-file"
+ file = File(
+ id="test_file_id",
+ tenant_id="test_tenant_id",
+ type=file_type,
+ transfer_method=transfer_method,
+ remote_url=url,
+ related_id=None,
+ filename=filename,
+ extension=extension,
+ mime_type=mime_type,
+ size=size,
+ )
+ else:
+ relation_id = draw(st.uuids(version=4))
+
+ file = File(
+ id="test_file_id",
+ tenant_id="test_tenant_id",
+ type=file_type,
+ transfer_method=transfer_method,
+ related_id=str(relation_id),
+ filename=filename,
+ extension=extension,
+ mime_type=mime_type,
+ size=size,
+ )
+ return file
+
+
+def _scalar_value() -> st.SearchStrategy[int | float | str | File | None]:
+ return st.one_of(
+ st.none(),
+ st.integers(),
+ st.floats(),
+ st.text(),
+ _generate_file(),
+ )
+
+
+@given(_scalar_value())
+def test_build_segment_and_extract_values_for_scalar_types(value):
+ seg = variable_factory.build_segment(value)
+ # nan == nan yields false, so we need to use `math.isnan` to check `seg.value` here.
+ if isinstance(value, float) and math.isnan(value):
+ assert math.isnan(seg.value)
+ else:
+ assert seg.value == value
+
+
+@given(st.lists(_scalar_value()))
+def test_build_segment_and_extract_values_for_array_types(values):
+ seg = variable_factory.build_segment(values)
+ assert seg.value == values
+
+
+def test_build_segment_type_for_scalar():
+ @dataclass(frozen=True)
+ class TestCase:
+ value: int | float | str | File
+ expected_type: SegmentType
+
+ file = File(
+ id="test_file_id",
+ tenant_id="test_tenant_id",
+ type=FileType.IMAGE,
+ transfer_method=FileTransferMethod.REMOTE_URL,
+ remote_url="https://test.example.com/test-file.png",
+ filename="test-file",
+ extension=".png",
+ mime_type="image/png",
+ size=1000,
+ )
+ cases = [
+ TestCase(0, SegmentType.INTEGER),
+ TestCase(0.0, SegmentType.FLOAT),
+ TestCase("", SegmentType.STRING),
+ TestCase(file, SegmentType.FILE),
+ ]
+
+ for idx, c in enumerate(cases, 1):
+ segment = variable_factory.build_segment(c.value)
+ assert segment.value_type == c.expected_type, f"test case {idx} failed."
+
+
+class TestBuildSegmentWithType:
+ """Test cases for build_segment_with_type function."""
+
+ def test_string_type(self):
+ """Test building a string segment with correct type."""
+ result = build_segment_with_type(SegmentType.STRING, "hello")
+ assert isinstance(result, StringSegment)
+ assert result.value == "hello"
+ assert result.value_type == SegmentType.STRING
+
+ def test_number_type_integer(self):
+ """Test building a number segment with integer value."""
+ result = build_segment_with_type(SegmentType.NUMBER, 42)
+ assert isinstance(result, IntegerSegment)
+ assert result.value == 42
+ assert result.value_type == SegmentType.INTEGER
+
+ def test_number_type_float(self):
+ """Test building a number segment with float value."""
+ result = build_segment_with_type(SegmentType.NUMBER, 3.14)
+ assert isinstance(result, FloatSegment)
+ assert result.value == 3.14
+ assert result.value_type == SegmentType.FLOAT
+
+ def test_object_type(self):
+ """Test building an object segment with correct type."""
+ test_obj = {"key": "value", "nested": {"inner": 123}}
+ result = build_segment_with_type(SegmentType.OBJECT, test_obj)
+ assert isinstance(result, ObjectSegment)
+ assert result.value == test_obj
+ assert result.value_type == SegmentType.OBJECT
+
+ def test_file_type(self):
+ """Test building a file segment with correct type."""
+ test_file = File(
+ id="test_file_id",
+ tenant_id="test_tenant_id",
+ type=FileType.IMAGE,
+ transfer_method=FileTransferMethod.REMOTE_URL,
+ remote_url="https://test.example.com/test-file.png",
+ filename="test-file",
+ extension=".png",
+ mime_type="image/png",
+ size=1000,
+ storage_key="test_storage_key",
+ )
+ result = build_segment_with_type(SegmentType.FILE, test_file)
+ assert isinstance(result, FileSegment)
+ assert result.value == test_file
+ assert result.value_type == SegmentType.FILE
+
+ def test_none_type(self):
+ """Test building a none segment with None value."""
+ result = build_segment_with_type(SegmentType.NONE, None)
+ assert isinstance(result, NoneSegment)
+ assert result.value is None
+ assert result.value_type == SegmentType.NONE
+
+ def test_empty_array_string(self):
+ """Test building an empty array[string] segment."""
+ result = build_segment_with_type(SegmentType.ARRAY_STRING, [])
+ assert isinstance(result, ArrayStringSegment)
+ assert result.value == []
+ assert result.value_type == SegmentType.ARRAY_STRING
+
+ def test_empty_array_number(self):
+ """Test building an empty array[number] segment."""
+ result = build_segment_with_type(SegmentType.ARRAY_NUMBER, [])
+ assert isinstance(result, ArrayNumberSegment)
+ assert result.value == []
+ assert result.value_type == SegmentType.ARRAY_NUMBER
+
+ def test_empty_array_object(self):
+ """Test building an empty array[object] segment."""
+ result = build_segment_with_type(SegmentType.ARRAY_OBJECT, [])
+ assert isinstance(result, ArrayObjectSegment)
+ assert result.value == []
+ assert result.value_type == SegmentType.ARRAY_OBJECT
+
+ def test_empty_array_file(self):
+ """Test building an empty array[file] segment."""
+ result = build_segment_with_type(SegmentType.ARRAY_FILE, [])
+ assert isinstance(result, ArrayFileSegment)
+ assert result.value == []
+ assert result.value_type == SegmentType.ARRAY_FILE
+
+ def test_empty_array_any(self):
+ """Test building an empty array[any] segment."""
+ result = build_segment_with_type(SegmentType.ARRAY_ANY, [])
+ assert isinstance(result, ArrayAnySegment)
+ assert result.value == []
+ assert result.value_type == SegmentType.ARRAY_ANY
+
+ def test_array_with_values(self):
+ """Test building array segments with actual values."""
+ # Array of strings
+ result = build_segment_with_type(SegmentType.ARRAY_STRING, ["hello", "world"])
+ assert isinstance(result, ArrayStringSegment)
+ assert result.value == ["hello", "world"]
+ assert result.value_type == SegmentType.ARRAY_STRING
+
+ # Array of numbers
+ result = build_segment_with_type(SegmentType.ARRAY_NUMBER, [1, 2, 3.14])
+ assert isinstance(result, ArrayNumberSegment)
+ assert result.value == [1, 2, 3.14]
+ assert result.value_type == SegmentType.ARRAY_NUMBER
+
+ # Array of objects
+ result = build_segment_with_type(SegmentType.ARRAY_OBJECT, [{"a": 1}, {"b": 2}])
+ assert isinstance(result, ArrayObjectSegment)
+ assert result.value == [{"a": 1}, {"b": 2}]
+ assert result.value_type == SegmentType.ARRAY_OBJECT
+
+ def test_type_mismatch_string_to_number(self):
+ """Test type mismatch when expecting number but getting string."""
+ with pytest.raises(TypeMismatchError) as exc_info:
+ build_segment_with_type(SegmentType.NUMBER, "not_a_number")
+
+ assert "Type mismatch" in str(exc_info.value)
+ assert "expected number" in str(exc_info.value)
+ assert "str" in str(exc_info.value)
+
+ def test_type_mismatch_number_to_string(self):
+ """Test type mismatch when expecting string but getting number."""
+ with pytest.raises(TypeMismatchError) as exc_info:
+ build_segment_with_type(SegmentType.STRING, 123)
+
+ assert "Type mismatch" in str(exc_info.value)
+ assert "expected string" in str(exc_info.value)
+ assert "int" in str(exc_info.value)
+
+ def test_type_mismatch_none_to_string(self):
+ """Test type mismatch when expecting string but getting None."""
+ with pytest.raises(TypeMismatchError) as exc_info:
+ build_segment_with_type(SegmentType.STRING, None)
+
+ assert "expected string, but got None" in str(exc_info.value)
+
+ def test_type_mismatch_empty_list_to_non_array(self):
+ """Test type mismatch when expecting non-array type but getting empty list."""
+ with pytest.raises(TypeMismatchError) as exc_info:
+ build_segment_with_type(SegmentType.STRING, [])
+
+ assert "expected string, but got empty list" in str(exc_info.value)
+
+ def test_type_mismatch_object_to_array(self):
+ """Test type mismatch when expecting array but getting object."""
+ with pytest.raises(TypeMismatchError) as exc_info:
+ build_segment_with_type(SegmentType.ARRAY_STRING, {"key": "value"})
+
+ assert "Type mismatch" in str(exc_info.value)
+ assert "expected array[string]" in str(exc_info.value)
+
+ def test_compatible_number_types(self):
+ """Test that int and float are both compatible with NUMBER type."""
+ # Integer should work
+ result_int = build_segment_with_type(SegmentType.NUMBER, 42)
+ assert isinstance(result_int, IntegerSegment)
+ assert result_int.value_type == SegmentType.INTEGER
+
+ # Float should work
+ result_float = build_segment_with_type(SegmentType.NUMBER, 3.14)
+ assert isinstance(result_float, FloatSegment)
+ assert result_float.value_type == SegmentType.FLOAT
+
+ @pytest.mark.parametrize(
+ ("segment_type", "value", "expected_class"),
+ [
+ (SegmentType.STRING, "test", StringSegment),
+ (SegmentType.INTEGER, 42, IntegerSegment),
+ (SegmentType.FLOAT, 3.14, FloatSegment),
+ (SegmentType.OBJECT, {}, ObjectSegment),
+ (SegmentType.NONE, None, NoneSegment),
+ (SegmentType.ARRAY_STRING, [], ArrayStringSegment),
+ (SegmentType.ARRAY_NUMBER, [], ArrayNumberSegment),
+ (SegmentType.ARRAY_OBJECT, [], ArrayObjectSegment),
+ (SegmentType.ARRAY_ANY, [], ArrayAnySegment),
+ ],
+ )
+ def test_parametrized_valid_types(self, segment_type, value, expected_class):
+ """Parametrized test for valid type combinations."""
+ result = build_segment_with_type(segment_type, value)
+ assert isinstance(result, expected_class)
+ assert result.value == value
+ assert result.value_type == segment_type
+
+ @pytest.mark.parametrize(
+ ("segment_type", "value"),
+ [
+ (SegmentType.STRING, 123),
+ (SegmentType.NUMBER, "not_a_number"),
+ (SegmentType.OBJECT, "not_an_object"),
+ (SegmentType.ARRAY_STRING, "not_an_array"),
+ (SegmentType.STRING, None),
+ (SegmentType.NUMBER, None),
+ ],
+ )
+ def test_parametrized_type_mismatches(self, segment_type, value):
+ """Parametrized test for type mismatches that should raise TypeMismatchError."""
+ with pytest.raises(TypeMismatchError):
+ build_segment_with_type(segment_type, value)
+
+
+# Test cases for ValueError scenarios in build_segment function
+class TestBuildSegmentValueErrors:
+ """Test cases for ValueError scenarios in the build_segment function."""
+
+ @dataclass(frozen=True)
+ class ValueErrorTestCase:
+ """Test case data for ValueError scenarios."""
+
+ name: str
+ description: str
+ test_value: Any
+
+ def _get_test_cases(self):
+ """Get all test cases for ValueError scenarios."""
+
+ # Define inline classes for complex test cases
+ class CustomType:
+ pass
+
+ def unsupported_function():
+ return "test"
+
+ def gen():
+ yield 1
+ yield 2
+
+ return [
+ self.ValueErrorTestCase(
+ name="unsupported_custom_type",
+ description="custom class that doesn't match any supported type",
+ test_value=CustomType(),
+ ),
+ self.ValueErrorTestCase(
+ name="unsupported_set_type",
+ description="set (unsupported collection type)",
+ test_value={1, 2, 3},
+ ),
+ self.ValueErrorTestCase(
+ name="unsupported_tuple_type", description="tuple (unsupported type)", test_value=(1, 2, 3)
+ ),
+ self.ValueErrorTestCase(
+ name="unsupported_bytes_type",
+ description="bytes (unsupported type)",
+ test_value=b"hello world",
+ ),
+ self.ValueErrorTestCase(
+ name="unsupported_function_type",
+ description="function (unsupported type)",
+ test_value=unsupported_function,
+ ),
+ self.ValueErrorTestCase(
+ name="unsupported_module_type", description="module (unsupported type)", test_value=math
+ ),
+ self.ValueErrorTestCase(
+ name="array_with_unsupported_element_types",
+ description="array with unsupported element types",
+ test_value=[CustomType()],
+ ),
+ self.ValueErrorTestCase(
+ name="mixed_array_with_unsupported_types",
+ description="array with mix of supported and unsupported types",
+ test_value=["valid_string", 42, CustomType()],
+ ),
+ self.ValueErrorTestCase(
+ name="nested_unsupported_types",
+ description="nested structures containing unsupported types",
+ test_value=[{"valid": "data"}, CustomType()],
+ ),
+ self.ValueErrorTestCase(
+ name="complex_number_type",
+ description="complex number (unsupported type)",
+ test_value=3 + 4j,
+ ),
+ self.ValueErrorTestCase(
+ name="range_type", description="range object (unsupported type)", test_value=range(10)
+ ),
+ self.ValueErrorTestCase(
+ name="generator_type",
+ description="generator (unsupported type)",
+ test_value=gen(),
+ ),
+ self.ValueErrorTestCase(
+ name="exception_message_contains_value",
+ description="set to verify error message contains the actual unsupported value",
+ test_value={1, 2, 3},
+ ),
+ self.ValueErrorTestCase(
+ name="array_with_mixed_unsupported_segment_types",
+ description="array processing with unsupported segment types in match",
+ test_value=[CustomType()],
+ ),
+ self.ValueErrorTestCase(
+ name="frozenset_type",
+ description="frozenset (unsupported type)",
+ test_value=frozenset([1, 2, 3]),
+ ),
+ self.ValueErrorTestCase(
+ name="memoryview_type",
+ description="memoryview (unsupported type)",
+ test_value=memoryview(b"hello"),
+ ),
+ self.ValueErrorTestCase(
+ name="slice_type", description="slice object (unsupported type)", test_value=slice(1, 10, 2)
+ ),
+ self.ValueErrorTestCase(name="type_object", description="type object (unsupported type)", test_value=type),
+ self.ValueErrorTestCase(
+ name="generic_object", description="generic object (unsupported type)", test_value=object()
+ ),
+ ]
+
+ def test_build_segment_unsupported_types(self):
+ """Table-driven test for all ValueError scenarios in build_segment function."""
+ test_cases = self._get_test_cases()
+
+ for index, test_case in enumerate(test_cases, 1):
+ # Use test value directly
+ test_value = test_case.test_value
+
+ with pytest.raises(ValueError) as exc_info: # noqa: PT012
+ segment = variable_factory.build_segment(test_value)
+ pytest.fail(f"Test case {index} ({test_case.name}) should raise ValueError but not, result={segment}")
+
+ error_message = str(exc_info.value)
+ assert "not supported value" in error_message, (
+ f"Test case {index} ({test_case.name}): Expected 'not supported value' in error message, "
+ f"but got: {error_message}"
+ )
+
+ def test_build_segment_boolean_type_note(self):
+ """Note: Boolean values are actually handled as integers in Python, so they don't raise ValueError."""
+ # Boolean values in Python are subclasses of int, so they get processed as integers
+ # True becomes IntegerSegment(value=1) and False becomes IntegerSegment(value=0)
+ true_segment = variable_factory.build_segment(True)
+ false_segment = variable_factory.build_segment(False)
+
+ # Verify they are processed as integers, not as errors
+ assert true_segment.value == 1, "Test case 1 (boolean_true): Expected True to be processed as integer 1"
+ assert false_segment.value == 0, "Test case 2 (boolean_false): Expected False to be processed as integer 0"
+ assert true_segment.value_type == SegmentType.INTEGER
+ assert false_segment.value_type == SegmentType.INTEGER
diff --git a/api/tests/unit_tests/libs/test_datetime_utils.py b/api/tests/unit_tests/libs/test_datetime_utils.py
new file mode 100644
index 0000000000..e7781a5821
--- /dev/null
+++ b/api/tests/unit_tests/libs/test_datetime_utils.py
@@ -0,0 +1,20 @@
+import datetime
+
+from libs.datetime_utils import naive_utc_now
+
+
+def test_naive_utc_now(monkeypatch):
+ tz_aware_utc_now = datetime.datetime.now(tz=datetime.UTC)
+
+ def _now_func(tz: datetime.timezone | None) -> datetime.datetime:
+ return tz_aware_utc_now.astimezone(tz)
+
+ monkeypatch.setattr("libs.datetime_utils._now_func", _now_func)
+
+ naive_datetime = naive_utc_now()
+
+ assert naive_datetime.tzinfo is None
+ assert naive_datetime.date() == tz_aware_utc_now.date()
+ naive_time = naive_datetime.time()
+ utc_time = tz_aware_utc_now.time()
+ assert naive_time == utc_time
diff --git a/api/tests/unit_tests/libs/test_helper.py b/api/tests/unit_tests/libs/test_helper.py
new file mode 100644
index 0000000000..b7701055f5
--- /dev/null
+++ b/api/tests/unit_tests/libs/test_helper.py
@@ -0,0 +1,65 @@
+import pytest
+
+from libs.helper import extract_tenant_id
+from models.account import Account
+from models.model import EndUser
+
+
+class TestExtractTenantId:
+ """Test cases for the extract_tenant_id utility function."""
+
+ def test_extract_tenant_id_from_account_with_tenant(self):
+ """Test extracting tenant_id from Account with current_tenant_id."""
+ # Create a mock Account object
+ account = Account()
+ # Mock the current_tenant_id property
+ account._current_tenant = type("MockTenant", (), {"id": "account-tenant-123"})()
+
+ tenant_id = extract_tenant_id(account)
+ assert tenant_id == "account-tenant-123"
+
+ def test_extract_tenant_id_from_account_without_tenant(self):
+ """Test extracting tenant_id from Account without current_tenant_id."""
+ # Create a mock Account object
+ account = Account()
+ account._current_tenant = None
+
+ tenant_id = extract_tenant_id(account)
+ assert tenant_id is None
+
+ def test_extract_tenant_id_from_enduser_with_tenant(self):
+ """Test extracting tenant_id from EndUser with tenant_id."""
+ # Create a mock EndUser object
+ end_user = EndUser()
+ end_user.tenant_id = "enduser-tenant-456"
+
+ tenant_id = extract_tenant_id(end_user)
+ assert tenant_id == "enduser-tenant-456"
+
+ def test_extract_tenant_id_from_enduser_without_tenant(self):
+ """Test extracting tenant_id from EndUser without tenant_id."""
+ # Create a mock EndUser object
+ end_user = EndUser()
+ end_user.tenant_id = None
+
+ tenant_id = extract_tenant_id(end_user)
+ assert tenant_id is None
+
+ def test_extract_tenant_id_with_invalid_user_type(self):
+ """Test extracting tenant_id with invalid user type raises ValueError."""
+ invalid_user = "not_a_user_object"
+
+ with pytest.raises(ValueError, match="Invalid user type.*Expected Account or EndUser"):
+ extract_tenant_id(invalid_user)
+
+ def test_extract_tenant_id_with_none_user(self):
+ """Test extracting tenant_id with None user raises ValueError."""
+ with pytest.raises(ValueError, match="Invalid user type.*Expected Account or EndUser"):
+ extract_tenant_id(None)
+
+ def test_extract_tenant_id_with_dict_user(self):
+ """Test extracting tenant_id with dict user raises ValueError."""
+ dict_user = {"id": "123", "tenant_id": "456"}
+
+ with pytest.raises(ValueError, match="Invalid user type.*Expected Account or EndUser"):
+ extract_tenant_id(dict_user)
diff --git a/api/tests/unit_tests/libs/test_login.py b/api/tests/unit_tests/libs/test_login.py
new file mode 100644
index 0000000000..39671077d4
--- /dev/null
+++ b/api/tests/unit_tests/libs/test_login.py
@@ -0,0 +1,232 @@
+from unittest.mock import MagicMock, patch
+
+import pytest
+from flask import Flask, g
+from flask_login import LoginManager, UserMixin
+
+from libs.login import _get_user, current_user, login_required
+
+
+class MockUser(UserMixin):
+ """Mock user class for testing."""
+
+ def __init__(self, id: str, is_authenticated: bool = True):
+ self.id = id
+ self._is_authenticated = is_authenticated
+
+ @property
+ def is_authenticated(self):
+ return self._is_authenticated
+
+
+class TestLoginRequired:
+ """Test cases for login_required decorator."""
+
+ @pytest.fixture
+ def setup_app(self, app: Flask):
+ """Set up Flask app with login manager."""
+ # Initialize login manager
+ login_manager = LoginManager()
+ login_manager.init_app(app)
+
+ # Mock unauthorized handler
+ login_manager.unauthorized = MagicMock(return_value="Unauthorized")
+
+ # Add a dummy user loader to prevent exceptions
+ @login_manager.user_loader
+ def load_user(user_id):
+ return None
+
+ return app
+
+ def test_authenticated_user_can_access_protected_view(self, setup_app: Flask):
+ """Test that authenticated users can access protected views."""
+
+ @login_required
+ def protected_view():
+ return "Protected content"
+
+ with setup_app.test_request_context():
+ # Mock authenticated user
+ mock_user = MockUser("test_user", is_authenticated=True)
+ with patch("libs.login._get_user", return_value=mock_user):
+ result = protected_view()
+ assert result == "Protected content"
+
+ def test_unauthenticated_user_cannot_access_protected_view(self, setup_app: Flask):
+ """Test that unauthenticated users are redirected."""
+
+ @login_required
+ def protected_view():
+ return "Protected content"
+
+ with setup_app.test_request_context():
+ # Mock unauthenticated user
+ mock_user = MockUser("test_user", is_authenticated=False)
+ with patch("libs.login._get_user", return_value=mock_user):
+ result = protected_view()
+ assert result == "Unauthorized"
+ setup_app.login_manager.unauthorized.assert_called_once()
+
+ def test_login_disabled_allows_unauthenticated_access(self, setup_app: Flask):
+ """Test that LOGIN_DISABLED config bypasses authentication."""
+
+ @login_required
+ def protected_view():
+ return "Protected content"
+
+ with setup_app.test_request_context():
+ # Mock unauthenticated user and LOGIN_DISABLED
+ mock_user = MockUser("test_user", is_authenticated=False)
+ with patch("libs.login._get_user", return_value=mock_user):
+ with patch("libs.login.dify_config") as mock_config:
+ mock_config.LOGIN_DISABLED = True
+
+ result = protected_view()
+ assert result == "Protected content"
+ # Ensure unauthorized was not called
+ setup_app.login_manager.unauthorized.assert_not_called()
+
+ def test_options_request_bypasses_authentication(self, setup_app: Flask):
+ """Test that OPTIONS requests are exempt from authentication."""
+
+ @login_required
+ def protected_view():
+ return "Protected content"
+
+ with setup_app.test_request_context(method="OPTIONS"):
+ # Mock unauthenticated user
+ mock_user = MockUser("test_user", is_authenticated=False)
+ with patch("libs.login._get_user", return_value=mock_user):
+ result = protected_view()
+ assert result == "Protected content"
+ # Ensure unauthorized was not called
+ setup_app.login_manager.unauthorized.assert_not_called()
+
+ def test_flask_2_compatibility(self, setup_app: Flask):
+ """Test Flask 2.x compatibility with ensure_sync."""
+
+ @login_required
+ def protected_view():
+ return "Protected content"
+
+ # Mock Flask 2.x ensure_sync
+ setup_app.ensure_sync = MagicMock(return_value=lambda: "Synced content")
+
+ with setup_app.test_request_context():
+ mock_user = MockUser("test_user", is_authenticated=True)
+ with patch("libs.login._get_user", return_value=mock_user):
+ result = protected_view()
+ assert result == "Synced content"
+ setup_app.ensure_sync.assert_called_once()
+
+ def test_flask_1_compatibility(self, setup_app: Flask):
+ """Test Flask 1.x compatibility without ensure_sync."""
+
+ @login_required
+ def protected_view():
+ return "Protected content"
+
+ # Remove ensure_sync to simulate Flask 1.x
+ if hasattr(setup_app, "ensure_sync"):
+ delattr(setup_app, "ensure_sync")
+
+ with setup_app.test_request_context():
+ mock_user = MockUser("test_user", is_authenticated=True)
+ with patch("libs.login._get_user", return_value=mock_user):
+ result = protected_view()
+ assert result == "Protected content"
+
+
+class TestGetUser:
+ """Test cases for _get_user function."""
+
+ def test_get_user_returns_user_from_g(self, app: Flask):
+ """Test that _get_user returns user from g._login_user."""
+ mock_user = MockUser("test_user")
+
+ with app.test_request_context():
+ g._login_user = mock_user
+ user = _get_user()
+ assert user == mock_user
+ assert user.id == "test_user"
+
+ def test_get_user_loads_user_if_not_in_g(self, app: Flask):
+ """Test that _get_user loads user if not already in g."""
+ mock_user = MockUser("test_user")
+
+ # Mock login manager
+ login_manager = MagicMock()
+ login_manager._load_user = MagicMock()
+ app.login_manager = login_manager
+
+ with app.test_request_context():
+ # Simulate _load_user setting g._login_user
+ def side_effect():
+ g._login_user = mock_user
+
+ login_manager._load_user.side_effect = side_effect
+
+ user = _get_user()
+ assert user == mock_user
+ login_manager._load_user.assert_called_once()
+
+ def test_get_user_returns_none_without_request_context(self, app: Flask):
+ """Test that _get_user returns None outside request context."""
+ # Outside of request context
+ user = _get_user()
+ assert user is None
+
+
+class TestCurrentUser:
+ """Test cases for current_user proxy."""
+
+ def test_current_user_proxy_returns_authenticated_user(self, app: Flask):
+ """Test that current_user proxy returns authenticated user."""
+ mock_user = MockUser("test_user", is_authenticated=True)
+
+ with app.test_request_context():
+ with patch("libs.login._get_user", return_value=mock_user):
+ assert current_user.id == "test_user"
+ assert current_user.is_authenticated is True
+
+ def test_current_user_proxy_returns_none_when_no_user(self, app: Flask):
+ """Test that current_user proxy handles None user."""
+ with app.test_request_context():
+ with patch("libs.login._get_user", return_value=None):
+ # When _get_user returns None, accessing attributes should fail
+ # or current_user should evaluate to falsy
+ try:
+ # Try to access an attribute that would exist on a real user
+ _ = current_user.id
+ pytest.fail("Should have raised AttributeError")
+ except AttributeError:
+ # This is expected when current_user is None
+ pass
+
+ def test_current_user_proxy_thread_safety(self, app: Flask):
+ """Test that current_user proxy is thread-safe."""
+ import threading
+
+ results = {}
+
+ def check_user_in_thread(user_id: str, index: int):
+ with app.test_request_context():
+ mock_user = MockUser(user_id)
+ with patch("libs.login._get_user", return_value=mock_user):
+ results[index] = current_user.id
+
+ # Create multiple threads with different users
+ threads = []
+ for i in range(5):
+ thread = threading.Thread(target=check_user_in_thread, args=(f"user_{i}", i))
+ threads.append(thread)
+ thread.start()
+
+ # Wait for all threads to complete
+ for thread in threads:
+ thread.join()
+
+ # Verify each thread got its own user
+ for i in range(5):
+ assert results[i] == f"user_{i}"
diff --git a/api/tests/unit_tests/libs/test_oauth_clients.py b/api/tests/unit_tests/libs/test_oauth_clients.py
new file mode 100644
index 0000000000..629d15b81a
--- /dev/null
+++ b/api/tests/unit_tests/libs/test_oauth_clients.py
@@ -0,0 +1,249 @@
+import urllib.parse
+from unittest.mock import MagicMock, patch
+
+import pytest
+import requests
+
+from libs.oauth import GitHubOAuth, GoogleOAuth, OAuthUserInfo
+
+
+class BaseOAuthTest:
+ """Base class for OAuth provider tests with common fixtures"""
+
+ @pytest.fixture
+ def oauth_config(self):
+ return {
+ "client_id": "test_client_id",
+ "client_secret": "test_client_secret",
+ "redirect_uri": "http://localhost/callback",
+ }
+
+ @pytest.fixture
+ def mock_response(self):
+ response = MagicMock()
+ response.json.return_value = {}
+ return response
+
+ def parse_auth_url(self, url):
+ """Helper to parse authorization URL"""
+ parsed = urllib.parse.urlparse(url)
+ params = urllib.parse.parse_qs(parsed.query)
+ return parsed, params
+
+
+class TestGitHubOAuth(BaseOAuthTest):
+ @pytest.fixture
+ def oauth(self, oauth_config):
+ return GitHubOAuth(oauth_config["client_id"], oauth_config["client_secret"], oauth_config["redirect_uri"])
+
+ @pytest.mark.parametrize(
+ ("invite_token", "expected_state"),
+ [
+ (None, None),
+ ("test_invite_token", "test_invite_token"),
+ ("", None),
+ ],
+ )
+ def test_should_generate_authorization_url_correctly(self, oauth, oauth_config, invite_token, expected_state):
+ url = oauth.get_authorization_url(invite_token)
+ parsed, params = self.parse_auth_url(url)
+
+ assert parsed.scheme == "https"
+ assert parsed.netloc == "github.com"
+ assert parsed.path == "/login/oauth/authorize"
+ assert params["client_id"][0] == oauth_config["client_id"]
+ assert params["redirect_uri"][0] == oauth_config["redirect_uri"]
+ assert params["scope"][0] == "user:email"
+
+ if expected_state:
+ assert params["state"][0] == expected_state
+ else:
+ assert "state" not in params
+
+ @pytest.mark.parametrize(
+ ("response_data", "expected_token", "should_raise"),
+ [
+ ({"access_token": "test_token"}, "test_token", False),
+ ({"error": "invalid_grant"}, None, True),
+ ({}, None, True),
+ ],
+ )
+ @patch("requests.post")
+ def test_should_retrieve_access_token(
+ self, mock_post, oauth, mock_response, response_data, expected_token, should_raise
+ ):
+ mock_response.json.return_value = response_data
+ mock_post.return_value = mock_response
+
+ if should_raise:
+ with pytest.raises(ValueError) as exc_info:
+ oauth.get_access_token("test_code")
+ assert "Error in GitHub OAuth" in str(exc_info.value)
+ else:
+ token = oauth.get_access_token("test_code")
+ assert token == expected_token
+
+ @pytest.mark.parametrize(
+ ("user_data", "email_data", "expected_email"),
+ [
+ # User with primary email
+ (
+ {"id": 12345, "login": "testuser", "name": "Test User"},
+ [
+ {"email": "secondary@example.com", "primary": False},
+ {"email": "primary@example.com", "primary": True},
+ ],
+ "primary@example.com",
+ ),
+ # User with no emails - fallback to noreply
+ ({"id": 12345, "login": "testuser", "name": "Test User"}, [], "12345+testuser@users.noreply.github.com"),
+ # User with only secondary email - fallback to noreply
+ (
+ {"id": 12345, "login": "testuser", "name": "Test User"},
+ [{"email": "secondary@example.com", "primary": False}],
+ "12345+testuser@users.noreply.github.com",
+ ),
+ ],
+ )
+ @patch("requests.get")
+ def test_should_retrieve_user_info_correctly(self, mock_get, oauth, user_data, email_data, expected_email):
+ user_response = MagicMock()
+ user_response.json.return_value = user_data
+
+ email_response = MagicMock()
+ email_response.json.return_value = email_data
+
+ mock_get.side_effect = [user_response, email_response]
+
+ user_info = oauth.get_user_info("test_token")
+
+ assert user_info.id == str(user_data["id"])
+ assert user_info.name == user_data["name"]
+ assert user_info.email == expected_email
+
+ @patch("requests.get")
+ def test_should_handle_network_errors(self, mock_get, oauth):
+ mock_get.side_effect = requests.exceptions.RequestException("Network error")
+
+ with pytest.raises(requests.exceptions.RequestException):
+ oauth.get_raw_user_info("test_token")
+
+
+class TestGoogleOAuth(BaseOAuthTest):
+ @pytest.fixture
+ def oauth(self, oauth_config):
+ return GoogleOAuth(oauth_config["client_id"], oauth_config["client_secret"], oauth_config["redirect_uri"])
+
+ @pytest.mark.parametrize(
+ ("invite_token", "expected_state"),
+ [
+ (None, None),
+ ("test_invite_token", "test_invite_token"),
+ ("", None),
+ ],
+ )
+ def test_should_generate_authorization_url_correctly(self, oauth, oauth_config, invite_token, expected_state):
+ url = oauth.get_authorization_url(invite_token)
+ parsed, params = self.parse_auth_url(url)
+
+ assert parsed.scheme == "https"
+ assert parsed.netloc == "accounts.google.com"
+ assert parsed.path == "/o/oauth2/v2/auth"
+ assert params["client_id"][0] == oauth_config["client_id"]
+ assert params["redirect_uri"][0] == oauth_config["redirect_uri"]
+ assert params["response_type"][0] == "code"
+ assert params["scope"][0] == "openid email"
+
+ if expected_state:
+ assert params["state"][0] == expected_state
+ else:
+ assert "state" not in params
+
+ @pytest.mark.parametrize(
+ ("response_data", "expected_token", "should_raise"),
+ [
+ ({"access_token": "test_token"}, "test_token", False),
+ ({"error": "invalid_grant"}, None, True),
+ ({}, None, True),
+ ],
+ )
+ @patch("requests.post")
+ def test_should_retrieve_access_token(
+ self, mock_post, oauth, oauth_config, mock_response, response_data, expected_token, should_raise
+ ):
+ mock_response.json.return_value = response_data
+ mock_post.return_value = mock_response
+
+ if should_raise:
+ with pytest.raises(ValueError) as exc_info:
+ oauth.get_access_token("test_code")
+ assert "Error in Google OAuth" in str(exc_info.value)
+ else:
+ token = oauth.get_access_token("test_code")
+ assert token == expected_token
+
+ mock_post.assert_called_once_with(
+ oauth._TOKEN_URL,
+ data={
+ "client_id": oauth_config["client_id"],
+ "client_secret": oauth_config["client_secret"],
+ "code": "test_code",
+ "grant_type": "authorization_code",
+ "redirect_uri": oauth_config["redirect_uri"],
+ },
+ headers={"Accept": "application/json"},
+ )
+
+ @pytest.mark.parametrize(
+ ("user_data", "expected_name"),
+ [
+ ({"sub": "123", "email": "test@example.com", "email_verified": True}, ""),
+ ({"sub": "123", "email": "test@example.com", "name": "Test User"}, ""), # Always returns empty string
+ ],
+ )
+ @patch("requests.get")
+ def test_should_retrieve_user_info_correctly(self, mock_get, oauth, mock_response, user_data, expected_name):
+ mock_response.json.return_value = user_data
+ mock_get.return_value = mock_response
+
+ user_info = oauth.get_user_info("test_token")
+
+ assert user_info.id == user_data["sub"]
+ assert user_info.name == expected_name
+ assert user_info.email == user_data["email"]
+
+ mock_get.assert_called_once_with(oauth._USER_INFO_URL, headers={"Authorization": "Bearer test_token"})
+
+ @pytest.mark.parametrize(
+ "exception_type",
+ [
+ requests.exceptions.HTTPError,
+ requests.exceptions.ConnectionError,
+ requests.exceptions.Timeout,
+ ],
+ )
+ @patch("requests.get")
+ def test_should_handle_http_errors(self, mock_get, oauth, exception_type):
+ mock_response = MagicMock()
+ mock_response.raise_for_status.side_effect = exception_type("Error")
+ mock_get.return_value = mock_response
+
+ with pytest.raises(exception_type):
+ oauth.get_raw_user_info("invalid_token")
+
+
+class TestOAuthUserInfo:
+ @pytest.mark.parametrize(
+ "user_data",
+ [
+ {"id": "123", "name": "Test User", "email": "test@example.com"},
+ {"id": "456", "name": "", "email": "user@domain.com"},
+ {"id": "789", "name": "Another User", "email": "another@test.org"},
+ ],
+ )
+ def test_should_create_user_info_dataclass(self, user_data):
+ user_info = OAuthUserInfo(**user_data)
+
+ assert user_info.id == user_data["id"]
+ assert user_info.name == user_data["name"]
+ assert user_info.email == user_data["email"]
diff --git a/api/tests/unit_tests/libs/test_passport.py b/api/tests/unit_tests/libs/test_passport.py
new file mode 100644
index 0000000000..f33484c18d
--- /dev/null
+++ b/api/tests/unit_tests/libs/test_passport.py
@@ -0,0 +1,205 @@
+from datetime import UTC, datetime, timedelta
+from unittest.mock import patch
+
+import jwt
+import pytest
+from werkzeug.exceptions import Unauthorized
+
+from libs.passport import PassportService
+
+
+class TestPassportService:
+ """Test PassportService JWT operations"""
+
+ @pytest.fixture
+ def passport_service(self):
+ """Create PassportService instance with test secret key"""
+ with patch("libs.passport.dify_config") as mock_config:
+ mock_config.SECRET_KEY = "test-secret-key-for-testing"
+ return PassportService()
+
+ @pytest.fixture
+ def another_passport_service(self):
+ """Create another PassportService instance with different secret key"""
+ with patch("libs.passport.dify_config") as mock_config:
+ mock_config.SECRET_KEY = "another-secret-key-for-testing"
+ return PassportService()
+
+ # Core functionality tests
+ def test_should_issue_and_verify_token(self, passport_service):
+ """Test complete JWT lifecycle: issue and verify"""
+ payload = {"user_id": "123", "app_code": "test-app"}
+ token = passport_service.issue(payload)
+
+ # Verify token format
+ assert isinstance(token, str)
+ assert len(token.split(".")) == 3 # JWT format: header.payload.signature
+
+ # Verify token content
+ decoded = passport_service.verify(token)
+ assert decoded == payload
+
+ def test_should_handle_different_payload_types(self, passport_service):
+ """Test issuing and verifying tokens with different payload types"""
+ test_cases = [
+ {"string": "value"},
+ {"number": 42},
+ {"float": 3.14},
+ {"boolean": True},
+ {"null": None},
+ {"array": [1, 2, 3]},
+ {"nested": {"key": "value"}},
+ {"unicode": "中文测试"},
+ {"emoji": "🔐"},
+ {}, # Empty payload
+ ]
+
+ for payload in test_cases:
+ token = passport_service.issue(payload)
+ decoded = passport_service.verify(token)
+ assert decoded == payload
+
+ # Security tests
+ def test_should_reject_modified_token(self, passport_service):
+ """Test that any modification to token invalidates it"""
+ token = passport_service.issue({"user": "test"})
+
+ # Test multiple modification points
+ test_positions = [0, len(token) // 3, len(token) // 2, len(token) - 1]
+
+ for pos in test_positions:
+ if pos < len(token) and token[pos] != ".":
+ # Change one character
+ tampered = token[:pos] + ("X" if token[pos] != "X" else "Y") + token[pos + 1 :]
+ with pytest.raises(Unauthorized):
+ passport_service.verify(tampered)
+
+ def test_should_reject_token_with_different_secret_key(self, passport_service, another_passport_service):
+ """Test key isolation - token from one service should not work with another"""
+ payload = {"user_id": "123", "app_code": "test-app"}
+ token = passport_service.issue(payload)
+
+ with pytest.raises(Unauthorized) as exc_info:
+ another_passport_service.verify(token)
+ assert str(exc_info.value) == "401 Unauthorized: Invalid token signature."
+
+ def test_should_use_hs256_algorithm(self, passport_service):
+ """Test that HS256 algorithm is used for signing"""
+ payload = {"test": "data"}
+ token = passport_service.issue(payload)
+
+ # Decode header without relying on JWT internals
+ # Use jwt.get_unverified_header which is a public API
+ header = jwt.get_unverified_header(token)
+ assert header["alg"] == "HS256"
+
+ def test_should_reject_token_with_wrong_algorithm(self, passport_service):
+ """Test rejection of token signed with different algorithm"""
+ payload = {"user_id": "123"}
+
+ # Create token with different algorithm
+ with patch("libs.passport.dify_config") as mock_config:
+ mock_config.SECRET_KEY = "test-secret-key-for-testing"
+ # Create token with HS512 instead of HS256
+ wrong_alg_token = jwt.encode(payload, mock_config.SECRET_KEY, algorithm="HS512")
+
+ # Should fail because service expects HS256
+ # InvalidAlgorithmError is now caught by PyJWTError handler
+ with pytest.raises(Unauthorized) as exc_info:
+ passport_service.verify(wrong_alg_token)
+ assert str(exc_info.value) == "401 Unauthorized: Invalid token."
+
+ # Exception handling tests
+ def test_should_handle_invalid_tokens(self, passport_service):
+ """Test handling of various invalid token formats"""
+ invalid_tokens = [
+ ("not.a.token", "Invalid token."),
+ ("invalid-jwt-format", "Invalid token."),
+ ("xxx.yyy.zzz", "Invalid token."),
+ ("a.b", "Invalid token."), # Missing signature
+ ("", "Invalid token."), # Empty string
+ (" ", "Invalid token."), # Whitespace
+ (None, "Invalid token."), # None value
+ # Malformed base64
+ ("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.INVALID_BASE64!@#$.signature", "Invalid token."),
+ ]
+
+ for invalid_token, expected_message in invalid_tokens:
+ with pytest.raises(Unauthorized) as exc_info:
+ passport_service.verify(invalid_token)
+ assert expected_message in str(exc_info.value)
+
+ def test_should_reject_expired_token(self, passport_service):
+ """Test rejection of expired token"""
+ past_time = datetime.now(UTC) - timedelta(hours=1)
+ payload = {"user_id": "123", "exp": past_time.timestamp()}
+
+ with patch("libs.passport.dify_config") as mock_config:
+ mock_config.SECRET_KEY = "test-secret-key-for-testing"
+ token = jwt.encode(payload, mock_config.SECRET_KEY, algorithm="HS256")
+
+ with pytest.raises(Unauthorized) as exc_info:
+ passport_service.verify(token)
+ assert str(exc_info.value) == "401 Unauthorized: Token has expired."
+
+ # Configuration tests
+ def test_should_handle_empty_secret_key(self):
+ """Test behavior when SECRET_KEY is empty"""
+ with patch("libs.passport.dify_config") as mock_config:
+ mock_config.SECRET_KEY = ""
+ service = PassportService()
+
+ # Empty secret key should still work but is insecure
+ payload = {"test": "data"}
+ token = service.issue(payload)
+ decoded = service.verify(token)
+ assert decoded == payload
+
+ def test_should_handle_none_secret_key(self):
+ """Test behavior when SECRET_KEY is None"""
+ with patch("libs.passport.dify_config") as mock_config:
+ mock_config.SECRET_KEY = None
+ service = PassportService()
+
+ payload = {"test": "data"}
+ # JWT library will raise TypeError when secret is None
+ with pytest.raises((TypeError, jwt.exceptions.InvalidKeyError)):
+ service.issue(payload)
+
+ # Boundary condition tests
+ def test_should_handle_large_payload(self, passport_service):
+ """Test handling of large payload"""
+ # Test with 100KB instead of 1MB for faster tests
+ large_data = "x" * (100 * 1024)
+ payload = {"data": large_data}
+
+ token = passport_service.issue(payload)
+ decoded = passport_service.verify(token)
+
+ assert decoded["data"] == large_data
+
+ def test_should_handle_special_characters_in_payload(self, passport_service):
+ """Test handling of special characters in payload"""
+ special_payloads = [
+ {"special": "!@#$%^&*()"},
+ {"quotes": 'He said "Hello"'},
+ {"backslash": "path\\to\\file"},
+ {"newline": "line1\nline2"},
+ {"unicode": "🔐🔑🛡️"},
+ {"mixed": "Test123!@#中文🔐"},
+ ]
+
+ for payload in special_payloads:
+ token = passport_service.issue(payload)
+ decoded = passport_service.verify(token)
+ assert decoded == payload
+
+ def test_should_catch_generic_pyjwt_errors(self, passport_service):
+ """Test that generic PyJWTError exceptions are caught and converted to Unauthorized"""
+ # Mock jwt.decode to raise a generic PyJWTError
+ with patch("libs.passport.jwt.decode") as mock_decode:
+ mock_decode.side_effect = jwt.exceptions.PyJWTError("Generic JWT error")
+
+ with pytest.raises(Unauthorized) as exc_info:
+ passport_service.verify("some-token")
+ assert str(exc_info.value) == "401 Unauthorized: Invalid token."
diff --git a/api/tests/unit_tests/libs/test_password.py b/api/tests/unit_tests/libs/test_password.py
new file mode 100644
index 0000000000..79fc792cc5
--- /dev/null
+++ b/api/tests/unit_tests/libs/test_password.py
@@ -0,0 +1,74 @@
+import base64
+import binascii
+import os
+
+import pytest
+
+from libs.password import compare_password, hash_password, valid_password
+
+
+class TestValidPassword:
+ """Test password format validation"""
+
+ def test_should_accept_valid_passwords(self):
+ """Test accepting valid password formats"""
+ assert valid_password("password123") == "password123"
+ assert valid_password("test1234") == "test1234"
+ assert valid_password("Test123456") == "Test123456"
+
+ def test_should_reject_invalid_passwords(self):
+ """Test rejecting invalid password formats"""
+ # Too short
+ with pytest.raises(ValueError) as exc_info:
+ valid_password("abc123")
+ assert "Password must contain letters and numbers" in str(exc_info.value)
+
+ # No numbers
+ with pytest.raises(ValueError):
+ valid_password("abcdefgh")
+
+ # No letters
+ with pytest.raises(ValueError):
+ valid_password("12345678")
+
+ # Empty
+ with pytest.raises(ValueError):
+ valid_password("")
+
+
+class TestPasswordHashing:
+ """Test password hashing and comparison"""
+
+ def setup_method(self):
+ """Setup test data"""
+ self.password = "test123password"
+ self.salt = os.urandom(16)
+ self.salt_base64 = base64.b64encode(self.salt).decode()
+
+ password_hash = hash_password(self.password, self.salt)
+ self.password_hash_base64 = base64.b64encode(password_hash).decode()
+
+ def test_should_verify_correct_password(self):
+ """Test correct password verification"""
+ result = compare_password(self.password, self.password_hash_base64, self.salt_base64)
+ assert result is True
+
+ def test_should_reject_wrong_password(self):
+ """Test rejection of incorrect passwords"""
+ result = compare_password("wrongpassword", self.password_hash_base64, self.salt_base64)
+ assert result is False
+
+ def test_should_handle_invalid_base64(self):
+ """Test handling of invalid base64 data"""
+ # Invalid base64 hash
+ with pytest.raises(binascii.Error):
+ compare_password(self.password, "invalid_base64!", self.salt_base64)
+
+ # Invalid base64 salt
+ with pytest.raises(binascii.Error):
+ compare_password(self.password, self.password_hash_base64, "invalid_base64!")
+
+ def test_should_be_case_sensitive(self):
+ """Test password case sensitivity"""
+ result = compare_password(self.password.upper(), self.password_hash_base64, self.salt_base64)
+ assert result is False
diff --git a/api/tests/unit_tests/libs/test_uuid_utils.py b/api/tests/unit_tests/libs/test_uuid_utils.py
new file mode 100644
index 0000000000..7dbda95f45
--- /dev/null
+++ b/api/tests/unit_tests/libs/test_uuid_utils.py
@@ -0,0 +1,351 @@
+import struct
+import time
+import uuid
+from unittest import mock
+
+import pytest
+from hypothesis import given
+from hypothesis import strategies as st
+
+from libs.uuid_utils import _create_uuidv7_bytes, uuidv7, uuidv7_boundary, uuidv7_timestamp
+
+
+# Tests for private helper function _create_uuidv7_bytes
+def test_create_uuidv7_bytes_basic_structure():
+ """Test basic byte structure creation."""
+ timestamp_ms = 1609459200000 # 2021-01-01 00:00:00 UTC in milliseconds
+ random_bytes = b"\x12\x34\x56\x78\x9a\xbc\xde\xf0\x11\x22"
+
+ result = _create_uuidv7_bytes(timestamp_ms, random_bytes)
+
+ # Should be exactly 16 bytes
+ assert len(result) == 16
+ assert isinstance(result, bytes)
+
+ # Create UUID from bytes to verify it's valid
+ uuid_obj = uuid.UUID(bytes=result)
+ assert uuid_obj.version == 7
+
+
+def test_create_uuidv7_bytes_timestamp_encoding():
+ """Test timestamp is correctly encoded in first 48 bits."""
+ timestamp_ms = 1609459200000 # 2021-01-01 00:00:00 UTC in milliseconds
+ random_bytes = b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+
+ result = _create_uuidv7_bytes(timestamp_ms, random_bytes)
+
+ # Extract timestamp from first 6 bytes
+ timestamp_bytes = b"\x00\x00" + result[0:6]
+ extracted_timestamp = struct.unpack(">Q", timestamp_bytes)[0]
+
+ assert extracted_timestamp == timestamp_ms
+
+
+def test_create_uuidv7_bytes_version_bits():
+ """Test version bits are set to 7."""
+ timestamp_ms = 1609459200000
+ random_bytes = b"\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00" # Set first 2 bytes to all 1s
+
+ result = _create_uuidv7_bytes(timestamp_ms, random_bytes)
+
+ # Extract version from bytes 6-7
+ version_and_rand_a = struct.unpack(">H", result[6:8])[0]
+ version = (version_and_rand_a >> 12) & 0x0F
+
+ assert version == 7
+
+
+def test_create_uuidv7_bytes_variant_bits():
+ """Test variant bits are set correctly."""
+ timestamp_ms = 1609459200000
+ random_bytes = b"\x00\x00\xff\x00\x00\x00\x00\x00\x00\x00" # Set byte 8 to all 1s
+
+ result = _create_uuidv7_bytes(timestamp_ms, random_bytes)
+
+ # Check variant bits in byte 8 (should be 10xxxxxx)
+ variant_byte = result[8]
+ variant_bits = (variant_byte >> 6) & 0b11
+
+ assert variant_bits == 0b10 # Should be binary 10
+
+
+def test_create_uuidv7_bytes_random_data():
+ """Test random bytes are placed correctly."""
+ timestamp_ms = 1609459200000
+ random_bytes = b"\x12\x34\x56\x78\x9a\xbc\xde\xf0\x11\x22"
+
+ result = _create_uuidv7_bytes(timestamp_ms, random_bytes)
+
+ # Check random data A (12 bits from bytes 6-7, excluding version)
+ version_and_rand_a = struct.unpack(">H", result[6:8])[0]
+ rand_a = version_and_rand_a & 0x0FFF
+ expected_rand_a = struct.unpack(">H", random_bytes[0:2])[0] & 0x0FFF
+ assert rand_a == expected_rand_a
+
+ # Check random data B (bytes 8-15, with variant bits preserved)
+ # Byte 8 should have variant bits set but preserve lower 6 bits
+ expected_byte_8 = (random_bytes[2] & 0x3F) | 0x80
+ assert result[8] == expected_byte_8
+
+ # Bytes 9-15 should match random_bytes[3:10]
+ assert result[9:16] == random_bytes[3:10]
+
+
+def test_create_uuidv7_bytes_zero_random():
+ """Test with zero random bytes (boundary case)."""
+ timestamp_ms = 1609459200000
+ zero_random_bytes = b"\x00" * 10
+
+ result = _create_uuidv7_bytes(timestamp_ms, zero_random_bytes)
+
+ # Should still be valid UUIDv7
+ uuid_obj = uuid.UUID(bytes=result)
+ assert uuid_obj.version == 7
+
+ # Version bits should be 0x7000
+ version_and_rand_a = struct.unpack(">H", result[6:8])[0]
+ assert version_and_rand_a == 0x7000
+
+ # Variant byte should be 0x80 (variant bits + zero random bits)
+ assert result[8] == 0x80
+
+ # Remaining bytes should be zero
+ assert result[9:16] == b"\x00" * 7
+
+
+def test_uuidv7_basic_generation():
+ """Test basic UUID generation produces valid UUIDv7."""
+ result = uuidv7()
+
+ # Should be a UUID object
+ assert isinstance(result, uuid.UUID)
+
+ # Should be version 7
+ assert result.version == 7
+
+ # Should have correct variant (RFC 4122 variant)
+ # Variant bits should be 10xxxxxx (0x80-0xBF range)
+ variant_byte = result.bytes[8]
+ assert (variant_byte >> 6) == 0b10
+
+
+def test_uuidv7_with_custom_timestamp():
+ """Test UUID generation with custom timestamp."""
+ custom_timestamp = 1609459200000 # 2021-01-01 00:00:00 UTC in milliseconds
+ result = uuidv7(custom_timestamp)
+
+ assert isinstance(result, uuid.UUID)
+ assert result.version == 7
+
+ # Extract and verify timestamp
+ extracted_timestamp = uuidv7_timestamp(result)
+ assert isinstance(extracted_timestamp, int)
+ assert extracted_timestamp == custom_timestamp # Exact match for integer milliseconds
+
+
+def test_uuidv7_with_none_timestamp(monkeypatch):
+ """Test UUID generation with None timestamp uses current time."""
+ mock_time = 1609459200
+ mock_time_func = mock.Mock(return_value=mock_time)
+ monkeypatch.setattr("time.time", mock_time_func)
+ result = uuidv7(None)
+
+ assert isinstance(result, uuid.UUID)
+ assert result.version == 7
+
+ # Should use the mocked current time (converted to milliseconds)
+ assert mock_time_func.called
+ extracted_timestamp = uuidv7_timestamp(result)
+ assert extracted_timestamp == mock_time * 1000 # 1609459200.0 * 1000
+
+
+def test_uuidv7_time_ordering():
+ """Test that sequential UUIDs have increasing timestamps."""
+ # Generate UUIDs with incrementing timestamps (in milliseconds)
+ timestamp1 = 1609459200000 # 2021-01-01 00:00:00 UTC
+ timestamp2 = 1609459201000 # 2021-01-01 00:00:01 UTC
+ timestamp3 = 1609459202000 # 2021-01-01 00:00:02 UTC
+
+ uuid1 = uuidv7(timestamp1)
+ uuid2 = uuidv7(timestamp2)
+ uuid3 = uuidv7(timestamp3)
+
+ # Extract timestamps
+ ts1 = uuidv7_timestamp(uuid1)
+ ts2 = uuidv7_timestamp(uuid2)
+ ts3 = uuidv7_timestamp(uuid3)
+
+ # Should be in ascending order
+ assert ts1 < ts2 < ts3
+
+ # UUIDs should be lexicographically ordered by their string representation
+ # due to time-ordering property of UUIDv7
+ uuid_strings = [str(uuid1), str(uuid2), str(uuid3)]
+ assert uuid_strings == sorted(uuid_strings)
+
+
+def test_uuidv7_uniqueness():
+ """Test that multiple calls generate different UUIDs."""
+ # Generate multiple UUIDs with the same timestamp (in milliseconds)
+ timestamp = 1609459200000
+ uuids = [uuidv7(timestamp) for _ in range(100)]
+
+ # All should be unique despite same timestamp (due to random bits)
+ assert len(set(uuids)) == 100
+
+ # All should have the same extracted timestamp
+ for uuid_obj in uuids:
+ extracted_ts = uuidv7_timestamp(uuid_obj)
+ assert extracted_ts == timestamp
+
+
+def test_uuidv7_timestamp_error_handling_wrong_version():
+ """Test error handling for non-UUIDv7 inputs."""
+
+ uuid_v4 = uuid.uuid4()
+ with pytest.raises(ValueError) as exc_ctx:
+ uuidv7_timestamp(uuid_v4)
+ assert "Expected UUIDv7 (version 7)" in str(exc_ctx.value)
+ assert f"got version {uuid_v4.version}" in str(exc_ctx.value)
+
+
+@given(st.integers(max_value=2**48 - 1, min_value=0))
+def test_uuidv7_timestamp_round_trip(timestamp_ms):
+ # Generate UUID with timestamp
+ uuid_obj = uuidv7(timestamp_ms)
+
+ # Extract timestamp back
+ extracted_timestamp = uuidv7_timestamp(uuid_obj)
+
+ # Should match exactly for integer millisecond timestamps
+ assert extracted_timestamp == timestamp_ms
+
+
+def test_uuidv7_timestamp_edge_cases():
+ """Test timestamp extraction with edge case values."""
+ # Test with very small timestamp
+ small_timestamp = 1 # 1ms after epoch
+ uuid_small = uuidv7(small_timestamp)
+ extracted_small = uuidv7_timestamp(uuid_small)
+ assert extracted_small == small_timestamp
+
+ # Test with large timestamp (year 2038+)
+ large_timestamp = 2147483647000 # 2038-01-19 03:14:07 UTC in milliseconds
+ uuid_large = uuidv7(large_timestamp)
+ extracted_large = uuidv7_timestamp(uuid_large)
+ assert extracted_large == large_timestamp
+
+
+def test_uuidv7_boundary_basic_generation():
+ """Test basic boundary UUID generation with a known timestamp."""
+ timestamp = 1609459200000 # 2021-01-01 00:00:00 UTC in milliseconds
+ result = uuidv7_boundary(timestamp)
+
+ # Should be a UUID object
+ assert isinstance(result, uuid.UUID)
+
+ # Should be version 7
+ assert result.version == 7
+
+ # Should have correct variant (RFC 4122 variant)
+ # Variant bits should be 10xxxxxx (0x80-0xBF range)
+ variant_byte = result.bytes[8]
+ assert (variant_byte >> 6) == 0b10
+
+
+def test_uuidv7_boundary_timestamp_extraction():
+ """Test that boundary UUID timestamp can be extracted correctly."""
+ timestamp = 1609459200000 # 2021-01-01 00:00:00 UTC in milliseconds
+ boundary_uuid = uuidv7_boundary(timestamp)
+
+ # Extract timestamp using existing function
+ extracted_timestamp = uuidv7_timestamp(boundary_uuid)
+
+ # Should match exactly
+ assert extracted_timestamp == timestamp
+
+
+def test_uuidv7_boundary_deterministic():
+ """Test that boundary UUIDs are deterministic for same timestamp."""
+ timestamp = 1609459200000 # 2021-01-01 00:00:00 UTC in milliseconds
+
+ # Generate multiple boundary UUIDs with same timestamp
+ uuid1 = uuidv7_boundary(timestamp)
+ uuid2 = uuidv7_boundary(timestamp)
+ uuid3 = uuidv7_boundary(timestamp)
+
+ # Should all be identical
+ assert uuid1 == uuid2 == uuid3
+ assert str(uuid1) == str(uuid2) == str(uuid3)
+
+
+def test_uuidv7_boundary_is_minimum():
+ """Test that boundary UUID is lexicographically smaller than regular UUIDs."""
+ timestamp = 1609459200000 # 2021-01-01 00:00:00 UTC in milliseconds
+
+ # Generate boundary UUID
+ boundary_uuid = uuidv7_boundary(timestamp)
+
+ # Generate multiple regular UUIDs with same timestamp
+ regular_uuids = [uuidv7(timestamp) for _ in range(50)]
+
+ # Boundary UUID should be lexicographically smaller than all regular UUIDs
+ boundary_str = str(boundary_uuid)
+ for regular_uuid in regular_uuids:
+ regular_str = str(regular_uuid)
+ assert boundary_str < regular_str, f"Boundary {boundary_str} should be < regular {regular_str}"
+
+ # Also test with bytes comparison
+ boundary_bytes = boundary_uuid.bytes
+ for regular_uuid in regular_uuids:
+ regular_bytes = regular_uuid.bytes
+ assert boundary_bytes < regular_bytes
+
+
+def test_uuidv7_boundary_different_timestamps():
+ """Test that boundary UUIDs with different timestamps are ordered correctly."""
+ timestamp1 = 1609459200000 # 2021-01-01 00:00:00 UTC
+ timestamp2 = 1609459201000 # 2021-01-01 00:00:01 UTC
+ timestamp3 = 1609459202000 # 2021-01-01 00:00:02 UTC
+
+ uuid1 = uuidv7_boundary(timestamp1)
+ uuid2 = uuidv7_boundary(timestamp2)
+ uuid3 = uuidv7_boundary(timestamp3)
+
+ # Extract timestamps to verify
+ ts1 = uuidv7_timestamp(uuid1)
+ ts2 = uuidv7_timestamp(uuid2)
+ ts3 = uuidv7_timestamp(uuid3)
+
+ # Should be in ascending order
+ assert ts1 < ts2 < ts3
+
+ # UUIDs should be lexicographically ordered
+ uuid_strings = [str(uuid1), str(uuid2), str(uuid3)]
+ assert uuid_strings == sorted(uuid_strings)
+
+ # Bytes should also be ordered
+ assert uuid1.bytes < uuid2.bytes < uuid3.bytes
+
+
+def test_uuidv7_boundary_edge_cases():
+ """Test boundary UUID generation with edge case timestamp values."""
+ # Test with timestamp 0 (Unix epoch)
+ epoch_uuid = uuidv7_boundary(0)
+ assert isinstance(epoch_uuid, uuid.UUID)
+ assert epoch_uuid.version == 7
+ assert uuidv7_timestamp(epoch_uuid) == 0
+
+ # Test with very large timestamp values
+ large_timestamp = 2147483647000 # 2038-01-19 03:14:07 UTC in milliseconds
+ large_uuid = uuidv7_boundary(large_timestamp)
+ assert isinstance(large_uuid, uuid.UUID)
+ assert large_uuid.version == 7
+ assert uuidv7_timestamp(large_uuid) == large_timestamp
+
+ # Test with current time
+ current_time = int(time.time() * 1000)
+ current_uuid = uuidv7_boundary(current_time)
+ assert isinstance(current_uuid, uuid.UUID)
+ assert current_uuid.version == 7
+ assert uuidv7_timestamp(current_uuid) == current_time
diff --git a/api/tests/unit_tests/models/__init__.py b/api/tests/unit_tests/models/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api/tests/unit_tests/models/test_workflow.py b/api/tests/unit_tests/models/test_workflow.py
index b79e95c7ed..5bc77ad0ef 100644
--- a/api/tests/unit_tests/models/test_workflow.py
+++ b/api/tests/unit_tests/models/test_workflow.py
@@ -1,10 +1,16 @@
+import dataclasses
import json
from unittest import mock
from uuid import uuid4
from constants import HIDDEN_VALUE
+from core.file.enums import FileTransferMethod, FileType
+from core.file.models import File
from core.variables import FloatVariable, IntegerVariable, SecretVariable, StringVariable
-from models.workflow import Workflow, WorkflowNodeExecutionModel
+from core.variables.segments import IntegerSegment, Segment
+from factories.variable_factory import build_segment
+from models.model import EndUser
+from models.workflow import Workflow, WorkflowDraftVariable, WorkflowNodeExecutionModel, is_system_variable_editable
def test_environment_variables():
@@ -38,7 +44,7 @@ def test_environment_variables():
)
# Mock current_user as an EndUser
- mock_user = mock.Mock()
+ mock_user = mock.Mock(spec=EndUser)
mock_user.tenant_id = "tenant_id"
with (
@@ -85,7 +91,7 @@ def test_update_environment_variables():
)
# Mock current_user as an EndUser
- mock_user = mock.Mock()
+ mock_user = mock.Mock(spec=EndUser)
mock_user.tenant_id = "tenant_id"
with (
@@ -131,7 +137,7 @@ def test_to_dict():
# Create some EnvironmentVariable instances
# Mock current_user as an EndUser
- mock_user = mock.Mock()
+ mock_user = mock.Mock(spec=EndUser)
mock_user.tenant_id = "tenant_id"
with (
@@ -163,3 +169,147 @@ class TestWorkflowNodeExecution:
original = {"a": 1, "b": ["2"]}
node_exec.execution_metadata = json.dumps(original)
assert node_exec.execution_metadata_dict == original
+
+
+class TestIsSystemVariableEditable:
+ def test_is_system_variable(self):
+ cases = [
+ ("query", True),
+ ("files", True),
+ ("dialogue_count", False),
+ ("conversation_id", False),
+ ("user_id", False),
+ ("app_id", False),
+ ("workflow_id", False),
+ ("workflow_run_id", False),
+ ]
+ for name, editable in cases:
+ assert editable == is_system_variable_editable(name)
+
+ assert is_system_variable_editable("invalid_or_new_system_variable") == False
+
+
+class TestWorkflowDraftVariableGetValue:
+ def test_get_value_by_case(self):
+ @dataclasses.dataclass
+ class TestCase:
+ name: str
+ value: Segment
+
+ tenant_id = "test_tenant_id"
+
+ test_file = File(
+ tenant_id=tenant_id,
+ type=FileType.IMAGE,
+ transfer_method=FileTransferMethod.REMOTE_URL,
+ remote_url="https://example.com/example.jpg",
+ filename="example.jpg",
+ extension=".jpg",
+ mime_type="image/jpeg",
+ size=100,
+ )
+ cases: list[TestCase] = [
+ TestCase(
+ name="number/int",
+ value=build_segment(1),
+ ),
+ TestCase(
+ name="number/float",
+ value=build_segment(1.0),
+ ),
+ TestCase(
+ name="string",
+ value=build_segment("a"),
+ ),
+ TestCase(
+ name="object",
+ value=build_segment({}),
+ ),
+ TestCase(
+ name="file",
+ value=build_segment(test_file),
+ ),
+ TestCase(
+ name="array[any]",
+ value=build_segment([1, "a"]),
+ ),
+ TestCase(
+ name="array[string]",
+ value=build_segment(["a", "b"]),
+ ),
+ TestCase(
+ name="array[number]/int",
+ value=build_segment([1, 2]),
+ ),
+ TestCase(
+ name="array[number]/float",
+ value=build_segment([1.0, 2.0]),
+ ),
+ TestCase(
+ name="array[number]/mixed",
+ value=build_segment([1, 2.0]),
+ ),
+ TestCase(
+ name="array[object]",
+ value=build_segment([{}, {"a": 1}]),
+ ),
+ TestCase(
+ name="none",
+ value=build_segment(None),
+ ),
+ ]
+
+ for idx, c in enumerate(cases, 1):
+ fail_msg = f"test case {c.name} failed, index={idx}"
+ draft_var = WorkflowDraftVariable()
+ draft_var.set_value(c.value)
+ assert c.value == draft_var.get_value(), fail_msg
+
+ def test_file_variable_preserves_all_fields(self):
+ """Test that File type variables preserve all fields during encoding/decoding."""
+ tenant_id = "test_tenant_id"
+
+ # Create a File with specific field values
+ test_file = File(
+ id="test_file_id",
+ tenant_id=tenant_id,
+ type=FileType.IMAGE,
+ transfer_method=FileTransferMethod.REMOTE_URL,
+ remote_url="https://example.com/test.jpg",
+ filename="test.jpg",
+ extension=".jpg",
+ mime_type="image/jpeg",
+ size=12345, # Specific size to test preservation
+ storage_key="test_storage_key",
+ )
+
+ # Create a FileSegment and WorkflowDraftVariable
+ file_segment = build_segment(test_file)
+ draft_var = WorkflowDraftVariable()
+ draft_var.set_value(file_segment)
+
+ # Retrieve the value and verify all fields are preserved
+ retrieved_segment = draft_var.get_value()
+ retrieved_file = retrieved_segment.value
+
+ # Verify all important fields are preserved
+ assert retrieved_file.id == test_file.id
+ assert retrieved_file.tenant_id == test_file.tenant_id
+ assert retrieved_file.type == test_file.type
+ assert retrieved_file.transfer_method == test_file.transfer_method
+ assert retrieved_file.remote_url == test_file.remote_url
+ assert retrieved_file.filename == test_file.filename
+ assert retrieved_file.extension == test_file.extension
+ assert retrieved_file.mime_type == test_file.mime_type
+ assert retrieved_file.size == test_file.size # This was the main issue being fixed
+ # Note: storage_key is not serialized in model_dump() so it won't be preserved
+
+ # Verify the segments have the same type and the important fields match
+ assert file_segment.value_type == retrieved_segment.value_type
+
+ def test_get_and_set_value(self):
+ draft_var = WorkflowDraftVariable()
+ int_var = IntegerSegment(value=1)
+ draft_var.set_value(int_var)
+ value = draft_var.get_value()
+ assert value == int_var
diff --git a/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_repository.py b/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_repository.py
index 643efb0a0c..c60800c493 100644
--- a/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_repository.py
+++ b/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_repository.py
@@ -137,37 +137,6 @@ def test_save_with_existing_tenant_id(repository, session):
session_obj.merge.assert_called_once_with(modified_execution)
-def test_get_by_node_execution_id(repository, session, mocker: MockerFixture):
- """Test get_by_node_execution_id method."""
- session_obj, _ = session
- # Set up mock
- mock_select = mocker.patch("core.repositories.sqlalchemy_workflow_node_execution_repository.select")
- mock_stmt = mocker.MagicMock()
- mock_select.return_value = mock_stmt
- mock_stmt.where.return_value = mock_stmt
-
- # Create a properly configured mock execution
- mock_execution = mocker.MagicMock(spec=WorkflowNodeExecutionModel)
- configure_mock_execution(mock_execution)
- session_obj.scalar.return_value = mock_execution
-
- # Create a mock domain model to be returned by _to_domain_model
- mock_domain_model = mocker.MagicMock()
- # Mock the _to_domain_model method to return our mock domain model
- repository._to_domain_model = mocker.MagicMock(return_value=mock_domain_model)
-
- # Call method
- result = repository.get_by_node_execution_id("test-node-execution-id")
-
- # Assert select was called with correct parameters
- mock_select.assert_called_once()
- session_obj.scalar.assert_called_once_with(mock_stmt)
- # Assert _to_domain_model was called with the mock execution
- repository._to_domain_model.assert_called_once_with(mock_execution)
- # Assert the result is our mock domain model
- assert result is mock_domain_model
-
-
def test_get_by_workflow_run(repository, session, mocker: MockerFixture):
"""Test get_by_workflow_run method."""
session_obj, _ = session
@@ -202,88 +171,6 @@ def test_get_by_workflow_run(repository, session, mocker: MockerFixture):
assert result[0] is mock_domain_model
-def test_get_running_executions(repository, session, mocker: MockerFixture):
- """Test get_running_executions method."""
- session_obj, _ = session
- # Set up mock
- mock_select = mocker.patch("core.repositories.sqlalchemy_workflow_node_execution_repository.select")
- mock_stmt = mocker.MagicMock()
- mock_select.return_value = mock_stmt
- mock_stmt.where.return_value = mock_stmt
-
- # Create a properly configured mock execution
- mock_execution = mocker.MagicMock(spec=WorkflowNodeExecutionModel)
- configure_mock_execution(mock_execution)
- session_obj.scalars.return_value.all.return_value = [mock_execution]
-
- # Create a mock domain model to be returned by _to_domain_model
- mock_domain_model = mocker.MagicMock()
- # Mock the _to_domain_model method to return our mock domain model
- repository._to_domain_model = mocker.MagicMock(return_value=mock_domain_model)
-
- # Call method
- result = repository.get_running_executions("test-workflow-run-id")
-
- # Assert select was called with correct parameters
- mock_select.assert_called_once()
- session_obj.scalars.assert_called_once_with(mock_stmt)
- # Assert _to_domain_model was called with the mock execution
- repository._to_domain_model.assert_called_once_with(mock_execution)
- # Assert the result contains our mock domain model
- assert len(result) == 1
- assert result[0] is mock_domain_model
-
-
-def test_update_via_save(repository, session):
- """Test updating an existing record via save method."""
- session_obj, _ = session
- # Create a mock execution
- execution = MagicMock(spec=WorkflowNodeExecutionModel)
- execution.tenant_id = None
- execution.app_id = None
- execution.inputs = None
- execution.process_data = None
- execution.outputs = None
- execution.metadata = None
-
- # Mock the to_db_model method to return the execution itself
- # This simulates the behavior of setting tenant_id and app_id
- repository.to_db_model = MagicMock(return_value=execution)
-
- # Call save method to update an existing record
- repository.save(execution)
-
- # Assert to_db_model was called with the execution
- repository.to_db_model.assert_called_once_with(execution)
-
- # Assert session.merge was called (for updates)
- session_obj.merge.assert_called_once_with(execution)
-
-
-def test_clear(repository, session, mocker: MockerFixture):
- """Test clear method."""
- session_obj, _ = session
- # Set up mock
- mock_delete = mocker.patch("core.repositories.sqlalchemy_workflow_node_execution_repository.delete")
- mock_stmt = mocker.MagicMock()
- mock_delete.return_value = mock_stmt
- mock_stmt.where.return_value = mock_stmt
-
- # Mock the execute result with rowcount
- mock_result = mocker.MagicMock()
- mock_result.rowcount = 5 # Simulate 5 records deleted
- session_obj.execute.return_value = mock_result
-
- # Call method
- repository.clear()
-
- # Assert delete was called with correct parameters
- mock_delete.assert_called_once_with(WorkflowNodeExecutionModel)
- mock_stmt.where.assert_called()
- session_obj.execute.assert_called_once_with(mock_stmt)
- session_obj.commit.assert_called_once()
-
-
def test_to_db_model(repository):
"""Test to_db_model method."""
# Create a domain model
diff --git a/api/tests/unit_tests/services/auth/__init__.py b/api/tests/unit_tests/services/auth/__init__.py
new file mode 100644
index 0000000000..852a892730
--- /dev/null
+++ b/api/tests/unit_tests/services/auth/__init__.py
@@ -0,0 +1 @@
+# API authentication service test module
diff --git a/api/tests/unit_tests/services/auth/test_api_key_auth_base.py b/api/tests/unit_tests/services/auth/test_api_key_auth_base.py
new file mode 100644
index 0000000000..b5d91ef3fb
--- /dev/null
+++ b/api/tests/unit_tests/services/auth/test_api_key_auth_base.py
@@ -0,0 +1,49 @@
+import pytest
+
+from services.auth.api_key_auth_base import ApiKeyAuthBase
+
+
+class ConcreteApiKeyAuth(ApiKeyAuthBase):
+ """Concrete implementation for testing abstract base class"""
+
+ def validate_credentials(self):
+ return True
+
+
+class TestApiKeyAuthBase:
+ def test_should_store_credentials_on_init(self):
+ """Test that credentials are properly stored during initialization"""
+ credentials = {"api_key": "test_key", "auth_type": "bearer"}
+ auth = ConcreteApiKeyAuth(credentials)
+ assert auth.credentials == credentials
+
+ def test_should_not_instantiate_abstract_class(self):
+ """Test that ApiKeyAuthBase cannot be instantiated directly"""
+ credentials = {"api_key": "test_key"}
+
+ with pytest.raises(TypeError) as exc_info:
+ ApiKeyAuthBase(credentials)
+
+ assert "Can't instantiate abstract class" in str(exc_info.value)
+ assert "validate_credentials" in str(exc_info.value)
+
+ def test_should_allow_subclass_implementation(self):
+ """Test that subclasses can properly implement the abstract method"""
+ credentials = {"api_key": "test_key", "auth_type": "bearer"}
+ auth = ConcreteApiKeyAuth(credentials)
+
+ # Should not raise any exception
+ result = auth.validate_credentials()
+ assert result is True
+
+ def test_should_handle_empty_credentials(self):
+ """Test initialization with empty credentials"""
+ credentials = {}
+ auth = ConcreteApiKeyAuth(credentials)
+ assert auth.credentials == {}
+
+ def test_should_handle_none_credentials(self):
+ """Test initialization with None credentials"""
+ credentials = None
+ auth = ConcreteApiKeyAuth(credentials)
+ assert auth.credentials is None
diff --git a/api/tests/unit_tests/services/auth/test_api_key_auth_factory.py b/api/tests/unit_tests/services/auth/test_api_key_auth_factory.py
new file mode 100644
index 0000000000..9d9cb7c6d5
--- /dev/null
+++ b/api/tests/unit_tests/services/auth/test_api_key_auth_factory.py
@@ -0,0 +1,81 @@
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from services.auth.api_key_auth_factory import ApiKeyAuthFactory
+from services.auth.auth_type import AuthType
+
+
+class TestApiKeyAuthFactory:
+ """Test cases for ApiKeyAuthFactory"""
+
+ @pytest.mark.parametrize(
+ ("provider", "auth_class_path"),
+ [
+ (AuthType.FIRECRAWL, "services.auth.firecrawl.firecrawl.FirecrawlAuth"),
+ (AuthType.WATERCRAWL, "services.auth.watercrawl.watercrawl.WatercrawlAuth"),
+ (AuthType.JINA, "services.auth.jina.jina.JinaAuth"),
+ ],
+ )
+ def test_get_apikey_auth_factory_valid_providers(self, provider, auth_class_path):
+ """Test getting auth factory for all valid providers"""
+ with patch(auth_class_path) as mock_auth:
+ auth_class = ApiKeyAuthFactory.get_apikey_auth_factory(provider)
+ assert auth_class == mock_auth
+
+ @pytest.mark.parametrize(
+ "invalid_provider",
+ [
+ "invalid_provider",
+ "",
+ None,
+ 123,
+ "UNSUPPORTED",
+ ],
+ )
+ def test_get_apikey_auth_factory_invalid_providers(self, invalid_provider):
+ """Test getting auth factory with various invalid providers"""
+ with pytest.raises(ValueError) as exc_info:
+ ApiKeyAuthFactory.get_apikey_auth_factory(invalid_provider)
+ assert str(exc_info.value) == "Invalid provider"
+
+ @pytest.mark.parametrize(
+ ("credentials_return_value", "expected_result"),
+ [
+ (True, True),
+ (False, False),
+ ],
+ )
+ @patch("services.auth.api_key_auth_factory.ApiKeyAuthFactory.get_apikey_auth_factory")
+ def test_validate_credentials_delegates_to_auth_instance(
+ self, mock_get_factory, credentials_return_value, expected_result
+ ):
+ """Test that validate_credentials delegates to auth instance correctly"""
+ # Arrange
+ mock_auth_instance = MagicMock()
+ mock_auth_instance.validate_credentials.return_value = credentials_return_value
+ mock_auth_class = MagicMock(return_value=mock_auth_instance)
+ mock_get_factory.return_value = mock_auth_class
+
+ # Act
+ factory = ApiKeyAuthFactory(AuthType.FIRECRAWL, {"api_key": "test_key"})
+ result = factory.validate_credentials()
+
+ # Assert
+ assert result is expected_result
+ mock_auth_instance.validate_credentials.assert_called_once()
+
+ @patch("services.auth.api_key_auth_factory.ApiKeyAuthFactory.get_apikey_auth_factory")
+ def test_validate_credentials_propagates_exceptions(self, mock_get_factory):
+ """Test that exceptions from auth instance are propagated"""
+ # Arrange
+ mock_auth_instance = MagicMock()
+ mock_auth_instance.validate_credentials.side_effect = Exception("Authentication error")
+ mock_auth_class = MagicMock(return_value=mock_auth_instance)
+ mock_get_factory.return_value = mock_auth_class
+
+ # Act & Assert
+ factory = ApiKeyAuthFactory(AuthType.FIRECRAWL, {"api_key": "test_key"})
+ with pytest.raises(Exception) as exc_info:
+ factory.validate_credentials()
+ assert str(exc_info.value) == "Authentication error"
diff --git a/api/tests/unit_tests/services/auth/test_api_key_auth_service.py b/api/tests/unit_tests/services/auth/test_api_key_auth_service.py
new file mode 100644
index 0000000000..f0e425e742
--- /dev/null
+++ b/api/tests/unit_tests/services/auth/test_api_key_auth_service.py
@@ -0,0 +1,382 @@
+import json
+from unittest.mock import Mock, patch
+
+import pytest
+
+from models.source import DataSourceApiKeyAuthBinding
+from services.auth.api_key_auth_service import ApiKeyAuthService
+
+
+class TestApiKeyAuthService:
+ """API key authentication service security tests"""
+
+ def setup_method(self):
+ """Setup test fixtures"""
+ self.tenant_id = "test_tenant_123"
+ self.category = "search"
+ self.provider = "google"
+ self.binding_id = "binding_123"
+ self.mock_credentials = {"auth_type": "api_key", "config": {"api_key": "test_secret_key_123"}}
+ self.mock_args = {"category": self.category, "provider": self.provider, "credentials": self.mock_credentials}
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ def test_get_provider_auth_list_success(self, mock_session):
+ """Test get provider auth list - success scenario"""
+ # Mock database query result
+ mock_binding = Mock()
+ mock_binding.tenant_id = self.tenant_id
+ mock_binding.provider = self.provider
+ mock_binding.disabled = False
+
+ mock_session.query.return_value.filter.return_value.all.return_value = [mock_binding]
+
+ result = ApiKeyAuthService.get_provider_auth_list(self.tenant_id)
+
+ assert len(result) == 1
+ assert result[0].tenant_id == self.tenant_id
+ mock_session.query.assert_called_once_with(DataSourceApiKeyAuthBinding)
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ def test_get_provider_auth_list_empty(self, mock_session):
+ """Test get provider auth list - empty result"""
+ mock_session.query.return_value.filter.return_value.all.return_value = []
+
+ result = ApiKeyAuthService.get_provider_auth_list(self.tenant_id)
+
+ assert result == []
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ def test_get_provider_auth_list_filters_disabled(self, mock_session):
+ """Test get provider auth list - filters disabled items"""
+ mock_session.query.return_value.filter.return_value.all.return_value = []
+
+ ApiKeyAuthService.get_provider_auth_list(self.tenant_id)
+
+ # Verify filter conditions include disabled.is_(False)
+ filter_call = mock_session.query.return_value.filter.call_args[0]
+ assert len(filter_call) == 2 # tenant_id and disabled filter conditions
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ @patch("services.auth.api_key_auth_service.ApiKeyAuthFactory")
+ @patch("services.auth.api_key_auth_service.encrypter")
+ def test_create_provider_auth_success(self, mock_encrypter, mock_factory, mock_session):
+ """Test create provider auth - success scenario"""
+ # Mock successful auth validation
+ mock_auth_instance = Mock()
+ mock_auth_instance.validate_credentials.return_value = True
+ mock_factory.return_value = mock_auth_instance
+
+ # Mock encryption
+ encrypted_key = "encrypted_test_key_123"
+ mock_encrypter.encrypt_token.return_value = encrypted_key
+
+ # Mock database operations
+ mock_session.add = Mock()
+ mock_session.commit = Mock()
+
+ ApiKeyAuthService.create_provider_auth(self.tenant_id, self.mock_args)
+
+ # Verify factory class calls
+ mock_factory.assert_called_once_with(self.provider, self.mock_credentials)
+ mock_auth_instance.validate_credentials.assert_called_once()
+
+ # Verify encryption calls
+ mock_encrypter.encrypt_token.assert_called_once_with(self.tenant_id, "test_secret_key_123")
+
+ # Verify database operations
+ mock_session.add.assert_called_once()
+ mock_session.commit.assert_called_once()
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ @patch("services.auth.api_key_auth_service.ApiKeyAuthFactory")
+ def test_create_provider_auth_validation_failed(self, mock_factory, mock_session):
+ """Test create provider auth - validation failed"""
+ # Mock failed auth validation
+ mock_auth_instance = Mock()
+ mock_auth_instance.validate_credentials.return_value = False
+ mock_factory.return_value = mock_auth_instance
+
+ ApiKeyAuthService.create_provider_auth(self.tenant_id, self.mock_args)
+
+ # Verify no database operations when validation fails
+ mock_session.add.assert_not_called()
+ mock_session.commit.assert_not_called()
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ @patch("services.auth.api_key_auth_service.ApiKeyAuthFactory")
+ @patch("services.auth.api_key_auth_service.encrypter")
+ def test_create_provider_auth_encrypts_api_key(self, mock_encrypter, mock_factory, mock_session):
+ """Test create provider auth - ensures API key is encrypted"""
+ # Mock successful auth validation
+ mock_auth_instance = Mock()
+ mock_auth_instance.validate_credentials.return_value = True
+ mock_factory.return_value = mock_auth_instance
+
+ # Mock encryption
+ encrypted_key = "encrypted_test_key_123"
+ mock_encrypter.encrypt_token.return_value = encrypted_key
+
+ # Mock database operations
+ mock_session.add = Mock()
+ mock_session.commit = Mock()
+
+ args_copy = self.mock_args.copy()
+ original_key = args_copy["credentials"]["config"]["api_key"] # type: ignore
+
+ ApiKeyAuthService.create_provider_auth(self.tenant_id, args_copy)
+
+ # Verify original key is replaced with encrypted key
+ assert args_copy["credentials"]["config"]["api_key"] == encrypted_key # type: ignore
+ assert args_copy["credentials"]["config"]["api_key"] != original_key # type: ignore
+
+ # Verify encryption function is called correctly
+ mock_encrypter.encrypt_token.assert_called_once_with(self.tenant_id, original_key)
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ def test_get_auth_credentials_success(self, mock_session):
+ """Test get auth credentials - success scenario"""
+ # Mock database query result
+ mock_binding = Mock()
+ mock_binding.credentials = json.dumps(self.mock_credentials)
+ mock_session.query.return_value.filter.return_value.first.return_value = mock_binding
+
+ result = ApiKeyAuthService.get_auth_credentials(self.tenant_id, self.category, self.provider)
+
+ assert result == self.mock_credentials
+ mock_session.query.assert_called_once_with(DataSourceApiKeyAuthBinding)
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ def test_get_auth_credentials_not_found(self, mock_session):
+ """Test get auth credentials - not found"""
+ mock_session.query.return_value.filter.return_value.first.return_value = None
+
+ result = ApiKeyAuthService.get_auth_credentials(self.tenant_id, self.category, self.provider)
+
+ assert result is None
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ def test_get_auth_credentials_filters_correctly(self, mock_session):
+ """Test get auth credentials - applies correct filters"""
+ mock_session.query.return_value.filter.return_value.first.return_value = None
+
+ ApiKeyAuthService.get_auth_credentials(self.tenant_id, self.category, self.provider)
+
+ # Verify filter conditions are correct
+ filter_call = mock_session.query.return_value.filter.call_args[0]
+ assert len(filter_call) == 4 # tenant_id, category, provider, disabled
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ def test_get_auth_credentials_json_parsing(self, mock_session):
+ """Test get auth credentials - JSON parsing"""
+ # Mock credentials with special characters
+ special_credentials = {"auth_type": "api_key", "config": {"api_key": "key_with_中文_and_special_chars_!@#$%"}}
+
+ mock_binding = Mock()
+ mock_binding.credentials = json.dumps(special_credentials, ensure_ascii=False)
+ mock_session.query.return_value.filter.return_value.first.return_value = mock_binding
+
+ result = ApiKeyAuthService.get_auth_credentials(self.tenant_id, self.category, self.provider)
+
+ assert result == special_credentials
+ assert result["config"]["api_key"] == "key_with_中文_and_special_chars_!@#$%"
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ def test_delete_provider_auth_success(self, mock_session):
+ """Test delete provider auth - success scenario"""
+ # Mock database query result
+ mock_binding = Mock()
+ mock_session.query.return_value.filter.return_value.first.return_value = mock_binding
+
+ ApiKeyAuthService.delete_provider_auth(self.tenant_id, self.binding_id)
+
+ # Verify delete operations
+ mock_session.delete.assert_called_once_with(mock_binding)
+ mock_session.commit.assert_called_once()
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ def test_delete_provider_auth_not_found(self, mock_session):
+ """Test delete provider auth - not found"""
+ mock_session.query.return_value.filter.return_value.first.return_value = None
+
+ ApiKeyAuthService.delete_provider_auth(self.tenant_id, self.binding_id)
+
+ # Verify no delete operations when not found
+ mock_session.delete.assert_not_called()
+ mock_session.commit.assert_not_called()
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ def test_delete_provider_auth_filters_by_tenant(self, mock_session):
+ """Test delete provider auth - filters by tenant"""
+ mock_session.query.return_value.filter.return_value.first.return_value = None
+
+ ApiKeyAuthService.delete_provider_auth(self.tenant_id, self.binding_id)
+
+ # Verify filter conditions include tenant_id and binding_id
+ filter_call = mock_session.query.return_value.filter.call_args[0]
+ assert len(filter_call) == 2
+
+ def test_validate_api_key_auth_args_success(self):
+ """Test API key auth args validation - success scenario"""
+ # Should not raise any exception
+ ApiKeyAuthService.validate_api_key_auth_args(self.mock_args)
+
+ def test_validate_api_key_auth_args_missing_category(self):
+ """Test API key auth args validation - missing category"""
+ args = self.mock_args.copy()
+ del args["category"]
+
+ with pytest.raises(ValueError, match="category is required"):
+ ApiKeyAuthService.validate_api_key_auth_args(args)
+
+ def test_validate_api_key_auth_args_empty_category(self):
+ """Test API key auth args validation - empty category"""
+ args = self.mock_args.copy()
+ args["category"] = ""
+
+ with pytest.raises(ValueError, match="category is required"):
+ ApiKeyAuthService.validate_api_key_auth_args(args)
+
+ def test_validate_api_key_auth_args_missing_provider(self):
+ """Test API key auth args validation - missing provider"""
+ args = self.mock_args.copy()
+ del args["provider"]
+
+ with pytest.raises(ValueError, match="provider is required"):
+ ApiKeyAuthService.validate_api_key_auth_args(args)
+
+ def test_validate_api_key_auth_args_empty_provider(self):
+ """Test API key auth args validation - empty provider"""
+ args = self.mock_args.copy()
+ args["provider"] = ""
+
+ with pytest.raises(ValueError, match="provider is required"):
+ ApiKeyAuthService.validate_api_key_auth_args(args)
+
+ def test_validate_api_key_auth_args_missing_credentials(self):
+ """Test API key auth args validation - missing credentials"""
+ args = self.mock_args.copy()
+ del args["credentials"]
+
+ with pytest.raises(ValueError, match="credentials is required"):
+ ApiKeyAuthService.validate_api_key_auth_args(args)
+
+ def test_validate_api_key_auth_args_empty_credentials(self):
+ """Test API key auth args validation - empty credentials"""
+ args = self.mock_args.copy()
+ args["credentials"] = None # type: ignore
+
+ with pytest.raises(ValueError, match="credentials is required"):
+ ApiKeyAuthService.validate_api_key_auth_args(args)
+
+ def test_validate_api_key_auth_args_invalid_credentials_type(self):
+ """Test API key auth args validation - invalid credentials type"""
+ args = self.mock_args.copy()
+ args["credentials"] = "not_a_dict"
+
+ with pytest.raises(ValueError, match="credentials must be a dictionary"):
+ ApiKeyAuthService.validate_api_key_auth_args(args)
+
+ def test_validate_api_key_auth_args_missing_auth_type(self):
+ """Test API key auth args validation - missing auth_type"""
+ args = self.mock_args.copy()
+ del args["credentials"]["auth_type"] # type: ignore
+
+ with pytest.raises(ValueError, match="auth_type is required"):
+ ApiKeyAuthService.validate_api_key_auth_args(args)
+
+ def test_validate_api_key_auth_args_empty_auth_type(self):
+ """Test API key auth args validation - empty auth_type"""
+ args = self.mock_args.copy()
+ args["credentials"]["auth_type"] = "" # type: ignore
+
+ with pytest.raises(ValueError, match="auth_type is required"):
+ ApiKeyAuthService.validate_api_key_auth_args(args)
+
+ @pytest.mark.parametrize(
+ "malicious_input",
+ [
+ "",
+ "'; DROP TABLE users; --",
+ "../../../etc/passwd",
+ "\\x00\\x00", # null bytes
+ "A" * 10000, # very long input
+ ],
+ )
+ def test_validate_api_key_auth_args_malicious_input(self, malicious_input):
+ """Test API key auth args validation - malicious input"""
+ args = self.mock_args.copy()
+ args["category"] = malicious_input
+
+ # Verify parameter validator doesn't crash on malicious input
+ # Should validate normally rather than raising security-related exceptions
+ ApiKeyAuthService.validate_api_key_auth_args(args)
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ @patch("services.auth.api_key_auth_service.ApiKeyAuthFactory")
+ @patch("services.auth.api_key_auth_service.encrypter")
+ def test_create_provider_auth_database_error_handling(self, mock_encrypter, mock_factory, mock_session):
+ """Test create provider auth - database error handling"""
+ # Mock successful auth validation
+ mock_auth_instance = Mock()
+ mock_auth_instance.validate_credentials.return_value = True
+ mock_factory.return_value = mock_auth_instance
+
+ # Mock encryption
+ mock_encrypter.encrypt_token.return_value = "encrypted_key"
+
+ # Mock database error
+ mock_session.commit.side_effect = Exception("Database error")
+
+ with pytest.raises(Exception, match="Database error"):
+ ApiKeyAuthService.create_provider_auth(self.tenant_id, self.mock_args)
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ def test_get_auth_credentials_invalid_json(self, mock_session):
+ """Test get auth credentials - invalid JSON"""
+ # Mock database returning invalid JSON
+ mock_binding = Mock()
+ mock_binding.credentials = "invalid json content"
+ mock_session.query.return_value.filter.return_value.first.return_value = mock_binding
+
+ with pytest.raises(json.JSONDecodeError):
+ ApiKeyAuthService.get_auth_credentials(self.tenant_id, self.category, self.provider)
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ @patch("services.auth.api_key_auth_service.ApiKeyAuthFactory")
+ def test_create_provider_auth_factory_exception(self, mock_factory, mock_session):
+ """Test create provider auth - factory exception"""
+ # Mock factory raising exception
+ mock_factory.side_effect = Exception("Factory error")
+
+ with pytest.raises(Exception, match="Factory error"):
+ ApiKeyAuthService.create_provider_auth(self.tenant_id, self.mock_args)
+
+ @patch("services.auth.api_key_auth_service.db.session")
+ @patch("services.auth.api_key_auth_service.ApiKeyAuthFactory")
+ @patch("services.auth.api_key_auth_service.encrypter")
+ def test_create_provider_auth_encryption_exception(self, mock_encrypter, mock_factory, mock_session):
+ """Test create provider auth - encryption exception"""
+ # Mock successful auth validation
+ mock_auth_instance = Mock()
+ mock_auth_instance.validate_credentials.return_value = True
+ mock_factory.return_value = mock_auth_instance
+
+ # Mock encryption exception
+ mock_encrypter.encrypt_token.side_effect = Exception("Encryption error")
+
+ with pytest.raises(Exception, match="Encryption error"):
+ ApiKeyAuthService.create_provider_auth(self.tenant_id, self.mock_args)
+
+ def test_validate_api_key_auth_args_none_input(self):
+ """Test API key auth args validation - None input"""
+ with pytest.raises(TypeError):
+ ApiKeyAuthService.validate_api_key_auth_args(None)
+
+ def test_validate_api_key_auth_args_dict_credentials_with_list_auth_type(self):
+ """Test API key auth args validation - dict credentials with list auth_type"""
+ args = self.mock_args.copy()
+ args["credentials"]["auth_type"] = ["api_key"] # type: ignore # list instead of string
+
+ # Current implementation checks if auth_type exists and is truthy, list ["api_key"] is truthy
+ # So this should not raise exception, this test should pass
+ ApiKeyAuthService.validate_api_key_auth_args(args)
diff --git a/api/tests/unit_tests/services/auth/test_auth_type.py b/api/tests/unit_tests/services/auth/test_auth_type.py
new file mode 100644
index 0000000000..94073f451e
--- /dev/null
+++ b/api/tests/unit_tests/services/auth/test_auth_type.py
@@ -0,0 +1,150 @@
+import pytest
+
+from services.auth.auth_type import AuthType
+
+
+class TestAuthType:
+ """Test cases for AuthType enum"""
+
+ def test_auth_type_is_str_enum(self):
+ """Test that AuthType is properly a StrEnum"""
+ assert issubclass(AuthType, str)
+ assert hasattr(AuthType, "__members__")
+
+ def test_auth_type_has_expected_values(self):
+ """Test that all expected auth types exist with correct values"""
+ expected_values = {
+ "FIRECRAWL": "firecrawl",
+ "WATERCRAWL": "watercrawl",
+ "JINA": "jinareader",
+ }
+
+ # Verify all expected members exist
+ for member_name, expected_value in expected_values.items():
+ assert hasattr(AuthType, member_name)
+ assert getattr(AuthType, member_name).value == expected_value
+
+ # Verify no extra members exist
+ assert len(AuthType) == len(expected_values)
+
+ @pytest.mark.parametrize(
+ ("auth_type", "expected_string"),
+ [
+ (AuthType.FIRECRAWL, "firecrawl"),
+ (AuthType.WATERCRAWL, "watercrawl"),
+ (AuthType.JINA, "jinareader"),
+ ],
+ )
+ def test_auth_type_string_representation(self, auth_type, expected_string):
+ """Test string representation of auth types"""
+ assert str(auth_type) == expected_string
+ assert auth_type.value == expected_string
+
+ @pytest.mark.parametrize(
+ ("auth_type", "compare_value", "expected_result"),
+ [
+ (AuthType.FIRECRAWL, "firecrawl", True),
+ (AuthType.WATERCRAWL, "watercrawl", True),
+ (AuthType.JINA, "jinareader", True),
+ (AuthType.FIRECRAWL, "FIRECRAWL", False), # Case sensitive
+ (AuthType.FIRECRAWL, "watercrawl", False),
+ (AuthType.JINA, "jina", False), # Full value mismatch
+ ],
+ )
+ def test_auth_type_comparison(self, auth_type, compare_value, expected_result):
+ """Test auth type comparison with strings"""
+ assert (auth_type == compare_value) is expected_result
+
+ def test_auth_type_iteration(self):
+ """Test that AuthType can be iterated over"""
+ auth_types = list(AuthType)
+ assert len(auth_types) == 3
+ assert AuthType.FIRECRAWL in auth_types
+ assert AuthType.WATERCRAWL in auth_types
+ assert AuthType.JINA in auth_types
+
+ def test_auth_type_membership(self):
+ """Test membership checking for AuthType"""
+ assert "firecrawl" in [auth.value for auth in AuthType]
+ assert "watercrawl" in [auth.value for auth in AuthType]
+ assert "jinareader" in [auth.value for auth in AuthType]
+ assert "invalid" not in [auth.value for auth in AuthType]
+
+ def test_auth_type_invalid_attribute_access(self):
+ """Test accessing non-existent auth type raises AttributeError"""
+ with pytest.raises(AttributeError):
+ _ = AuthType.INVALID_TYPE
+
+ def test_auth_type_immutability(self):
+ """Test that enum values cannot be modified"""
+ # In Python 3.11+, enum members are read-only
+ with pytest.raises(AttributeError):
+ AuthType.FIRECRAWL = "modified"
+
+ def test_auth_type_from_value(self):
+ """Test creating AuthType from string value"""
+ assert AuthType("firecrawl") == AuthType.FIRECRAWL
+ assert AuthType("watercrawl") == AuthType.WATERCRAWL
+ assert AuthType("jinareader") == AuthType.JINA
+
+ # Test invalid value
+ with pytest.raises(ValueError) as exc_info:
+ AuthType("invalid_auth_type")
+ assert "invalid_auth_type" in str(exc_info.value)
+
+ def test_auth_type_name_property(self):
+ """Test the name property of enum members"""
+ assert AuthType.FIRECRAWL.name == "FIRECRAWL"
+ assert AuthType.WATERCRAWL.name == "WATERCRAWL"
+ assert AuthType.JINA.name == "JINA"
+
+ @pytest.mark.parametrize(
+ "auth_type",
+ [AuthType.FIRECRAWL, AuthType.WATERCRAWL, AuthType.JINA],
+ )
+ def test_auth_type_isinstance_checks(self, auth_type):
+ """Test isinstance checks for auth types"""
+ assert isinstance(auth_type, AuthType)
+ assert isinstance(auth_type, str)
+ assert isinstance(auth_type.value, str)
+
+ def test_auth_type_hash(self):
+ """Test that auth types are hashable and can be used in sets/dicts"""
+ auth_set = {AuthType.FIRECRAWL, AuthType.WATERCRAWL, AuthType.JINA}
+ assert len(auth_set) == 3
+
+ auth_dict = {
+ AuthType.FIRECRAWL: "firecrawl_handler",
+ AuthType.WATERCRAWL: "watercrawl_handler",
+ AuthType.JINA: "jina_handler",
+ }
+ assert auth_dict[AuthType.FIRECRAWL] == "firecrawl_handler"
+
+ def test_auth_type_json_serializable(self):
+ """Test that auth types can be JSON serialized"""
+ import json
+
+ auth_data = {
+ "provider": AuthType.FIRECRAWL,
+ "enabled": True,
+ }
+
+ # Should serialize to string value
+ json_str = json.dumps(auth_data, default=str)
+ assert '"provider": "firecrawl"' in json_str
+
+ def test_auth_type_matches_factory_usage(self):
+ """Test that all AuthType values are handled by ApiKeyAuthFactory"""
+ # This test verifies that the enum values match what's expected
+ # by the factory implementation
+ from services.auth.api_key_auth_factory import ApiKeyAuthFactory
+
+ for auth_type in AuthType:
+ # Should not raise ValueError for valid auth types
+ try:
+ auth_class = ApiKeyAuthFactory.get_apikey_auth_factory(auth_type)
+ assert auth_class is not None
+ except ImportError:
+ # It's OK if the actual auth implementation doesn't exist
+ # We're just testing that the enum value is recognized
+ pass
diff --git a/api/tests/unit_tests/services/auth/test_firecrawl_auth.py b/api/tests/unit_tests/services/auth/test_firecrawl_auth.py
new file mode 100644
index 0000000000..ffdf5897ed
--- /dev/null
+++ b/api/tests/unit_tests/services/auth/test_firecrawl_auth.py
@@ -0,0 +1,191 @@
+from unittest.mock import MagicMock, patch
+
+import pytest
+import requests
+
+from services.auth.firecrawl.firecrawl import FirecrawlAuth
+
+
+class TestFirecrawlAuth:
+ @pytest.fixture
+ def valid_credentials(self):
+ """Fixture for valid bearer credentials"""
+ return {"auth_type": "bearer", "config": {"api_key": "test_api_key_123"}}
+
+ @pytest.fixture
+ def auth_instance(self, valid_credentials):
+ """Fixture for FirecrawlAuth instance with valid credentials"""
+ return FirecrawlAuth(valid_credentials)
+
+ def test_should_initialize_with_valid_bearer_credentials(self, valid_credentials):
+ """Test successful initialization with valid bearer credentials"""
+ auth = FirecrawlAuth(valid_credentials)
+ assert auth.api_key == "test_api_key_123"
+ assert auth.base_url == "https://api.firecrawl.dev"
+ assert auth.credentials == valid_credentials
+
+ def test_should_initialize_with_custom_base_url(self):
+ """Test initialization with custom base URL"""
+ credentials = {
+ "auth_type": "bearer",
+ "config": {"api_key": "test_api_key_123", "base_url": "https://custom.firecrawl.dev"},
+ }
+ auth = FirecrawlAuth(credentials)
+ assert auth.api_key == "test_api_key_123"
+ assert auth.base_url == "https://custom.firecrawl.dev"
+
+ @pytest.mark.parametrize(
+ ("auth_type", "expected_error"),
+ [
+ ("basic", "Invalid auth type, Firecrawl auth type must be Bearer"),
+ ("x-api-key", "Invalid auth type, Firecrawl auth type must be Bearer"),
+ ("", "Invalid auth type, Firecrawl auth type must be Bearer"),
+ ],
+ )
+ def test_should_raise_error_for_invalid_auth_type(self, auth_type, expected_error):
+ """Test that non-bearer auth types raise ValueError"""
+ credentials = {"auth_type": auth_type, "config": {"api_key": "test_api_key_123"}}
+ with pytest.raises(ValueError) as exc_info:
+ FirecrawlAuth(credentials)
+ assert str(exc_info.value) == expected_error
+
+ @pytest.mark.parametrize(
+ ("credentials", "expected_error"),
+ [
+ ({"auth_type": "bearer", "config": {}}, "No API key provided"),
+ ({"auth_type": "bearer"}, "No API key provided"),
+ ({"auth_type": "bearer", "config": {"api_key": ""}}, "No API key provided"),
+ ({"auth_type": "bearer", "config": {"api_key": None}}, "No API key provided"),
+ ],
+ )
+ def test_should_raise_error_for_missing_api_key(self, credentials, expected_error):
+ """Test that missing or empty API key raises ValueError"""
+ with pytest.raises(ValueError) as exc_info:
+ FirecrawlAuth(credentials)
+ assert str(exc_info.value) == expected_error
+
+ @patch("services.auth.firecrawl.firecrawl.requests.post")
+ def test_should_validate_valid_credentials_successfully(self, mock_post, auth_instance):
+ """Test successful credential validation"""
+ mock_response = MagicMock()
+ mock_response.status_code = 200
+ mock_post.return_value = mock_response
+
+ result = auth_instance.validate_credentials()
+
+ assert result is True
+ expected_data = {
+ "url": "https://example.com",
+ "includePaths": [],
+ "excludePaths": [],
+ "limit": 1,
+ "scrapeOptions": {"onlyMainContent": True},
+ }
+ mock_post.assert_called_once_with(
+ "https://api.firecrawl.dev/v1/crawl",
+ headers={"Content-Type": "application/json", "Authorization": "Bearer test_api_key_123"},
+ json=expected_data,
+ )
+
+ @pytest.mark.parametrize(
+ ("status_code", "error_message"),
+ [
+ (402, "Payment required"),
+ (409, "Conflict error"),
+ (500, "Internal server error"),
+ ],
+ )
+ @patch("services.auth.firecrawl.firecrawl.requests.post")
+ def test_should_handle_http_errors(self, mock_post, status_code, error_message, auth_instance):
+ """Test handling of various HTTP error codes"""
+ mock_response = MagicMock()
+ mock_response.status_code = status_code
+ mock_response.json.return_value = {"error": error_message}
+ mock_post.return_value = mock_response
+
+ with pytest.raises(Exception) as exc_info:
+ auth_instance.validate_credentials()
+ assert str(exc_info.value) == f"Failed to authorize. Status code: {status_code}. Error: {error_message}"
+
+ @pytest.mark.parametrize(
+ ("status_code", "response_text", "has_json_error", "expected_error_contains"),
+ [
+ (403, '{"error": "Forbidden"}', True, "Failed to authorize. Status code: 403. Error: Forbidden"),
+ (404, "", True, "Unexpected error occurred while trying to authorize. Status code: 404"),
+ (401, "Not JSON", True, "Expecting value"), # JSON decode error
+ ],
+ )
+ @patch("services.auth.firecrawl.firecrawl.requests.post")
+ def test_should_handle_unexpected_errors(
+ self, mock_post, status_code, response_text, has_json_error, expected_error_contains, auth_instance
+ ):
+ """Test handling of unexpected errors with various response formats"""
+ mock_response = MagicMock()
+ mock_response.status_code = status_code
+ mock_response.text = response_text
+ if has_json_error:
+ mock_response.json.side_effect = Exception("Not JSON")
+ mock_post.return_value = mock_response
+
+ with pytest.raises(Exception) as exc_info:
+ auth_instance.validate_credentials()
+ assert expected_error_contains in str(exc_info.value)
+
+ @pytest.mark.parametrize(
+ ("exception_type", "exception_message"),
+ [
+ (requests.ConnectionError, "Network error"),
+ (requests.Timeout, "Request timeout"),
+ (requests.ReadTimeout, "Read timeout"),
+ (requests.ConnectTimeout, "Connection timeout"),
+ ],
+ )
+ @patch("services.auth.firecrawl.firecrawl.requests.post")
+ def test_should_handle_network_errors(self, mock_post, exception_type, exception_message, auth_instance):
+ """Test handling of various network-related errors including timeouts"""
+ mock_post.side_effect = exception_type(exception_message)
+
+ with pytest.raises(exception_type) as exc_info:
+ auth_instance.validate_credentials()
+ assert exception_message in str(exc_info.value)
+
+ def test_should_not_expose_api_key_in_error_messages(self):
+ """Test that API key is not exposed in error messages"""
+ credentials = {"auth_type": "bearer", "config": {"api_key": "super_secret_key_12345"}}
+ auth = FirecrawlAuth(credentials)
+
+ # Verify API key is stored but not in any error message
+ assert auth.api_key == "super_secret_key_12345"
+
+ # Test various error scenarios don't expose the key
+ with pytest.raises(ValueError) as exc_info:
+ FirecrawlAuth({"auth_type": "basic", "config": {"api_key": "super_secret_key_12345"}})
+ assert "super_secret_key_12345" not in str(exc_info.value)
+
+ @patch("services.auth.firecrawl.firecrawl.requests.post")
+ def test_should_use_custom_base_url_in_validation(self, mock_post):
+ """Test that custom base URL is used in validation"""
+ mock_response = MagicMock()
+ mock_response.status_code = 200
+ mock_post.return_value = mock_response
+
+ credentials = {
+ "auth_type": "bearer",
+ "config": {"api_key": "test_api_key_123", "base_url": "https://custom.firecrawl.dev"},
+ }
+ auth = FirecrawlAuth(credentials)
+ result = auth.validate_credentials()
+
+ assert result is True
+ assert mock_post.call_args[0][0] == "https://custom.firecrawl.dev/v1/crawl"
+
+ @patch("services.auth.firecrawl.firecrawl.requests.post")
+ def test_should_handle_timeout_with_retry_suggestion(self, mock_post, auth_instance):
+ """Test that timeout errors are handled gracefully with appropriate error message"""
+ mock_post.side_effect = requests.Timeout("The request timed out after 30 seconds")
+
+ with pytest.raises(requests.Timeout) as exc_info:
+ auth_instance.validate_credentials()
+
+ # Verify the timeout exception is raised with original message
+ assert "timed out" in str(exc_info.value)
diff --git a/api/tests/unit_tests/services/auth/test_jina_auth.py b/api/tests/unit_tests/services/auth/test_jina_auth.py
new file mode 100644
index 0000000000..ccbca5a36f
--- /dev/null
+++ b/api/tests/unit_tests/services/auth/test_jina_auth.py
@@ -0,0 +1,155 @@
+from unittest.mock import MagicMock, patch
+
+import pytest
+import requests
+
+from services.auth.jina.jina import JinaAuth
+
+
+class TestJinaAuth:
+ def test_should_initialize_with_valid_bearer_credentials(self):
+ """Test successful initialization with valid bearer credentials"""
+ credentials = {"auth_type": "bearer", "config": {"api_key": "test_api_key_123"}}
+ auth = JinaAuth(credentials)
+ assert auth.api_key == "test_api_key_123"
+ assert auth.credentials == credentials
+
+ def test_should_raise_error_for_invalid_auth_type(self):
+ """Test that non-bearer auth type raises ValueError"""
+ credentials = {"auth_type": "basic", "config": {"api_key": "test_api_key_123"}}
+ with pytest.raises(ValueError) as exc_info:
+ JinaAuth(credentials)
+ assert str(exc_info.value) == "Invalid auth type, Jina Reader auth type must be Bearer"
+
+ def test_should_raise_error_for_missing_api_key(self):
+ """Test that missing API key raises ValueError"""
+ credentials = {"auth_type": "bearer", "config": {}}
+ with pytest.raises(ValueError) as exc_info:
+ JinaAuth(credentials)
+ assert str(exc_info.value) == "No API key provided"
+
+ def test_should_raise_error_for_missing_config(self):
+ """Test that missing config section raises ValueError"""
+ credentials = {"auth_type": "bearer"}
+ with pytest.raises(ValueError) as exc_info:
+ JinaAuth(credentials)
+ assert str(exc_info.value) == "No API key provided"
+
+ @patch("services.auth.jina.jina.requests.post")
+ def test_should_validate_valid_credentials_successfully(self, mock_post):
+ """Test successful credential validation"""
+ mock_response = MagicMock()
+ mock_response.status_code = 200
+ mock_post.return_value = mock_response
+
+ credentials = {"auth_type": "bearer", "config": {"api_key": "test_api_key_123"}}
+ auth = JinaAuth(credentials)
+ result = auth.validate_credentials()
+
+ assert result is True
+ mock_post.assert_called_once_with(
+ "https://r.jina.ai",
+ headers={"Content-Type": "application/json", "Authorization": "Bearer test_api_key_123"},
+ json={"url": "https://example.com"},
+ )
+
+ @patch("services.auth.jina.jina.requests.post")
+ def test_should_handle_http_402_error(self, mock_post):
+ """Test handling of 402 Payment Required error"""
+ mock_response = MagicMock()
+ mock_response.status_code = 402
+ mock_response.json.return_value = {"error": "Payment required"}
+ mock_post.return_value = mock_response
+
+ credentials = {"auth_type": "bearer", "config": {"api_key": "test_api_key_123"}}
+ auth = JinaAuth(credentials)
+
+ with pytest.raises(Exception) as exc_info:
+ auth.validate_credentials()
+ assert str(exc_info.value) == "Failed to authorize. Status code: 402. Error: Payment required"
+
+ @patch("services.auth.jina.jina.requests.post")
+ def test_should_handle_http_409_error(self, mock_post):
+ """Test handling of 409 Conflict error"""
+ mock_response = MagicMock()
+ mock_response.status_code = 409
+ mock_response.json.return_value = {"error": "Conflict error"}
+ mock_post.return_value = mock_response
+
+ credentials = {"auth_type": "bearer", "config": {"api_key": "test_api_key_123"}}
+ auth = JinaAuth(credentials)
+
+ with pytest.raises(Exception) as exc_info:
+ auth.validate_credentials()
+ assert str(exc_info.value) == "Failed to authorize. Status code: 409. Error: Conflict error"
+
+ @patch("services.auth.jina.jina.requests.post")
+ def test_should_handle_http_500_error(self, mock_post):
+ """Test handling of 500 Internal Server Error"""
+ mock_response = MagicMock()
+ mock_response.status_code = 500
+ mock_response.json.return_value = {"error": "Internal server error"}
+ mock_post.return_value = mock_response
+
+ credentials = {"auth_type": "bearer", "config": {"api_key": "test_api_key_123"}}
+ auth = JinaAuth(credentials)
+
+ with pytest.raises(Exception) as exc_info:
+ auth.validate_credentials()
+ assert str(exc_info.value) == "Failed to authorize. Status code: 500. Error: Internal server error"
+
+ @patch("services.auth.jina.jina.requests.post")
+ def test_should_handle_unexpected_error_with_text_response(self, mock_post):
+ """Test handling of unexpected errors with text response"""
+ mock_response = MagicMock()
+ mock_response.status_code = 403
+ mock_response.text = '{"error": "Forbidden"}'
+ mock_response.json.side_effect = Exception("Not JSON")
+ mock_post.return_value = mock_response
+
+ credentials = {"auth_type": "bearer", "config": {"api_key": "test_api_key_123"}}
+ auth = JinaAuth(credentials)
+
+ with pytest.raises(Exception) as exc_info:
+ auth.validate_credentials()
+ assert str(exc_info.value) == "Failed to authorize. Status code: 403. Error: Forbidden"
+
+ @patch("services.auth.jina.jina.requests.post")
+ def test_should_handle_unexpected_error_without_text(self, mock_post):
+ """Test handling of unexpected errors without text response"""
+ mock_response = MagicMock()
+ mock_response.status_code = 404
+ mock_response.text = ""
+ mock_response.json.side_effect = Exception("Not JSON")
+ mock_post.return_value = mock_response
+
+ credentials = {"auth_type": "bearer", "config": {"api_key": "test_api_key_123"}}
+ auth = JinaAuth(credentials)
+
+ with pytest.raises(Exception) as exc_info:
+ auth.validate_credentials()
+ assert str(exc_info.value) == "Unexpected error occurred while trying to authorize. Status code: 404"
+
+ @patch("services.auth.jina.jina.requests.post")
+ def test_should_handle_network_errors(self, mock_post):
+ """Test handling of network connection errors"""
+ mock_post.side_effect = requests.ConnectionError("Network error")
+
+ credentials = {"auth_type": "bearer", "config": {"api_key": "test_api_key_123"}}
+ auth = JinaAuth(credentials)
+
+ with pytest.raises(requests.ConnectionError):
+ auth.validate_credentials()
+
+ def test_should_not_expose_api_key_in_error_messages(self):
+ """Test that API key is not exposed in error messages"""
+ credentials = {"auth_type": "bearer", "config": {"api_key": "super_secret_key_12345"}}
+ auth = JinaAuth(credentials)
+
+ # Verify API key is stored but not in any error message
+ assert auth.api_key == "super_secret_key_12345"
+
+ # Test various error scenarios don't expose the key
+ with pytest.raises(ValueError) as exc_info:
+ JinaAuth({"auth_type": "basic", "config": {"api_key": "super_secret_key_12345"}})
+ assert "super_secret_key_12345" not in str(exc_info.value)
diff --git a/api/tests/unit_tests/services/auth/test_watercrawl_auth.py b/api/tests/unit_tests/services/auth/test_watercrawl_auth.py
new file mode 100644
index 0000000000..bacf0b24ea
--- /dev/null
+++ b/api/tests/unit_tests/services/auth/test_watercrawl_auth.py
@@ -0,0 +1,205 @@
+from unittest.mock import MagicMock, patch
+
+import pytest
+import requests
+
+from services.auth.watercrawl.watercrawl import WatercrawlAuth
+
+
+class TestWatercrawlAuth:
+ @pytest.fixture
+ def valid_credentials(self):
+ """Fixture for valid x-api-key credentials"""
+ return {"auth_type": "x-api-key", "config": {"api_key": "test_api_key_123"}}
+
+ @pytest.fixture
+ def auth_instance(self, valid_credentials):
+ """Fixture for WatercrawlAuth instance with valid credentials"""
+ return WatercrawlAuth(valid_credentials)
+
+ def test_should_initialize_with_valid_x_api_key_credentials(self, valid_credentials):
+ """Test successful initialization with valid x-api-key credentials"""
+ auth = WatercrawlAuth(valid_credentials)
+ assert auth.api_key == "test_api_key_123"
+ assert auth.base_url == "https://app.watercrawl.dev"
+ assert auth.credentials == valid_credentials
+
+ def test_should_initialize_with_custom_base_url(self):
+ """Test initialization with custom base URL"""
+ credentials = {
+ "auth_type": "x-api-key",
+ "config": {"api_key": "test_api_key_123", "base_url": "https://custom.watercrawl.dev"},
+ }
+ auth = WatercrawlAuth(credentials)
+ assert auth.api_key == "test_api_key_123"
+ assert auth.base_url == "https://custom.watercrawl.dev"
+
+ @pytest.mark.parametrize(
+ ("auth_type", "expected_error"),
+ [
+ ("bearer", "Invalid auth type, WaterCrawl auth type must be x-api-key"),
+ ("basic", "Invalid auth type, WaterCrawl auth type must be x-api-key"),
+ ("", "Invalid auth type, WaterCrawl auth type must be x-api-key"),
+ ],
+ )
+ def test_should_raise_error_for_invalid_auth_type(self, auth_type, expected_error):
+ """Test that non-x-api-key auth types raise ValueError"""
+ credentials = {"auth_type": auth_type, "config": {"api_key": "test_api_key_123"}}
+ with pytest.raises(ValueError) as exc_info:
+ WatercrawlAuth(credentials)
+ assert str(exc_info.value) == expected_error
+
+ @pytest.mark.parametrize(
+ ("credentials", "expected_error"),
+ [
+ ({"auth_type": "x-api-key", "config": {}}, "No API key provided"),
+ ({"auth_type": "x-api-key"}, "No API key provided"),
+ ({"auth_type": "x-api-key", "config": {"api_key": ""}}, "No API key provided"),
+ ({"auth_type": "x-api-key", "config": {"api_key": None}}, "No API key provided"),
+ ],
+ )
+ def test_should_raise_error_for_missing_api_key(self, credentials, expected_error):
+ """Test that missing or empty API key raises ValueError"""
+ with pytest.raises(ValueError) as exc_info:
+ WatercrawlAuth(credentials)
+ assert str(exc_info.value) == expected_error
+
+ @patch("services.auth.watercrawl.watercrawl.requests.get")
+ def test_should_validate_valid_credentials_successfully(self, mock_get, auth_instance):
+ """Test successful credential validation"""
+ mock_response = MagicMock()
+ mock_response.status_code = 200
+ mock_get.return_value = mock_response
+
+ result = auth_instance.validate_credentials()
+
+ assert result is True
+ mock_get.assert_called_once_with(
+ "https://app.watercrawl.dev/api/v1/core/crawl-requests/",
+ headers={"Content-Type": "application/json", "X-API-KEY": "test_api_key_123"},
+ )
+
+ @pytest.mark.parametrize(
+ ("status_code", "error_message"),
+ [
+ (402, "Payment required"),
+ (409, "Conflict error"),
+ (500, "Internal server error"),
+ ],
+ )
+ @patch("services.auth.watercrawl.watercrawl.requests.get")
+ def test_should_handle_http_errors(self, mock_get, status_code, error_message, auth_instance):
+ """Test handling of various HTTP error codes"""
+ mock_response = MagicMock()
+ mock_response.status_code = status_code
+ mock_response.json.return_value = {"error": error_message}
+ mock_get.return_value = mock_response
+
+ with pytest.raises(Exception) as exc_info:
+ auth_instance.validate_credentials()
+ assert str(exc_info.value) == f"Failed to authorize. Status code: {status_code}. Error: {error_message}"
+
+ @pytest.mark.parametrize(
+ ("status_code", "response_text", "has_json_error", "expected_error_contains"),
+ [
+ (403, '{"error": "Forbidden"}', True, "Failed to authorize. Status code: 403. Error: Forbidden"),
+ (404, "", True, "Unexpected error occurred while trying to authorize. Status code: 404"),
+ (401, "Not JSON", True, "Expecting value"), # JSON decode error
+ ],
+ )
+ @patch("services.auth.watercrawl.watercrawl.requests.get")
+ def test_should_handle_unexpected_errors(
+ self, mock_get, status_code, response_text, has_json_error, expected_error_contains, auth_instance
+ ):
+ """Test handling of unexpected errors with various response formats"""
+ mock_response = MagicMock()
+ mock_response.status_code = status_code
+ mock_response.text = response_text
+ if has_json_error:
+ mock_response.json.side_effect = Exception("Not JSON")
+ mock_get.return_value = mock_response
+
+ with pytest.raises(Exception) as exc_info:
+ auth_instance.validate_credentials()
+ assert expected_error_contains in str(exc_info.value)
+
+ @pytest.mark.parametrize(
+ ("exception_type", "exception_message"),
+ [
+ (requests.ConnectionError, "Network error"),
+ (requests.Timeout, "Request timeout"),
+ (requests.ReadTimeout, "Read timeout"),
+ (requests.ConnectTimeout, "Connection timeout"),
+ ],
+ )
+ @patch("services.auth.watercrawl.watercrawl.requests.get")
+ def test_should_handle_network_errors(self, mock_get, exception_type, exception_message, auth_instance):
+ """Test handling of various network-related errors including timeouts"""
+ mock_get.side_effect = exception_type(exception_message)
+
+ with pytest.raises(exception_type) as exc_info:
+ auth_instance.validate_credentials()
+ assert exception_message in str(exc_info.value)
+
+ def test_should_not_expose_api_key_in_error_messages(self):
+ """Test that API key is not exposed in error messages"""
+ credentials = {"auth_type": "x-api-key", "config": {"api_key": "super_secret_key_12345"}}
+ auth = WatercrawlAuth(credentials)
+
+ # Verify API key is stored but not in any error message
+ assert auth.api_key == "super_secret_key_12345"
+
+ # Test various error scenarios don't expose the key
+ with pytest.raises(ValueError) as exc_info:
+ WatercrawlAuth({"auth_type": "bearer", "config": {"api_key": "super_secret_key_12345"}})
+ assert "super_secret_key_12345" not in str(exc_info.value)
+
+ @patch("services.auth.watercrawl.watercrawl.requests.get")
+ def test_should_use_custom_base_url_in_validation(self, mock_get):
+ """Test that custom base URL is used in validation"""
+ mock_response = MagicMock()
+ mock_response.status_code = 200
+ mock_get.return_value = mock_response
+
+ credentials = {
+ "auth_type": "x-api-key",
+ "config": {"api_key": "test_api_key_123", "base_url": "https://custom.watercrawl.dev"},
+ }
+ auth = WatercrawlAuth(credentials)
+ result = auth.validate_credentials()
+
+ assert result is True
+ assert mock_get.call_args[0][0] == "https://custom.watercrawl.dev/api/v1/core/crawl-requests/"
+
+ @pytest.mark.parametrize(
+ ("base_url", "expected_url"),
+ [
+ ("https://app.watercrawl.dev", "https://app.watercrawl.dev/api/v1/core/crawl-requests/"),
+ ("https://app.watercrawl.dev/", "https://app.watercrawl.dev/api/v1/core/crawl-requests/"),
+ ("https://app.watercrawl.dev//", "https://app.watercrawl.dev/api/v1/core/crawl-requests/"),
+ ],
+ )
+ @patch("services.auth.watercrawl.watercrawl.requests.get")
+ def test_should_use_urljoin_for_url_construction(self, mock_get, base_url, expected_url):
+ """Test that urljoin is used correctly for URL construction with various base URLs"""
+ mock_response = MagicMock()
+ mock_response.status_code = 200
+ mock_get.return_value = mock_response
+
+ credentials = {"auth_type": "x-api-key", "config": {"api_key": "test_api_key_123", "base_url": base_url}}
+ auth = WatercrawlAuth(credentials)
+ auth.validate_credentials()
+
+ # Verify the correct URL was called
+ assert mock_get.call_args[0][0] == expected_url
+
+ @patch("services.auth.watercrawl.watercrawl.requests.get")
+ def test_should_handle_timeout_with_retry_suggestion(self, mock_get, auth_instance):
+ """Test that timeout errors are handled gracefully with appropriate error message"""
+ mock_get.side_effect = requests.Timeout("The request timed out after 30 seconds")
+
+ with pytest.raises(requests.Timeout) as exc_info:
+ auth_instance.validate_credentials()
+
+ # Verify the timeout exception is raised with original message
+ assert "timed out" in str(exc_info.value)
diff --git a/api/tests/unit_tests/services/services_test_help.py b/api/tests/unit_tests/services/services_test_help.py
new file mode 100644
index 0000000000..c6b962f7fc
--- /dev/null
+++ b/api/tests/unit_tests/services/services_test_help.py
@@ -0,0 +1,59 @@
+from unittest.mock import MagicMock
+
+
+class ServiceDbTestHelper:
+ """
+ Helper class for service database query tests.
+ """
+
+ @staticmethod
+ def setup_db_query_filter_by_mock(mock_db, query_results):
+ """
+ Smart database query mock that responds based on model type and query parameters.
+
+ Args:
+ mock_db: Mock database session
+ query_results: Dict mapping (model_name, filter_key, filter_value) to return value
+ Example: {('Account', 'email', 'test@example.com'): mock_account}
+ """
+
+ def query_side_effect(model):
+ mock_query = MagicMock()
+
+ def filter_by_side_effect(**kwargs):
+ mock_filter_result = MagicMock()
+
+ def first_side_effect():
+ # Find matching result based on model and filter parameters
+ for (model_name, filter_key, filter_value), result in query_results.items():
+ if model.__name__ == model_name and filter_key in kwargs and kwargs[filter_key] == filter_value:
+ return result
+ return None
+
+ mock_filter_result.first.side_effect = first_side_effect
+
+ # Handle order_by calls for complex queries
+ def order_by_side_effect(*args, **kwargs):
+ mock_order_result = MagicMock()
+
+ def order_first_side_effect():
+ # Look for order_by results in the same query_results dict
+ for (model_name, filter_key, filter_value), result in query_results.items():
+ if (
+ model.__name__ == model_name
+ and filter_key == "order_by"
+ and filter_value == "first_available"
+ ):
+ return result
+ return None
+
+ mock_order_result.first.side_effect = order_first_side_effect
+ return mock_order_result
+
+ mock_filter_result.order_by.side_effect = order_by_side_effect
+ return mock_filter_result
+
+ mock_query.filter_by.side_effect = filter_by_side_effect
+ return mock_query
+
+ mock_db.session.query.side_effect = query_side_effect
diff --git a/api/tests/unit_tests/services/test_account_service.py b/api/tests/unit_tests/services/test_account_service.py
new file mode 100644
index 0000000000..13900ab6d1
--- /dev/null
+++ b/api/tests/unit_tests/services/test_account_service.py
@@ -0,0 +1,1545 @@
+import json
+from datetime import datetime, timedelta
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from configs import dify_config
+from models.account import Account
+from services.account_service import AccountService, RegisterService, TenantService
+from services.errors.account import (
+ AccountAlreadyInTenantError,
+ AccountLoginError,
+ AccountNotFoundError,
+ AccountPasswordError,
+ AccountRegisterError,
+ CurrentPasswordIncorrectError,
+)
+from tests.unit_tests.services.services_test_help import ServiceDbTestHelper
+
+
+class TestAccountAssociatedDataFactory:
+ """Factory class for creating test data and mock objects for account service tests."""
+
+ @staticmethod
+ def create_account_mock(
+ account_id: str = "user-123",
+ email: str = "test@example.com",
+ name: str = "Test User",
+ status: str = "active",
+ password: str = "hashed_password",
+ password_salt: str = "salt",
+ interface_language: str = "en-US",
+ interface_theme: str = "light",
+ timezone: str = "UTC",
+ **kwargs,
+ ) -> MagicMock:
+ """Create a mock account with specified attributes."""
+ account = MagicMock(spec=Account)
+ account.id = account_id
+ account.email = email
+ account.name = name
+ account.status = status
+ account.password = password
+ account.password_salt = password_salt
+ account.interface_language = interface_language
+ account.interface_theme = interface_theme
+ account.timezone = timezone
+ # Set last_active_at to a datetime object that's older than 10 minutes
+ account.last_active_at = datetime.now() - timedelta(minutes=15)
+ account.initialized_at = None
+ for key, value in kwargs.items():
+ setattr(account, key, value)
+ return account
+
+ @staticmethod
+ def create_tenant_join_mock(
+ tenant_id: str = "tenant-456",
+ account_id: str = "user-123",
+ current: bool = True,
+ role: str = "normal",
+ **kwargs,
+ ) -> MagicMock:
+ """Create a mock tenant account join record."""
+ tenant_join = MagicMock()
+ tenant_join.tenant_id = tenant_id
+ tenant_join.account_id = account_id
+ tenant_join.current = current
+ tenant_join.role = role
+ for key, value in kwargs.items():
+ setattr(tenant_join, key, value)
+ return tenant_join
+
+ @staticmethod
+ def create_feature_service_mock(allow_register: bool = True):
+ """Create a mock feature service."""
+ mock_service = MagicMock()
+ mock_service.get_system_features.return_value.is_allow_register = allow_register
+ return mock_service
+
+ @staticmethod
+ def create_billing_service_mock(email_frozen: bool = False):
+ """Create a mock billing service."""
+ mock_service = MagicMock()
+ mock_service.is_email_in_freeze.return_value = email_frozen
+ return mock_service
+
+
+class TestAccountService:
+ """
+ Comprehensive unit tests for AccountService methods.
+
+ This test suite covers all account-related operations including:
+ - Authentication and login
+ - Account creation and registration
+ - Password management
+ - JWT token generation
+ - User loading and tenant management
+ - Error conditions and edge cases
+ """
+
+ @pytest.fixture
+ def mock_db_dependencies(self):
+ """Common mock setup for database dependencies."""
+ with patch("services.account_service.db") as mock_db:
+ mock_db.session.add = MagicMock()
+ mock_db.session.commit = MagicMock()
+ yield {
+ "db": mock_db,
+ }
+
+ @pytest.fixture
+ def mock_password_dependencies(self):
+ """Mock setup for password-related functions."""
+ with (
+ patch("services.account_service.compare_password") as mock_compare_password,
+ patch("services.account_service.hash_password") as mock_hash_password,
+ patch("services.account_service.valid_password") as mock_valid_password,
+ ):
+ yield {
+ "compare_password": mock_compare_password,
+ "hash_password": mock_hash_password,
+ "valid_password": mock_valid_password,
+ }
+
+ @pytest.fixture
+ def mock_external_service_dependencies(self):
+ """Mock setup for external service dependencies."""
+ with (
+ patch("services.account_service.FeatureService") as mock_feature_service,
+ patch("services.account_service.BillingService") as mock_billing_service,
+ patch("services.account_service.PassportService") as mock_passport_service,
+ ):
+ yield {
+ "feature_service": mock_feature_service,
+ "billing_service": mock_billing_service,
+ "passport_service": mock_passport_service,
+ }
+
+ @pytest.fixture
+ def mock_db_with_autospec(self):
+ """
+ Mock database with autospec for more realistic behavior.
+ This approach preserves the actual method signatures and behavior.
+ """
+ with patch("services.account_service.db", autospec=True) as mock_db:
+ # Create a more realistic session mock
+ mock_session = MagicMock()
+ mock_db.session = mock_session
+
+ # Setup basic session methods
+ mock_session.add = MagicMock()
+ mock_session.commit = MagicMock()
+ mock_session.query = MagicMock()
+
+ yield mock_db
+
+ def _assert_database_operations_called(self, mock_db):
+ """Helper method to verify database operations were called."""
+ mock_db.session.commit.assert_called()
+
+ def _assert_database_operations_not_called(self, mock_db):
+ """Helper method to verify database operations were not called."""
+ mock_db.session.commit.assert_not_called()
+
+ def _assert_exception_raised(self, exception_type, callable_func, *args, **kwargs):
+ """Helper method to verify that specific exception is raised."""
+ with pytest.raises(exception_type):
+ callable_func(*args, **kwargs)
+
+ # ==================== Authentication Tests ====================
+
+ def test_authenticate_success(self, mock_db_dependencies, mock_password_dependencies):
+ """Test successful authentication with correct email and password."""
+ # Setup test data
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+
+ # Setup smart database query mock
+ query_results = {("Account", "email", "test@example.com"): mock_account}
+ ServiceDbTestHelper.setup_db_query_filter_by_mock(mock_db_dependencies["db"], query_results)
+
+ mock_password_dependencies["compare_password"].return_value = True
+
+ # Execute test
+ result = AccountService.authenticate("test@example.com", "password")
+
+ # Verify results
+ assert result == mock_account
+ self._assert_database_operations_called(mock_db_dependencies["db"])
+
+ def test_authenticate_account_not_found(self, mock_db_dependencies):
+ """Test authentication when account does not exist."""
+ # Setup smart database query mock - no matching results
+ query_results = {("Account", "email", "notfound@example.com"): None}
+ ServiceDbTestHelper.setup_db_query_filter_by_mock(mock_db_dependencies["db"], query_results)
+
+ # Execute test and verify exception
+ self._assert_exception_raised(
+ AccountNotFoundError, AccountService.authenticate, "notfound@example.com", "password"
+ )
+
+ def test_authenticate_account_banned(self, mock_db_dependencies):
+ """Test authentication when account is banned."""
+ # Setup test data
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock(status="banned")
+
+ # Setup smart database query mock
+ query_results = {("Account", "email", "banned@example.com"): mock_account}
+ ServiceDbTestHelper.setup_db_query_filter_by_mock(mock_db_dependencies["db"], query_results)
+
+ # Execute test and verify exception
+ self._assert_exception_raised(AccountLoginError, AccountService.authenticate, "banned@example.com", "password")
+
+ def test_authenticate_password_error(self, mock_db_dependencies, mock_password_dependencies):
+ """Test authentication with wrong password."""
+ # Setup test data
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+
+ # Setup smart database query mock
+ query_results = {("Account", "email", "test@example.com"): mock_account}
+ ServiceDbTestHelper.setup_db_query_filter_by_mock(mock_db_dependencies["db"], query_results)
+
+ mock_password_dependencies["compare_password"].return_value = False
+
+ # Execute test and verify exception
+ self._assert_exception_raised(
+ AccountPasswordError, AccountService.authenticate, "test@example.com", "wrongpassword"
+ )
+
+ def test_authenticate_pending_account_activates(self, mock_db_dependencies, mock_password_dependencies):
+ """Test authentication for a pending account, which should activate on login."""
+ # Setup test data
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock(status="pending")
+
+ # Setup smart database query mock
+ query_results = {("Account", "email", "pending@example.com"): mock_account}
+ ServiceDbTestHelper.setup_db_query_filter_by_mock(mock_db_dependencies["db"], query_results)
+
+ mock_password_dependencies["compare_password"].return_value = True
+
+ # Execute test
+ result = AccountService.authenticate("pending@example.com", "password")
+
+ # Verify results
+ assert result == mock_account
+ assert mock_account.status == "active"
+ self._assert_database_operations_called(mock_db_dependencies["db"])
+
+ # ==================== Account Creation Tests ====================
+
+ def test_create_account_success(
+ self, mock_db_dependencies, mock_password_dependencies, mock_external_service_dependencies
+ ):
+ """Test successful account creation with all required parameters."""
+ # Setup mocks
+ mock_external_service_dependencies["feature_service"].get_system_features.return_value.is_allow_register = True
+ mock_external_service_dependencies["billing_service"].is_email_in_freeze.return_value = False
+ mock_password_dependencies["hash_password"].return_value = b"hashed_password"
+
+ # Execute test
+ result = AccountService.create_account(
+ email="test@example.com",
+ name="Test User",
+ interface_language="en-US",
+ password="password123",
+ interface_theme="light",
+ )
+
+ # Verify results
+ assert result.email == "test@example.com"
+ assert result.name == "Test User"
+ assert result.interface_language == "en-US"
+ assert result.interface_theme == "light"
+ assert result.password is not None
+ assert result.password_salt is not None
+ assert result.timezone is not None
+
+ # Verify database operations
+ mock_db_dependencies["db"].session.add.assert_called_once()
+ added_account = mock_db_dependencies["db"].session.add.call_args[0][0]
+ assert added_account.email == "test@example.com"
+ assert added_account.name == "Test User"
+ assert added_account.interface_language == "en-US"
+ assert added_account.interface_theme == "light"
+ assert added_account.password is not None
+ assert added_account.password_salt is not None
+ assert added_account.timezone is not None
+ self._assert_database_operations_called(mock_db_dependencies["db"])
+
+ def test_create_account_registration_disabled(self, mock_external_service_dependencies):
+ """Test account creation when registration is disabled."""
+ # Setup mocks
+ mock_external_service_dependencies["feature_service"].get_system_features.return_value.is_allow_register = False
+
+ # Execute test and verify exception
+ self._assert_exception_raised(
+ Exception, # AccountNotFound
+ AccountService.create_account,
+ email="test@example.com",
+ name="Test User",
+ interface_language="en-US",
+ )
+
+ def test_create_account_email_frozen(self, mock_db_dependencies, mock_external_service_dependencies):
+ """Test account creation with frozen email address."""
+ # Setup mocks
+ mock_external_service_dependencies["feature_service"].get_system_features.return_value.is_allow_register = True
+ mock_external_service_dependencies["billing_service"].is_email_in_freeze.return_value = True
+ dify_config.BILLING_ENABLED = True
+
+ # Execute test and verify exception
+ self._assert_exception_raised(
+ AccountRegisterError,
+ AccountService.create_account,
+ email="frozen@example.com",
+ name="Test User",
+ interface_language="en-US",
+ )
+ dify_config.BILLING_ENABLED = False
+
+ def test_create_account_without_password(self, mock_db_dependencies, mock_external_service_dependencies):
+ """Test account creation without password (for invite-based registration)."""
+ # Setup mocks
+ mock_external_service_dependencies["feature_service"].get_system_features.return_value.is_allow_register = True
+ mock_external_service_dependencies["billing_service"].is_email_in_freeze.return_value = False
+
+ # Execute test
+ result = AccountService.create_account(
+ email="test@example.com",
+ name="Test User",
+ interface_language="zh-CN",
+ password=None,
+ interface_theme="dark",
+ )
+
+ # Verify results
+ assert result.email == "test@example.com"
+ assert result.name == "Test User"
+ assert result.interface_language == "zh-CN"
+ assert result.interface_theme == "dark"
+ assert result.password is None
+ assert result.password_salt is None
+ assert result.timezone is not None
+
+ # Verify database operations
+ mock_db_dependencies["db"].session.add.assert_called_once()
+ added_account = mock_db_dependencies["db"].session.add.call_args[0][0]
+ assert added_account.email == "test@example.com"
+ assert added_account.name == "Test User"
+ assert added_account.interface_language == "zh-CN"
+ assert added_account.interface_theme == "dark"
+ assert added_account.password is None
+ assert added_account.password_salt is None
+ assert added_account.timezone is not None
+ self._assert_database_operations_called(mock_db_dependencies["db"])
+
+ # ==================== Password Management Tests ====================
+
+ def test_update_account_password_success(self, mock_db_dependencies, mock_password_dependencies):
+ """Test successful password update with correct current password and valid new password."""
+ # Setup test data
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+ mock_password_dependencies["compare_password"].return_value = True
+ mock_password_dependencies["valid_password"].return_value = None
+ mock_password_dependencies["hash_password"].return_value = b"new_hashed_password"
+
+ # Execute test
+ result = AccountService.update_account_password(mock_account, "old_password", "new_password123")
+
+ # Verify results
+ assert result == mock_account
+ assert mock_account.password is not None
+ assert mock_account.password_salt is not None
+
+ # Verify password validation was called
+ mock_password_dependencies["compare_password"].assert_called_once_with(
+ "old_password", "hashed_password", "salt"
+ )
+ mock_password_dependencies["valid_password"].assert_called_once_with("new_password123")
+
+ # Verify database operations
+ self._assert_database_operations_called(mock_db_dependencies["db"])
+
+ def test_update_account_password_current_password_incorrect(self, mock_password_dependencies):
+ """Test password update with incorrect current password."""
+ # Setup test data
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+ mock_password_dependencies["compare_password"].return_value = False
+
+ # Execute test and verify exception
+ self._assert_exception_raised(
+ CurrentPasswordIncorrectError,
+ AccountService.update_account_password,
+ mock_account,
+ "wrong_password",
+ "new_password123",
+ )
+
+ # Verify password comparison was called
+ mock_password_dependencies["compare_password"].assert_called_once_with(
+ "wrong_password", "hashed_password", "salt"
+ )
+
+ def test_update_account_password_invalid_new_password(self, mock_password_dependencies):
+ """Test password update with invalid new password."""
+ # Setup test data
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+ mock_password_dependencies["compare_password"].return_value = True
+ mock_password_dependencies["valid_password"].side_effect = ValueError("Password too short")
+
+ # Execute test and verify exception
+ self._assert_exception_raised(
+ ValueError, AccountService.update_account_password, mock_account, "old_password", "short"
+ )
+
+ # Verify password validation was called
+ mock_password_dependencies["valid_password"].assert_called_once_with("short")
+
+ # ==================== User Loading Tests ====================
+
+ def test_load_user_success(self, mock_db_dependencies):
+ """Test successful user loading with current tenant."""
+ # Setup test data
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+ mock_tenant_join = TestAccountAssociatedDataFactory.create_tenant_join_mock()
+
+ # Setup smart database query mock
+ query_results = {
+ ("Account", "id", "user-123"): mock_account,
+ ("TenantAccountJoin", "account_id", "user-123"): mock_tenant_join,
+ }
+ ServiceDbTestHelper.setup_db_query_filter_by_mock(mock_db_dependencies["db"], query_results)
+
+ # Mock datetime
+ with patch("services.account_service.datetime") as mock_datetime:
+ mock_now = datetime.now()
+ mock_datetime.now.return_value = mock_now
+ mock_datetime.UTC = "UTC"
+
+ # Execute test
+ result = AccountService.load_user("user-123")
+
+ # Verify results
+ assert result == mock_account
+ assert mock_account.set_tenant_id.called
+
+ def test_load_user_not_found(self, mock_db_dependencies):
+ """Test user loading when user does not exist."""
+ # Setup smart database query mock - no matching results
+ query_results = {("Account", "id", "non-existent-user"): None}
+ ServiceDbTestHelper.setup_db_query_filter_by_mock(mock_db_dependencies["db"], query_results)
+
+ # Execute test
+ result = AccountService.load_user("non-existent-user")
+
+ # Verify results
+ assert result is None
+
+ def test_load_user_banned(self, mock_db_dependencies):
+ """Test user loading when user is banned."""
+ # Setup test data
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock(status="banned")
+
+ # Setup smart database query mock
+ query_results = {("Account", "id", "user-123"): mock_account}
+ ServiceDbTestHelper.setup_db_query_filter_by_mock(mock_db_dependencies["db"], query_results)
+
+ # Execute test and verify exception
+ self._assert_exception_raised(
+ Exception, # Unauthorized
+ AccountService.load_user,
+ "user-123",
+ )
+
+ def test_load_user_no_current_tenant(self, mock_db_dependencies):
+ """Test user loading when user has no current tenant but has available tenants."""
+ # Setup test data
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+ mock_available_tenant = TestAccountAssociatedDataFactory.create_tenant_join_mock(current=False)
+
+ # Setup smart database query mock for complex scenario
+ query_results = {
+ ("Account", "id", "user-123"): mock_account,
+ ("TenantAccountJoin", "account_id", "user-123"): None, # No current tenant
+ ("TenantAccountJoin", "order_by", "first_available"): mock_available_tenant, # First available tenant
+ }
+ ServiceDbTestHelper.setup_db_query_filter_by_mock(mock_db_dependencies["db"], query_results)
+
+ # Mock datetime
+ with patch("services.account_service.datetime") as mock_datetime:
+ mock_now = datetime.now()
+ mock_datetime.now.return_value = mock_now
+ mock_datetime.UTC = "UTC"
+
+ # Execute test
+ result = AccountService.load_user("user-123")
+
+ # Verify results
+ assert result == mock_account
+ assert mock_available_tenant.current is True
+ self._assert_database_operations_called(mock_db_dependencies["db"])
+
+ def test_load_user_no_tenants(self, mock_db_dependencies):
+ """Test user loading when user has no tenants at all."""
+ # Setup test data
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+
+ # Setup smart database query mock for no tenants scenario
+ query_results = {
+ ("Account", "id", "user-123"): mock_account,
+ ("TenantAccountJoin", "account_id", "user-123"): None, # No current tenant
+ ("TenantAccountJoin", "order_by", "first_available"): None, # No available tenants
+ }
+ ServiceDbTestHelper.setup_db_query_filter_by_mock(mock_db_dependencies["db"], query_results)
+
+ # Mock datetime
+ with patch("services.account_service.datetime") as mock_datetime:
+ mock_now = datetime.now()
+ mock_datetime.now.return_value = mock_now
+ mock_datetime.UTC = "UTC"
+
+ # Execute test
+ result = AccountService.load_user("user-123")
+
+ # Verify results
+ assert result is None
+
+
+class TestTenantService:
+ """
+ Comprehensive unit tests for TenantService methods.
+
+ This test suite covers all tenant-related operations including:
+ - Tenant creation and management
+ - Member management and permissions
+ - Tenant switching
+ - Role updates and permission checks
+ - Error conditions and edge cases
+ """
+
+ @pytest.fixture
+ def mock_db_dependencies(self):
+ """Common mock setup for database dependencies."""
+ with patch("services.account_service.db") as mock_db:
+ mock_db.session.add = MagicMock()
+ mock_db.session.commit = MagicMock()
+ yield {
+ "db": mock_db,
+ }
+
+ @pytest.fixture
+ def mock_rsa_dependencies(self):
+ """Mock setup for RSA-related functions."""
+ with patch("services.account_service.generate_key_pair") as mock_generate_key_pair:
+ yield mock_generate_key_pair
+
+ @pytest.fixture
+ def mock_external_service_dependencies(self):
+ """Mock setup for external service dependencies."""
+ with (
+ patch("services.account_service.FeatureService") as mock_feature_service,
+ patch("services.account_service.BillingService") as mock_billing_service,
+ ):
+ yield {
+ "feature_service": mock_feature_service,
+ "billing_service": mock_billing_service,
+ }
+
+ def _assert_database_operations_called(self, mock_db):
+ """Helper method to verify database operations were called."""
+ mock_db.session.commit.assert_called()
+
+ def _assert_exception_raised(self, exception_type, callable_func, *args, **kwargs):
+ """Helper method to verify that specific exception is raised."""
+ with pytest.raises(exception_type):
+ callable_func(*args, **kwargs)
+
+ # ==================== Tenant Creation Tests ====================
+
+ def test_create_owner_tenant_if_not_exist_new_user(
+ self, mock_db_dependencies, mock_rsa_dependencies, mock_external_service_dependencies
+ ):
+ """Test creating owner tenant for new user without existing tenants."""
+ # Setup test data
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+
+ # Setup smart database query mock - no existing tenant joins
+ query_results = {
+ ("TenantAccountJoin", "account_id", "user-123"): None,
+ ("TenantAccountJoin", "tenant_id", "tenant-456"): None, # For has_roles check
+ }
+ ServiceDbTestHelper.setup_db_query_filter_by_mock(mock_db_dependencies["db"], query_results)
+
+ # Setup external service mocks
+ mock_external_service_dependencies[
+ "feature_service"
+ ].get_system_features.return_value.is_allow_create_workspace = True
+ mock_external_service_dependencies[
+ "feature_service"
+ ].get_system_features.return_value.license.workspaces.is_available.return_value = True
+
+ # Mock tenant creation
+ mock_tenant = MagicMock()
+ mock_tenant.id = "tenant-456"
+ mock_tenant.name = "Test User's Workspace"
+
+ # Mock database operations
+ mock_db_dependencies["db"].session.add = MagicMock()
+
+ # Mock RSA key generation
+ mock_rsa_dependencies.return_value = "mock_public_key"
+
+ # Mock has_roles method to return False (no existing owner)
+ with patch("services.account_service.TenantService.has_roles") as mock_has_roles:
+ mock_has_roles.return_value = False
+
+ # Mock Tenant creation to set proper ID
+ with patch("services.account_service.Tenant") as mock_tenant_class:
+ mock_tenant_instance = MagicMock()
+ mock_tenant_instance.id = "tenant-456"
+ mock_tenant_instance.name = "Test User's Workspace"
+ mock_tenant_class.return_value = mock_tenant_instance
+
+ # Execute test
+ TenantService.create_owner_tenant_if_not_exist(mock_account)
+
+ # Verify tenant was created with correct parameters
+ mock_db_dependencies["db"].session.add.assert_called()
+
+ # Get all calls to session.add
+ add_calls = mock_db_dependencies["db"].session.add.call_args_list
+
+ # Should have at least 2 calls: one for Tenant, one for TenantAccountJoin
+ assert len(add_calls) >= 2
+
+ # Verify Tenant was added with correct name
+ tenant_added = False
+ tenant_account_join_added = False
+
+ for call in add_calls:
+ added_object = call[0][0] # First argument of the call
+
+ # Check if it's a Tenant object
+ if hasattr(added_object, "name") and hasattr(added_object, "id"):
+ # This should be a Tenant object
+ assert added_object.name == "Test User's Workspace"
+ tenant_added = True
+
+ # Check if it's a TenantAccountJoin object
+ elif (
+ hasattr(added_object, "tenant_id")
+ and hasattr(added_object, "account_id")
+ and hasattr(added_object, "role")
+ ):
+ # This should be a TenantAccountJoin object
+ assert added_object.tenant_id is not None
+ assert added_object.account_id == "user-123"
+ assert added_object.role == "owner"
+ tenant_account_join_added = True
+
+ assert tenant_added, "Tenant object was not added to database"
+ assert tenant_account_join_added, "TenantAccountJoin object was not added to database"
+
+ self._assert_database_operations_called(mock_db_dependencies["db"])
+ assert mock_rsa_dependencies.called, "RSA key generation was not called"
+
+ # ==================== Member Management Tests ====================
+
+ def test_create_tenant_member_success(self, mock_db_dependencies):
+ """Test successful tenant member creation."""
+ # Setup test data
+ mock_tenant = MagicMock()
+ mock_tenant.id = "tenant-456"
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+
+ # Setup smart database query mock - no existing member
+ query_results = {("TenantAccountJoin", "tenant_id", "tenant-456"): None}
+ ServiceDbTestHelper.setup_db_query_filter_by_mock(mock_db_dependencies["db"], query_results)
+
+ # Mock database operations
+ mock_db_dependencies["db"].session.add = MagicMock()
+
+ # Execute test
+ result = TenantService.create_tenant_member(mock_tenant, mock_account, "normal")
+
+ # Verify member was created with correct parameters
+ assert result is not None
+ mock_db_dependencies["db"].session.add.assert_called_once()
+
+ # Verify the TenantAccountJoin object was added with correct parameters
+ added_tenant_account_join = mock_db_dependencies["db"].session.add.call_args[0][0]
+ assert added_tenant_account_join.tenant_id == "tenant-456"
+ assert added_tenant_account_join.account_id == "user-123"
+ assert added_tenant_account_join.role == "normal"
+
+ self._assert_database_operations_called(mock_db_dependencies["db"])
+
+ # ==================== Tenant Switching Tests ====================
+
+ def test_switch_tenant_success(self):
+ """Test successful tenant switching."""
+ # Setup test data
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+ mock_tenant_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
+ tenant_id="tenant-456", account_id="user-123", current=False
+ )
+
+ # Mock the complex query in switch_tenant method
+ with patch("services.account_service.db") as mock_db:
+ # Mock the join query that returns the tenant_account_join
+ mock_query = MagicMock()
+ mock_filter = MagicMock()
+ mock_filter.first.return_value = mock_tenant_join
+ mock_query.filter.return_value = mock_filter
+ mock_query.join.return_value = mock_query
+ mock_db.session.query.return_value = mock_query
+
+ # Execute test
+ TenantService.switch_tenant(mock_account, "tenant-456")
+
+ # Verify tenant was switched
+ assert mock_tenant_join.current is True
+ self._assert_database_operations_called(mock_db)
+
+ def test_switch_tenant_no_tenant_id(self):
+ """Test tenant switching without providing tenant ID."""
+ # Setup test data
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+
+ # Execute test and verify exception
+ self._assert_exception_raised(ValueError, TenantService.switch_tenant, mock_account, None)
+
+ # ==================== Role Management Tests ====================
+
+ def test_update_member_role_success(self):
+ """Test successful member role update."""
+ # Setup test data
+ mock_tenant = MagicMock()
+ mock_tenant.id = "tenant-456"
+ mock_member = TestAccountAssociatedDataFactory.create_account_mock(account_id="member-789")
+ mock_operator = TestAccountAssociatedDataFactory.create_account_mock(account_id="operator-123")
+ mock_target_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
+ tenant_id="tenant-456", account_id="member-789", role="normal"
+ )
+ mock_operator_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
+ tenant_id="tenant-456", account_id="operator-123", role="owner"
+ )
+
+ # Mock the database queries in update_member_role method
+ with patch("services.account_service.db") as mock_db:
+ # Mock the first query for operator permission check
+ mock_query1 = MagicMock()
+ mock_filter1 = MagicMock()
+ mock_filter1.first.return_value = mock_operator_join
+ mock_query1.filter_by.return_value = mock_filter1
+
+ # Mock the second query for target member
+ mock_query2 = MagicMock()
+ mock_filter2 = MagicMock()
+ mock_filter2.first.return_value = mock_target_join
+ mock_query2.filter_by.return_value = mock_filter2
+
+ # Make the query method return different mocks for different calls
+ mock_db.session.query.side_effect = [mock_query1, mock_query2]
+
+ # Execute test
+ TenantService.update_member_role(mock_tenant, mock_member, "admin", mock_operator)
+
+ # Verify role was updated
+ assert mock_target_join.role == "admin"
+ self._assert_database_operations_called(mock_db)
+
+ # ==================== Permission Check Tests ====================
+
+ def test_check_member_permission_success(self, mock_db_dependencies):
+ """Test successful member permission check."""
+ # Setup test data
+ mock_tenant = MagicMock()
+ mock_tenant.id = "tenant-456"
+ mock_operator = TestAccountAssociatedDataFactory.create_account_mock(account_id="operator-123")
+ mock_member = TestAccountAssociatedDataFactory.create_account_mock(account_id="member-789")
+ mock_operator_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
+ tenant_id="tenant-456", account_id="operator-123", role="owner"
+ )
+
+ # Setup smart database query mock
+ query_results = {("TenantAccountJoin", "tenant_id", "tenant-456"): mock_operator_join}
+ ServiceDbTestHelper.setup_db_query_filter_by_mock(mock_db_dependencies["db"], query_results)
+
+ # Execute test - should not raise exception
+ TenantService.check_member_permission(mock_tenant, mock_operator, mock_member, "add")
+
+ def test_check_member_permission_operate_self(self):
+ """Test member permission check when operator tries to operate self."""
+ # Setup test data
+ mock_tenant = MagicMock()
+ mock_tenant.id = "tenant-456"
+ mock_operator = TestAccountAssociatedDataFactory.create_account_mock(account_id="operator-123")
+
+ # Execute test and verify exception
+ from services.errors.account import CannotOperateSelfError
+
+ self._assert_exception_raised(
+ CannotOperateSelfError,
+ TenantService.check_member_permission,
+ mock_tenant,
+ mock_operator,
+ mock_operator, # Same as operator
+ "add",
+ )
+
+
+class TestRegisterService:
+ """
+ Comprehensive unit tests for RegisterService methods.
+
+ This test suite covers all registration-related operations including:
+ - System setup
+ - Account registration
+ - Member invitation
+ - Token management
+ - Invitation validation
+ - Error conditions and edge cases
+ """
+
+ @pytest.fixture
+ def mock_db_dependencies(self):
+ """Common mock setup for database dependencies."""
+ with patch("services.account_service.db") as mock_db:
+ mock_db.session.add = MagicMock()
+ mock_db.session.commit = MagicMock()
+ mock_db.session.begin_nested = MagicMock()
+ mock_db.session.rollback = MagicMock()
+ yield {
+ "db": mock_db,
+ }
+
+ @pytest.fixture
+ def mock_redis_dependencies(self):
+ """Mock setup for Redis-related functions."""
+ with patch("services.account_service.redis_client") as mock_redis:
+ yield mock_redis
+
+ @pytest.fixture
+ def mock_external_service_dependencies(self):
+ """Mock setup for external service dependencies."""
+ with (
+ patch("services.account_service.FeatureService") as mock_feature_service,
+ patch("services.account_service.BillingService") as mock_billing_service,
+ patch("services.account_service.PassportService") as mock_passport_service,
+ ):
+ yield {
+ "feature_service": mock_feature_service,
+ "billing_service": mock_billing_service,
+ "passport_service": mock_passport_service,
+ }
+
+ @pytest.fixture
+ def mock_task_dependencies(self):
+ """Mock setup for task dependencies."""
+ with patch("services.account_service.send_invite_member_mail_task") as mock_send_mail:
+ yield mock_send_mail
+
+ def _assert_database_operations_called(self, mock_db):
+ """Helper method to verify database operations were called."""
+ mock_db.session.commit.assert_called()
+
+ def _assert_database_operations_not_called(self, mock_db):
+ """Helper method to verify database operations were not called."""
+ mock_db.session.commit.assert_not_called()
+
+ def _assert_exception_raised(self, exception_type, callable_func, *args, **kwargs):
+ """Helper method to verify that specific exception is raised."""
+ with pytest.raises(exception_type):
+ callable_func(*args, **kwargs)
+
+ # ==================== Setup Tests ====================
+
+ def test_setup_success(self, mock_db_dependencies, mock_external_service_dependencies):
+ """Test successful system setup."""
+ # Setup mocks
+ mock_external_service_dependencies["feature_service"].get_system_features.return_value.is_allow_register = True
+ mock_external_service_dependencies["billing_service"].is_email_in_freeze.return_value = False
+
+ # Mock AccountService.create_account
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+ with patch("services.account_service.AccountService.create_account") as mock_create_account:
+ mock_create_account.return_value = mock_account
+
+ # Mock TenantService.create_owner_tenant_if_not_exist
+ with patch("services.account_service.TenantService.create_owner_tenant_if_not_exist") as mock_create_tenant:
+ # Mock DifySetup
+ with patch("services.account_service.DifySetup") as mock_dify_setup:
+ mock_dify_setup_instance = MagicMock()
+ mock_dify_setup.return_value = mock_dify_setup_instance
+
+ # Execute test
+ RegisterService.setup("admin@example.com", "Admin User", "password123", "192.168.1.1")
+
+ # Verify results
+ mock_create_account.assert_called_once_with(
+ email="admin@example.com",
+ name="Admin User",
+ interface_language="en-US",
+ password="password123",
+ is_setup=True,
+ )
+ mock_create_tenant.assert_called_once_with(account=mock_account, is_setup=True)
+ mock_dify_setup.assert_called_once()
+ self._assert_database_operations_called(mock_db_dependencies["db"])
+
+ def test_setup_failure_rollback(self, mock_db_dependencies, mock_external_service_dependencies):
+ """Test setup failure with proper rollback."""
+ # Setup mocks to simulate failure
+ mock_external_service_dependencies["feature_service"].get_system_features.return_value.is_allow_register = True
+ mock_external_service_dependencies["billing_service"].is_email_in_freeze.return_value = False
+
+ # Mock AccountService.create_account to raise exception
+ with patch("services.account_service.AccountService.create_account") as mock_create_account:
+ mock_create_account.side_effect = Exception("Database error")
+
+ # Execute test and verify exception
+ self._assert_exception_raised(
+ ValueError,
+ RegisterService.setup,
+ "admin@example.com",
+ "Admin User",
+ "password123",
+ "192.168.1.1",
+ )
+
+ # Verify rollback operations were called
+ mock_db_dependencies["db"].session.query.assert_called()
+
+ # ==================== Registration Tests ====================
+
+ def test_register_success(self, mock_db_dependencies, mock_external_service_dependencies):
+ """Test successful account registration."""
+ # Setup mocks
+ mock_external_service_dependencies["feature_service"].get_system_features.return_value.is_allow_register = True
+ mock_external_service_dependencies[
+ "feature_service"
+ ].get_system_features.return_value.is_allow_create_workspace = True
+ mock_external_service_dependencies[
+ "feature_service"
+ ].get_system_features.return_value.license.workspaces.is_available.return_value = True
+ mock_external_service_dependencies["billing_service"].is_email_in_freeze.return_value = False
+
+ # Mock AccountService.create_account
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+ with patch("services.account_service.AccountService.create_account") as mock_create_account:
+ mock_create_account.return_value = mock_account
+
+ # Mock TenantService.create_tenant and create_tenant_member
+ with (
+ patch("services.account_service.TenantService.create_tenant") as mock_create_tenant,
+ patch("services.account_service.TenantService.create_tenant_member") as mock_create_member,
+ patch("services.account_service.tenant_was_created") as mock_event,
+ ):
+ mock_tenant = MagicMock()
+ mock_tenant.id = "tenant-456"
+ mock_create_tenant.return_value = mock_tenant
+
+ # Execute test
+ result = RegisterService.register(
+ email="test@example.com",
+ name="Test User",
+ password="password123",
+ language="en-US",
+ )
+
+ # Verify results
+ assert result == mock_account
+ assert result.status == "active"
+ assert result.initialized_at is not None
+ mock_create_account.assert_called_once_with(
+ email="test@example.com",
+ name="Test User",
+ interface_language="en-US",
+ password="password123",
+ is_setup=False,
+ )
+ mock_create_tenant.assert_called_once_with("Test User's Workspace")
+ mock_create_member.assert_called_once_with(mock_tenant, mock_account, role="owner")
+ mock_event.send.assert_called_once_with(mock_tenant)
+ self._assert_database_operations_called(mock_db_dependencies["db"])
+
+ def test_register_with_oauth(self, mock_db_dependencies, mock_external_service_dependencies):
+ """Test account registration with OAuth integration."""
+ # Setup mocks
+ mock_external_service_dependencies["feature_service"].get_system_features.return_value.is_allow_register = True
+ mock_external_service_dependencies[
+ "feature_service"
+ ].get_system_features.return_value.is_allow_create_workspace = True
+ mock_external_service_dependencies[
+ "feature_service"
+ ].get_system_features.return_value.license.workspaces.is_available.return_value = True
+ mock_external_service_dependencies["billing_service"].is_email_in_freeze.return_value = False
+
+ # Mock AccountService.create_account and link_account_integrate
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+ with (
+ patch("services.account_service.AccountService.create_account") as mock_create_account,
+ patch("services.account_service.AccountService.link_account_integrate") as mock_link_account,
+ ):
+ mock_create_account.return_value = mock_account
+
+ # Mock TenantService methods
+ with (
+ patch("services.account_service.TenantService.create_tenant") as mock_create_tenant,
+ patch("services.account_service.TenantService.create_tenant_member") as mock_create_member,
+ patch("services.account_service.tenant_was_created") as mock_event,
+ ):
+ mock_tenant = MagicMock()
+ mock_create_tenant.return_value = mock_tenant
+
+ # Execute test
+ result = RegisterService.register(
+ email="test@example.com",
+ name="Test User",
+ password=None,
+ open_id="oauth123",
+ provider="google",
+ language="en-US",
+ )
+
+ # Verify results
+ assert result == mock_account
+ mock_link_account.assert_called_once_with("google", "oauth123", mock_account)
+ self._assert_database_operations_called(mock_db_dependencies["db"])
+
+ def test_register_with_pending_status(self, mock_db_dependencies, mock_external_service_dependencies):
+ """Test account registration with pending status."""
+ # Setup mocks
+ mock_external_service_dependencies["feature_service"].get_system_features.return_value.is_allow_register = True
+ mock_external_service_dependencies[
+ "feature_service"
+ ].get_system_features.return_value.is_allow_create_workspace = True
+ mock_external_service_dependencies[
+ "feature_service"
+ ].get_system_features.return_value.license.workspaces.is_available.return_value = True
+ mock_external_service_dependencies["billing_service"].is_email_in_freeze.return_value = False
+
+ # Mock AccountService.create_account
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+ with patch("services.account_service.AccountService.create_account") as mock_create_account:
+ mock_create_account.return_value = mock_account
+
+ # Mock TenantService methods
+ with (
+ patch("services.account_service.TenantService.create_tenant") as mock_create_tenant,
+ patch("services.account_service.TenantService.create_tenant_member") as mock_create_member,
+ patch("services.account_service.tenant_was_created") as mock_event,
+ ):
+ mock_tenant = MagicMock()
+ mock_create_tenant.return_value = mock_tenant
+
+ # Execute test with pending status
+ from models.account import AccountStatus
+
+ result = RegisterService.register(
+ email="test@example.com",
+ name="Test User",
+ password="password123",
+ language="en-US",
+ status=AccountStatus.PENDING,
+ )
+
+ # Verify results
+ assert result == mock_account
+ assert result.status == "pending"
+ self._assert_database_operations_called(mock_db_dependencies["db"])
+
+ def test_register_workspace_not_allowed(self, mock_db_dependencies, mock_external_service_dependencies):
+ """Test registration when workspace creation is not allowed."""
+ # Setup mocks
+ mock_external_service_dependencies["feature_service"].get_system_features.return_value.is_allow_register = True
+ mock_external_service_dependencies[
+ "feature_service"
+ ].get_system_features.return_value.is_allow_create_workspace = True
+ mock_external_service_dependencies[
+ "feature_service"
+ ].get_system_features.return_value.license.workspaces.is_available.return_value = True
+ mock_external_service_dependencies["billing_service"].is_email_in_freeze.return_value = False
+
+ # Mock AccountService.create_account
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock()
+ with patch("services.account_service.AccountService.create_account") as mock_create_account:
+ mock_create_account.return_value = mock_account
+
+ # Execute test and verify exception
+ from services.errors.workspace import WorkSpaceNotAllowedCreateError
+
+ with patch("services.account_service.TenantService.create_tenant") as mock_create_tenant:
+ mock_create_tenant.side_effect = WorkSpaceNotAllowedCreateError()
+
+ self._assert_exception_raised(
+ AccountRegisterError,
+ RegisterService.register,
+ email="test@example.com",
+ name="Test User",
+ password="password123",
+ language="en-US",
+ )
+
+ # Verify rollback was called
+ mock_db_dependencies["db"].session.rollback.assert_called()
+
+ def test_register_general_exception(self, mock_db_dependencies, mock_external_service_dependencies):
+ """Test registration with general exception handling."""
+ # Setup mocks
+ mock_external_service_dependencies["feature_service"].get_system_features.return_value.is_allow_register = True
+ mock_external_service_dependencies["billing_service"].is_email_in_freeze.return_value = False
+
+ # Mock AccountService.create_account to raise exception
+ with patch("services.account_service.AccountService.create_account") as mock_create_account:
+ mock_create_account.side_effect = Exception("Unexpected error")
+
+ # Execute test and verify exception
+ self._assert_exception_raised(
+ AccountRegisterError,
+ RegisterService.register,
+ email="test@example.com",
+ name="Test User",
+ password="password123",
+ language="en-US",
+ )
+
+ # Verify rollback was called
+ mock_db_dependencies["db"].session.rollback.assert_called()
+
+ # ==================== Member Invitation Tests ====================
+
+ def test_invite_new_member_new_account(self, mock_db_dependencies, mock_redis_dependencies, mock_task_dependencies):
+ """Test inviting a new member who doesn't have an account."""
+ # Setup test data
+ mock_tenant = MagicMock()
+ mock_tenant.id = "tenant-456"
+ mock_tenant.name = "Test Workspace"
+ mock_inviter = TestAccountAssociatedDataFactory.create_account_mock(account_id="inviter-123", name="Inviter")
+
+ # Mock database queries - need to mock the Session query
+ mock_session = MagicMock()
+ mock_session.query.return_value.filter_by.return_value.first.return_value = None # No existing account
+
+ with patch("services.account_service.Session") as mock_session_class:
+ mock_session_class.return_value.__enter__.return_value = mock_session
+ mock_session_class.return_value.__exit__.return_value = None
+
+ # Mock RegisterService.register
+ mock_new_account = TestAccountAssociatedDataFactory.create_account_mock(
+ account_id="new-user-456", email="newuser@example.com", name="newuser", status="pending"
+ )
+ with patch("services.account_service.RegisterService.register") as mock_register:
+ mock_register.return_value = mock_new_account
+
+ # Mock TenantService methods
+ with (
+ patch("services.account_service.TenantService.check_member_permission") as mock_check_permission,
+ patch("services.account_service.TenantService.create_tenant_member") as mock_create_member,
+ patch("services.account_service.TenantService.switch_tenant") as mock_switch_tenant,
+ patch("services.account_service.RegisterService.generate_invite_token") as mock_generate_token,
+ ):
+ mock_generate_token.return_value = "invite-token-123"
+
+ # Execute test
+ result = RegisterService.invite_new_member(
+ tenant=mock_tenant,
+ email="newuser@example.com",
+ language="en-US",
+ role="normal",
+ inviter=mock_inviter,
+ )
+
+ # Verify results
+ assert result == "invite-token-123"
+ mock_register.assert_called_once_with(
+ email="newuser@example.com",
+ name="newuser",
+ language="en-US",
+ status="pending",
+ is_setup=True,
+ )
+ mock_create_member.assert_called_once_with(mock_tenant, mock_new_account, "normal")
+ mock_switch_tenant.assert_called_once_with(mock_new_account, mock_tenant.id)
+ mock_generate_token.assert_called_once_with(mock_tenant, mock_new_account)
+ mock_task_dependencies.delay.assert_called_once()
+
+ def test_invite_new_member_existing_account(
+ self, mock_db_dependencies, mock_redis_dependencies, mock_task_dependencies
+ ):
+ """Test inviting a new member who already has an account."""
+ # Setup test data
+ mock_tenant = MagicMock()
+ mock_tenant.id = "tenant-456"
+ mock_tenant.name = "Test Workspace"
+ mock_inviter = TestAccountAssociatedDataFactory.create_account_mock(account_id="inviter-123", name="Inviter")
+ mock_existing_account = TestAccountAssociatedDataFactory.create_account_mock(
+ account_id="existing-user-456", email="existing@example.com", status="pending"
+ )
+
+ # Mock database queries - need to mock the Session query
+ mock_session = MagicMock()
+ mock_session.query.return_value.filter_by.return_value.first.return_value = mock_existing_account
+
+ with patch("services.account_service.Session") as mock_session_class:
+ mock_session_class.return_value.__enter__.return_value = mock_session
+ mock_session_class.return_value.__exit__.return_value = None
+
+ # Mock the db.session.query for TenantAccountJoin
+ mock_db_query = MagicMock()
+ mock_db_query.filter_by.return_value.first.return_value = None # No existing member
+ mock_db_dependencies["db"].session.query.return_value = mock_db_query
+
+ # Mock TenantService methods
+ with (
+ patch("services.account_service.TenantService.check_member_permission") as mock_check_permission,
+ patch("services.account_service.TenantService.create_tenant_member") as mock_create_member,
+ patch("services.account_service.RegisterService.generate_invite_token") as mock_generate_token,
+ ):
+ mock_generate_token.return_value = "invite-token-123"
+
+ # Execute test
+ result = RegisterService.invite_new_member(
+ tenant=mock_tenant,
+ email="existing@example.com",
+ language="en-US",
+ role="normal",
+ inviter=mock_inviter,
+ )
+
+ # Verify results
+ assert result == "invite-token-123"
+ mock_create_member.assert_called_once_with(mock_tenant, mock_existing_account, "normal")
+ mock_generate_token.assert_called_once_with(mock_tenant, mock_existing_account)
+ mock_task_dependencies.delay.assert_called_once()
+
+ def test_invite_new_member_already_in_tenant(self, mock_db_dependencies, mock_redis_dependencies):
+ """Test inviting a member who is already in the tenant."""
+ # Setup test data
+ mock_tenant = MagicMock()
+ mock_tenant.id = "tenant-456"
+ mock_inviter = TestAccountAssociatedDataFactory.create_account_mock(account_id="inviter-123", name="Inviter")
+ mock_existing_account = TestAccountAssociatedDataFactory.create_account_mock(
+ account_id="existing-user-456", email="existing@example.com", status="active"
+ )
+
+ # Mock database queries
+ query_results = {
+ ("Account", "email", "existing@example.com"): mock_existing_account,
+ (
+ "TenantAccountJoin",
+ "tenant_id",
+ "tenant-456",
+ ): TestAccountAssociatedDataFactory.create_tenant_join_mock(),
+ }
+ ServiceDbTestHelper.setup_db_query_filter_by_mock(mock_db_dependencies["db"], query_results)
+
+ # Mock TenantService methods
+ with patch("services.account_service.TenantService.check_member_permission") as mock_check_permission:
+ # Execute test and verify exception
+ self._assert_exception_raised(
+ AccountAlreadyInTenantError,
+ RegisterService.invite_new_member,
+ tenant=mock_tenant,
+ email="existing@example.com",
+ language="en-US",
+ role="normal",
+ inviter=mock_inviter,
+ )
+
+ def test_invite_new_member_no_inviter(self):
+ """Test inviting a member without providing an inviter."""
+ # Setup test data
+ mock_tenant = MagicMock()
+
+ # Execute test and verify exception
+ self._assert_exception_raised(
+ ValueError,
+ RegisterService.invite_new_member,
+ tenant=mock_tenant,
+ email="test@example.com",
+ language="en-US",
+ role="normal",
+ inviter=None,
+ )
+
+ # ==================== Token Management Tests ====================
+
+ def test_generate_invite_token_success(self, mock_redis_dependencies):
+ """Test successful invite token generation."""
+ # Setup test data
+ mock_tenant = MagicMock()
+ mock_tenant.id = "tenant-456"
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock(
+ account_id="user-123", email="test@example.com"
+ )
+
+ # Mock uuid generation
+ with patch("services.account_service.uuid.uuid4") as mock_uuid:
+ mock_uuid.return_value = "test-uuid-123"
+
+ # Execute test
+ result = RegisterService.generate_invite_token(mock_tenant, mock_account)
+
+ # Verify results
+ assert result == "test-uuid-123"
+ mock_redis_dependencies.setex.assert_called_once()
+
+ # Verify the stored data
+ call_args = mock_redis_dependencies.setex.call_args
+ assert call_args[0][0] == "member_invite:token:test-uuid-123"
+ stored_data = json.loads(call_args[0][2])
+ assert stored_data["account_id"] == "user-123"
+ assert stored_data["email"] == "test@example.com"
+ assert stored_data["workspace_id"] == "tenant-456"
+
+ def test_is_valid_invite_token_valid(self, mock_redis_dependencies):
+ """Test checking valid invite token."""
+ # Setup mock
+ mock_redis_dependencies.get.return_value = b'{"test": "data"}'
+
+ # Execute test
+ result = RegisterService.is_valid_invite_token("valid-token")
+
+ # Verify results
+ assert result is True
+ mock_redis_dependencies.get.assert_called_once_with("member_invite:token:valid-token")
+
+ def test_is_valid_invite_token_invalid(self, mock_redis_dependencies):
+ """Test checking invalid invite token."""
+ # Setup mock
+ mock_redis_dependencies.get.return_value = None
+
+ # Execute test
+ result = RegisterService.is_valid_invite_token("invalid-token")
+
+ # Verify results
+ assert result is False
+ mock_redis_dependencies.get.assert_called_once_with("member_invite:token:invalid-token")
+
+ def test_revoke_token_with_workspace_and_email(self, mock_redis_dependencies):
+ """Test revoking token with workspace ID and email."""
+ # Execute test
+ RegisterService.revoke_token("workspace-123", "test@example.com", "token-123")
+
+ # Verify results
+ mock_redis_dependencies.delete.assert_called_once()
+ call_args = mock_redis_dependencies.delete.call_args
+ assert "workspace-123" in call_args[0][0]
+ # The email is hashed, so we check for the hash pattern instead
+ assert "member_invite_token:" in call_args[0][0]
+
+ def test_revoke_token_without_workspace_and_email(self, mock_redis_dependencies):
+ """Test revoking token without workspace ID and email."""
+ # Execute test
+ RegisterService.revoke_token("", "", "token-123")
+
+ # Verify results
+ mock_redis_dependencies.delete.assert_called_once_with("member_invite:token:token-123")
+
+ # ==================== Invitation Validation Tests ====================
+
+ def test_get_invitation_if_token_valid_success(self, mock_db_dependencies, mock_redis_dependencies):
+ """Test successful invitation validation."""
+ # Setup test data
+ mock_tenant = MagicMock()
+ mock_tenant.id = "tenant-456"
+ mock_tenant.status = "normal"
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock(
+ account_id="user-123", email="test@example.com"
+ )
+
+ with patch("services.account_service.RegisterService._get_invitation_by_token") as mock_get_invitation_by_token:
+ # Mock the invitation data returned by _get_invitation_by_token
+ invitation_data = {
+ "account_id": "user-123",
+ "email": "test@example.com",
+ "workspace_id": "tenant-456",
+ }
+ mock_get_invitation_by_token.return_value = invitation_data
+
+ # Mock database queries - complex query mocking
+ mock_query1 = MagicMock()
+ mock_query1.filter.return_value.first.return_value = mock_tenant
+
+ mock_query2 = MagicMock()
+ mock_query2.join.return_value.filter.return_value.first.return_value = (mock_account, "normal")
+
+ mock_db_dependencies["db"].session.query.side_effect = [mock_query1, mock_query2]
+
+ # Execute test
+ result = RegisterService.get_invitation_if_token_valid("tenant-456", "test@example.com", "token-123")
+
+ # Verify results
+ assert result is not None
+ assert result["account"] == mock_account
+ assert result["tenant"] == mock_tenant
+ assert result["data"] == invitation_data
+
+ def test_get_invitation_if_token_valid_no_token_data(self, mock_redis_dependencies):
+ """Test invitation validation with no token data."""
+ # Setup mock
+ mock_redis_dependencies.get.return_value = None
+
+ # Execute test
+ result = RegisterService.get_invitation_if_token_valid("tenant-456", "test@example.com", "token-123")
+
+ # Verify results
+ assert result is None
+
+ def test_get_invitation_if_token_valid_tenant_not_found(self, mock_db_dependencies, mock_redis_dependencies):
+ """Test invitation validation when tenant is not found."""
+ # Setup mock Redis data
+ invitation_data = {
+ "account_id": "user-123",
+ "email": "test@example.com",
+ "workspace_id": "tenant-456",
+ }
+ mock_redis_dependencies.get.return_value = json.dumps(invitation_data).encode()
+
+ # Mock database queries - no tenant found
+ mock_query = MagicMock()
+ mock_query.filter.return_value.first.return_value = None
+ mock_db_dependencies["db"].session.query.return_value = mock_query
+
+ # Execute test
+ result = RegisterService.get_invitation_if_token_valid("tenant-456", "test@example.com", "token-123")
+
+ # Verify results
+ assert result is None
+
+ def test_get_invitation_if_token_valid_account_not_found(self, mock_db_dependencies, mock_redis_dependencies):
+ """Test invitation validation when account is not found."""
+ # Setup test data
+ mock_tenant = MagicMock()
+ mock_tenant.id = "tenant-456"
+ mock_tenant.status = "normal"
+
+ # Mock Redis data
+ invitation_data = {
+ "account_id": "user-123",
+ "email": "test@example.com",
+ "workspace_id": "tenant-456",
+ }
+ mock_redis_dependencies.get.return_value = json.dumps(invitation_data).encode()
+
+ # Mock database queries
+ mock_query1 = MagicMock()
+ mock_query1.filter.return_value.first.return_value = mock_tenant
+
+ mock_query2 = MagicMock()
+ mock_query2.join.return_value.filter.return_value.first.return_value = None # No account found
+
+ mock_db_dependencies["db"].session.query.side_effect = [mock_query1, mock_query2]
+
+ # Execute test
+ result = RegisterService.get_invitation_if_token_valid("tenant-456", "test@example.com", "token-123")
+
+ # Verify results
+ assert result is None
+
+ def test_get_invitation_if_token_valid_account_id_mismatch(self, mock_db_dependencies, mock_redis_dependencies):
+ """Test invitation validation when account ID doesn't match."""
+ # Setup test data
+ mock_tenant = MagicMock()
+ mock_tenant.id = "tenant-456"
+ mock_tenant.status = "normal"
+ mock_account = TestAccountAssociatedDataFactory.create_account_mock(
+ account_id="different-user-456", email="test@example.com"
+ )
+
+ # Mock Redis data with different account ID
+ invitation_data = {
+ "account_id": "user-123",
+ "email": "test@example.com",
+ "workspace_id": "tenant-456",
+ }
+ mock_redis_dependencies.get.return_value = json.dumps(invitation_data).encode()
+
+ # Mock database queries
+ mock_query1 = MagicMock()
+ mock_query1.filter.return_value.first.return_value = mock_tenant
+
+ mock_query2 = MagicMock()
+ mock_query2.join.return_value.filter.return_value.first.return_value = (mock_account, "normal")
+
+ mock_db_dependencies["db"].session.query.side_effect = [mock_query1, mock_query2]
+
+ # Execute test
+ result = RegisterService.get_invitation_if_token_valid("tenant-456", "test@example.com", "token-123")
+
+ # Verify results
+ assert result is None
+
+ # ==================== Helper Method Tests ====================
+
+ def test_get_invitation_token_key(self):
+ """Test the _get_invitation_token_key helper method."""
+ # Execute test
+ result = RegisterService._get_invitation_token_key("test-token")
+
+ # Verify results
+ assert result == "member_invite:token:test-token"
+
+ def test_get_invitation_by_token_with_workspace_and_email(self, mock_redis_dependencies):
+ """Test _get_invitation_by_token with workspace ID and email."""
+ # Setup mock
+ mock_redis_dependencies.get.return_value = b"user-123"
+
+ # Execute test
+ result = RegisterService._get_invitation_by_token("token-123", "workspace-456", "test@example.com")
+
+ # Verify results
+ assert result is not None
+ assert result["account_id"] == "user-123"
+ assert result["email"] == "test@example.com"
+ assert result["workspace_id"] == "workspace-456"
+
+ def test_get_invitation_by_token_without_workspace_and_email(self, mock_redis_dependencies):
+ """Test _get_invitation_by_token without workspace ID and email."""
+ # Setup mock
+ invitation_data = {
+ "account_id": "user-123",
+ "email": "test@example.com",
+ "workspace_id": "tenant-456",
+ }
+ mock_redis_dependencies.get.return_value = json.dumps(invitation_data).encode()
+
+ # Execute test
+ result = RegisterService._get_invitation_by_token("token-123")
+
+ # Verify results
+ assert result is not None
+ assert result == invitation_data
+
+ def test_get_invitation_by_token_no_data(self, mock_redis_dependencies):
+ """Test _get_invitation_by_token with no data."""
+ # Setup mock
+ mock_redis_dependencies.get.return_value = None
+
+ # Execute test
+ result = RegisterService._get_invitation_by_token("token-123")
+
+ # Verify results
+ assert result is None
diff --git a/api/tests/unit_tests/services/test_dataset_permission.py b/api/tests/unit_tests/services/test_dataset_permission.py
index 066f541c1b..a67252e856 100644
--- a/api/tests/unit_tests/services/test_dataset_permission.py
+++ b/api/tests/unit_tests/services/test_dataset_permission.py
@@ -8,151 +8,298 @@ from services.dataset_service import DatasetService
from services.errors.account import NoPermissionError
+class DatasetPermissionTestDataFactory:
+ """Factory class for creating test data and mock objects for dataset permission tests."""
+
+ @staticmethod
+ def create_dataset_mock(
+ dataset_id: str = "dataset-123",
+ tenant_id: str = "test-tenant-123",
+ created_by: str = "creator-456",
+ permission: DatasetPermissionEnum = DatasetPermissionEnum.ONLY_ME,
+ **kwargs,
+ ) -> Mock:
+ """Create a mock dataset with specified attributes."""
+ dataset = Mock(spec=Dataset)
+ dataset.id = dataset_id
+ dataset.tenant_id = tenant_id
+ dataset.created_by = created_by
+ dataset.permission = permission
+ for key, value in kwargs.items():
+ setattr(dataset, key, value)
+ return dataset
+
+ @staticmethod
+ def create_user_mock(
+ user_id: str = "user-789",
+ tenant_id: str = "test-tenant-123",
+ role: TenantAccountRole = TenantAccountRole.NORMAL,
+ **kwargs,
+ ) -> Mock:
+ """Create a mock user with specified attributes."""
+ user = Mock(spec=Account)
+ user.id = user_id
+ user.current_tenant_id = tenant_id
+ user.current_role = role
+ for key, value in kwargs.items():
+ setattr(user, key, value)
+ return user
+
+ @staticmethod
+ def create_dataset_permission_mock(
+ dataset_id: str = "dataset-123",
+ account_id: str = "user-789",
+ **kwargs,
+ ) -> Mock:
+ """Create a mock dataset permission record."""
+ permission = Mock(spec=DatasetPermission)
+ permission.dataset_id = dataset_id
+ permission.account_id = account_id
+ for key, value in kwargs.items():
+ setattr(permission, key, value)
+ return permission
+
+
class TestDatasetPermissionService:
- """Test cases for dataset permission checking functionality"""
-
- def setup_method(self):
- """Set up test fixtures"""
- # Mock tenant and user
- self.tenant_id = "test-tenant-123"
- self.creator_id = "creator-456"
- self.normal_user_id = "normal-789"
- self.owner_user_id = "owner-999"
-
- # Mock dataset
- self.dataset = Mock(spec=Dataset)
- self.dataset.id = "dataset-123"
- self.dataset.tenant_id = self.tenant_id
- self.dataset.created_by = self.creator_id
-
- # Mock users
- self.creator_user = Mock(spec=Account)
- self.creator_user.id = self.creator_id
- self.creator_user.current_tenant_id = self.tenant_id
- self.creator_user.current_role = TenantAccountRole.EDITOR
-
- self.normal_user = Mock(spec=Account)
- self.normal_user.id = self.normal_user_id
- self.normal_user.current_tenant_id = self.tenant_id
- self.normal_user.current_role = TenantAccountRole.NORMAL
-
- self.owner_user = Mock(spec=Account)
- self.owner_user.id = self.owner_user_id
- self.owner_user.current_tenant_id = self.tenant_id
- self.owner_user.current_role = TenantAccountRole.OWNER
+ """
+ Comprehensive unit tests for DatasetService.check_dataset_permission method.
+
+ This test suite covers all permission scenarios including:
+ - Cross-tenant access restrictions
+ - Owner privilege checks
+ - Different permission levels (ONLY_ME, ALL_TEAM, PARTIAL_TEAM)
+ - Explicit permission checks for PARTIAL_TEAM
+ - Error conditions and logging
+ """
+
+ @pytest.fixture
+ def mock_dataset_service_dependencies(self):
+ """Common mock setup for dataset service dependencies."""
+ with patch("services.dataset_service.db.session") as mock_session:
+ yield {
+ "db_session": mock_session,
+ }
+
+ @pytest.fixture
+ def mock_logging_dependencies(self):
+ """Mock setup for logging tests."""
+ with patch("services.dataset_service.logging") as mock_logging:
+ yield {
+ "logging": mock_logging,
+ }
+
+ def _assert_permission_check_passes(self, dataset: Mock, user: Mock):
+ """Helper method to verify that permission check passes without raising exceptions."""
+ # Should not raise any exception
+ DatasetService.check_dataset_permission(dataset, user)
+
+ def _assert_permission_check_fails(
+ self, dataset: Mock, user: Mock, expected_message: str = "You do not have permission to access this dataset."
+ ):
+ """Helper method to verify that permission check fails with expected error."""
+ with pytest.raises(NoPermissionError, match=expected_message):
+ DatasetService.check_dataset_permission(dataset, user)
+
+ def _assert_database_query_called(self, mock_session: Mock, dataset_id: str, account_id: str):
+ """Helper method to verify database query calls for permission checks."""
+ mock_session.query().filter_by.assert_called_with(dataset_id=dataset_id, account_id=account_id)
+
+ def _assert_database_query_not_called(self, mock_session: Mock):
+ """Helper method to verify that database query was not called."""
+ mock_session.query.assert_not_called()
+
+ # ==================== Cross-Tenant Access Tests ====================
def test_permission_check_different_tenant_should_fail(self):
- """Test that users from different tenants cannot access dataset"""
- self.normal_user.current_tenant_id = "different-tenant"
+ """Test that users from different tenants cannot access dataset regardless of other permissions."""
+ # Create dataset and user from different tenants
+ dataset = DatasetPermissionTestDataFactory.create_dataset_mock(
+ tenant_id="tenant-123", permission=DatasetPermissionEnum.ALL_TEAM
+ )
+ user = DatasetPermissionTestDataFactory.create_user_mock(
+ user_id="user-789", tenant_id="different-tenant-456", role=TenantAccountRole.EDITOR
+ )
+
+ # Should fail due to different tenant
+ self._assert_permission_check_fails(dataset, user)
- with pytest.raises(NoPermissionError, match="You do not have permission to access this dataset."):
- DatasetService.check_dataset_permission(self.dataset, self.normal_user)
+ # ==================== Owner Privilege Tests ====================
def test_owner_can_access_any_dataset(self):
- """Test that tenant owners can access any dataset regardless of permission"""
- self.dataset.permission = DatasetPermissionEnum.ONLY_ME
+ """Test that tenant owners can access any dataset regardless of permission level."""
+ # Create dataset with restrictive permission
+ dataset = DatasetPermissionTestDataFactory.create_dataset_mock(permission=DatasetPermissionEnum.ONLY_ME)
- # Should not raise any exception
- DatasetService.check_dataset_permission(self.dataset, self.owner_user)
+ # Create owner user
+ owner_user = DatasetPermissionTestDataFactory.create_user_mock(
+ user_id="owner-999", role=TenantAccountRole.OWNER
+ )
+
+ # Owner should have access regardless of dataset permission
+ self._assert_permission_check_passes(dataset, owner_user)
+
+ # ==================== ONLY_ME Permission Tests ====================
def test_only_me_permission_creator_can_access(self):
- """Test ONLY_ME permission allows only creator to access"""
- self.dataset.permission = DatasetPermissionEnum.ONLY_ME
+ """Test ONLY_ME permission allows only the dataset creator to access."""
+ # Create dataset with ONLY_ME permission
+ dataset = DatasetPermissionTestDataFactory.create_dataset_mock(
+ created_by="creator-456", permission=DatasetPermissionEnum.ONLY_ME
+ )
+
+ # Create creator user
+ creator_user = DatasetPermissionTestDataFactory.create_user_mock(
+ user_id="creator-456", role=TenantAccountRole.EDITOR
+ )
# Creator should be able to access
- DatasetService.check_dataset_permission(self.dataset, self.creator_user)
+ self._assert_permission_check_passes(dataset, creator_user)
def test_only_me_permission_others_cannot_access(self):
- """Test ONLY_ME permission denies access to non-creators"""
- self.dataset.permission = DatasetPermissionEnum.ONLY_ME
+ """Test ONLY_ME permission denies access to non-creators."""
+ # Create dataset with ONLY_ME permission
+ dataset = DatasetPermissionTestDataFactory.create_dataset_mock(
+ created_by="creator-456", permission=DatasetPermissionEnum.ONLY_ME
+ )
+
+ # Create normal user (not the creator)
+ normal_user = DatasetPermissionTestDataFactory.create_user_mock(
+ user_id="normal-789", role=TenantAccountRole.NORMAL
+ )
- with pytest.raises(NoPermissionError, match="You do not have permission to access this dataset."):
- DatasetService.check_dataset_permission(self.dataset, self.normal_user)
+ # Non-creator should be denied access
+ self._assert_permission_check_fails(dataset, normal_user)
+
+ # ==================== ALL_TEAM Permission Tests ====================
def test_all_team_permission_allows_access(self):
- """Test ALL_TEAM permission allows any team member to access"""
- self.dataset.permission = DatasetPermissionEnum.ALL_TEAM
+ """Test ALL_TEAM permission allows any team member to access the dataset."""
+ # Create dataset with ALL_TEAM permission
+ dataset = DatasetPermissionTestDataFactory.create_dataset_mock(permission=DatasetPermissionEnum.ALL_TEAM)
+
+ # Create different types of team members
+ normal_user = DatasetPermissionTestDataFactory.create_user_mock(
+ user_id="normal-789", role=TenantAccountRole.NORMAL
+ )
+ editor_user = DatasetPermissionTestDataFactory.create_user_mock(
+ user_id="editor-456", role=TenantAccountRole.EDITOR
+ )
+
+ # All team members should have access
+ self._assert_permission_check_passes(dataset, normal_user)
+ self._assert_permission_check_passes(dataset, editor_user)
- # Should not raise any exception for team members
- DatasetService.check_dataset_permission(self.dataset, self.normal_user)
- DatasetService.check_dataset_permission(self.dataset, self.creator_user)
+ # ==================== PARTIAL_TEAM Permission Tests ====================
- @patch("services.dataset_service.db.session")
- def test_partial_team_permission_creator_can_access(self, mock_session):
- """Test PARTIAL_TEAM permission allows creator to access"""
- self.dataset.permission = DatasetPermissionEnum.PARTIAL_TEAM
+ def test_partial_team_permission_creator_can_access(self, mock_dataset_service_dependencies):
+ """Test PARTIAL_TEAM permission allows creator to access without database query."""
+ # Create dataset with PARTIAL_TEAM permission
+ dataset = DatasetPermissionTestDataFactory.create_dataset_mock(
+ created_by="creator-456", permission=DatasetPermissionEnum.PARTIAL_TEAM
+ )
- # Should not raise any exception for creator
- DatasetService.check_dataset_permission(self.dataset, self.creator_user)
+ # Create creator user
+ creator_user = DatasetPermissionTestDataFactory.create_user_mock(
+ user_id="creator-456", role=TenantAccountRole.EDITOR
+ )
- # Should not query database for creator
- mock_session.query.assert_not_called()
+ # Creator should have access without database query
+ self._assert_permission_check_passes(dataset, creator_user)
+ self._assert_database_query_not_called(mock_dataset_service_dependencies["db_session"])
- @patch("services.dataset_service.db.session")
- def test_partial_team_permission_with_explicit_permission(self, mock_session):
- """Test PARTIAL_TEAM permission allows users with explicit permission"""
- self.dataset.permission = DatasetPermissionEnum.PARTIAL_TEAM
+ def test_partial_team_permission_with_explicit_permission(self, mock_dataset_service_dependencies):
+ """Test PARTIAL_TEAM permission allows users with explicit permission records."""
+ # Create dataset with PARTIAL_TEAM permission
+ dataset = DatasetPermissionTestDataFactory.create_dataset_mock(permission=DatasetPermissionEnum.PARTIAL_TEAM)
+
+ # Create normal user (not the creator)
+ normal_user = DatasetPermissionTestDataFactory.create_user_mock(
+ user_id="normal-789", role=TenantAccountRole.NORMAL
+ )
# Mock database query to return a permission record
- mock_permission = Mock(spec=DatasetPermission)
- mock_session.query().filter_by().first.return_value = mock_permission
+ mock_permission = DatasetPermissionTestDataFactory.create_dataset_permission_mock(
+ dataset_id=dataset.id, account_id=normal_user.id
+ )
+ mock_dataset_service_dependencies["db_session"].query().filter_by().first.return_value = mock_permission
- # Should not raise any exception
- DatasetService.check_dataset_permission(self.dataset, self.normal_user)
+ # User with explicit permission should have access
+ self._assert_permission_check_passes(dataset, normal_user)
+ self._assert_database_query_called(mock_dataset_service_dependencies["db_session"], dataset.id, normal_user.id)
- # Verify database was queried correctly
- mock_session.query().filter_by.assert_called_with(dataset_id=self.dataset.id, account_id=self.normal_user.id)
+ def test_partial_team_permission_without_explicit_permission(self, mock_dataset_service_dependencies):
+ """Test PARTIAL_TEAM permission denies users without explicit permission records."""
+ # Create dataset with PARTIAL_TEAM permission
+ dataset = DatasetPermissionTestDataFactory.create_dataset_mock(permission=DatasetPermissionEnum.PARTIAL_TEAM)
- @patch("services.dataset_service.db.session")
- def test_partial_team_permission_without_explicit_permission(self, mock_session):
- """Test PARTIAL_TEAM permission denies users without explicit permission"""
- self.dataset.permission = DatasetPermissionEnum.PARTIAL_TEAM
+ # Create normal user (not the creator)
+ normal_user = DatasetPermissionTestDataFactory.create_user_mock(
+ user_id="normal-789", role=TenantAccountRole.NORMAL
+ )
# Mock database query to return None (no permission record)
- mock_session.query().filter_by().first.return_value = None
-
- with pytest.raises(NoPermissionError, match="You do not have permission to access this dataset."):
- DatasetService.check_dataset_permission(self.dataset, self.normal_user)
+ mock_dataset_service_dependencies["db_session"].query().filter_by().first.return_value = None
- # Verify database was queried correctly
- mock_session.query().filter_by.assert_called_with(dataset_id=self.dataset.id, account_id=self.normal_user.id)
+ # User without explicit permission should be denied access
+ self._assert_permission_check_fails(dataset, normal_user)
+ self._assert_database_query_called(mock_dataset_service_dependencies["db_session"], dataset.id, normal_user.id)
- @patch("services.dataset_service.db.session")
- def test_partial_team_permission_non_creator_without_permission_fails(self, mock_session):
- """Test that non-creators without explicit permission are denied access"""
- self.dataset.permission = DatasetPermissionEnum.PARTIAL_TEAM
+ def test_partial_team_permission_non_creator_without_permission_fails(self, mock_dataset_service_dependencies):
+ """Test that non-creators without explicit permission are denied access to PARTIAL_TEAM datasets."""
+ # Create dataset with PARTIAL_TEAM permission
+ dataset = DatasetPermissionTestDataFactory.create_dataset_mock(
+ created_by="creator-456", permission=DatasetPermissionEnum.PARTIAL_TEAM
+ )
# Create a different user (not the creator)
- other_user = Mock(spec=Account)
- other_user.id = "other-user-123"
- other_user.current_tenant_id = self.tenant_id
- other_user.current_role = TenantAccountRole.NORMAL
+ other_user = DatasetPermissionTestDataFactory.create_user_mock(
+ user_id="other-user-123", role=TenantAccountRole.NORMAL
+ )
# Mock database query to return None (no permission record)
- mock_session.query().filter_by().first.return_value = None
+ mock_dataset_service_dependencies["db_session"].query().filter_by().first.return_value = None
+
+ # Non-creator without explicit permission should be denied access
+ self._assert_permission_check_fails(dataset, other_user)
+ self._assert_database_query_called(mock_dataset_service_dependencies["db_session"], dataset.id, other_user.id)
- with pytest.raises(NoPermissionError, match="You do not have permission to access this dataset."):
- DatasetService.check_dataset_permission(self.dataset, other_user)
+ # ==================== Enum Usage Tests ====================
def test_partial_team_permission_uses_correct_enum(self):
- """Test that the method correctly uses DatasetPermissionEnum.PARTIAL_TEAM"""
- # This test ensures we're using the enum instead of string literals
- self.dataset.permission = DatasetPermissionEnum.PARTIAL_TEAM
+ """Test that the method correctly uses DatasetPermissionEnum.PARTIAL_TEAM instead of string literals."""
+ # Create dataset with PARTIAL_TEAM permission using enum
+ dataset = DatasetPermissionTestDataFactory.create_dataset_mock(
+ created_by="creator-456", permission=DatasetPermissionEnum.PARTIAL_TEAM
+ )
+
+ # Create creator user
+ creator_user = DatasetPermissionTestDataFactory.create_user_mock(
+ user_id="creator-456", role=TenantAccountRole.EDITOR
+ )
- # Creator should always have access
- DatasetService.check_dataset_permission(self.dataset, self.creator_user)
+ # Creator should always have access regardless of permission level
+ self._assert_permission_check_passes(dataset, creator_user)
- @patch("services.dataset_service.logging")
- @patch("services.dataset_service.db.session")
- def test_permission_denied_logs_debug_message(self, mock_session, mock_logging):
- """Test that permission denied events are logged"""
- self.dataset.permission = DatasetPermissionEnum.PARTIAL_TEAM
- mock_session.query().filter_by().first.return_value = None
+ # ==================== Logging Tests ====================
+
+ def test_permission_denied_logs_debug_message(self, mock_dataset_service_dependencies, mock_logging_dependencies):
+ """Test that permission denied events are properly logged for debugging purposes."""
+ # Create dataset with PARTIAL_TEAM permission
+ dataset = DatasetPermissionTestDataFactory.create_dataset_mock(permission=DatasetPermissionEnum.PARTIAL_TEAM)
+
+ # Create normal user (not the creator)
+ normal_user = DatasetPermissionTestDataFactory.create_user_mock(
+ user_id="normal-789", role=TenantAccountRole.NORMAL
+ )
+
+ # Mock database query to return None (no permission record)
+ mock_dataset_service_dependencies["db_session"].query().filter_by().first.return_value = None
+ # Attempt permission check (should fail)
with pytest.raises(NoPermissionError):
- DatasetService.check_dataset_permission(self.dataset, self.normal_user)
+ DatasetService.check_dataset_permission(dataset, normal_user)
- # Verify debug message was logged
- mock_logging.debug.assert_called_with(
- f"User {self.normal_user.id} does not have permission to access dataset {self.dataset.id}"
+ # Verify debug message was logged with correct user and dataset information
+ mock_logging_dependencies["logging"].debug.assert_called_with(
+ f"User {normal_user.id} does not have permission to access dataset {dataset.id}"
)
diff --git a/api/tests/unit_tests/services/test_dataset_service_batch_update_document_status.py b/api/tests/unit_tests/services/test_dataset_service_batch_update_document_status.py
new file mode 100644
index 0000000000..dc09aca5b2
--- /dev/null
+++ b/api/tests/unit_tests/services/test_dataset_service_batch_update_document_status.py
@@ -0,0 +1,804 @@
+import datetime
+from typing import Optional
+
+# Mock redis_client before importing dataset_service
+from unittest.mock import Mock, call, patch
+
+import pytest
+
+from models.dataset import Dataset, Document
+from services.dataset_service import DocumentService
+from services.errors.document import DocumentIndexingError
+from tests.unit_tests.conftest import redis_mock
+
+
+class DocumentBatchUpdateTestDataFactory:
+ """Factory class for creating test data and mock objects for document batch update tests."""
+
+ @staticmethod
+ def create_dataset_mock(dataset_id: str = "dataset-123", tenant_id: str = "tenant-456") -> Mock:
+ """Create a mock dataset with specified attributes."""
+ dataset = Mock(spec=Dataset)
+ dataset.id = dataset_id
+ dataset.tenant_id = tenant_id
+ return dataset
+
+ @staticmethod
+ def create_user_mock(user_id: str = "user-789") -> Mock:
+ """Create a mock user."""
+ user = Mock()
+ user.id = user_id
+ return user
+
+ @staticmethod
+ def create_document_mock(
+ document_id: str = "doc-1",
+ name: str = "test_document.pdf",
+ enabled: bool = True,
+ archived: bool = False,
+ indexing_status: str = "completed",
+ completed_at: Optional[datetime.datetime] = None,
+ **kwargs,
+ ) -> Mock:
+ """Create a mock document with specified attributes."""
+ document = Mock(spec=Document)
+ document.id = document_id
+ document.name = name
+ document.enabled = enabled
+ document.archived = archived
+ document.indexing_status = indexing_status
+ document.completed_at = completed_at or datetime.datetime.now()
+
+ # Set default values for optional fields
+ document.disabled_at = None
+ document.disabled_by = None
+ document.archived_at = None
+ document.archived_by = None
+ document.updated_at = None
+
+ for key, value in kwargs.items():
+ setattr(document, key, value)
+ return document
+
+ @staticmethod
+ def create_multiple_documents(
+ document_ids: list[str], enabled: bool = True, archived: bool = False, indexing_status: str = "completed"
+ ) -> list[Mock]:
+ """Create multiple mock documents with specified attributes."""
+ documents = []
+ for doc_id in document_ids:
+ doc = DocumentBatchUpdateTestDataFactory.create_document_mock(
+ document_id=doc_id,
+ name=f"document_{doc_id}.pdf",
+ enabled=enabled,
+ archived=archived,
+ indexing_status=indexing_status,
+ )
+ documents.append(doc)
+ return documents
+
+
+class TestDatasetServiceBatchUpdateDocumentStatus:
+ """
+ Comprehensive unit tests for DocumentService.batch_update_document_status method.
+
+ This test suite covers all supported actions (enable, disable, archive, un_archive),
+ error conditions, edge cases, and validates proper interaction with Redis cache,
+ database operations, and async task triggers.
+ """
+
+ @pytest.fixture
+ def mock_document_service_dependencies(self):
+ """Common mock setup for document service dependencies."""
+ with (
+ patch("services.dataset_service.DocumentService.get_document") as mock_get_doc,
+ patch("extensions.ext_database.db.session") as mock_db,
+ patch("services.dataset_service.datetime") as mock_datetime,
+ ):
+ current_time = datetime.datetime(2023, 1, 1, 12, 0, 0)
+ mock_datetime.datetime.now.return_value = current_time
+ mock_datetime.UTC = datetime.UTC
+
+ yield {
+ "get_document": mock_get_doc,
+ "db_session": mock_db,
+ "datetime": mock_datetime,
+ "current_time": current_time,
+ }
+
+ @pytest.fixture
+ def mock_async_task_dependencies(self):
+ """Mock setup for async task dependencies."""
+ with (
+ patch("services.dataset_service.add_document_to_index_task") as mock_add_task,
+ patch("services.dataset_service.remove_document_from_index_task") as mock_remove_task,
+ ):
+ yield {"add_task": mock_add_task, "remove_task": mock_remove_task}
+
+ def _assert_document_enabled(self, document: Mock, user_id: str, current_time: datetime.datetime):
+ """Helper method to verify document was enabled correctly."""
+ assert document.enabled == True
+ assert document.disabled_at is None
+ assert document.disabled_by is None
+ assert document.updated_at == current_time.replace(tzinfo=None)
+
+ def _assert_document_disabled(self, document: Mock, user_id: str, current_time: datetime.datetime):
+ """Helper method to verify document was disabled correctly."""
+ assert document.enabled == False
+ assert document.disabled_at == current_time.replace(tzinfo=None)
+ assert document.disabled_by == user_id
+ assert document.updated_at == current_time.replace(tzinfo=None)
+
+ def _assert_document_archived(self, document: Mock, user_id: str, current_time: datetime.datetime):
+ """Helper method to verify document was archived correctly."""
+ assert document.archived == True
+ assert document.archived_at == current_time.replace(tzinfo=None)
+ assert document.archived_by == user_id
+ assert document.updated_at == current_time.replace(tzinfo=None)
+
+ def _assert_document_unarchived(self, document: Mock):
+ """Helper method to verify document was unarchived correctly."""
+ assert document.archived == False
+ assert document.archived_at is None
+ assert document.archived_by is None
+
+ def _assert_redis_cache_operations(self, document_ids: list[str], action: str = "setex"):
+ """Helper method to verify Redis cache operations."""
+ if action == "setex":
+ expected_calls = [call(f"document_{doc_id}_indexing", 600, 1) for doc_id in document_ids]
+ redis_mock.setex.assert_has_calls(expected_calls)
+ elif action == "get":
+ expected_calls = [call(f"document_{doc_id}_indexing") for doc_id in document_ids]
+ redis_mock.get.assert_has_calls(expected_calls)
+
+ def _assert_async_task_calls(self, mock_task, document_ids: list[str], task_type: str):
+ """Helper method to verify async task calls."""
+ expected_calls = [call(doc_id) for doc_id in document_ids]
+ if task_type in {"add", "remove"}:
+ mock_task.delay.assert_has_calls(expected_calls)
+
+ # ==================== Enable Document Tests ====================
+
+ def test_batch_update_enable_documents_success(
+ self, mock_document_service_dependencies, mock_async_task_dependencies
+ ):
+ """Test successful enabling of disabled documents."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create disabled documents
+ disabled_docs = DocumentBatchUpdateTestDataFactory.create_multiple_documents(["doc-1", "doc-2"], enabled=False)
+ mock_document_service_dependencies["get_document"].side_effect = disabled_docs
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Call the method to enable documents
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-1", "doc-2"], action="enable", user=user
+ )
+
+ # Verify document attributes were updated correctly
+ for doc in disabled_docs:
+ self._assert_document_enabled(doc, user.id, mock_document_service_dependencies["current_time"])
+
+ # Verify Redis cache operations
+ self._assert_redis_cache_operations(["doc-1", "doc-2"], "get")
+ self._assert_redis_cache_operations(["doc-1", "doc-2"], "setex")
+
+ # Verify async tasks were triggered for indexing
+ self._assert_async_task_calls(mock_async_task_dependencies["add_task"], ["doc-1", "doc-2"], "add")
+
+ # Verify database operations
+ mock_db = mock_document_service_dependencies["db_session"]
+ assert mock_db.add.call_count == 2
+ assert mock_db.commit.call_count == 1
+
+ def test_batch_update_enable_already_enabled_document_skipped(self, mock_document_service_dependencies):
+ """Test enabling documents that are already enabled."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create already enabled document
+ enabled_doc = DocumentBatchUpdateTestDataFactory.create_document_mock(enabled=True)
+ mock_document_service_dependencies["get_document"].return_value = enabled_doc
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Attempt to enable already enabled document
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-1"], action="enable", user=user
+ )
+
+ # Verify no database operations occurred (document was skipped)
+ mock_db = mock_document_service_dependencies["db_session"]
+ mock_db.commit.assert_not_called()
+
+ # Verify no Redis setex operations occurred (document was skipped)
+ redis_mock.setex.assert_not_called()
+
+ # ==================== Disable Document Tests ====================
+
+ def test_batch_update_disable_documents_success(
+ self, mock_document_service_dependencies, mock_async_task_dependencies
+ ):
+ """Test successful disabling of enabled and completed documents."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create enabled documents
+ enabled_docs = DocumentBatchUpdateTestDataFactory.create_multiple_documents(["doc-1", "doc-2"], enabled=True)
+ mock_document_service_dependencies["get_document"].side_effect = enabled_docs
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Call the method to disable documents
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-1", "doc-2"], action="disable", user=user
+ )
+
+ # Verify document attributes were updated correctly
+ for doc in enabled_docs:
+ self._assert_document_disabled(doc, user.id, mock_document_service_dependencies["current_time"])
+
+ # Verify Redis cache operations for indexing prevention
+ self._assert_redis_cache_operations(["doc-1", "doc-2"], "setex")
+
+ # Verify async tasks were triggered to remove from index
+ self._assert_async_task_calls(mock_async_task_dependencies["remove_task"], ["doc-1", "doc-2"], "remove")
+
+ # Verify database operations
+ mock_db = mock_document_service_dependencies["db_session"]
+ assert mock_db.add.call_count == 2
+ assert mock_db.commit.call_count == 1
+
+ def test_batch_update_disable_already_disabled_document_skipped(
+ self, mock_document_service_dependencies, mock_async_task_dependencies
+ ):
+ """Test disabling documents that are already disabled."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create already disabled document
+ disabled_doc = DocumentBatchUpdateTestDataFactory.create_document_mock(enabled=False)
+ mock_document_service_dependencies["get_document"].return_value = disabled_doc
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Attempt to disable already disabled document
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-1"], action="disable", user=user
+ )
+
+ # Verify no database operations occurred (document was skipped)
+ mock_db = mock_document_service_dependencies["db_session"]
+ mock_db.commit.assert_not_called()
+
+ # Verify no Redis setex operations occurred (document was skipped)
+ redis_mock.setex.assert_not_called()
+
+ # Verify no async tasks were triggered (document was skipped)
+ mock_async_task_dependencies["add_task"].delay.assert_not_called()
+
+ def test_batch_update_disable_non_completed_document_error(self, mock_document_service_dependencies):
+ """Test that DocumentIndexingError is raised when trying to disable non-completed documents."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create a document that's not completed
+ non_completed_doc = DocumentBatchUpdateTestDataFactory.create_document_mock(
+ enabled=True,
+ indexing_status="indexing", # Not completed
+ completed_at=None, # Not completed
+ )
+ mock_document_service_dependencies["get_document"].return_value = non_completed_doc
+
+ # Verify that DocumentIndexingError is raised
+ with pytest.raises(DocumentIndexingError) as exc_info:
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-1"], action="disable", user=user
+ )
+
+ # Verify error message indicates document is not completed
+ assert "is not completed" in str(exc_info.value)
+
+ # ==================== Archive Document Tests ====================
+
+ def test_batch_update_archive_documents_success(
+ self, mock_document_service_dependencies, mock_async_task_dependencies
+ ):
+ """Test successful archiving of unarchived documents."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create unarchived enabled document
+ unarchived_doc = DocumentBatchUpdateTestDataFactory.create_document_mock(enabled=True, archived=False)
+ mock_document_service_dependencies["get_document"].return_value = unarchived_doc
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Call the method to archive documents
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-1"], action="archive", user=user
+ )
+
+ # Verify document attributes were updated correctly
+ self._assert_document_archived(unarchived_doc, user.id, mock_document_service_dependencies["current_time"])
+
+ # Verify Redis cache was set (because document was enabled)
+ redis_mock.setex.assert_called_once_with("document_doc-1_indexing", 600, 1)
+
+ # Verify async task was triggered to remove from index (because enabled)
+ mock_async_task_dependencies["remove_task"].delay.assert_called_once_with("doc-1")
+
+ # Verify database operations
+ mock_db = mock_document_service_dependencies["db_session"]
+ mock_db.add.assert_called_once()
+ mock_db.commit.assert_called_once()
+
+ def test_batch_update_archive_already_archived_document_skipped(self, mock_document_service_dependencies):
+ """Test archiving documents that are already archived."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create already archived document
+ archived_doc = DocumentBatchUpdateTestDataFactory.create_document_mock(enabled=True, archived=True)
+ mock_document_service_dependencies["get_document"].return_value = archived_doc
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Attempt to archive already archived document
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-3"], action="archive", user=user
+ )
+
+ # Verify no database operations occurred (document was skipped)
+ mock_db = mock_document_service_dependencies["db_session"]
+ mock_db.commit.assert_not_called()
+
+ # Verify no Redis setex operations occurred (document was skipped)
+ redis_mock.setex.assert_not_called()
+
+ def test_batch_update_archive_disabled_document_no_index_removal(
+ self, mock_document_service_dependencies, mock_async_task_dependencies
+ ):
+ """Test archiving disabled documents (should not trigger index removal)."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Set up disabled, unarchived document
+ disabled_unarchived_doc = DocumentBatchUpdateTestDataFactory.create_document_mock(enabled=False, archived=False)
+ mock_document_service_dependencies["get_document"].return_value = disabled_unarchived_doc
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Archive the disabled document
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-1"], action="archive", user=user
+ )
+
+ # Verify document was archived
+ self._assert_document_archived(
+ disabled_unarchived_doc, user.id, mock_document_service_dependencies["current_time"]
+ )
+
+ # Verify no Redis cache was set (document is disabled)
+ redis_mock.setex.assert_not_called()
+
+ # Verify no index removal task was triggered (document is disabled)
+ mock_async_task_dependencies["remove_task"].delay.assert_not_called()
+
+ # Verify database operations still occurred
+ mock_db = mock_document_service_dependencies["db_session"]
+ mock_db.add.assert_called_once()
+ mock_db.commit.assert_called_once()
+
+ # ==================== Unarchive Document Tests ====================
+
+ def test_batch_update_unarchive_documents_success(
+ self, mock_document_service_dependencies, mock_async_task_dependencies
+ ):
+ """Test successful unarchiving of archived documents."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create mock archived document
+ archived_doc = DocumentBatchUpdateTestDataFactory.create_document_mock(enabled=True, archived=True)
+ mock_document_service_dependencies["get_document"].return_value = archived_doc
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Call the method to unarchive documents
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-1"], action="un_archive", user=user
+ )
+
+ # Verify document attributes were updated correctly
+ self._assert_document_unarchived(archived_doc)
+ assert archived_doc.updated_at == mock_document_service_dependencies["current_time"].replace(tzinfo=None)
+
+ # Verify Redis cache was set (because document is enabled)
+ redis_mock.setex.assert_called_once_with("document_doc-1_indexing", 600, 1)
+
+ # Verify async task was triggered to add back to index (because enabled)
+ mock_async_task_dependencies["add_task"].delay.assert_called_once_with("doc-1")
+
+ # Verify database operations
+ mock_db = mock_document_service_dependencies["db_session"]
+ mock_db.add.assert_called_once()
+ mock_db.commit.assert_called_once()
+
+ def test_batch_update_unarchive_already_unarchived_document_skipped(
+ self, mock_document_service_dependencies, mock_async_task_dependencies
+ ):
+ """Test unarchiving documents that are already unarchived."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create already unarchived document
+ unarchived_doc = DocumentBatchUpdateTestDataFactory.create_document_mock(enabled=True, archived=False)
+ mock_document_service_dependencies["get_document"].return_value = unarchived_doc
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Attempt to unarchive already unarchived document
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-1"], action="un_archive", user=user
+ )
+
+ # Verify no database operations occurred (document was skipped)
+ mock_db = mock_document_service_dependencies["db_session"]
+ mock_db.commit.assert_not_called()
+
+ # Verify no Redis setex operations occurred (document was skipped)
+ redis_mock.setex.assert_not_called()
+
+ # Verify no async tasks were triggered (document was skipped)
+ mock_async_task_dependencies["add_task"].delay.assert_not_called()
+
+ def test_batch_update_unarchive_disabled_document_no_index_addition(
+ self, mock_document_service_dependencies, mock_async_task_dependencies
+ ):
+ """Test unarchiving disabled documents (should not trigger index addition)."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create mock archived but disabled document
+ archived_disabled_doc = DocumentBatchUpdateTestDataFactory.create_document_mock(enabled=False, archived=True)
+ mock_document_service_dependencies["get_document"].return_value = archived_disabled_doc
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Unarchive the disabled document
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-1"], action="un_archive", user=user
+ )
+
+ # Verify document was unarchived
+ self._assert_document_unarchived(archived_disabled_doc)
+ assert archived_disabled_doc.updated_at == mock_document_service_dependencies["current_time"].replace(
+ tzinfo=None
+ )
+
+ # Verify no Redis cache was set (document is disabled)
+ redis_mock.setex.assert_not_called()
+
+ # Verify no index addition task was triggered (document is disabled)
+ mock_async_task_dependencies["add_task"].delay.assert_not_called()
+
+ # Verify database operations still occurred
+ mock_db = mock_document_service_dependencies["db_session"]
+ mock_db.add.assert_called_once()
+ mock_db.commit.assert_called_once()
+
+ # ==================== Error Handling Tests ====================
+
+ def test_batch_update_document_indexing_error_redis_cache_hit(self, mock_document_service_dependencies):
+ """Test that DocumentIndexingError is raised when documents are currently being indexed."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create mock enabled document
+ enabled_doc = DocumentBatchUpdateTestDataFactory.create_document_mock(enabled=True)
+ mock_document_service_dependencies["get_document"].return_value = enabled_doc
+
+ # Set up mock to indicate document is being indexed
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = "indexing"
+
+ # Verify that DocumentIndexingError is raised
+ with pytest.raises(DocumentIndexingError) as exc_info:
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-1"], action="enable", user=user
+ )
+
+ # Verify error message contains document name
+ assert "test_document.pdf" in str(exc_info.value)
+ assert "is being indexed" in str(exc_info.value)
+
+ # Verify Redis cache was checked
+ redis_mock.get.assert_called_once_with("document_doc-1_indexing")
+
+ def test_batch_update_invalid_action_error(self, mock_document_service_dependencies):
+ """Test that ValueError is raised when an invalid action is provided."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create mock document
+ doc = DocumentBatchUpdateTestDataFactory.create_document_mock(enabled=True)
+ mock_document_service_dependencies["get_document"].return_value = doc
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Test with invalid action
+ invalid_action = "invalid_action"
+ with pytest.raises(ValueError) as exc_info:
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-1"], action=invalid_action, user=user
+ )
+
+ # Verify error message contains the invalid action
+ assert invalid_action in str(exc_info.value)
+ assert "Invalid action" in str(exc_info.value)
+
+ # Verify no Redis operations occurred
+ redis_mock.setex.assert_not_called()
+
+ def test_batch_update_async_task_error_handling(
+ self, mock_document_service_dependencies, mock_async_task_dependencies
+ ):
+ """Test handling of async task errors during batch operations."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create mock disabled document
+ disabled_doc = DocumentBatchUpdateTestDataFactory.create_document_mock(enabled=False)
+ mock_document_service_dependencies["get_document"].return_value = disabled_doc
+
+ # Mock async task to raise an exception
+ mock_async_task_dependencies["add_task"].delay.side_effect = Exception("Celery task error")
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Verify that async task error is propagated
+ with pytest.raises(Exception) as exc_info:
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-1"], action="enable", user=user
+ )
+
+ # Verify error message
+ assert "Celery task error" in str(exc_info.value)
+
+ # Verify database operations completed successfully
+ mock_db = mock_document_service_dependencies["db_session"]
+ mock_db.add.assert_called_once()
+ mock_db.commit.assert_called_once()
+
+ # Verify Redis cache was set successfully
+ redis_mock.setex.assert_called_once_with("document_doc-1_indexing", 600, 1)
+
+ # Verify document was updated
+ self._assert_document_enabled(disabled_doc, user.id, mock_document_service_dependencies["current_time"])
+
+ # ==================== Edge Case Tests ====================
+
+ def test_batch_update_empty_document_list(self, mock_document_service_dependencies):
+ """Test batch operations with an empty document ID list."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Call method with empty document list
+ result = DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=[], action="enable", user=user
+ )
+
+ # Verify no document lookups were performed
+ mock_document_service_dependencies["get_document"].assert_not_called()
+
+ # Verify method returns None (early return)
+ assert result is None
+
+ def test_batch_update_document_not_found_skipped(self, mock_document_service_dependencies):
+ """Test behavior when some documents don't exist in the database."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Mock document service to return None (document not found)
+ mock_document_service_dependencies["get_document"].return_value = None
+
+ # Call method with non-existent document ID
+ # This should not raise an error, just skip the missing document
+ try:
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["non-existent-doc"], action="enable", user=user
+ )
+ except Exception as e:
+ pytest.fail(f"Method should not raise exception for missing documents: {e}")
+
+ # Verify document lookup was attempted
+ mock_document_service_dependencies["get_document"].assert_called_once_with(dataset.id, "non-existent-doc")
+
+ def test_batch_update_mixed_document_states_and_actions(
+ self, mock_document_service_dependencies, mock_async_task_dependencies
+ ):
+ """Test batch operations on documents with mixed states and various scenarios."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create documents in various states
+ disabled_doc = DocumentBatchUpdateTestDataFactory.create_document_mock("doc-1", enabled=False)
+ enabled_doc = DocumentBatchUpdateTestDataFactory.create_document_mock("doc-2", enabled=True)
+ archived_doc = DocumentBatchUpdateTestDataFactory.create_document_mock("doc-3", enabled=True, archived=True)
+
+ # Mix of different document states
+ documents = [disabled_doc, enabled_doc, archived_doc]
+ mock_document_service_dependencies["get_document"].side_effect = documents
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Perform enable operation on mixed state documents
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=["doc-1", "doc-2", "doc-3"], action="enable", user=user
+ )
+
+ # Verify only the disabled document was processed
+ # (enabled and archived documents should be skipped for enable action)
+
+ # Only one add should occur (for the disabled document that was enabled)
+ mock_db = mock_document_service_dependencies["db_session"]
+ mock_db.add.assert_called_once()
+ # Only one commit should occur
+ mock_db.commit.assert_called_once()
+
+ # Only one Redis setex should occur (for the document that was enabled)
+ redis_mock.setex.assert_called_once_with("document_doc-1_indexing", 600, 1)
+
+ # Only one async task should be triggered (for the document that was enabled)
+ mock_async_task_dependencies["add_task"].delay.assert_called_once_with("doc-1")
+
+ # ==================== Performance Tests ====================
+
+ def test_batch_update_large_document_list_performance(
+ self, mock_document_service_dependencies, mock_async_task_dependencies
+ ):
+ """Test batch operations with a large number of documents."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create large list of document IDs
+ document_ids = [f"doc-{i}" for i in range(1, 101)] # 100 documents
+
+ # Create mock documents
+ mock_documents = DocumentBatchUpdateTestDataFactory.create_multiple_documents(
+ document_ids,
+ enabled=False, # All disabled, will be enabled
+ )
+ mock_document_service_dependencies["get_document"].side_effect = mock_documents
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Perform batch enable operation
+ DocumentService.batch_update_document_status(
+ dataset=dataset, document_ids=document_ids, action="enable", user=user
+ )
+
+ # Verify all documents were processed
+ assert mock_document_service_dependencies["get_document"].call_count == 100
+
+ # Verify all documents were updated
+ for mock_doc in mock_documents:
+ self._assert_document_enabled(mock_doc, user.id, mock_document_service_dependencies["current_time"])
+
+ # Verify database operations
+ mock_db = mock_document_service_dependencies["db_session"]
+ assert mock_db.add.call_count == 100
+ assert mock_db.commit.call_count == 1
+
+ # Verify Redis cache operations occurred for each document
+ assert redis_mock.setex.call_count == 100
+
+ # Verify async tasks were triggered for each document
+ assert mock_async_task_dependencies["add_task"].delay.call_count == 100
+
+ # Verify correct Redis cache keys were set
+ expected_redis_calls = [call(f"document_doc-{i}_indexing", 600, 1) for i in range(1, 101)]
+ redis_mock.setex.assert_has_calls(expected_redis_calls)
+
+ # Verify correct async task calls
+ expected_task_calls = [call(f"doc-{i}") for i in range(1, 101)]
+ mock_async_task_dependencies["add_task"].delay.assert_has_calls(expected_task_calls)
+
+ def test_batch_update_mixed_document_states_complex_scenario(
+ self, mock_document_service_dependencies, mock_async_task_dependencies
+ ):
+ """Test complex batch operations with documents in various states."""
+ dataset = DocumentBatchUpdateTestDataFactory.create_dataset_mock()
+ user = DocumentBatchUpdateTestDataFactory.create_user_mock()
+
+ # Create documents in various states
+ doc1 = DocumentBatchUpdateTestDataFactory.create_document_mock("doc-1", enabled=False) # Will be enabled
+ doc2 = DocumentBatchUpdateTestDataFactory.create_document_mock(
+ "doc-2", enabled=True
+ ) # Already enabled, will be skipped
+ doc3 = DocumentBatchUpdateTestDataFactory.create_document_mock(
+ "doc-3", enabled=True
+ ) # Already enabled, will be skipped
+ doc4 = DocumentBatchUpdateTestDataFactory.create_document_mock(
+ "doc-4", enabled=True
+ ) # Not affected by enable action
+ doc5 = DocumentBatchUpdateTestDataFactory.create_document_mock(
+ "doc-5", enabled=True, archived=True
+ ) # Not affected by enable action
+ doc6 = None # Non-existent, will be skipped
+
+ mock_document_service_dependencies["get_document"].side_effect = [doc1, doc2, doc3, doc4, doc5, doc6]
+
+ # Reset module-level Redis mock
+ redis_mock.reset_mock()
+ redis_mock.get.return_value = None
+
+ # Perform mixed batch operations
+ DocumentService.batch_update_document_status(
+ dataset=dataset,
+ document_ids=["doc-1", "doc-2", "doc-3", "doc-4", "doc-5", "doc-6"],
+ action="enable", # This will only affect doc1
+ user=user,
+ )
+
+ # Verify document 1 was enabled
+ self._assert_document_enabled(doc1, user.id, mock_document_service_dependencies["current_time"])
+
+ # Verify other documents were skipped appropriately
+ assert doc2.enabled == True # No change
+ assert doc3.enabled == True # No change
+ assert doc4.enabled == True # No change
+ assert doc5.enabled == True # No change
+
+ # Verify database commits occurred for processed documents
+ # Only doc1 should be added (others were skipped, doc6 doesn't exist)
+ mock_db = mock_document_service_dependencies["db_session"]
+ assert mock_db.add.call_count == 1
+ assert mock_db.commit.call_count == 1
+
+ # Verify Redis cache operations occurred for processed documents
+ # Only doc1 should have Redis operations
+ assert redis_mock.setex.call_count == 1
+
+ # Verify async tasks were triggered for processed documents
+ # Only doc1 should trigger tasks
+ assert mock_async_task_dependencies["add_task"].delay.call_count == 1
+
+ # Verify correct Redis cache keys were set
+ expected_redis_calls = [call("document_doc-1_indexing", 600, 1)]
+ redis_mock.setex.assert_has_calls(expected_redis_calls)
+
+ # Verify correct async task calls
+ expected_task_calls = [call("doc-1")]
+ mock_async_task_dependencies["add_task"].delay.assert_has_calls(expected_task_calls)
diff --git a/api/tests/unit_tests/services/test_dataset_service_update_dataset.py b/api/tests/unit_tests/services/test_dataset_service_update_dataset.py
new file mode 100644
index 0000000000..7c40b1e556
--- /dev/null
+++ b/api/tests/unit_tests/services/test_dataset_service_update_dataset.py
@@ -0,0 +1,631 @@
+import datetime
+from typing import Any, Optional
+
+# Mock redis_client before importing dataset_service
+from unittest.mock import Mock, patch
+
+import pytest
+
+from core.model_runtime.entities.model_entities import ModelType
+from models.dataset import Dataset, ExternalKnowledgeBindings
+from services.dataset_service import DatasetService
+from services.errors.account import NoPermissionError
+
+
+class DatasetUpdateTestDataFactory:
+ """Factory class for creating test data and mock objects for dataset update tests."""
+
+ @staticmethod
+ def create_dataset_mock(
+ dataset_id: str = "dataset-123",
+ provider: str = "vendor",
+ name: str = "old_name",
+ description: str = "old_description",
+ indexing_technique: str = "high_quality",
+ retrieval_model: str = "old_model",
+ embedding_model_provider: Optional[str] = None,
+ embedding_model: Optional[str] = None,
+ collection_binding_id: Optional[str] = None,
+ **kwargs,
+ ) -> Mock:
+ """Create a mock dataset with specified attributes."""
+ dataset = Mock(spec=Dataset)
+ dataset.id = dataset_id
+ dataset.provider = provider
+ dataset.name = name
+ dataset.description = description
+ dataset.indexing_technique = indexing_technique
+ dataset.retrieval_model = retrieval_model
+ dataset.embedding_model_provider = embedding_model_provider
+ dataset.embedding_model = embedding_model
+ dataset.collection_binding_id = collection_binding_id
+ for key, value in kwargs.items():
+ setattr(dataset, key, value)
+ return dataset
+
+ @staticmethod
+ def create_user_mock(user_id: str = "user-789") -> Mock:
+ """Create a mock user."""
+ user = Mock()
+ user.id = user_id
+ return user
+
+ @staticmethod
+ def create_external_binding_mock(
+ external_knowledge_id: str = "old_knowledge_id", external_knowledge_api_id: str = "old_api_id"
+ ) -> Mock:
+ """Create a mock external knowledge binding."""
+ binding = Mock(spec=ExternalKnowledgeBindings)
+ binding.external_knowledge_id = external_knowledge_id
+ binding.external_knowledge_api_id = external_knowledge_api_id
+ return binding
+
+ @staticmethod
+ def create_embedding_model_mock(model: str = "text-embedding-ada-002", provider: str = "openai") -> Mock:
+ """Create a mock embedding model."""
+ embedding_model = Mock()
+ embedding_model.model = model
+ embedding_model.provider = provider
+ return embedding_model
+
+ @staticmethod
+ def create_collection_binding_mock(binding_id: str = "binding-456") -> Mock:
+ """Create a mock collection binding."""
+ binding = Mock()
+ binding.id = binding_id
+ return binding
+
+ @staticmethod
+ def create_current_user_mock(tenant_id: str = "tenant-123") -> Mock:
+ """Create a mock current user."""
+ current_user = Mock()
+ current_user.current_tenant_id = tenant_id
+ return current_user
+
+
+class TestDatasetServiceUpdateDataset:
+ """
+ Comprehensive unit tests for DatasetService.update_dataset method.
+
+ This test suite covers all supported scenarios including:
+ - External dataset updates
+ - Internal dataset updates with different indexing techniques
+ - Embedding model updates
+ - Permission checks
+ - Error conditions and edge cases
+ """
+
+ @pytest.fixture
+ def mock_dataset_service_dependencies(self):
+ """Common mock setup for dataset service dependencies."""
+ with (
+ patch("services.dataset_service.DatasetService.get_dataset") as mock_get_dataset,
+ patch("services.dataset_service.DatasetService.check_dataset_permission") as mock_check_perm,
+ patch("extensions.ext_database.db.session") as mock_db,
+ patch("services.dataset_service.naive_utc_now") as mock_naive_utc_now,
+ ):
+ current_time = datetime.datetime(2023, 1, 1, 12, 0, 0)
+ mock_naive_utc_now.return_value = current_time
+
+ yield {
+ "get_dataset": mock_get_dataset,
+ "check_permission": mock_check_perm,
+ "db_session": mock_db,
+ "naive_utc_now": mock_naive_utc_now,
+ "current_time": current_time,
+ }
+
+ @pytest.fixture
+ def mock_external_provider_dependencies(self):
+ """Mock setup for external provider tests."""
+ with patch("services.dataset_service.Session") as mock_session:
+ from extensions.ext_database import db
+
+ with patch.object(db.__class__, "engine", new_callable=Mock):
+ session_mock = Mock()
+ mock_session.return_value.__enter__.return_value = session_mock
+ yield session_mock
+
+ @pytest.fixture
+ def mock_internal_provider_dependencies(self):
+ """Mock setup for internal provider tests."""
+ with (
+ patch("services.dataset_service.ModelManager") as mock_model_manager,
+ patch(
+ "services.dataset_service.DatasetCollectionBindingService.get_dataset_collection_binding"
+ ) as mock_get_binding,
+ patch("services.dataset_service.deal_dataset_vector_index_task") as mock_task,
+ patch("services.dataset_service.current_user") as mock_current_user,
+ ):
+ mock_current_user.current_tenant_id = "tenant-123"
+ yield {
+ "model_manager": mock_model_manager,
+ "get_binding": mock_get_binding,
+ "task": mock_task,
+ "current_user": mock_current_user,
+ }
+
+ def _assert_database_update_called(self, mock_db, dataset_id: str, expected_updates: dict[str, Any]):
+ """Helper method to verify database update calls."""
+ mock_db.query.return_value.filter_by.return_value.update.assert_called_once_with(expected_updates)
+ mock_db.commit.assert_called_once()
+
+ def _assert_external_dataset_update(self, mock_dataset, mock_binding, update_data: dict[str, Any]):
+ """Helper method to verify external dataset updates."""
+ assert mock_dataset.name == update_data.get("name", mock_dataset.name)
+ assert mock_dataset.description == update_data.get("description", mock_dataset.description)
+ assert mock_dataset.retrieval_model == update_data.get("external_retrieval_model", mock_dataset.retrieval_model)
+
+ if "external_knowledge_id" in update_data:
+ assert mock_binding.external_knowledge_id == update_data["external_knowledge_id"]
+ if "external_knowledge_api_id" in update_data:
+ assert mock_binding.external_knowledge_api_id == update_data["external_knowledge_api_id"]
+
+ # ==================== External Dataset Tests ====================
+
+ def test_update_external_dataset_success(
+ self, mock_dataset_service_dependencies, mock_external_provider_dependencies
+ ):
+ """Test successful update of external dataset."""
+ dataset = DatasetUpdateTestDataFactory.create_dataset_mock(
+ provider="external", name="old_name", description="old_description", retrieval_model="old_model"
+ )
+ mock_dataset_service_dependencies["get_dataset"].return_value = dataset
+
+ user = DatasetUpdateTestDataFactory.create_user_mock()
+ binding = DatasetUpdateTestDataFactory.create_external_binding_mock()
+
+ # Mock external knowledge binding query
+ mock_external_provider_dependencies.query.return_value.filter_by.return_value.first.return_value = binding
+
+ update_data = {
+ "name": "new_name",
+ "description": "new_description",
+ "external_retrieval_model": "new_model",
+ "permission": "only_me",
+ "external_knowledge_id": "new_knowledge_id",
+ "external_knowledge_api_id": "new_api_id",
+ }
+
+ result = DatasetService.update_dataset("dataset-123", update_data, user)
+
+ # Verify permission check was called
+ mock_dataset_service_dependencies["check_permission"].assert_called_once_with(dataset, user)
+
+ # Verify dataset and binding updates
+ self._assert_external_dataset_update(dataset, binding, update_data)
+
+ # Verify database operations
+ mock_db = mock_dataset_service_dependencies["db_session"]
+ mock_db.add.assert_any_call(dataset)
+ mock_db.add.assert_any_call(binding)
+ mock_db.commit.assert_called_once()
+
+ # Verify return value
+ assert result == dataset
+
+ def test_update_external_dataset_missing_knowledge_id_error(self, mock_dataset_service_dependencies):
+ """Test error when external knowledge id is missing."""
+ dataset = DatasetUpdateTestDataFactory.create_dataset_mock(provider="external")
+ mock_dataset_service_dependencies["get_dataset"].return_value = dataset
+
+ user = DatasetUpdateTestDataFactory.create_user_mock()
+ update_data = {"name": "new_name", "external_knowledge_api_id": "api_id"}
+
+ with pytest.raises(ValueError) as context:
+ DatasetService.update_dataset("dataset-123", update_data, user)
+
+ assert "External knowledge id is required" in str(context.value)
+
+ def test_update_external_dataset_missing_api_id_error(self, mock_dataset_service_dependencies):
+ """Test error when external knowledge api id is missing."""
+ dataset = DatasetUpdateTestDataFactory.create_dataset_mock(provider="external")
+ mock_dataset_service_dependencies["get_dataset"].return_value = dataset
+
+ user = DatasetUpdateTestDataFactory.create_user_mock()
+ update_data = {"name": "new_name", "external_knowledge_id": "knowledge_id"}
+
+ with pytest.raises(ValueError) as context:
+ DatasetService.update_dataset("dataset-123", update_data, user)
+
+ assert "External knowledge api id is required" in str(context.value)
+
+ def test_update_external_dataset_binding_not_found_error(
+ self, mock_dataset_service_dependencies, mock_external_provider_dependencies
+ ):
+ """Test error when external knowledge binding is not found."""
+ dataset = DatasetUpdateTestDataFactory.create_dataset_mock(provider="external")
+ mock_dataset_service_dependencies["get_dataset"].return_value = dataset
+
+ user = DatasetUpdateTestDataFactory.create_user_mock()
+
+ # Mock external knowledge binding query returning None
+ mock_external_provider_dependencies.query.return_value.filter_by.return_value.first.return_value = None
+
+ update_data = {
+ "name": "new_name",
+ "external_knowledge_id": "knowledge_id",
+ "external_knowledge_api_id": "api_id",
+ }
+
+ with pytest.raises(ValueError) as context:
+ DatasetService.update_dataset("dataset-123", update_data, user)
+
+ assert "External knowledge binding not found" in str(context.value)
+
+ # ==================== Internal Dataset Basic Tests ====================
+
+ def test_update_internal_dataset_basic_success(self, mock_dataset_service_dependencies):
+ """Test successful update of internal dataset with basic fields."""
+ dataset = DatasetUpdateTestDataFactory.create_dataset_mock(
+ provider="vendor",
+ indexing_technique="high_quality",
+ embedding_model_provider="openai",
+ embedding_model="text-embedding-ada-002",
+ collection_binding_id="binding-123",
+ )
+ mock_dataset_service_dependencies["get_dataset"].return_value = dataset
+
+ user = DatasetUpdateTestDataFactory.create_user_mock()
+
+ update_data = {
+ "name": "new_name",
+ "description": "new_description",
+ "indexing_technique": "high_quality",
+ "retrieval_model": "new_model",
+ "embedding_model_provider": "openai",
+ "embedding_model": "text-embedding-ada-002",
+ }
+
+ result = DatasetService.update_dataset("dataset-123", update_data, user)
+
+ # Verify permission check was called
+ mock_dataset_service_dependencies["check_permission"].assert_called_once_with(dataset, user)
+
+ # Verify database update was called with correct filtered data
+ expected_filtered_data = {
+ "name": "new_name",
+ "description": "new_description",
+ "indexing_technique": "high_quality",
+ "retrieval_model": "new_model",
+ "embedding_model_provider": "openai",
+ "embedding_model": "text-embedding-ada-002",
+ "updated_by": user.id,
+ "updated_at": mock_dataset_service_dependencies["current_time"],
+ }
+
+ self._assert_database_update_called(
+ mock_dataset_service_dependencies["db_session"], "dataset-123", expected_filtered_data
+ )
+
+ # Verify return value
+ assert result == dataset
+
+ def test_update_internal_dataset_filter_none_values(self, mock_dataset_service_dependencies):
+ """Test that None values are filtered out except for description field."""
+ dataset = DatasetUpdateTestDataFactory.create_dataset_mock(provider="vendor", indexing_technique="high_quality")
+ mock_dataset_service_dependencies["get_dataset"].return_value = dataset
+
+ user = DatasetUpdateTestDataFactory.create_user_mock()
+
+ update_data = {
+ "name": "new_name",
+ "description": None, # Should be included
+ "indexing_technique": "high_quality",
+ "retrieval_model": "new_model",
+ "embedding_model_provider": None, # Should be filtered out
+ "embedding_model": None, # Should be filtered out
+ }
+
+ result = DatasetService.update_dataset("dataset-123", update_data, user)
+
+ # Verify database update was called with filtered data
+ expected_filtered_data = {
+ "name": "new_name",
+ "description": None, # Description should be included even if None
+ "indexing_technique": "high_quality",
+ "retrieval_model": "new_model",
+ "updated_by": user.id,
+ "updated_at": mock_dataset_service_dependencies["current_time"],
+ }
+
+ actual_call_args = mock_dataset_service_dependencies[
+ "db_session"
+ ].query.return_value.filter_by.return_value.update.call_args[0][0]
+ # Remove timestamp for comparison as it's dynamic
+ del actual_call_args["updated_at"]
+ del expected_filtered_data["updated_at"]
+
+ assert actual_call_args == expected_filtered_data
+
+ # Verify return value
+ assert result == dataset
+
+ # ==================== Indexing Technique Switch Tests ====================
+
+ def test_update_internal_dataset_indexing_technique_to_economy(
+ self, mock_dataset_service_dependencies, mock_internal_provider_dependencies
+ ):
+ """Test updating internal dataset indexing technique to economy."""
+ dataset = DatasetUpdateTestDataFactory.create_dataset_mock(provider="vendor", indexing_technique="high_quality")
+ mock_dataset_service_dependencies["get_dataset"].return_value = dataset
+
+ user = DatasetUpdateTestDataFactory.create_user_mock()
+
+ update_data = {"indexing_technique": "economy", "retrieval_model": "new_model"}
+
+ result = DatasetService.update_dataset("dataset-123", update_data, user)
+
+ # Verify database update was called with embedding model fields cleared
+ expected_filtered_data = {
+ "indexing_technique": "economy",
+ "embedding_model": None,
+ "embedding_model_provider": None,
+ "collection_binding_id": None,
+ "retrieval_model": "new_model",
+ "updated_by": user.id,
+ "updated_at": mock_dataset_service_dependencies["current_time"],
+ }
+
+ self._assert_database_update_called(
+ mock_dataset_service_dependencies["db_session"], "dataset-123", expected_filtered_data
+ )
+
+ # Verify return value
+ assert result == dataset
+
+ def test_update_internal_dataset_indexing_technique_to_high_quality(
+ self, mock_dataset_service_dependencies, mock_internal_provider_dependencies
+ ):
+ """Test updating internal dataset indexing technique to high_quality."""
+ dataset = DatasetUpdateTestDataFactory.create_dataset_mock(provider="vendor", indexing_technique="economy")
+ mock_dataset_service_dependencies["get_dataset"].return_value = dataset
+
+ user = DatasetUpdateTestDataFactory.create_user_mock()
+
+ # Mock embedding model
+ embedding_model = DatasetUpdateTestDataFactory.create_embedding_model_mock()
+ mock_internal_provider_dependencies[
+ "model_manager"
+ ].return_value.get_model_instance.return_value = embedding_model
+
+ # Mock collection binding
+ binding = DatasetUpdateTestDataFactory.create_collection_binding_mock()
+ mock_internal_provider_dependencies["get_binding"].return_value = binding
+
+ update_data = {
+ "indexing_technique": "high_quality",
+ "embedding_model_provider": "openai",
+ "embedding_model": "text-embedding-ada-002",
+ "retrieval_model": "new_model",
+ }
+
+ result = DatasetService.update_dataset("dataset-123", update_data, user)
+
+ # Verify embedding model was validated
+ mock_internal_provider_dependencies["model_manager"].return_value.get_model_instance.assert_called_once_with(
+ tenant_id=mock_internal_provider_dependencies["current_user"].current_tenant_id,
+ provider="openai",
+ model_type=ModelType.TEXT_EMBEDDING,
+ model="text-embedding-ada-002",
+ )
+
+ # Verify collection binding was retrieved
+ mock_internal_provider_dependencies["get_binding"].assert_called_once_with("openai", "text-embedding-ada-002")
+
+ # Verify database update was called with correct data
+ expected_filtered_data = {
+ "indexing_technique": "high_quality",
+ "embedding_model": "text-embedding-ada-002",
+ "embedding_model_provider": "openai",
+ "collection_binding_id": "binding-456",
+ "retrieval_model": "new_model",
+ "updated_by": user.id,
+ "updated_at": mock_dataset_service_dependencies["current_time"],
+ }
+
+ self._assert_database_update_called(
+ mock_dataset_service_dependencies["db_session"], "dataset-123", expected_filtered_data
+ )
+
+ # Verify vector index task was triggered
+ mock_internal_provider_dependencies["task"].delay.assert_called_once_with("dataset-123", "add")
+
+ # Verify return value
+ assert result == dataset
+
+ # ==================== Embedding Model Update Tests ====================
+
+ def test_update_internal_dataset_keep_existing_embedding_model(self, mock_dataset_service_dependencies):
+ """Test updating internal dataset without changing embedding model."""
+ dataset = DatasetUpdateTestDataFactory.create_dataset_mock(
+ provider="vendor",
+ indexing_technique="high_quality",
+ embedding_model_provider="openai",
+ embedding_model="text-embedding-ada-002",
+ collection_binding_id="binding-123",
+ )
+ mock_dataset_service_dependencies["get_dataset"].return_value = dataset
+
+ user = DatasetUpdateTestDataFactory.create_user_mock()
+
+ update_data = {"name": "new_name", "indexing_technique": "high_quality", "retrieval_model": "new_model"}
+
+ result = DatasetService.update_dataset("dataset-123", update_data, user)
+
+ # Verify database update was called with existing embedding model preserved
+ expected_filtered_data = {
+ "name": "new_name",
+ "indexing_technique": "high_quality",
+ "embedding_model_provider": "openai",
+ "embedding_model": "text-embedding-ada-002",
+ "collection_binding_id": "binding-123",
+ "retrieval_model": "new_model",
+ "updated_by": user.id,
+ "updated_at": mock_dataset_service_dependencies["current_time"],
+ }
+
+ self._assert_database_update_called(
+ mock_dataset_service_dependencies["db_session"], "dataset-123", expected_filtered_data
+ )
+
+ # Verify return value
+ assert result == dataset
+
+ def test_update_internal_dataset_embedding_model_update(
+ self, mock_dataset_service_dependencies, mock_internal_provider_dependencies
+ ):
+ """Test updating internal dataset with new embedding model."""
+ dataset = DatasetUpdateTestDataFactory.create_dataset_mock(
+ provider="vendor",
+ indexing_technique="high_quality",
+ embedding_model_provider="openai",
+ embedding_model="text-embedding-ada-002",
+ )
+ mock_dataset_service_dependencies["get_dataset"].return_value = dataset
+
+ user = DatasetUpdateTestDataFactory.create_user_mock()
+
+ # Mock embedding model
+ embedding_model = DatasetUpdateTestDataFactory.create_embedding_model_mock("text-embedding-3-small")
+ mock_internal_provider_dependencies[
+ "model_manager"
+ ].return_value.get_model_instance.return_value = embedding_model
+
+ # Mock collection binding
+ binding = DatasetUpdateTestDataFactory.create_collection_binding_mock("binding-789")
+ mock_internal_provider_dependencies["get_binding"].return_value = binding
+
+ update_data = {
+ "indexing_technique": "high_quality",
+ "embedding_model_provider": "openai",
+ "embedding_model": "text-embedding-3-small",
+ "retrieval_model": "new_model",
+ }
+
+ result = DatasetService.update_dataset("dataset-123", update_data, user)
+
+ # Verify embedding model was validated
+ mock_internal_provider_dependencies["model_manager"].return_value.get_model_instance.assert_called_once_with(
+ tenant_id=mock_internal_provider_dependencies["current_user"].current_tenant_id,
+ provider="openai",
+ model_type=ModelType.TEXT_EMBEDDING,
+ model="text-embedding-3-small",
+ )
+
+ # Verify collection binding was retrieved
+ mock_internal_provider_dependencies["get_binding"].assert_called_once_with("openai", "text-embedding-3-small")
+
+ # Verify database update was called with correct data
+ expected_filtered_data = {
+ "indexing_technique": "high_quality",
+ "embedding_model": "text-embedding-3-small",
+ "embedding_model_provider": "openai",
+ "collection_binding_id": "binding-789",
+ "retrieval_model": "new_model",
+ "updated_by": user.id,
+ "updated_at": mock_dataset_service_dependencies["current_time"],
+ }
+
+ self._assert_database_update_called(
+ mock_dataset_service_dependencies["db_session"], "dataset-123", expected_filtered_data
+ )
+
+ # Verify vector index task was triggered
+ mock_internal_provider_dependencies["task"].delay.assert_called_once_with("dataset-123", "update")
+
+ # Verify return value
+ assert result == dataset
+
+ def test_update_internal_dataset_no_indexing_technique_change(self, mock_dataset_service_dependencies):
+ """Test updating internal dataset without changing indexing technique."""
+ dataset = DatasetUpdateTestDataFactory.create_dataset_mock(
+ provider="vendor",
+ indexing_technique="high_quality",
+ embedding_model_provider="openai",
+ embedding_model="text-embedding-ada-002",
+ collection_binding_id="binding-123",
+ )
+ mock_dataset_service_dependencies["get_dataset"].return_value = dataset
+
+ user = DatasetUpdateTestDataFactory.create_user_mock()
+
+ update_data = {
+ "name": "new_name",
+ "indexing_technique": "high_quality", # Same as current
+ "retrieval_model": "new_model",
+ }
+
+ result = DatasetService.update_dataset("dataset-123", update_data, user)
+
+ # Verify database update was called with correct data
+ expected_filtered_data = {
+ "name": "new_name",
+ "indexing_technique": "high_quality",
+ "embedding_model_provider": "openai",
+ "embedding_model": "text-embedding-ada-002",
+ "collection_binding_id": "binding-123",
+ "retrieval_model": "new_model",
+ "updated_by": user.id,
+ "updated_at": mock_dataset_service_dependencies["current_time"],
+ }
+
+ self._assert_database_update_called(
+ mock_dataset_service_dependencies["db_session"], "dataset-123", expected_filtered_data
+ )
+
+ # Verify return value
+ assert result == dataset
+
+ # ==================== Error Handling Tests ====================
+
+ def test_update_dataset_not_found_error(self, mock_dataset_service_dependencies):
+ """Test error when dataset is not found."""
+ mock_dataset_service_dependencies["get_dataset"].return_value = None
+
+ user = DatasetUpdateTestDataFactory.create_user_mock()
+ update_data = {"name": "new_name"}
+
+ with pytest.raises(ValueError) as context:
+ DatasetService.update_dataset("dataset-123", update_data, user)
+
+ assert "Dataset not found" in str(context.value)
+
+ def test_update_dataset_permission_error(self, mock_dataset_service_dependencies):
+ """Test error when user doesn't have permission."""
+ dataset = DatasetUpdateTestDataFactory.create_dataset_mock()
+ mock_dataset_service_dependencies["get_dataset"].return_value = dataset
+
+ user = DatasetUpdateTestDataFactory.create_user_mock()
+ mock_dataset_service_dependencies["check_permission"].side_effect = NoPermissionError("No permission")
+
+ update_data = {"name": "new_name"}
+
+ with pytest.raises(NoPermissionError):
+ DatasetService.update_dataset("dataset-123", update_data, user)
+
+ def test_update_internal_dataset_embedding_model_error(
+ self, mock_dataset_service_dependencies, mock_internal_provider_dependencies
+ ):
+ """Test error when embedding model is not available."""
+ dataset = DatasetUpdateTestDataFactory.create_dataset_mock(provider="vendor", indexing_technique="economy")
+ mock_dataset_service_dependencies["get_dataset"].return_value = dataset
+
+ user = DatasetUpdateTestDataFactory.create_user_mock()
+
+ # Mock model manager to raise error
+ mock_internal_provider_dependencies["model_manager"].return_value.get_model_instance.side_effect = Exception(
+ "No Embedding Model available"
+ )
+
+ update_data = {
+ "indexing_technique": "high_quality",
+ "embedding_model_provider": "invalid_provider",
+ "embedding_model": "invalid_model",
+ "retrieval_model": "new_model",
+ }
+
+ with pytest.raises(Exception) as context:
+ DatasetService.update_dataset("dataset-123", update_data, user)
+
+ assert "No Embedding Model available".lower() in str(context.value).lower()
diff --git a/api/tests/unit_tests/services/tools/__init__.py b/api/tests/unit_tests/services/tools/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api/tests/unit_tests/services/tools/test_tools_transform_service.py b/api/tests/unit_tests/services/tools/test_tools_transform_service.py
new file mode 100644
index 0000000000..549ad018e8
--- /dev/null
+++ b/api/tests/unit_tests/services/tools/test_tools_transform_service.py
@@ -0,0 +1,301 @@
+from unittest.mock import Mock
+
+from core.tools.__base.tool import Tool
+from core.tools.entities.api_entities import ToolApiEntity
+from core.tools.entities.common_entities import I18nObject
+from core.tools.entities.tool_entities import ToolParameter
+from services.tools.tools_transform_service import ToolTransformService
+
+
+class TestToolTransformService:
+ """Test cases for ToolTransformService.convert_tool_entity_to_api_entity method"""
+
+ def test_convert_tool_with_parameter_override(self):
+ """Test that runtime parameters correctly override base parameters"""
+ # Create mock base parameters
+ base_param1 = Mock(spec=ToolParameter)
+ base_param1.name = "param1"
+ base_param1.form = ToolParameter.ToolParameterForm.FORM
+ base_param1.type = "string"
+ base_param1.label = "Base Param 1"
+
+ base_param2 = Mock(spec=ToolParameter)
+ base_param2.name = "param2"
+ base_param2.form = ToolParameter.ToolParameterForm.FORM
+ base_param2.type = "string"
+ base_param2.label = "Base Param 2"
+
+ # Create mock runtime parameters that override base parameters
+ runtime_param1 = Mock(spec=ToolParameter)
+ runtime_param1.name = "param1"
+ runtime_param1.form = ToolParameter.ToolParameterForm.FORM
+ runtime_param1.type = "string"
+ runtime_param1.label = "Runtime Param 1" # Different label to verify override
+
+ # Create mock tool
+ mock_tool = Mock(spec=Tool)
+ mock_tool.entity = Mock()
+ mock_tool.entity.parameters = [base_param1, base_param2]
+ mock_tool.entity.identity = Mock()
+ mock_tool.entity.identity.author = "test_author"
+ mock_tool.entity.identity.name = "test_tool"
+ mock_tool.entity.identity.label = I18nObject(en_US="Test Tool")
+ mock_tool.entity.description = Mock()
+ mock_tool.entity.description.human = I18nObject(en_US="Test description")
+ mock_tool.entity.output_schema = {}
+ mock_tool.get_runtime_parameters.return_value = [runtime_param1]
+
+ # Mock fork_tool_runtime to return the same tool
+ mock_tool.fork_tool_runtime.return_value = mock_tool
+
+ # Call the method
+ result = ToolTransformService.convert_tool_entity_to_api_entity(mock_tool, "test_tenant", None)
+
+ # Verify the result
+ assert isinstance(result, ToolApiEntity)
+ assert result.author == "test_author"
+ assert result.name == "test_tool"
+ assert result.parameters is not None
+ assert len(result.parameters) == 2
+
+ # Find the overridden parameter
+ overridden_param = next((p for p in result.parameters if p.name == "param1"), None)
+ assert overridden_param is not None
+ assert overridden_param.label == "Runtime Param 1" # Should be runtime version
+
+ # Find the non-overridden parameter
+ original_param = next((p for p in result.parameters if p.name == "param2"), None)
+ assert original_param is not None
+ assert original_param.label == "Base Param 2" # Should be base version
+
+ def test_convert_tool_with_additional_runtime_parameters(self):
+ """Test that additional runtime parameters are added to the final list"""
+ # Create mock base parameters
+ base_param1 = Mock(spec=ToolParameter)
+ base_param1.name = "param1"
+ base_param1.form = ToolParameter.ToolParameterForm.FORM
+ base_param1.type = "string"
+ base_param1.label = "Base Param 1"
+
+ # Create mock runtime parameters - one that overrides and one that's new
+ runtime_param1 = Mock(spec=ToolParameter)
+ runtime_param1.name = "param1"
+ runtime_param1.form = ToolParameter.ToolParameterForm.FORM
+ runtime_param1.type = "string"
+ runtime_param1.label = "Runtime Param 1"
+
+ runtime_param2 = Mock(spec=ToolParameter)
+ runtime_param2.name = "runtime_only"
+ runtime_param2.form = ToolParameter.ToolParameterForm.FORM
+ runtime_param2.type = "string"
+ runtime_param2.label = "Runtime Only Param"
+
+ # Create mock tool
+ mock_tool = Mock(spec=Tool)
+ mock_tool.entity = Mock()
+ mock_tool.entity.parameters = [base_param1]
+ mock_tool.entity.identity = Mock()
+ mock_tool.entity.identity.author = "test_author"
+ mock_tool.entity.identity.name = "test_tool"
+ mock_tool.entity.identity.label = I18nObject(en_US="Test Tool")
+ mock_tool.entity.description = Mock()
+ mock_tool.entity.description.human = I18nObject(en_US="Test description")
+ mock_tool.entity.output_schema = {}
+ mock_tool.get_runtime_parameters.return_value = [runtime_param1, runtime_param2]
+
+ # Mock fork_tool_runtime to return the same tool
+ mock_tool.fork_tool_runtime.return_value = mock_tool
+
+ # Call the method
+ result = ToolTransformService.convert_tool_entity_to_api_entity(mock_tool, "test_tenant", None)
+
+ # Verify the result
+ assert isinstance(result, ToolApiEntity)
+ assert result.parameters is not None
+ assert len(result.parameters) == 2
+
+ # Check that both parameters are present
+ param_names = [p.name for p in result.parameters]
+ assert "param1" in param_names
+ assert "runtime_only" in param_names
+
+ # Verify the overridden parameter has runtime version
+ overridden_param = next((p for p in result.parameters if p.name == "param1"), None)
+ assert overridden_param is not None
+ assert overridden_param.label == "Runtime Param 1"
+
+ # Verify the new runtime parameter is included
+ new_param = next((p for p in result.parameters if p.name == "runtime_only"), None)
+ assert new_param is not None
+ assert new_param.label == "Runtime Only Param"
+
+ def test_convert_tool_with_non_form_runtime_parameters(self):
+ """Test that non-FORM runtime parameters are not added as new parameters"""
+ # Create mock base parameters
+ base_param1 = Mock(spec=ToolParameter)
+ base_param1.name = "param1"
+ base_param1.form = ToolParameter.ToolParameterForm.FORM
+ base_param1.type = "string"
+ base_param1.label = "Base Param 1"
+
+ # Create mock runtime parameters with different forms
+ runtime_param1 = Mock(spec=ToolParameter)
+ runtime_param1.name = "param1"
+ runtime_param1.form = ToolParameter.ToolParameterForm.FORM
+ runtime_param1.type = "string"
+ runtime_param1.label = "Runtime Param 1"
+
+ runtime_param2 = Mock(spec=ToolParameter)
+ runtime_param2.name = "llm_param"
+ runtime_param2.form = ToolParameter.ToolParameterForm.LLM
+ runtime_param2.type = "string"
+ runtime_param2.label = "LLM Param"
+
+ # Create mock tool
+ mock_tool = Mock(spec=Tool)
+ mock_tool.entity = Mock()
+ mock_tool.entity.parameters = [base_param1]
+ mock_tool.entity.identity = Mock()
+ mock_tool.entity.identity.author = "test_author"
+ mock_tool.entity.identity.name = "test_tool"
+ mock_tool.entity.identity.label = I18nObject(en_US="Test Tool")
+ mock_tool.entity.description = Mock()
+ mock_tool.entity.description.human = I18nObject(en_US="Test description")
+ mock_tool.entity.output_schema = {}
+ mock_tool.get_runtime_parameters.return_value = [runtime_param1, runtime_param2]
+
+ # Mock fork_tool_runtime to return the same tool
+ mock_tool.fork_tool_runtime.return_value = mock_tool
+
+ # Call the method
+ result = ToolTransformService.convert_tool_entity_to_api_entity(mock_tool, "test_tenant", None)
+
+ # Verify the result
+ assert isinstance(result, ToolApiEntity)
+ assert result.parameters is not None
+ assert len(result.parameters) == 1 # Only the FORM parameter should be present
+
+ # Check that only the FORM parameter is present
+ param_names = [p.name for p in result.parameters]
+ assert "param1" in param_names
+ assert "llm_param" not in param_names
+
+ def test_convert_tool_with_empty_parameters(self):
+ """Test conversion with empty base and runtime parameters"""
+ # Create mock tool with no parameters
+ mock_tool = Mock(spec=Tool)
+ mock_tool.entity = Mock()
+ mock_tool.entity.parameters = []
+ mock_tool.entity.identity = Mock()
+ mock_tool.entity.identity.author = "test_author"
+ mock_tool.entity.identity.name = "test_tool"
+ mock_tool.entity.identity.label = I18nObject(en_US="Test Tool")
+ mock_tool.entity.description = Mock()
+ mock_tool.entity.description.human = I18nObject(en_US="Test description")
+ mock_tool.entity.output_schema = {}
+ mock_tool.get_runtime_parameters.return_value = []
+
+ # Mock fork_tool_runtime to return the same tool
+ mock_tool.fork_tool_runtime.return_value = mock_tool
+
+ # Call the method
+ result = ToolTransformService.convert_tool_entity_to_api_entity(mock_tool, "test_tenant", None)
+
+ # Verify the result
+ assert isinstance(result, ToolApiEntity)
+ assert result.parameters is not None
+ assert len(result.parameters) == 0
+
+ def test_convert_tool_with_none_parameters(self):
+ """Test conversion when base parameters is None"""
+ # Create mock tool with None parameters
+ mock_tool = Mock(spec=Tool)
+ mock_tool.entity = Mock()
+ mock_tool.entity.parameters = None
+ mock_tool.entity.identity = Mock()
+ mock_tool.entity.identity.author = "test_author"
+ mock_tool.entity.identity.name = "test_tool"
+ mock_tool.entity.identity.label = I18nObject(en_US="Test Tool")
+ mock_tool.entity.description = Mock()
+ mock_tool.entity.description.human = I18nObject(en_US="Test description")
+ mock_tool.entity.output_schema = {}
+ mock_tool.get_runtime_parameters.return_value = []
+
+ # Mock fork_tool_runtime to return the same tool
+ mock_tool.fork_tool_runtime.return_value = mock_tool
+
+ # Call the method
+ result = ToolTransformService.convert_tool_entity_to_api_entity(mock_tool, "test_tenant", None)
+
+ # Verify the result
+ assert isinstance(result, ToolApiEntity)
+ assert result.parameters is not None
+ assert len(result.parameters) == 0
+
+ def test_convert_tool_parameter_order_preserved(self):
+ """Test that parameter order is preserved correctly"""
+ # Create mock base parameters in specific order
+ base_param1 = Mock(spec=ToolParameter)
+ base_param1.name = "param1"
+ base_param1.form = ToolParameter.ToolParameterForm.FORM
+ base_param1.type = "string"
+ base_param1.label = "Base Param 1"
+
+ base_param2 = Mock(spec=ToolParameter)
+ base_param2.name = "param2"
+ base_param2.form = ToolParameter.ToolParameterForm.FORM
+ base_param2.type = "string"
+ base_param2.label = "Base Param 2"
+
+ base_param3 = Mock(spec=ToolParameter)
+ base_param3.name = "param3"
+ base_param3.form = ToolParameter.ToolParameterForm.FORM
+ base_param3.type = "string"
+ base_param3.label = "Base Param 3"
+
+ # Create runtime parameter that overrides middle parameter
+ runtime_param2 = Mock(spec=ToolParameter)
+ runtime_param2.name = "param2"
+ runtime_param2.form = ToolParameter.ToolParameterForm.FORM
+ runtime_param2.type = "string"
+ runtime_param2.label = "Runtime Param 2"
+
+ # Create new runtime parameter
+ runtime_param4 = Mock(spec=ToolParameter)
+ runtime_param4.name = "param4"
+ runtime_param4.form = ToolParameter.ToolParameterForm.FORM
+ runtime_param4.type = "string"
+ runtime_param4.label = "Runtime Param 4"
+
+ # Create mock tool
+ mock_tool = Mock(spec=Tool)
+ mock_tool.entity = Mock()
+ mock_tool.entity.parameters = [base_param1, base_param2, base_param3]
+ mock_tool.entity.identity = Mock()
+ mock_tool.entity.identity.author = "test_author"
+ mock_tool.entity.identity.name = "test_tool"
+ mock_tool.entity.identity.label = I18nObject(en_US="Test Tool")
+ mock_tool.entity.description = Mock()
+ mock_tool.entity.description.human = I18nObject(en_US="Test description")
+ mock_tool.entity.output_schema = {}
+ mock_tool.get_runtime_parameters.return_value = [runtime_param2, runtime_param4]
+
+ # Mock fork_tool_runtime to return the same tool
+ mock_tool.fork_tool_runtime.return_value = mock_tool
+
+ # Call the method
+ result = ToolTransformService.convert_tool_entity_to_api_entity(mock_tool, "test_tenant", None)
+
+ # Verify the result
+ assert isinstance(result, ToolApiEntity)
+ assert result.parameters is not None
+ assert len(result.parameters) == 4
+
+ # Check that order is maintained: base parameters first, then new runtime parameters
+ param_names = [p.name for p in result.parameters]
+ assert param_names == ["param1", "param2", "param3", "param4"]
+
+ # Verify that param2 was overridden with runtime version
+ param2 = result.parameters[1]
+ assert param2.name == "param2"
+ assert param2.label == "Runtime Param 2"
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_deletion.py b/api/tests/unit_tests/services/workflow/test_workflow_deletion.py
index 223020c2c5..2c87eaf805 100644
--- a/api/tests/unit_tests/services/workflow/test_workflow_deletion.py
+++ b/api/tests/unit_tests/services/workflow/test_workflow_deletion.py
@@ -10,7 +10,8 @@ from services.workflow_service import DraftWorkflowDeletionError, WorkflowInUseE
@pytest.fixture
def workflow_setup():
- workflow_service = WorkflowService()
+ mock_session_maker = MagicMock()
+ workflow_service = WorkflowService(mock_session_maker)
session = MagicMock(spec=Session)
tenant_id = "test-tenant-id"
workflow_id = "test-workflow-id"
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_draft_variable_service.py b/api/tests/unit_tests/services/workflow/test_workflow_draft_variable_service.py
new file mode 100644
index 0000000000..8b1348b75b
--- /dev/null
+++ b/api/tests/unit_tests/services/workflow/test_workflow_draft_variable_service.py
@@ -0,0 +1,391 @@
+import dataclasses
+import secrets
+from unittest.mock import MagicMock, Mock, patch
+
+import pytest
+from sqlalchemy import Engine
+from sqlalchemy.orm import Session
+
+from core.variables import StringSegment
+from core.workflow.constants import SYSTEM_VARIABLE_NODE_ID
+from core.workflow.nodes.enums import NodeType
+from models.enums import DraftVariableType
+from models.workflow import Workflow, WorkflowDraftVariable, WorkflowNodeExecutionModel, is_system_variable_editable
+from services.workflow_draft_variable_service import (
+ DraftVariableSaver,
+ VariableResetError,
+ WorkflowDraftVariableService,
+)
+
+
+@pytest.fixture
+def mock_engine() -> Engine:
+ return Mock(spec=Engine)
+
+
+@pytest.fixture
+def mock_session(mock_engine) -> Session:
+ mock_session = Mock(spec=Session)
+ mock_session.get_bind.return_value = mock_engine
+ return mock_session
+
+
+class TestDraftVariableSaver:
+ def _get_test_app_id(self):
+ suffix = secrets.token_hex(6)
+ return f"test_app_id_{suffix}"
+
+ def test__should_variable_be_visible(self):
+ mock_session = MagicMock(spec=Session)
+ test_app_id = self._get_test_app_id()
+ saver = DraftVariableSaver(
+ session=mock_session,
+ app_id=test_app_id,
+ node_id="test_node_id",
+ node_type=NodeType.START,
+ node_execution_id="test_execution_id",
+ )
+ assert saver._should_variable_be_visible("123_456", NodeType.IF_ELSE, "output") == False
+ assert saver._should_variable_be_visible("123", NodeType.START, "output") == True
+
+ def test__normalize_variable_for_start_node(self):
+ @dataclasses.dataclass(frozen=True)
+ class TestCase:
+ name: str
+ input_node_id: str
+ input_name: str
+ expected_node_id: str
+ expected_name: str
+
+ _NODE_ID = "1747228642872"
+ cases = [
+ TestCase(
+ name="name with `sys.` prefix should return the system node_id",
+ input_node_id=_NODE_ID,
+ input_name="sys.workflow_id",
+ expected_node_id=SYSTEM_VARIABLE_NODE_ID,
+ expected_name="workflow_id",
+ ),
+ TestCase(
+ name="name without `sys.` prefix should return the original input node_id",
+ input_node_id=_NODE_ID,
+ input_name="start_input",
+ expected_node_id=_NODE_ID,
+ expected_name="start_input",
+ ),
+ TestCase(
+ name="dummy_variable should return the original input node_id",
+ input_node_id=_NODE_ID,
+ input_name="__dummy__",
+ expected_node_id=_NODE_ID,
+ expected_name="__dummy__",
+ ),
+ ]
+
+ mock_session = MagicMock(spec=Session)
+ test_app_id = self._get_test_app_id()
+ saver = DraftVariableSaver(
+ session=mock_session,
+ app_id=test_app_id,
+ node_id=_NODE_ID,
+ node_type=NodeType.START,
+ node_execution_id="test_execution_id",
+ )
+ for idx, c in enumerate(cases, 1):
+ fail_msg = f"Test case {c.name} failed, index={idx}"
+ node_id, name = saver._normalize_variable_for_start_node(c.input_name)
+ assert node_id == c.expected_node_id, fail_msg
+ assert name == c.expected_name, fail_msg
+
+
+class TestWorkflowDraftVariableService:
+ def _get_test_app_id(self):
+ suffix = secrets.token_hex(6)
+ return f"test_app_id_{suffix}"
+
+ def _create_test_workflow(self, app_id: str) -> Workflow:
+ """Create a real Workflow instance for testing"""
+ return Workflow.new(
+ tenant_id="test_tenant_id",
+ app_id=app_id,
+ type="workflow",
+ version="draft",
+ graph='{"nodes": [], "edges": []}',
+ features="{}",
+ created_by="test_user_id",
+ environment_variables=[],
+ conversation_variables=[],
+ )
+
+ def test_reset_conversation_variable(self, mock_session):
+ """Test resetting a conversation variable"""
+ service = WorkflowDraftVariableService(mock_session)
+
+ test_app_id = self._get_test_app_id()
+ workflow = self._create_test_workflow(test_app_id)
+
+ # Create real conversation variable
+ test_value = StringSegment(value="test_value")
+ variable = WorkflowDraftVariable.new_conversation_variable(
+ app_id=test_app_id, name="test_var", value=test_value, description="Test conversation variable"
+ )
+
+ # Mock the _reset_conv_var method
+ expected_result = WorkflowDraftVariable.new_conversation_variable(
+ app_id=test_app_id,
+ name="test_var",
+ value=StringSegment(value="reset_value"),
+ )
+ with patch.object(service, "_reset_conv_var", return_value=expected_result) as mock_reset_conv:
+ result = service.reset_variable(workflow, variable)
+
+ mock_reset_conv.assert_called_once_with(workflow, variable)
+ assert result == expected_result
+
+ def test_reset_node_variable_with_no_execution_id(self, mock_session):
+ """Test resetting a node variable with no execution ID - should delete variable"""
+ service = WorkflowDraftVariableService(mock_session)
+
+ test_app_id = self._get_test_app_id()
+ workflow = self._create_test_workflow(test_app_id)
+
+ # Create real node variable with no execution ID
+ test_value = StringSegment(value="test_value")
+ variable = WorkflowDraftVariable.new_node_variable(
+ app_id=test_app_id,
+ node_id="test_node_id",
+ name="test_var",
+ value=test_value,
+ node_execution_id="exec-id", # Set initially
+ )
+ # Manually set to None to simulate the test condition
+ variable.node_execution_id = None
+
+ result = service._reset_node_var_or_sys_var(workflow, variable)
+
+ # Should delete the variable and return None
+ mock_session.delete.assert_called_once_with(instance=variable)
+ mock_session.flush.assert_called_once()
+ assert result is None
+
+ def test_reset_node_variable_with_missing_execution_record(
+ self,
+ mock_engine,
+ mock_session,
+ monkeypatch,
+ ):
+ """Test resetting a node variable when execution record doesn't exist"""
+ mock_repo_session = Mock(spec=Session)
+
+ mock_session_maker = MagicMock()
+ # Mock the context manager protocol for sessionmaker
+ mock_session_maker.return_value.__enter__.return_value = mock_repo_session
+ mock_session_maker.return_value.__exit__.return_value = None
+ monkeypatch.setattr("services.workflow_draft_variable_service.sessionmaker", mock_session_maker)
+ service = WorkflowDraftVariableService(mock_session)
+
+ # Mock the repository to return None (no execution record found)
+ service._api_node_execution_repo = Mock()
+ service._api_node_execution_repo.get_execution_by_id.return_value = None
+
+ test_app_id = self._get_test_app_id()
+ workflow = self._create_test_workflow(test_app_id)
+
+ # Create real node variable with execution ID
+ test_value = StringSegment(value="test_value")
+ variable = WorkflowDraftVariable.new_node_variable(
+ app_id=test_app_id, node_id="test_node_id", name="test_var", value=test_value, node_execution_id="exec-id"
+ )
+ # Variable is editable by default from factory method
+
+ result = service._reset_node_var_or_sys_var(workflow, variable)
+
+ mock_session_maker.assert_called_once_with(bind=mock_engine, expire_on_commit=False)
+ # Should delete the variable and return None
+ mock_session.delete.assert_called_once_with(instance=variable)
+ mock_session.flush.assert_called_once()
+ assert result is None
+
+ def test_reset_node_variable_with_valid_execution_record(
+ self,
+ mock_session,
+ monkeypatch,
+ ):
+ """Test resetting a node variable with valid execution record - should restore from execution"""
+ mock_repo_session = Mock(spec=Session)
+
+ mock_session_maker = MagicMock()
+ # Mock the context manager protocol for sessionmaker
+ mock_session_maker.return_value.__enter__.return_value = mock_repo_session
+ mock_session_maker.return_value.__exit__.return_value = None
+ mock_session_maker = monkeypatch.setattr(
+ "services.workflow_draft_variable_service.sessionmaker", mock_session_maker
+ )
+ service = WorkflowDraftVariableService(mock_session)
+
+ # Create mock execution record
+ mock_execution = Mock(spec=WorkflowNodeExecutionModel)
+ mock_execution.outputs_dict = {"test_var": "output_value"}
+
+ # Mock the repository to return the execution record
+ service._api_node_execution_repo = Mock()
+ service._api_node_execution_repo.get_execution_by_id.return_value = mock_execution
+
+ test_app_id = self._get_test_app_id()
+ workflow = self._create_test_workflow(test_app_id)
+
+ # Create real node variable with execution ID
+ test_value = StringSegment(value="original_value")
+ variable = WorkflowDraftVariable.new_node_variable(
+ app_id=test_app_id, node_id="test_node_id", name="test_var", value=test_value, node_execution_id="exec-id"
+ )
+ # Variable is editable by default from factory method
+
+ # Mock workflow methods
+ mock_node_config = {"type": "test_node"}
+ with (
+ patch.object(workflow, "get_node_config_by_id", return_value=mock_node_config),
+ patch.object(workflow, "get_node_type_from_node_config", return_value=NodeType.LLM),
+ ):
+ result = service._reset_node_var_or_sys_var(workflow, variable)
+
+ # Verify last_edited_at was reset
+ assert variable.last_edited_at is None
+ # Verify session.flush was called
+ mock_session.flush.assert_called()
+
+ # Should return the updated variable
+ assert result == variable
+
+ def test_reset_non_editable_system_variable_raises_error(self, mock_session):
+ """Test that resetting a non-editable system variable raises an error"""
+ service = WorkflowDraftVariableService(mock_session)
+
+ test_app_id = self._get_test_app_id()
+ workflow = self._create_test_workflow(test_app_id)
+
+ # Create a non-editable system variable (workflow_id is not editable)
+ test_value = StringSegment(value="test_workflow_id")
+ variable = WorkflowDraftVariable.new_sys_variable(
+ app_id=test_app_id,
+ name="workflow_id", # This is not in _EDITABLE_SYSTEM_VARIABLE
+ value=test_value,
+ node_execution_id="exec-id",
+ editable=False, # Non-editable system variable
+ )
+
+ with pytest.raises(VariableResetError) as exc_info:
+ service.reset_variable(workflow, variable)
+ assert "cannot reset system variable" in str(exc_info.value)
+ assert f"variable_id={variable.id}" in str(exc_info.value)
+
+ def test_reset_editable_system_variable_succeeds(self, mock_session):
+ """Test that resetting an editable system variable succeeds"""
+ service = WorkflowDraftVariableService(mock_session)
+
+ test_app_id = self._get_test_app_id()
+ workflow = self._create_test_workflow(test_app_id)
+
+ # Create an editable system variable (files is editable)
+ test_value = StringSegment(value="[]")
+ variable = WorkflowDraftVariable.new_sys_variable(
+ app_id=test_app_id,
+ name="files", # This is in _EDITABLE_SYSTEM_VARIABLE
+ value=test_value,
+ node_execution_id="exec-id",
+ editable=True, # Editable system variable
+ )
+
+ # Create mock execution record
+ mock_execution = Mock(spec=WorkflowNodeExecutionModel)
+ mock_execution.outputs_dict = {"sys.files": "[]"}
+
+ # Mock the repository to return the execution record
+ service._api_node_execution_repo = Mock()
+ service._api_node_execution_repo.get_execution_by_id.return_value = mock_execution
+
+ result = service._reset_node_var_or_sys_var(workflow, variable)
+
+ # Should succeed and return the variable
+ assert result == variable
+ assert variable.last_edited_at is None
+ mock_session.flush.assert_called()
+
+ def test_reset_query_system_variable_succeeds(self, mock_session):
+ """Test that resetting query system variable (another editable one) succeeds"""
+ service = WorkflowDraftVariableService(mock_session)
+
+ test_app_id = self._get_test_app_id()
+ workflow = self._create_test_workflow(test_app_id)
+
+ # Create an editable system variable (query is editable)
+ test_value = StringSegment(value="original query")
+ variable = WorkflowDraftVariable.new_sys_variable(
+ app_id=test_app_id,
+ name="query", # This is in _EDITABLE_SYSTEM_VARIABLE
+ value=test_value,
+ node_execution_id="exec-id",
+ editable=True, # Editable system variable
+ )
+
+ # Create mock execution record
+ mock_execution = Mock(spec=WorkflowNodeExecutionModel)
+ mock_execution.outputs_dict = {"sys.query": "reset query"}
+
+ # Mock the repository to return the execution record
+ service._api_node_execution_repo = Mock()
+ service._api_node_execution_repo.get_execution_by_id.return_value = mock_execution
+
+ result = service._reset_node_var_or_sys_var(workflow, variable)
+
+ # Should succeed and return the variable
+ assert result == variable
+ assert variable.last_edited_at is None
+ mock_session.flush.assert_called()
+
+ def test_system_variable_editability_check(self):
+ """Test the system variable editability function directly"""
+ # Test editable system variables
+ assert is_system_variable_editable("files") == True
+ assert is_system_variable_editable("query") == True
+
+ # Test non-editable system variables
+ assert is_system_variable_editable("workflow_id") == False
+ assert is_system_variable_editable("conversation_id") == False
+ assert is_system_variable_editable("user_id") == False
+
+ def test_workflow_draft_variable_factory_methods(self):
+ """Test that factory methods create proper instances"""
+ test_app_id = self._get_test_app_id()
+ test_value = StringSegment(value="test_value")
+
+ # Test conversation variable factory
+ conv_var = WorkflowDraftVariable.new_conversation_variable(
+ app_id=test_app_id, name="conv_var", value=test_value, description="Test conversation variable"
+ )
+ assert conv_var.get_variable_type() == DraftVariableType.CONVERSATION
+ assert conv_var.editable == True
+ assert conv_var.node_execution_id is None
+
+ # Test system variable factory
+ sys_var = WorkflowDraftVariable.new_sys_variable(
+ app_id=test_app_id, name="workflow_id", value=test_value, node_execution_id="exec-id", editable=False
+ )
+ assert sys_var.get_variable_type() == DraftVariableType.SYS
+ assert sys_var.editable == False
+ assert sys_var.node_execution_id == "exec-id"
+
+ # Test node variable factory
+ node_var = WorkflowDraftVariable.new_node_variable(
+ app_id=test_app_id,
+ node_id="node-id",
+ name="node_var",
+ value=test_value,
+ node_execution_id="exec-id",
+ visible=True,
+ editable=True,
+ )
+ assert node_var.get_variable_type() == DraftVariableType.NODE
+ assert node_var.visible == True
+ assert node_var.editable == True
+ assert node_var.node_execution_id == "exec-id"
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_node_execution_service_repository.py b/api/tests/unit_tests/services/workflow/test_workflow_node_execution_service_repository.py
new file mode 100644
index 0000000000..32d2f8b7e0
--- /dev/null
+++ b/api/tests/unit_tests/services/workflow/test_workflow_node_execution_service_repository.py
@@ -0,0 +1,288 @@
+from datetime import datetime
+from unittest.mock import MagicMock
+from uuid import uuid4
+
+import pytest
+from sqlalchemy.orm import Session
+
+from models.workflow import WorkflowNodeExecutionModel
+from repositories.sqlalchemy_api_workflow_node_execution_repository import (
+ DifyAPISQLAlchemyWorkflowNodeExecutionRepository,
+)
+
+
+class TestSQLAlchemyWorkflowNodeExecutionServiceRepository:
+ @pytest.fixture
+ def repository(self):
+ mock_session_maker = MagicMock()
+ return DifyAPISQLAlchemyWorkflowNodeExecutionRepository(session_maker=mock_session_maker)
+
+ @pytest.fixture
+ def mock_execution(self):
+ execution = MagicMock(spec=WorkflowNodeExecutionModel)
+ execution.id = str(uuid4())
+ execution.tenant_id = "tenant-123"
+ execution.app_id = "app-456"
+ execution.workflow_id = "workflow-789"
+ execution.workflow_run_id = "run-101"
+ execution.node_id = "node-202"
+ execution.index = 1
+ execution.created_at = "2023-01-01T00:00:00Z"
+ return execution
+
+ def test_get_node_last_execution_found(self, repository, mock_execution):
+ """Test getting the last execution for a node when it exists."""
+ # Arrange
+ mock_session = MagicMock(spec=Session)
+ repository._session_maker.return_value.__enter__.return_value = mock_session
+ mock_session.scalar.return_value = mock_execution
+
+ # Act
+ result = repository.get_node_last_execution(
+ tenant_id="tenant-123",
+ app_id="app-456",
+ workflow_id="workflow-789",
+ node_id="node-202",
+ )
+
+ # Assert
+ assert result == mock_execution
+ mock_session.scalar.assert_called_once()
+ # Verify the query was constructed correctly
+ call_args = mock_session.scalar.call_args[0][0]
+ assert hasattr(call_args, "compile") # It's a SQLAlchemy statement
+
+ def test_get_node_last_execution_not_found(self, repository):
+ """Test getting the last execution for a node when it doesn't exist."""
+ # Arrange
+ mock_session = MagicMock(spec=Session)
+ repository._session_maker.return_value.__enter__.return_value = mock_session
+ mock_session.scalar.return_value = None
+
+ # Act
+ result = repository.get_node_last_execution(
+ tenant_id="tenant-123",
+ app_id="app-456",
+ workflow_id="workflow-789",
+ node_id="node-202",
+ )
+
+ # Assert
+ assert result is None
+ mock_session.scalar.assert_called_once()
+
+ def test_get_executions_by_workflow_run(self, repository, mock_execution):
+ """Test getting all executions for a workflow run."""
+ # Arrange
+ mock_session = MagicMock(spec=Session)
+ repository._session_maker.return_value.__enter__.return_value = mock_session
+ executions = [mock_execution]
+ mock_session.execute.return_value.scalars.return_value.all.return_value = executions
+
+ # Act
+ result = repository.get_executions_by_workflow_run(
+ tenant_id="tenant-123",
+ app_id="app-456",
+ workflow_run_id="run-101",
+ )
+
+ # Assert
+ assert result == executions
+ mock_session.execute.assert_called_once()
+ # Verify the query was constructed correctly
+ call_args = mock_session.execute.call_args[0][0]
+ assert hasattr(call_args, "compile") # It's a SQLAlchemy statement
+
+ def test_get_executions_by_workflow_run_empty(self, repository):
+ """Test getting executions for a workflow run when none exist."""
+ # Arrange
+ mock_session = MagicMock(spec=Session)
+ repository._session_maker.return_value.__enter__.return_value = mock_session
+ mock_session.execute.return_value.scalars.return_value.all.return_value = []
+
+ # Act
+ result = repository.get_executions_by_workflow_run(
+ tenant_id="tenant-123",
+ app_id="app-456",
+ workflow_run_id="run-101",
+ )
+
+ # Assert
+ assert result == []
+ mock_session.execute.assert_called_once()
+
+ def test_get_execution_by_id_found(self, repository, mock_execution):
+ """Test getting execution by ID when it exists."""
+ # Arrange
+ mock_session = MagicMock(spec=Session)
+ repository._session_maker.return_value.__enter__.return_value = mock_session
+ mock_session.scalar.return_value = mock_execution
+
+ # Act
+ result = repository.get_execution_by_id(mock_execution.id)
+
+ # Assert
+ assert result == mock_execution
+ mock_session.scalar.assert_called_once()
+
+ def test_get_execution_by_id_not_found(self, repository):
+ """Test getting execution by ID when it doesn't exist."""
+ # Arrange
+ mock_session = MagicMock(spec=Session)
+ repository._session_maker.return_value.__enter__.return_value = mock_session
+ mock_session.scalar.return_value = None
+
+ # Act
+ result = repository.get_execution_by_id("non-existent-id")
+
+ # Assert
+ assert result is None
+ mock_session.scalar.assert_called_once()
+
+ def test_repository_implements_protocol(self, repository):
+ """Test that the repository implements the required protocol methods."""
+ # Verify all protocol methods are implemented
+ assert hasattr(repository, "get_node_last_execution")
+ assert hasattr(repository, "get_executions_by_workflow_run")
+ assert hasattr(repository, "get_execution_by_id")
+
+ # Verify methods are callable
+ assert callable(repository.get_node_last_execution)
+ assert callable(repository.get_executions_by_workflow_run)
+ assert callable(repository.get_execution_by_id)
+ assert callable(repository.delete_expired_executions)
+ assert callable(repository.delete_executions_by_app)
+ assert callable(repository.get_expired_executions_batch)
+ assert callable(repository.delete_executions_by_ids)
+
+ def test_delete_expired_executions(self, repository):
+ """Test deleting expired executions."""
+ # Arrange
+ mock_session = MagicMock(spec=Session)
+ repository._session_maker.return_value.__enter__.return_value = mock_session
+
+ # Mock the select query to return some IDs first time, then empty to stop loop
+ execution_ids = ["id1", "id2"] # Less than batch_size to trigger break
+
+ # Mock execute method to handle both select and delete statements
+ def mock_execute(stmt):
+ mock_result = MagicMock()
+ # For select statements, return execution IDs
+ if hasattr(stmt, "limit"): # This is our select statement
+ mock_result.scalars.return_value.all.return_value = execution_ids
+ else: # This is our delete statement
+ mock_result.rowcount = 2
+ return mock_result
+
+ mock_session.execute.side_effect = mock_execute
+
+ before_date = datetime(2023, 1, 1)
+
+ # Act
+ result = repository.delete_expired_executions(
+ tenant_id="tenant-123",
+ before_date=before_date,
+ batch_size=1000,
+ )
+
+ # Assert
+ assert result == 2
+ assert mock_session.execute.call_count == 2 # One select call, one delete call
+ mock_session.commit.assert_called_once()
+
+ def test_delete_executions_by_app(self, repository):
+ """Test deleting executions by app."""
+ # Arrange
+ mock_session = MagicMock(spec=Session)
+ repository._session_maker.return_value.__enter__.return_value = mock_session
+
+ # Mock the select query to return some IDs first time, then empty to stop loop
+ execution_ids = ["id1", "id2"]
+
+ # Mock execute method to handle both select and delete statements
+ def mock_execute(stmt):
+ mock_result = MagicMock()
+ # For select statements, return execution IDs
+ if hasattr(stmt, "limit"): # This is our select statement
+ mock_result.scalars.return_value.all.return_value = execution_ids
+ else: # This is our delete statement
+ mock_result.rowcount = 2
+ return mock_result
+
+ mock_session.execute.side_effect = mock_execute
+
+ # Act
+ result = repository.delete_executions_by_app(
+ tenant_id="tenant-123",
+ app_id="app-456",
+ batch_size=1000,
+ )
+
+ # Assert
+ assert result == 2
+ assert mock_session.execute.call_count == 2 # One select call, one delete call
+ mock_session.commit.assert_called_once()
+
+ def test_get_expired_executions_batch(self, repository):
+ """Test getting expired executions batch for backup."""
+ # Arrange
+ mock_session = MagicMock(spec=Session)
+ repository._session_maker.return_value.__enter__.return_value = mock_session
+
+ # Create mock execution objects
+ mock_execution1 = MagicMock()
+ mock_execution1.id = "exec-1"
+ mock_execution2 = MagicMock()
+ mock_execution2.id = "exec-2"
+
+ mock_session.execute.return_value.scalars.return_value.all.return_value = [mock_execution1, mock_execution2]
+
+ before_date = datetime(2023, 1, 1)
+
+ # Act
+ result = repository.get_expired_executions_batch(
+ tenant_id="tenant-123",
+ before_date=before_date,
+ batch_size=1000,
+ )
+
+ # Assert
+ assert len(result) == 2
+ assert result[0].id == "exec-1"
+ assert result[1].id == "exec-2"
+ mock_session.execute.assert_called_once()
+
+ def test_delete_executions_by_ids(self, repository):
+ """Test deleting executions by IDs."""
+ # Arrange
+ mock_session = MagicMock(spec=Session)
+ repository._session_maker.return_value.__enter__.return_value = mock_session
+
+ # Mock the delete query result
+ mock_result = MagicMock()
+ mock_result.rowcount = 3
+ mock_session.execute.return_value = mock_result
+
+ execution_ids = ["id1", "id2", "id3"]
+
+ # Act
+ result = repository.delete_executions_by_ids(execution_ids)
+
+ # Assert
+ assert result == 3
+ mock_session.execute.assert_called_once()
+ mock_session.commit.assert_called_once()
+
+ def test_delete_executions_by_ids_empty_list(self, repository):
+ """Test deleting executions with empty ID list."""
+ # Arrange
+ mock_session = MagicMock(spec=Session)
+ repository._session_maker.return_value.__enter__.return_value = mock_session
+
+ # Act
+ result = repository.delete_executions_by_ids([])
+
+ # Assert
+ assert result == 0
+ mock_session.query.assert_not_called()
+ mock_session.commit.assert_not_called()
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_service.py b/api/tests/unit_tests/services/workflow/test_workflow_service.py
index 13393668ea..9700cbaf0e 100644
--- a/api/tests/unit_tests/services/workflow/test_workflow_service.py
+++ b/api/tests/unit_tests/services/workflow/test_workflow_service.py
@@ -10,7 +10,8 @@ from services.workflow_service import WorkflowService
class TestWorkflowService:
@pytest.fixture
def workflow_service(self):
- return WorkflowService()
+ mock_session_maker = MagicMock()
+ return WorkflowService(mock_session_maker)
@pytest.fixture
def mock_app(self):
diff --git a/api/tests/unit_tests/utils/http_parser/test_oauth_convert_request_to_raw_data.py b/api/tests/unit_tests/utils/http_parser/test_oauth_convert_request_to_raw_data.py
index f788a9756b..293ac253f5 100644
--- a/api/tests/unit_tests/utils/http_parser/test_oauth_convert_request_to_raw_data.py
+++ b/api/tests/unit_tests/utils/http_parser/test_oauth_convert_request_to_raw_data.py
@@ -1,3 +1,5 @@
+import json
+
from werkzeug import Request
from werkzeug.datastructures import Headers
from werkzeug.test import EnvironBuilder
@@ -15,6 +17,59 @@ def test_oauth_convert_request_to_raw_data():
request = Request(builder.get_environ())
raw_request_bytes = oauth_handler._convert_request_to_raw_data(request)
- assert b"GET /test HTTP/1.1" in raw_request_bytes
+ assert b"GET /test? HTTP/1.1" in raw_request_bytes
+ assert b"Content-Type: application/json" in raw_request_bytes
+ assert b"\r\n\r\n" in raw_request_bytes
+
+
+def test_oauth_convert_request_to_raw_data_with_query_params():
+ oauth_handler = OAuthHandler()
+ builder = EnvironBuilder(
+ method="GET",
+ path="/test",
+ query_string="code=abc123&state=xyz789",
+ headers=Headers({"Content-Type": "application/json"}),
+ )
+ request = Request(builder.get_environ())
+ raw_request_bytes = oauth_handler._convert_request_to_raw_data(request)
+
+ assert b"GET /test?code=abc123&state=xyz789 HTTP/1.1" in raw_request_bytes
+ assert b"Content-Type: application/json" in raw_request_bytes
+ assert b"\r\n\r\n" in raw_request_bytes
+
+
+def test_oauth_convert_request_to_raw_data_with_post_body():
+ oauth_handler = OAuthHandler()
+ builder = EnvironBuilder(
+ method="POST",
+ path="/test",
+ data="param1=value1¶m2=value2",
+ headers=Headers({"Content-Type": "application/x-www-form-urlencoded"}),
+ )
+ request = Request(builder.get_environ())
+ raw_request_bytes = oauth_handler._convert_request_to_raw_data(request)
+
+ assert b"POST /test? HTTP/1.1" in raw_request_bytes
+ assert b"Content-Type: application/x-www-form-urlencoded" in raw_request_bytes
+ assert b"\r\n\r\n" in raw_request_bytes
+ assert b"param1=value1¶m2=value2" in raw_request_bytes
+
+
+def test_oauth_convert_request_to_raw_data_with_json_body():
+ oauth_handler = OAuthHandler()
+ json_data = {"code": "abc123", "state": "xyz789", "grant_type": "authorization_code"}
+ builder = EnvironBuilder(
+ method="POST",
+ path="/test",
+ data=json.dumps(json_data),
+ headers=Headers({"Content-Type": "application/json"}),
+ )
+ request = Request(builder.get_environ())
+ raw_request_bytes = oauth_handler._convert_request_to_raw_data(request)
+
+ assert b"POST /test? HTTP/1.1" in raw_request_bytes
assert b"Content-Type: application/json" in raw_request_bytes
assert b"\r\n\r\n" in raw_request_bytes
+ assert b'"code": "abc123"' in raw_request_bytes
+ assert b'"state": "xyz789"' in raw_request_bytes
+ assert b'"grant_type": "authorization_code"' in raw_request_bytes
diff --git a/api/tests/unit_tests/utils/oauth_encryption/test_system_oauth_encryption.py b/api/tests/unit_tests/utils/oauth_encryption/test_system_oauth_encryption.py
new file mode 100644
index 0000000000..30990f8d50
--- /dev/null
+++ b/api/tests/unit_tests/utils/oauth_encryption/test_system_oauth_encryption.py
@@ -0,0 +1,619 @@
+import base64
+import hashlib
+from unittest.mock import patch
+
+import pytest
+from Crypto.Cipher import AES
+from Crypto.Random import get_random_bytes
+from Crypto.Util.Padding import pad
+
+from core.tools.utils.system_oauth_encryption import (
+ OAuthEncryptionError,
+ SystemOAuthEncrypter,
+ create_system_oauth_encrypter,
+ decrypt_system_oauth_params,
+ encrypt_system_oauth_params,
+ get_system_oauth_encrypter,
+)
+
+
+class TestSystemOAuthEncrypter:
+ """Test cases for SystemOAuthEncrypter class"""
+
+ def test_init_with_secret_key(self):
+ """Test initialization with provided secret key"""
+ secret_key = "test_secret_key"
+ encrypter = SystemOAuthEncrypter(secret_key=secret_key)
+ expected_key = hashlib.sha256(secret_key.encode()).digest()
+ assert encrypter.key == expected_key
+
+ def test_init_with_none_secret_key(self):
+ """Test initialization with None secret key falls back to config"""
+ with patch("core.tools.utils.system_oauth_encryption.dify_config") as mock_config:
+ mock_config.SECRET_KEY = "config_secret"
+ encrypter = SystemOAuthEncrypter(secret_key=None)
+ expected_key = hashlib.sha256(b"config_secret").digest()
+ assert encrypter.key == expected_key
+
+ def test_init_with_empty_secret_key(self):
+ """Test initialization with empty secret key"""
+ encrypter = SystemOAuthEncrypter(secret_key="")
+ expected_key = hashlib.sha256(b"").digest()
+ assert encrypter.key == expected_key
+
+ def test_init_without_secret_key_uses_config(self):
+ """Test initialization without secret key uses config"""
+ with patch("core.tools.utils.system_oauth_encryption.dify_config") as mock_config:
+ mock_config.SECRET_KEY = "default_secret"
+ encrypter = SystemOAuthEncrypter()
+ expected_key = hashlib.sha256(b"default_secret").digest()
+ assert encrypter.key == expected_key
+
+ def test_encrypt_oauth_params_basic(self):
+ """Test basic OAuth parameters encryption"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+ oauth_params = {"client_id": "test_id", "client_secret": "test_secret"}
+
+ encrypted = encrypter.encrypt_oauth_params(oauth_params)
+
+ assert isinstance(encrypted, str)
+ assert len(encrypted) > 0
+ # Should be valid base64
+ try:
+ base64.b64decode(encrypted)
+ except Exception:
+ pytest.fail("Encrypted result is not valid base64")
+
+ def test_encrypt_oauth_params_empty_dict(self):
+ """Test encryption with empty dictionary"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+ oauth_params = {}
+
+ encrypted = encrypter.encrypt_oauth_params(oauth_params)
+ assert isinstance(encrypted, str)
+ assert len(encrypted) > 0
+
+ def test_encrypt_oauth_params_complex_data(self):
+ """Test encryption with complex data structures"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+ oauth_params = {
+ "client_id": "test_id",
+ "client_secret": "test_secret",
+ "scopes": ["read", "write", "admin"],
+ "metadata": {"issuer": "test_issuer", "expires_in": 3600, "is_active": True},
+ "numeric_value": 42,
+ "boolean_value": False,
+ "null_value": None,
+ }
+
+ encrypted = encrypter.encrypt_oauth_params(oauth_params)
+ assert isinstance(encrypted, str)
+ assert len(encrypted) > 0
+
+ def test_encrypt_oauth_params_unicode_data(self):
+ """Test encryption with unicode data"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+ oauth_params = {"client_id": "test_id", "client_secret": "test_secret", "description": "This is a test case 🚀"}
+
+ encrypted = encrypter.encrypt_oauth_params(oauth_params)
+ assert isinstance(encrypted, str)
+ assert len(encrypted) > 0
+
+ def test_encrypt_oauth_params_large_data(self):
+ """Test encryption with large data"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+ oauth_params = {
+ "client_id": "test_id",
+ "large_data": "x" * 10000, # 10KB of data
+ }
+
+ encrypted = encrypter.encrypt_oauth_params(oauth_params)
+ assert isinstance(encrypted, str)
+ assert len(encrypted) > 0
+
+ def test_encrypt_oauth_params_invalid_input(self):
+ """Test encryption with invalid input types"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+
+ with pytest.raises(Exception): # noqa: B017
+ encrypter.encrypt_oauth_params(None) # type: ignore
+
+ with pytest.raises(Exception): # noqa: B017
+ encrypter.encrypt_oauth_params("not_a_dict") # type: ignore
+
+ def test_decrypt_oauth_params_basic(self):
+ """Test basic OAuth parameters decryption"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+ original_params = {"client_id": "test_id", "client_secret": "test_secret"}
+
+ encrypted = encrypter.encrypt_oauth_params(original_params)
+ decrypted = encrypter.decrypt_oauth_params(encrypted)
+
+ assert decrypted == original_params
+
+ def test_decrypt_oauth_params_empty_dict(self):
+ """Test decryption of empty dictionary"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+ original_params = {}
+
+ encrypted = encrypter.encrypt_oauth_params(original_params)
+ decrypted = encrypter.decrypt_oauth_params(encrypted)
+
+ assert decrypted == original_params
+
+ def test_decrypt_oauth_params_complex_data(self):
+ """Test decryption with complex data structures"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+ original_params = {
+ "client_id": "test_id",
+ "client_secret": "test_secret",
+ "scopes": ["read", "write", "admin"],
+ "metadata": {"issuer": "test_issuer", "expires_in": 3600, "is_active": True},
+ "numeric_value": 42,
+ "boolean_value": False,
+ "null_value": None,
+ }
+
+ encrypted = encrypter.encrypt_oauth_params(original_params)
+ decrypted = encrypter.decrypt_oauth_params(encrypted)
+
+ assert decrypted == original_params
+
+ def test_decrypt_oauth_params_unicode_data(self):
+ """Test decryption with unicode data"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+ original_params = {
+ "client_id": "test_id",
+ "client_secret": "test_secret",
+ "description": "This is a test case 🚀",
+ }
+
+ encrypted = encrypter.encrypt_oauth_params(original_params)
+ decrypted = encrypter.decrypt_oauth_params(encrypted)
+
+ assert decrypted == original_params
+
+ def test_decrypt_oauth_params_large_data(self):
+ """Test decryption with large data"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+ original_params = {
+ "client_id": "test_id",
+ "large_data": "x" * 10000, # 10KB of data
+ }
+
+ encrypted = encrypter.encrypt_oauth_params(original_params)
+ decrypted = encrypter.decrypt_oauth_params(encrypted)
+
+ assert decrypted == original_params
+
+ def test_decrypt_oauth_params_invalid_base64(self):
+ """Test decryption with invalid base64 data"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+
+ with pytest.raises(OAuthEncryptionError):
+ encrypter.decrypt_oauth_params("invalid_base64!")
+
+ def test_decrypt_oauth_params_empty_string(self):
+ """Test decryption with empty string"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+
+ with pytest.raises(ValueError) as exc_info:
+ encrypter.decrypt_oauth_params("")
+
+ assert "encrypted_data cannot be empty" in str(exc_info.value)
+
+ def test_decrypt_oauth_params_non_string_input(self):
+ """Test decryption with non-string input"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+
+ with pytest.raises(ValueError) as exc_info:
+ encrypter.decrypt_oauth_params(123) # type: ignore
+
+ assert "encrypted_data must be a string" in str(exc_info.value)
+
+ with pytest.raises(ValueError) as exc_info:
+ encrypter.decrypt_oauth_params(None) # type: ignore
+
+ assert "encrypted_data must be a string" in str(exc_info.value)
+
+ def test_decrypt_oauth_params_too_short_data(self):
+ """Test decryption with too short encrypted data"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+
+ # Create data that's too short (less than 32 bytes)
+ short_data = base64.b64encode(b"short").decode()
+
+ with pytest.raises(OAuthEncryptionError) as exc_info:
+ encrypter.decrypt_oauth_params(short_data)
+
+ assert "Invalid encrypted data format" in str(exc_info.value)
+
+ def test_decrypt_oauth_params_corrupted_data(self):
+ """Test decryption with corrupted data"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+
+ # Create corrupted data (valid base64 but invalid encrypted content)
+ corrupted_data = base64.b64encode(b"x" * 48).decode() # 48 bytes of garbage
+
+ with pytest.raises(OAuthEncryptionError):
+ encrypter.decrypt_oauth_params(corrupted_data)
+
+ def test_decrypt_oauth_params_wrong_key(self):
+ """Test decryption with wrong key"""
+ encrypter1 = SystemOAuthEncrypter("secret1")
+ encrypter2 = SystemOAuthEncrypter("secret2")
+
+ original_params = {"client_id": "test_id", "client_secret": "test_secret"}
+ encrypted = encrypter1.encrypt_oauth_params(original_params)
+
+ with pytest.raises(OAuthEncryptionError):
+ encrypter2.decrypt_oauth_params(encrypted)
+
+ def test_encryption_decryption_consistency(self):
+ """Test that encryption and decryption are consistent"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+
+ test_cases = [
+ {},
+ {"simple": "value"},
+ {"client_id": "id", "client_secret": "secret"},
+ {"complex": {"nested": {"deep": "value"}}},
+ {"unicode": "test 🚀"},
+ {"numbers": 42, "boolean": True, "null": None},
+ {"array": [1, 2, 3, "four", {"five": 5}]},
+ ]
+
+ for original_params in test_cases:
+ encrypted = encrypter.encrypt_oauth_params(original_params)
+ decrypted = encrypter.decrypt_oauth_params(encrypted)
+ assert decrypted == original_params, f"Failed for case: {original_params}"
+
+ def test_encryption_randomness(self):
+ """Test that encryption produces different results for same input"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+ oauth_params = {"client_id": "test_id", "client_secret": "test_secret"}
+
+ encrypted1 = encrypter.encrypt_oauth_params(oauth_params)
+ encrypted2 = encrypter.encrypt_oauth_params(oauth_params)
+
+ # Should be different due to random IV
+ assert encrypted1 != encrypted2
+
+ # But should decrypt to same result
+ decrypted1 = encrypter.decrypt_oauth_params(encrypted1)
+ decrypted2 = encrypter.decrypt_oauth_params(encrypted2)
+ assert decrypted1 == decrypted2 == oauth_params
+
+ def test_different_secret_keys_produce_different_results(self):
+ """Test that different secret keys produce different encrypted results"""
+ encrypter1 = SystemOAuthEncrypter("secret1")
+ encrypter2 = SystemOAuthEncrypter("secret2")
+
+ oauth_params = {"client_id": "test_id", "client_secret": "test_secret"}
+
+ encrypted1 = encrypter1.encrypt_oauth_params(oauth_params)
+ encrypted2 = encrypter2.encrypt_oauth_params(oauth_params)
+
+ # Should produce different encrypted results
+ assert encrypted1 != encrypted2
+
+ # But each should decrypt correctly with its own key
+ decrypted1 = encrypter1.decrypt_oauth_params(encrypted1)
+ decrypted2 = encrypter2.decrypt_oauth_params(encrypted2)
+ assert decrypted1 == decrypted2 == oauth_params
+
+ @patch("core.tools.utils.system_oauth_encryption.get_random_bytes")
+ def test_encrypt_oauth_params_crypto_error(self, mock_get_random_bytes):
+ """Test encryption when crypto operation fails"""
+ mock_get_random_bytes.side_effect = Exception("Crypto error")
+
+ encrypter = SystemOAuthEncrypter("test_secret")
+ oauth_params = {"client_id": "test_id"}
+
+ with pytest.raises(OAuthEncryptionError) as exc_info:
+ encrypter.encrypt_oauth_params(oauth_params)
+
+ assert "Encryption failed" in str(exc_info.value)
+
+ @patch("core.tools.utils.system_oauth_encryption.TypeAdapter")
+ def test_encrypt_oauth_params_serialization_error(self, mock_type_adapter):
+ """Test encryption when JSON serialization fails"""
+ mock_type_adapter.return_value.dump_json.side_effect = Exception("Serialization error")
+
+ encrypter = SystemOAuthEncrypter("test_secret")
+ oauth_params = {"client_id": "test_id"}
+
+ with pytest.raises(OAuthEncryptionError) as exc_info:
+ encrypter.encrypt_oauth_params(oauth_params)
+
+ assert "Encryption failed" in str(exc_info.value)
+
+ def test_decrypt_oauth_params_invalid_json(self):
+ """Test decryption with invalid JSON data"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+
+ # Create valid encrypted data but with invalid JSON content
+ iv = get_random_bytes(16)
+ cipher = AES.new(encrypter.key, AES.MODE_CBC, iv)
+ invalid_json = b"invalid json content"
+ padded_data = pad(invalid_json, AES.block_size)
+ encrypted_data = cipher.encrypt(padded_data)
+ combined = iv + encrypted_data
+ encoded = base64.b64encode(combined).decode()
+
+ with pytest.raises(OAuthEncryptionError):
+ encrypter.decrypt_oauth_params(encoded)
+
+ def test_key_derivation_consistency(self):
+ """Test that key derivation is consistent"""
+ secret_key = "test_secret"
+ encrypter1 = SystemOAuthEncrypter(secret_key)
+ encrypter2 = SystemOAuthEncrypter(secret_key)
+
+ assert encrypter1.key == encrypter2.key
+
+ # Keys should be 32 bytes (256 bits)
+ assert len(encrypter1.key) == 32
+
+
+class TestFactoryFunctions:
+ """Test cases for factory functions"""
+
+ def test_create_system_oauth_encrypter_with_secret(self):
+ """Test factory function with secret key"""
+ secret_key = "test_secret"
+ encrypter = create_system_oauth_encrypter(secret_key)
+
+ assert isinstance(encrypter, SystemOAuthEncrypter)
+ expected_key = hashlib.sha256(secret_key.encode()).digest()
+ assert encrypter.key == expected_key
+
+ def test_create_system_oauth_encrypter_without_secret(self):
+ """Test factory function without secret key"""
+ with patch("core.tools.utils.system_oauth_encryption.dify_config") as mock_config:
+ mock_config.SECRET_KEY = "config_secret"
+ encrypter = create_system_oauth_encrypter()
+
+ assert isinstance(encrypter, SystemOAuthEncrypter)
+ expected_key = hashlib.sha256(b"config_secret").digest()
+ assert encrypter.key == expected_key
+
+ def test_create_system_oauth_encrypter_with_none_secret(self):
+ """Test factory function with None secret key"""
+ with patch("core.tools.utils.system_oauth_encryption.dify_config") as mock_config:
+ mock_config.SECRET_KEY = "config_secret"
+ encrypter = create_system_oauth_encrypter(None)
+
+ assert isinstance(encrypter, SystemOAuthEncrypter)
+ expected_key = hashlib.sha256(b"config_secret").digest()
+ assert encrypter.key == expected_key
+
+
+class TestGlobalEncrypterInstance:
+ """Test cases for global encrypter instance"""
+
+ def test_get_system_oauth_encrypter_singleton(self):
+ """Test that get_system_oauth_encrypter returns singleton instance"""
+ # Clear the global instance first
+ import core.tools.utils.system_oauth_encryption
+
+ core.tools.utils.system_oauth_encryption._oauth_encrypter = None
+
+ encrypter1 = get_system_oauth_encrypter()
+ encrypter2 = get_system_oauth_encrypter()
+
+ assert encrypter1 is encrypter2
+ assert isinstance(encrypter1, SystemOAuthEncrypter)
+
+ def test_get_system_oauth_encrypter_uses_config(self):
+ """Test that global encrypter uses config"""
+ # Clear the global instance first
+ import core.tools.utils.system_oauth_encryption
+
+ core.tools.utils.system_oauth_encryption._oauth_encrypter = None
+
+ with patch("core.tools.utils.system_oauth_encryption.dify_config") as mock_config:
+ mock_config.SECRET_KEY = "global_secret"
+ encrypter = get_system_oauth_encrypter()
+
+ expected_key = hashlib.sha256(b"global_secret").digest()
+ assert encrypter.key == expected_key
+
+
+class TestConvenienceFunctions:
+ """Test cases for convenience functions"""
+
+ def test_encrypt_system_oauth_params(self):
+ """Test encrypt_system_oauth_params convenience function"""
+ oauth_params = {"client_id": "test_id", "client_secret": "test_secret"}
+
+ encrypted = encrypt_system_oauth_params(oauth_params)
+
+ assert isinstance(encrypted, str)
+ assert len(encrypted) > 0
+
+ def test_decrypt_system_oauth_params(self):
+ """Test decrypt_system_oauth_params convenience function"""
+ oauth_params = {"client_id": "test_id", "client_secret": "test_secret"}
+
+ encrypted = encrypt_system_oauth_params(oauth_params)
+ decrypted = decrypt_system_oauth_params(encrypted)
+
+ assert decrypted == oauth_params
+
+ def test_convenience_functions_consistency(self):
+ """Test that convenience functions work consistently"""
+ test_cases = [
+ {},
+ {"simple": "value"},
+ {"client_id": "id", "client_secret": "secret"},
+ {"complex": {"nested": {"deep": "value"}}},
+ {"unicode": "test 🚀"},
+ {"numbers": 42, "boolean": True, "null": None},
+ ]
+
+ for original_params in test_cases:
+ encrypted = encrypt_system_oauth_params(original_params)
+ decrypted = decrypt_system_oauth_params(encrypted)
+ assert decrypted == original_params, f"Failed for case: {original_params}"
+
+ def test_convenience_functions_with_errors(self):
+ """Test convenience functions with error conditions"""
+ # Test encryption with invalid input
+ with pytest.raises(Exception): # noqa: B017
+ encrypt_system_oauth_params(None) # type: ignore
+
+ # Test decryption with invalid input
+ with pytest.raises(ValueError):
+ decrypt_system_oauth_params("")
+
+ with pytest.raises(ValueError):
+ decrypt_system_oauth_params(None) # type: ignore
+
+
+class TestErrorHandling:
+ """Test cases for error handling"""
+
+ def test_oauth_encryption_error_inheritance(self):
+ """Test that OAuthEncryptionError is a proper exception"""
+ error = OAuthEncryptionError("Test error")
+ assert isinstance(error, Exception)
+ assert str(error) == "Test error"
+
+ def test_oauth_encryption_error_with_cause(self):
+ """Test OAuthEncryptionError with cause"""
+ original_error = ValueError("Original error")
+ error = OAuthEncryptionError("Wrapper error")
+ error.__cause__ = original_error
+
+ assert isinstance(error, Exception)
+ assert str(error) == "Wrapper error"
+ assert error.__cause__ is original_error
+
+ def test_error_messages_are_informative(self):
+ """Test that error messages are informative"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+
+ # Test empty string error
+ with pytest.raises(ValueError) as exc_info:
+ encrypter.decrypt_oauth_params("")
+ assert "encrypted_data cannot be empty" in str(exc_info.value)
+
+ # Test non-string error
+ with pytest.raises(ValueError) as exc_info:
+ encrypter.decrypt_oauth_params(123) # type: ignore
+ assert "encrypted_data must be a string" in str(exc_info.value)
+
+ # Test invalid format error
+ short_data = base64.b64encode(b"short").decode()
+ with pytest.raises(OAuthEncryptionError) as exc_info:
+ encrypter.decrypt_oauth_params(short_data)
+ assert "Invalid encrypted data format" in str(exc_info.value)
+
+
+class TestEdgeCases:
+ """Test cases for edge cases and boundary conditions"""
+
+ def test_very_long_secret_key(self):
+ """Test with very long secret key"""
+ long_secret = "x" * 10000
+ encrypter = SystemOAuthEncrypter(long_secret)
+
+ # Key should still be 32 bytes due to SHA-256
+ assert len(encrypter.key) == 32
+
+ # Should still work normally
+ oauth_params = {"client_id": "test_id"}
+ encrypted = encrypter.encrypt_oauth_params(oauth_params)
+ decrypted = encrypter.decrypt_oauth_params(encrypted)
+ assert decrypted == oauth_params
+
+ def test_special_characters_in_secret_key(self):
+ """Test with special characters in secret key"""
+ special_secret = "!@#$%^&*()_+-=[]{}|;':\",./<>?`~test🚀"
+ encrypter = SystemOAuthEncrypter(special_secret)
+
+ oauth_params = {"client_id": "test_id"}
+ encrypted = encrypter.encrypt_oauth_params(oauth_params)
+ decrypted = encrypter.decrypt_oauth_params(encrypted)
+ assert decrypted == oauth_params
+
+ def test_empty_values_in_oauth_params(self):
+ """Test with empty values in oauth params"""
+ oauth_params = {
+ "client_id": "",
+ "client_secret": "",
+ "empty_dict": {},
+ "empty_list": [],
+ "empty_string": "",
+ "zero": 0,
+ "false": False,
+ "none": None,
+ }
+
+ encrypter = SystemOAuthEncrypter("test_secret")
+ encrypted = encrypter.encrypt_oauth_params(oauth_params)
+ decrypted = encrypter.decrypt_oauth_params(encrypted)
+ assert decrypted == oauth_params
+
+ def test_deeply_nested_oauth_params(self):
+ """Test with deeply nested oauth params"""
+ oauth_params = {"level1": {"level2": {"level3": {"level4": {"level5": {"deep_value": "found"}}}}}}
+
+ encrypter = SystemOAuthEncrypter("test_secret")
+ encrypted = encrypter.encrypt_oauth_params(oauth_params)
+ decrypted = encrypter.decrypt_oauth_params(encrypted)
+ assert decrypted == oauth_params
+
+ def test_oauth_params_with_all_json_types(self):
+ """Test with all JSON-supported data types"""
+ oauth_params = {
+ "string": "test_string",
+ "integer": 42,
+ "float": 3.14159,
+ "boolean_true": True,
+ "boolean_false": False,
+ "null_value": None,
+ "empty_string": "",
+ "array": [1, "two", 3.0, True, False, None],
+ "object": {"nested_string": "nested_value", "nested_number": 123, "nested_bool": True},
+ }
+
+ encrypter = SystemOAuthEncrypter("test_secret")
+ encrypted = encrypter.encrypt_oauth_params(oauth_params)
+ decrypted = encrypter.decrypt_oauth_params(encrypted)
+ assert decrypted == oauth_params
+
+
+class TestPerformance:
+ """Test cases for performance considerations"""
+
+ def test_large_oauth_params(self):
+ """Test with large oauth params"""
+ large_value = "x" * 100000 # 100KB
+ oauth_params = {"client_id": "test_id", "large_data": large_value}
+
+ encrypter = SystemOAuthEncrypter("test_secret")
+ encrypted = encrypter.encrypt_oauth_params(oauth_params)
+ decrypted = encrypter.decrypt_oauth_params(encrypted)
+ assert decrypted == oauth_params
+
+ def test_many_fields_oauth_params(self):
+ """Test with many fields in oauth params"""
+ oauth_params = {f"field_{i}": f"value_{i}" for i in range(1000)}
+
+ encrypter = SystemOAuthEncrypter("test_secret")
+ encrypted = encrypter.encrypt_oauth_params(oauth_params)
+ decrypted = encrypter.decrypt_oauth_params(encrypted)
+ assert decrypted == oauth_params
+
+ def test_repeated_encryption_decryption(self):
+ """Test repeated encryption and decryption operations"""
+ encrypter = SystemOAuthEncrypter("test_secret")
+ oauth_params = {"client_id": "test_id", "client_secret": "test_secret"}
+
+ # Test multiple rounds of encryption/decryption
+ for i in range(100):
+ encrypted = encrypter.encrypt_oauth_params(oauth_params)
+ decrypted = encrypter.decrypt_oauth_params(encrypted)
+ assert decrypted == oauth_params
diff --git a/api/tests/unit_tests/utils/structured_output_parser/__init__.py b/api/tests/unit_tests/utils/structured_output_parser/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api/tests/unit_tests/utils/structured_output_parser/test_structured_output_parser.py b/api/tests/unit_tests/utils/structured_output_parser/test_structured_output_parser.py
new file mode 100644
index 0000000000..93284eed4b
--- /dev/null
+++ b/api/tests/unit_tests/utils/structured_output_parser/test_structured_output_parser.py
@@ -0,0 +1,465 @@
+from decimal import Decimal
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from core.llm_generator.output_parser.errors import OutputParserError
+from core.llm_generator.output_parser.structured_output import invoke_llm_with_structured_output
+from core.model_runtime.entities.llm_entities import (
+ LLMResult,
+ LLMResultChunk,
+ LLMResultChunkDelta,
+ LLMResultChunkWithStructuredOutput,
+ LLMResultWithStructuredOutput,
+ LLMUsage,
+)
+from core.model_runtime.entities.message_entities import (
+ AssistantPromptMessage,
+ SystemPromptMessage,
+ TextPromptMessageContent,
+ UserPromptMessage,
+)
+from core.model_runtime.entities.model_entities import AIModelEntity, ModelType
+
+
+def create_mock_usage(prompt_tokens: int = 10, completion_tokens: int = 5) -> LLMUsage:
+ """Create a mock LLMUsage with all required fields"""
+ return LLMUsage(
+ prompt_tokens=prompt_tokens,
+ prompt_unit_price=Decimal("0.001"),
+ prompt_price_unit=Decimal(1),
+ prompt_price=Decimal(str(prompt_tokens)) * Decimal("0.001"),
+ completion_tokens=completion_tokens,
+ completion_unit_price=Decimal("0.002"),
+ completion_price_unit=Decimal(1),
+ completion_price=Decimal(str(completion_tokens)) * Decimal("0.002"),
+ total_tokens=prompt_tokens + completion_tokens,
+ total_price=Decimal(str(prompt_tokens)) * Decimal("0.001") + Decimal(str(completion_tokens)) * Decimal("0.002"),
+ currency="USD",
+ latency=1.5,
+ )
+
+
+def get_model_entity(provider: str, model_name: str, support_structure_output: bool = False) -> AIModelEntity:
+ """Create a mock AIModelEntity for testing"""
+ model_schema = MagicMock()
+ model_schema.model = model_name
+ model_schema.provider = provider
+ model_schema.model_type = ModelType.LLM
+ model_schema.model_provider = provider
+ model_schema.model_name = model_name
+ model_schema.support_structure_output = support_structure_output
+ model_schema.parameter_rules = []
+
+ return model_schema
+
+
+def get_model_instance() -> MagicMock:
+ """Create a mock ModelInstance for testing"""
+ mock_instance = MagicMock()
+ mock_instance.provider = "openai"
+ mock_instance.credentials = {}
+ return mock_instance
+
+
+def test_structured_output_parser():
+ """Test cases for invoke_llm_with_structured_output function"""
+
+ testcases = [
+ # Test case 1: Model with native structured output support, non-streaming
+ {
+ "name": "native_structured_output_non_streaming",
+ "provider": "openai",
+ "model_name": "gpt-4o",
+ "support_structure_output": True,
+ "stream": False,
+ "json_schema": {"type": "object", "properties": {"name": {"type": "string"}}},
+ "expected_llm_response": LLMResult(
+ model="gpt-4o",
+ message=AssistantPromptMessage(content='{"name": "test"}'),
+ usage=create_mock_usage(prompt_tokens=10, completion_tokens=5),
+ ),
+ "expected_result_type": LLMResultWithStructuredOutput,
+ "should_raise": False,
+ },
+ # Test case 2: Model with native structured output support, streaming
+ {
+ "name": "native_structured_output_streaming",
+ "provider": "openai",
+ "model_name": "gpt-4o",
+ "support_structure_output": True,
+ "stream": True,
+ "json_schema": {"type": "object", "properties": {"name": {"type": "string"}}},
+ "expected_llm_response": [
+ LLMResultChunk(
+ model="gpt-4o",
+ prompt_messages=[UserPromptMessage(content="test")],
+ system_fingerprint="test",
+ delta=LLMResultChunkDelta(
+ index=0,
+ message=AssistantPromptMessage(content='{"name":'),
+ usage=create_mock_usage(prompt_tokens=10, completion_tokens=2),
+ ),
+ ),
+ LLMResultChunk(
+ model="gpt-4o",
+ prompt_messages=[UserPromptMessage(content="test")],
+ system_fingerprint="test",
+ delta=LLMResultChunkDelta(
+ index=0,
+ message=AssistantPromptMessage(content=' "test"}'),
+ usage=create_mock_usage(prompt_tokens=10, completion_tokens=3),
+ ),
+ ),
+ ],
+ "expected_result_type": "generator",
+ "should_raise": False,
+ },
+ # Test case 3: Model without native structured output support, non-streaming
+ {
+ "name": "prompt_based_structured_output_non_streaming",
+ "provider": "anthropic",
+ "model_name": "claude-3-sonnet",
+ "support_structure_output": False,
+ "stream": False,
+ "json_schema": {"type": "object", "properties": {"answer": {"type": "string"}}},
+ "expected_llm_response": LLMResult(
+ model="claude-3-sonnet",
+ message=AssistantPromptMessage(content='{"answer": "test response"}'),
+ usage=create_mock_usage(prompt_tokens=15, completion_tokens=8),
+ ),
+ "expected_result_type": LLMResultWithStructuredOutput,
+ "should_raise": False,
+ },
+ # Test case 4: Model without native structured output support, streaming
+ {
+ "name": "prompt_based_structured_output_streaming",
+ "provider": "anthropic",
+ "model_name": "claude-3-sonnet",
+ "support_structure_output": False,
+ "stream": True,
+ "json_schema": {"type": "object", "properties": {"answer": {"type": "string"}}},
+ "expected_llm_response": [
+ LLMResultChunk(
+ model="claude-3-sonnet",
+ prompt_messages=[UserPromptMessage(content="test")],
+ system_fingerprint="test",
+ delta=LLMResultChunkDelta(
+ index=0,
+ message=AssistantPromptMessage(content='{"answer": "test'),
+ usage=create_mock_usage(prompt_tokens=15, completion_tokens=3),
+ ),
+ ),
+ LLMResultChunk(
+ model="claude-3-sonnet",
+ prompt_messages=[UserPromptMessage(content="test")],
+ system_fingerprint="test",
+ delta=LLMResultChunkDelta(
+ index=0,
+ message=AssistantPromptMessage(content=' response"}'),
+ usage=create_mock_usage(prompt_tokens=15, completion_tokens=5),
+ ),
+ ),
+ ],
+ "expected_result_type": "generator",
+ "should_raise": False,
+ },
+ # Test case 5: Streaming with list content
+ {
+ "name": "streaming_with_list_content",
+ "provider": "openai",
+ "model_name": "gpt-4o",
+ "support_structure_output": True,
+ "stream": True,
+ "json_schema": {"type": "object", "properties": {"data": {"type": "string"}}},
+ "expected_llm_response": [
+ LLMResultChunk(
+ model="gpt-4o",
+ prompt_messages=[UserPromptMessage(content="test")],
+ system_fingerprint="test",
+ delta=LLMResultChunkDelta(
+ index=0,
+ message=AssistantPromptMessage(
+ content=[
+ TextPromptMessageContent(data='{"data":'),
+ ]
+ ),
+ usage=create_mock_usage(prompt_tokens=10, completion_tokens=2),
+ ),
+ ),
+ LLMResultChunk(
+ model="gpt-4o",
+ prompt_messages=[UserPromptMessage(content="test")],
+ system_fingerprint="test",
+ delta=LLMResultChunkDelta(
+ index=0,
+ message=AssistantPromptMessage(
+ content=[
+ TextPromptMessageContent(data=' "value"}'),
+ ]
+ ),
+ usage=create_mock_usage(prompt_tokens=10, completion_tokens=3),
+ ),
+ ),
+ ],
+ "expected_result_type": "generator",
+ "should_raise": False,
+ },
+ # Test case 6: Error case - non-string LLM response content (non-streaming)
+ {
+ "name": "error_non_string_content_non_streaming",
+ "provider": "openai",
+ "model_name": "gpt-4o",
+ "support_structure_output": True,
+ "stream": False,
+ "json_schema": {"type": "object", "properties": {"name": {"type": "string"}}},
+ "expected_llm_response": LLMResult(
+ model="gpt-4o",
+ message=AssistantPromptMessage(content=None), # Non-string content
+ usage=create_mock_usage(prompt_tokens=10, completion_tokens=5),
+ ),
+ "expected_result_type": None,
+ "should_raise": True,
+ "expected_error": OutputParserError,
+ },
+ # Test case 7: JSON repair scenario
+ {
+ "name": "json_repair_scenario",
+ "provider": "openai",
+ "model_name": "gpt-4o",
+ "support_structure_output": True,
+ "stream": False,
+ "json_schema": {"type": "object", "properties": {"name": {"type": "string"}}},
+ "expected_llm_response": LLMResult(
+ model="gpt-4o",
+ message=AssistantPromptMessage(content='{"name": "test"'), # Invalid JSON - missing closing brace
+ usage=create_mock_usage(prompt_tokens=10, completion_tokens=5),
+ ),
+ "expected_result_type": LLMResultWithStructuredOutput,
+ "should_raise": False,
+ },
+ # Test case 8: Model with parameter rules for response format
+ {
+ "name": "model_with_parameter_rules",
+ "provider": "openai",
+ "model_name": "gpt-4o",
+ "support_structure_output": True,
+ "stream": False,
+ "json_schema": {"type": "object", "properties": {"result": {"type": "string"}}},
+ "parameter_rules": [
+ MagicMock(name="response_format", options=["json_schema"], required=False),
+ ],
+ "expected_llm_response": LLMResult(
+ model="gpt-4o",
+ message=AssistantPromptMessage(content='{"result": "success"}'),
+ usage=create_mock_usage(prompt_tokens=10, completion_tokens=5),
+ ),
+ "expected_result_type": LLMResultWithStructuredOutput,
+ "should_raise": False,
+ },
+ # Test case 9: Model without native support but with JSON response format rules
+ {
+ "name": "non_native_with_json_rules",
+ "provider": "anthropic",
+ "model_name": "claude-3-sonnet",
+ "support_structure_output": False,
+ "stream": False,
+ "json_schema": {"type": "object", "properties": {"output": {"type": "string"}}},
+ "parameter_rules": [
+ MagicMock(name="response_format", options=["JSON"], required=False),
+ ],
+ "expected_llm_response": LLMResult(
+ model="claude-3-sonnet",
+ message=AssistantPromptMessage(content='{"output": "result"}'),
+ usage=create_mock_usage(prompt_tokens=15, completion_tokens=8),
+ ),
+ "expected_result_type": LLMResultWithStructuredOutput,
+ "should_raise": False,
+ },
+ ]
+
+ for case in testcases:
+ print(f"Running test case: {case['name']}")
+
+ # Setup model entity
+ model_schema = get_model_entity(case["provider"], case["model_name"], case["support_structure_output"])
+
+ # Add parameter rules if specified
+ if "parameter_rules" in case:
+ model_schema.parameter_rules = case["parameter_rules"]
+
+ # Setup model instance
+ model_instance = get_model_instance()
+ model_instance.invoke_llm.return_value = case["expected_llm_response"]
+
+ # Setup prompt messages
+ prompt_messages = [
+ SystemPromptMessage(content="You are a helpful assistant."),
+ UserPromptMessage(content="Generate a response according to the schema."),
+ ]
+
+ if case["should_raise"]:
+ # Test error cases
+ with pytest.raises(case["expected_error"]): # noqa: PT012
+ if case["stream"]:
+ result_generator = invoke_llm_with_structured_output(
+ provider=case["provider"],
+ model_schema=model_schema,
+ model_instance=model_instance,
+ prompt_messages=prompt_messages,
+ json_schema=case["json_schema"],
+ stream=case["stream"],
+ )
+ # Consume the generator to trigger the error
+ list(result_generator)
+ else:
+ invoke_llm_with_structured_output(
+ provider=case["provider"],
+ model_schema=model_schema,
+ model_instance=model_instance,
+ prompt_messages=prompt_messages,
+ json_schema=case["json_schema"],
+ stream=case["stream"],
+ )
+ else:
+ # Test successful cases
+ with patch("core.llm_generator.output_parser.structured_output.json_repair.loads") as mock_json_repair:
+ # Configure json_repair mock for cases that need it
+ if case["name"] == "json_repair_scenario":
+ mock_json_repair.return_value = {"name": "test"}
+
+ result = invoke_llm_with_structured_output(
+ provider=case["provider"],
+ model_schema=model_schema,
+ model_instance=model_instance,
+ prompt_messages=prompt_messages,
+ json_schema=case["json_schema"],
+ stream=case["stream"],
+ model_parameters={"temperature": 0.7, "max_tokens": 100},
+ user="test_user",
+ )
+
+ if case["expected_result_type"] == "generator":
+ # Test streaming results
+ assert hasattr(result, "__iter__")
+ chunks = list(result)
+ assert len(chunks) > 0
+
+ # Verify all chunks are LLMResultChunkWithStructuredOutput
+ for chunk in chunks[:-1]: # All except last
+ assert isinstance(chunk, LLMResultChunkWithStructuredOutput)
+ assert chunk.model == case["model_name"]
+
+ # Last chunk should have structured output
+ last_chunk = chunks[-1]
+ assert isinstance(last_chunk, LLMResultChunkWithStructuredOutput)
+ assert last_chunk.structured_output is not None
+ assert isinstance(last_chunk.structured_output, dict)
+ else:
+ # Test non-streaming results
+ assert isinstance(result, case["expected_result_type"])
+ assert result.model == case["model_name"]
+ assert result.structured_output is not None
+ assert isinstance(result.structured_output, dict)
+
+ # Verify model_instance.invoke_llm was called with correct parameters
+ model_instance.invoke_llm.assert_called_once()
+ call_args = model_instance.invoke_llm.call_args
+
+ assert call_args.kwargs["stream"] == case["stream"]
+ assert call_args.kwargs["user"] == "test_user"
+ assert "temperature" in call_args.kwargs["model_parameters"]
+ assert "max_tokens" in call_args.kwargs["model_parameters"]
+
+
+def test_parse_structured_output_edge_cases():
+ """Test edge cases for structured output parsing"""
+
+ # Test case with list that contains dict (reasoning model scenario)
+ testcase_list_with_dict = {
+ "name": "list_with_dict_parsing",
+ "provider": "deepseek",
+ "model_name": "deepseek-r1",
+ "support_structure_output": False,
+ "stream": False,
+ "json_schema": {"type": "object", "properties": {"thought": {"type": "string"}}},
+ "expected_llm_response": LLMResult(
+ model="deepseek-r1",
+ message=AssistantPromptMessage(content='[{"thought": "reasoning process"}, "other content"]'),
+ usage=create_mock_usage(prompt_tokens=10, completion_tokens=5),
+ ),
+ "expected_result_type": LLMResultWithStructuredOutput,
+ "should_raise": False,
+ }
+
+ # Setup for list parsing test
+ model_schema = get_model_entity(
+ testcase_list_with_dict["provider"],
+ testcase_list_with_dict["model_name"],
+ testcase_list_with_dict["support_structure_output"],
+ )
+
+ model_instance = get_model_instance()
+ model_instance.invoke_llm.return_value = testcase_list_with_dict["expected_llm_response"]
+
+ prompt_messages = [UserPromptMessage(content="Test reasoning")]
+
+ with patch("core.llm_generator.output_parser.structured_output.json_repair.loads") as mock_json_repair:
+ # Mock json_repair to return a list with dict
+ mock_json_repair.return_value = [{"thought": "reasoning process"}, "other content"]
+
+ result = invoke_llm_with_structured_output(
+ provider=testcase_list_with_dict["provider"],
+ model_schema=model_schema,
+ model_instance=model_instance,
+ prompt_messages=prompt_messages,
+ json_schema=testcase_list_with_dict["json_schema"],
+ stream=testcase_list_with_dict["stream"],
+ )
+
+ assert isinstance(result, LLMResultWithStructuredOutput)
+ assert result.structured_output == {"thought": "reasoning process"}
+
+
+def test_model_specific_schema_preparation():
+ """Test schema preparation for different model types"""
+
+ # Test Gemini model
+ gemini_case = {
+ "provider": "google",
+ "model_name": "gemini-pro",
+ "support_structure_output": True,
+ "stream": False,
+ "json_schema": {"type": "object", "properties": {"result": {"type": "boolean"}}, "additionalProperties": False},
+ }
+
+ model_schema = get_model_entity(
+ gemini_case["provider"], gemini_case["model_name"], gemini_case["support_structure_output"]
+ )
+
+ model_instance = get_model_instance()
+ model_instance.invoke_llm.return_value = LLMResult(
+ model="gemini-pro",
+ message=AssistantPromptMessage(content='{"result": "true"}'),
+ usage=create_mock_usage(prompt_tokens=10, completion_tokens=5),
+ )
+
+ prompt_messages = [UserPromptMessage(content="Test")]
+
+ result = invoke_llm_with_structured_output(
+ provider=gemini_case["provider"],
+ model_schema=model_schema,
+ model_instance=model_instance,
+ prompt_messages=prompt_messages,
+ json_schema=gemini_case["json_schema"],
+ stream=gemini_case["stream"],
+ )
+
+ assert isinstance(result, LLMResultWithStructuredOutput)
+
+ # Verify model_instance.invoke_llm was called and check the schema preparation
+ model_instance.invoke_llm.assert_called_once()
+ call_args = model_instance.invoke_llm.call_args
+
+ # For Gemini, the schema should not have additionalProperties and boolean should be converted to string
+ assert "json_schema" in call_args.kwargs["model_parameters"]
diff --git a/api/uv.lock b/api/uv.lock
index c900191ceb..21b6b20f53 100644
--- a/api/uv.lock
+++ b/api/uv.lock
@@ -36,7 +36,7 @@ wheels = [
[[package]]
name = "aiohttp"
-version = "3.12.7"
+version = "3.12.13"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "aiohappyeyeballs" },
@@ -47,42 +47,42 @@ dependencies = [
{ name = "propcache" },
{ name = "yarl" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/eb/62/95588e933dfea06a3af0332990bd19f6768f8f37fa4c0fe33fe4c55cf9d0/aiohttp-3.12.7.tar.gz", hash = "sha256:08bf55b216c779eddb6e41c1841c17d7ddd12776c7d7b36051c0a292a9ca828e", size = 7806530, upload-time = "2025-06-02T16:34:10.399Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/af/19/37560cc111d6fd95ff6c4bd14445e3c629269fce406c89cc7a69a2865ecf/aiohttp-3.12.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:388b5947aa6931ef4ce3ed4edde6853e84980677886992cfadcf733dd06eed63", size = 707169, upload-time = "2025-06-02T16:31:39.107Z" },
- { url = "https://files.pythonhosted.org/packages/b9/18/29bbefb094f81a687473c1d31391bf8a4c48c7b5b8559c3679fc14e67597/aiohttp-3.12.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9ed5af1cce257cca27a3e920b003b3b397f63418a203064b7d804ea3b45782af", size = 479443, upload-time = "2025-06-02T16:31:41.185Z" },
- { url = "https://files.pythonhosted.org/packages/cf/7d/119f3e012c75a3fe38f86ac1d77f1452779e0e940770d5827d4e62aa5655/aiohttp-3.12.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f466ae8f9c02993b7d167be685bdbeb527cf254a3cfcc757697e0e336399d0a2", size = 467706, upload-time = "2025-06-02T16:31:43.401Z" },
- { url = "https://files.pythonhosted.org/packages/83/f1/f61d8573d648e17347ab9a112063e4363664b5b6100792467fbb26028bde/aiohttp-3.12.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2be095a420a9f9a12eff343d877ae180dd919238b539431af08cef929e874759", size = 1737902, upload-time = "2025-06-02T16:31:45.948Z" },
- { url = "https://files.pythonhosted.org/packages/4b/f8/7a8a000bc63de3c79aaa8f03b0784e29e9982276f4579c5e2e56d560e403/aiohttp-3.12.7-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:b058cf2ba6adba699960d7bc403411c8a99ab5d3e5ea3eb01473638ae7d1a30e", size = 1686569, upload-time = "2025-06-02T16:31:47.749Z" },
- { url = "https://files.pythonhosted.org/packages/5c/4e/29a5b35ca9a598f51dc7deff4e8403bf813988f30a8b250e25a8442641b7/aiohttp-3.12.7-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9b6a660163b055686dbb0acc961978fd14537eba5d9da6cbdb4dced7a8d3be1a", size = 1785359, upload-time = "2025-06-02T16:31:49.687Z" },
- { url = "https://files.pythonhosted.org/packages/f9/36/0521398a69c40ac24c659b130597e2544cde1d7dd00291b8a6206bb552d0/aiohttp-3.12.7-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d741923905f267ad5d5c8f86a56f9d2beac9f32a36c217c5d9ef65cd74fd8ca0", size = 1824408, upload-time = "2025-06-02T16:31:51.518Z" },
- { url = "https://files.pythonhosted.org/packages/c1/41/79506d76da96399b6b700acbe10b14291547a3b49a1cc7ed2c5edaa199ce/aiohttp-3.12.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:519f5454b6018158ae0e789b8f6a88726c47dd680982eb318ef3ca4dee727314", size = 1726867, upload-time = "2025-06-02T16:31:53.277Z" },
- { url = "https://files.pythonhosted.org/packages/32/d1/d59ed16962934b46c7569d04af2dc9638a38ae5812680b9d6c7ee42d770e/aiohttp-3.12.7-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e4eebfe470e22cc4b374d7e32c07e96d777a5c0fa51f3824de68e697da037ec", size = 1663943, upload-time = "2025-06-02T16:31:55.094Z" },
- { url = "https://files.pythonhosted.org/packages/15/d5/971d1b277e6a3d5b679f0c9ba076c343a5125ea2eacc51c23ea7d875d43a/aiohttp-3.12.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:74ff39445f94923cf595e9e6dd602ecbe66b12364e2207e61342b8834417f8da", size = 1712217, upload-time = "2025-06-02T16:31:57.336Z" },
- { url = "https://files.pythonhosted.org/packages/e1/9c/c21fd0ba87772f3d1d43cdbfcfd40fe29f37d36a5d73997a8a4d4d1485c3/aiohttp-3.12.7-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:77cb9dba16486ecfeac8076763600b9714941e0ff696e53a30e8d408d9a196ca", size = 1707375, upload-time = "2025-06-02T16:31:59.12Z" },
- { url = "https://files.pythonhosted.org/packages/85/48/bb97ef3a694df852b70e6f5c1aaf3621a3a26b35f0a0d90481f3fdb1ce8b/aiohttp-3.12.7-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:a7b3b9cbe83e3918a1918b0de274884f17b64224c1c9210a6fb0f7c10d246636", size = 1687561, upload-time = "2025-06-02T16:32:01.385Z" },
- { url = "https://files.pythonhosted.org/packages/d5/75/0b85f30ba9eb1dbdb5d3a53d3a0db29990220f69187acb24d06903686c5d/aiohttp-3.12.7-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:6055f53c70938498884e71ca966abe8e9e7558489e13a7e40b6384dee7230d1d", size = 1781163, upload-time = "2025-06-02T16:32:03.176Z" },
- { url = "https://files.pythonhosted.org/packages/92/51/6350a4c485c7d2fb794101d46085c3830485ec1c37738d8af6c9c5ed8e1a/aiohttp-3.12.7-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:8493a42d5b2a736c6804239b985feebeea1c60f8fcb46a3607d6dce3c1a42b12", size = 1801624, upload-time = "2025-06-02T16:32:05.027Z" },
- { url = "https://files.pythonhosted.org/packages/4f/dd/6a75eaaac93b5552090e42c38a576062028ce4af50f0b50ac550332d332c/aiohttp-3.12.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:372f2237cade45f563d973c2a913895f2699a892c0eb11c55c6880b6f0acf219", size = 1714679, upload-time = "2025-06-02T16:32:06.837Z" },
- { url = "https://files.pythonhosted.org/packages/de/ad/0574964387d8eed7fcd0c2fe6ef20c4affe0b265c710938d5fffdb3776b5/aiohttp-3.12.7-cp311-cp311-win32.whl", hash = "sha256:41f686749a099b507563a5c0cb4fd77367b05448a2c1758784ad506a28e9e579", size = 424709, upload-time = "2025-06-02T16:32:08.671Z" },
- { url = "https://files.pythonhosted.org/packages/4f/ab/6b82b43abb0990e4452aaef509cf1403ab50c04b5c090f92fb1b255fb319/aiohttp-3.12.7-cp311-cp311-win_amd64.whl", hash = "sha256:7a3691583470d4397aca70fbf8e0f0778b63a2c2a6a23263bdeeb68395972f29", size = 449100, upload-time = "2025-06-02T16:32:10.373Z" },
- { url = "https://files.pythonhosted.org/packages/5d/65/0bd8ccbffa33ee69db9f5c43f3f62fb8b600b607388e9a8deab8962d0523/aiohttp-3.12.7-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:9b9345918f5b5156a5712c37d1d331baf320df67547ea032a49a609b773c3606", size = 698263, upload-time = "2025-06-02T16:32:12.107Z" },
- { url = "https://files.pythonhosted.org/packages/99/64/a48a8abc4e684fb447d1f7b61e7adcb19865b91e20b50595f49b2942fbb3/aiohttp-3.12.7-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:3091b4883f405dbabeb9ea821a25dec16d03a51c3e0d2752fc3ab48b652bf196", size = 472877, upload-time = "2025-06-02T16:32:14.386Z" },
- { url = "https://files.pythonhosted.org/packages/7d/e4/994bc56a7d7733e9cd1f45db8b656e78d51d7a61cefff8043ec4f7d4a23f/aiohttp-3.12.7-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:97fd97abd4cf199eff4041d0346a7dc68b60deab177f01de87283be513ffc3ab", size = 465716, upload-time = "2025-06-02T16:32:16.108Z" },
- { url = "https://files.pythonhosted.org/packages/39/b0/bddc489288a0e3b05fa05387db9caebc38577204a17db0d5428abae524ba/aiohttp-3.12.7-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a5938973105cd5ff17176e8cb36bc19cac7c82ae7c58c0dbd7e023972d0c708", size = 1712513, upload-time = "2025-06-02T16:32:17.898Z" },
- { url = "https://files.pythonhosted.org/packages/4d/4a/c06d3ce0dc5f96338cc8d18da57d74608585a3751234eeef5952e4f48ade/aiohttp-3.12.7-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:e506ae5c4c05d1a1e87edd64b994cea2d49385d41d32e1c6be8764f31cf2245c", size = 1695167, upload-time = "2025-06-02T16:32:20.131Z" },
- { url = "https://files.pythonhosted.org/packages/79/ec/e847fdfe2b1c1f1a2b0ba5343a9b2bd033a0545f8eaf1f7894a6614473ae/aiohttp-3.12.7-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b780b402e6361c4cfcec252580f5ecdd86cb68376520ac34748d3f8b262dd598", size = 1750261, upload-time = "2025-06-02T16:32:22.717Z" },
- { url = "https://files.pythonhosted.org/packages/2c/5e/b832ff59737d99cc5ae51b737c52976d19990ccee922ba6fe811f615e7f9/aiohttp-3.12.7-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cf981bbfb7ff2ebc1b3bfae49d2efe2c51ca1cf3d90867f47c310df65398e85e", size = 1796416, upload-time = "2025-06-02T16:32:25.15Z" },
- { url = "https://files.pythonhosted.org/packages/e0/ff/51ae87efce9b53aafd384179f58923bf178f561897cf80054a440fdf8363/aiohttp-3.12.7-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94f98e0e5a49f89b252e115844f756c04fc8050f38252a32a3dd994ce8121f10", size = 1715855, upload-time = "2025-06-02T16:32:27.236Z" },
- { url = "https://files.pythonhosted.org/packages/b1/54/5a77116498f84d2503f5588e687eccfa43a85aa2450bc195ee6e5bb75695/aiohttp-3.12.7-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:410e96cc6824fc4ced9703fb2ac2d06c6190d21fc6f5b588f62b1918628449c1", size = 1631656, upload-time = "2025-06-02T16:32:29.15Z" },
- { url = "https://files.pythonhosted.org/packages/46/34/554220592f8ade7f3cabebfb9325e95078f842140f293ced3ab977fd13ec/aiohttp-3.12.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:43e93987fe9df4349db8deae7c391695538c35e4ba893133c7e823234f6e4537", size = 1692718, upload-time = "2025-06-02T16:32:31.295Z" },
- { url = "https://files.pythonhosted.org/packages/ff/9d/ae7103bb8c73c3521e38ae8cde301ddc937024b1681ce134bb1ef01be7d0/aiohttp-3.12.7-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:cb3f3dcb59f3e16819a1c7d3fa32e7b87255b661c1e139a1b5940bde270704ab", size = 1714171, upload-time = "2025-06-02T16:32:33.767Z" },
- { url = "https://files.pythonhosted.org/packages/5d/4d/9b8b8f362e36392939019340321f7efcc1807bb2c4cdea8eb1019d3398ff/aiohttp-3.12.7-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:4a46fe4a4c66b2712059e48a8384eb93565fbe3251af4844860fed846ef4ca75", size = 1654822, upload-time = "2025-06-02T16:32:36.23Z" },
- { url = "https://files.pythonhosted.org/packages/48/30/0ca82df423ee346206bc167852c825cd210c11d2f1fa0064a2a55d7f60d5/aiohttp-3.12.7-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:ad01793164661af70918490ef8efc2c09df7a3c686b6c84ca90a2d69cdbc3911", size = 1734385, upload-time = "2025-06-02T16:32:38.171Z" },
- { url = "https://files.pythonhosted.org/packages/43/bd/96d12318c0f82ac8323bd4459ee26291ad220f688988077a21e538b0872c/aiohttp-3.12.7-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:e85c6833be3f49cead2e7bc79080e5c18d6dab9af32226ab5a01dc20c523e7d9", size = 1762356, upload-time = "2025-06-02T16:32:40.142Z" },
- { url = "https://files.pythonhosted.org/packages/6c/39/7a9b706bf42f293415584d60cf35e80d0558929ab70e72cb40b747f0dfc7/aiohttp-3.12.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:3c9f52149d8249566e72c50c7985c2345521b3b78f84aa86f6f492cd50b14793", size = 1721970, upload-time = "2025-06-02T16:32:42.187Z" },
- { url = "https://files.pythonhosted.org/packages/19/f2/8899367a52dec8100f43036e5a792cfdbae317bf3a80549da90290083ff4/aiohttp-3.12.7-cp312-cp312-win32.whl", hash = "sha256:0e1c33ac0f6a396bcefe9c1d52c9d38a051861885a5c102ca5c8298aba0108fa", size = 419443, upload-time = "2025-06-02T16:32:44.335Z" },
- { url = "https://files.pythonhosted.org/packages/e8/34/ad5225b4edbcc23496537011d67ef1a147c03205c07340f4a50993b219b9/aiohttp-3.12.7-cp312-cp312-win_amd64.whl", hash = "sha256:b4aed5233a9d13e34e8624ecb798533aa2da97e7048cc69671b7a6d7a2efe7e8", size = 445544, upload-time = "2025-06-02T16:32:46.631Z" },
+sdist = { url = "https://files.pythonhosted.org/packages/42/6e/ab88e7cb2a4058bed2f7870276454f85a7c56cd6da79349eb314fc7bbcaa/aiohttp-3.12.13.tar.gz", hash = "sha256:47e2da578528264a12e4e3dd8dd72a7289e5f812758fe086473fab037a10fcce", size = 7819160, upload-time = "2025-06-14T15:15:41.354Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/6a/65/5566b49553bf20ffed6041c665a5504fb047cefdef1b701407b8ce1a47c4/aiohttp-3.12.13-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:7c229b1437aa2576b99384e4be668af1db84b31a45305d02f61f5497cfa6f60c", size = 709401, upload-time = "2025-06-14T15:13:30.774Z" },
+ { url = "https://files.pythonhosted.org/packages/14/b5/48e4cc61b54850bdfafa8fe0b641ab35ad53d8e5a65ab22b310e0902fa42/aiohttp-3.12.13-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:04076d8c63471e51e3689c93940775dc3d12d855c0c80d18ac5a1c68f0904358", size = 481669, upload-time = "2025-06-14T15:13:32.316Z" },
+ { url = "https://files.pythonhosted.org/packages/04/4f/e3f95c8b2a20a0437d51d41d5ccc4a02970d8ad59352efb43ea2841bd08e/aiohttp-3.12.13-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:55683615813ce3601640cfaa1041174dc956d28ba0511c8cbd75273eb0587014", size = 469933, upload-time = "2025-06-14T15:13:34.104Z" },
+ { url = "https://files.pythonhosted.org/packages/41/c9/c5269f3b6453b1cfbd2cfbb6a777d718c5f086a3727f576c51a468b03ae2/aiohttp-3.12.13-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:921bc91e602d7506d37643e77819cb0b840d4ebb5f8d6408423af3d3bf79a7b7", size = 1740128, upload-time = "2025-06-14T15:13:35.604Z" },
+ { url = "https://files.pythonhosted.org/packages/6f/49/a3f76caa62773d33d0cfaa842bdf5789a78749dbfe697df38ab1badff369/aiohttp-3.12.13-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:e72d17fe0974ddeae8ed86db297e23dba39c7ac36d84acdbb53df2e18505a013", size = 1688796, upload-time = "2025-06-14T15:13:37.125Z" },
+ { url = "https://files.pythonhosted.org/packages/ad/e4/556fccc4576dc22bf18554b64cc873b1a3e5429a5bdb7bbef7f5d0bc7664/aiohttp-3.12.13-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0653d15587909a52e024a261943cf1c5bdc69acb71f411b0dd5966d065a51a47", size = 1787589, upload-time = "2025-06-14T15:13:38.745Z" },
+ { url = "https://files.pythonhosted.org/packages/b9/3d/d81b13ed48e1a46734f848e26d55a7391708421a80336e341d2aef3b6db2/aiohttp-3.12.13-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a77b48997c66722c65e157c06c74332cdf9c7ad00494b85ec43f324e5c5a9b9a", size = 1826635, upload-time = "2025-06-14T15:13:40.733Z" },
+ { url = "https://files.pythonhosted.org/packages/75/a5/472e25f347da88459188cdaadd1f108f6292f8a25e62d226e63f860486d1/aiohttp-3.12.13-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d6946bae55fd36cfb8e4092c921075cde029c71c7cb571d72f1079d1e4e013bc", size = 1729095, upload-time = "2025-06-14T15:13:42.312Z" },
+ { url = "https://files.pythonhosted.org/packages/b9/fe/322a78b9ac1725bfc59dfc301a5342e73d817592828e4445bd8f4ff83489/aiohttp-3.12.13-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4f95db8c8b219bcf294a53742c7bda49b80ceb9d577c8e7aa075612b7f39ffb7", size = 1666170, upload-time = "2025-06-14T15:13:44.884Z" },
+ { url = "https://files.pythonhosted.org/packages/7a/77/ec80912270e231d5e3839dbd6c065472b9920a159ec8a1895cf868c2708e/aiohttp-3.12.13-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:03d5eb3cfb4949ab4c74822fb3326cd9655c2b9fe22e4257e2100d44215b2e2b", size = 1714444, upload-time = "2025-06-14T15:13:46.401Z" },
+ { url = "https://files.pythonhosted.org/packages/21/b2/fb5aedbcb2b58d4180e58500e7c23ff8593258c27c089abfbcc7db65bd40/aiohttp-3.12.13-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:6383dd0ffa15515283c26cbf41ac8e6705aab54b4cbb77bdb8935a713a89bee9", size = 1709604, upload-time = "2025-06-14T15:13:48.377Z" },
+ { url = "https://files.pythonhosted.org/packages/e3/15/a94c05f7c4dc8904f80b6001ad6e07e035c58a8ebfcc15e6b5d58500c858/aiohttp-3.12.13-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:6548a411bc8219b45ba2577716493aa63b12803d1e5dc70508c539d0db8dbf5a", size = 1689786, upload-time = "2025-06-14T15:13:50.401Z" },
+ { url = "https://files.pythonhosted.org/packages/1d/fd/0d2e618388f7a7a4441eed578b626bda9ec6b5361cd2954cfc5ab39aa170/aiohttp-3.12.13-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:81b0fcbfe59a4ca41dc8f635c2a4a71e63f75168cc91026c61be665945739e2d", size = 1783389, upload-time = "2025-06-14T15:13:51.945Z" },
+ { url = "https://files.pythonhosted.org/packages/a6/6b/6986d0c75996ef7e64ff7619b9b7449b1d1cbbe05c6755e65d92f1784fe9/aiohttp-3.12.13-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:6a83797a0174e7995e5edce9dcecc517c642eb43bc3cba296d4512edf346eee2", size = 1803853, upload-time = "2025-06-14T15:13:53.533Z" },
+ { url = "https://files.pythonhosted.org/packages/21/65/cd37b38f6655d95dd07d496b6d2f3924f579c43fd64b0e32b547b9c24df5/aiohttp-3.12.13-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a5734d8469a5633a4e9ffdf9983ff7cdb512524645c7a3d4bc8a3de45b935ac3", size = 1716909, upload-time = "2025-06-14T15:13:55.148Z" },
+ { url = "https://files.pythonhosted.org/packages/fd/20/2de7012427dc116714c38ca564467f6143aec3d5eca3768848d62aa43e62/aiohttp-3.12.13-cp311-cp311-win32.whl", hash = "sha256:fef8d50dfa482925bb6b4c208b40d8e9fa54cecba923dc65b825a72eed9a5dbd", size = 427036, upload-time = "2025-06-14T15:13:57.076Z" },
+ { url = "https://files.pythonhosted.org/packages/f8/b6/98518bcc615ef998a64bef371178b9afc98ee25895b4f476c428fade2220/aiohttp-3.12.13-cp311-cp311-win_amd64.whl", hash = "sha256:9a27da9c3b5ed9d04c36ad2df65b38a96a37e9cfba6f1381b842d05d98e6afe9", size = 451427, upload-time = "2025-06-14T15:13:58.505Z" },
+ { url = "https://files.pythonhosted.org/packages/b4/6a/ce40e329788013cd190b1d62bbabb2b6a9673ecb6d836298635b939562ef/aiohttp-3.12.13-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:0aa580cf80558557285b49452151b9c69f2fa3ad94c5c9e76e684719a8791b73", size = 700491, upload-time = "2025-06-14T15:14:00.048Z" },
+ { url = "https://files.pythonhosted.org/packages/28/d9/7150d5cf9163e05081f1c5c64a0cdf3c32d2f56e2ac95db2a28fe90eca69/aiohttp-3.12.13-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b103a7e414b57e6939cc4dece8e282cfb22043efd0c7298044f6594cf83ab347", size = 475104, upload-time = "2025-06-14T15:14:01.691Z" },
+ { url = "https://files.pythonhosted.org/packages/f8/91/d42ba4aed039ce6e449b3e2db694328756c152a79804e64e3da5bc19dffc/aiohttp-3.12.13-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:78f64e748e9e741d2eccff9597d09fb3cd962210e5b5716047cbb646dc8fe06f", size = 467948, upload-time = "2025-06-14T15:14:03.561Z" },
+ { url = "https://files.pythonhosted.org/packages/99/3b/06f0a632775946981d7c4e5a865cddb6e8dfdbaed2f56f9ade7bb4a1039b/aiohttp-3.12.13-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:29c955989bf4c696d2ededc6b0ccb85a73623ae6e112439398935362bacfaaf6", size = 1714742, upload-time = "2025-06-14T15:14:05.558Z" },
+ { url = "https://files.pythonhosted.org/packages/92/a6/2552eebad9ec5e3581a89256276009e6a974dc0793632796af144df8b740/aiohttp-3.12.13-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:d640191016763fab76072c87d8854a19e8e65d7a6fcfcbf017926bdbbb30a7e5", size = 1697393, upload-time = "2025-06-14T15:14:07.194Z" },
+ { url = "https://files.pythonhosted.org/packages/d8/9f/bd08fdde114b3fec7a021381b537b21920cdd2aa29ad48c5dffd8ee314f1/aiohttp-3.12.13-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4dc507481266b410dede95dd9f26c8d6f5a14315372cc48a6e43eac652237d9b", size = 1752486, upload-time = "2025-06-14T15:14:08.808Z" },
+ { url = "https://files.pythonhosted.org/packages/f7/e1/affdea8723aec5bd0959171b5490dccd9a91fcc505c8c26c9f1dca73474d/aiohttp-3.12.13-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8a94daa873465d518db073bd95d75f14302e0208a08e8c942b2f3f1c07288a75", size = 1798643, upload-time = "2025-06-14T15:14:10.767Z" },
+ { url = "https://files.pythonhosted.org/packages/f3/9d/666d856cc3af3a62ae86393baa3074cc1d591a47d89dc3bf16f6eb2c8d32/aiohttp-3.12.13-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:177f52420cde4ce0bb9425a375d95577fe082cb5721ecb61da3049b55189e4e6", size = 1718082, upload-time = "2025-06-14T15:14:12.38Z" },
+ { url = "https://files.pythonhosted.org/packages/f3/ce/3c185293843d17be063dada45efd2712bb6bf6370b37104b4eda908ffdbd/aiohttp-3.12.13-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0f7df1f620ec40f1a7fbcb99ea17d7326ea6996715e78f71a1c9a021e31b96b8", size = 1633884, upload-time = "2025-06-14T15:14:14.415Z" },
+ { url = "https://files.pythonhosted.org/packages/3a/5b/f3413f4b238113be35dfd6794e65029250d4b93caa0974ca572217745bdb/aiohttp-3.12.13-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3062d4ad53b36e17796dce1c0d6da0ad27a015c321e663657ba1cc7659cfc710", size = 1694943, upload-time = "2025-06-14T15:14:16.48Z" },
+ { url = "https://files.pythonhosted.org/packages/82/c8/0e56e8bf12081faca85d14a6929ad5c1263c146149cd66caa7bc12255b6d/aiohttp-3.12.13-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:8605e22d2a86b8e51ffb5253d9045ea73683d92d47c0b1438e11a359bdb94462", size = 1716398, upload-time = "2025-06-14T15:14:18.589Z" },
+ { url = "https://files.pythonhosted.org/packages/ea/f3/33192b4761f7f9b2f7f4281365d925d663629cfaea093a64b658b94fc8e1/aiohttp-3.12.13-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:54fbbe6beafc2820de71ece2198458a711e224e116efefa01b7969f3e2b3ddae", size = 1657051, upload-time = "2025-06-14T15:14:20.223Z" },
+ { url = "https://files.pythonhosted.org/packages/5e/0b/26ddd91ca8f84c48452431cb4c5dd9523b13bc0c9766bda468e072ac9e29/aiohttp-3.12.13-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:050bd277dfc3768b606fd4eae79dd58ceda67d8b0b3c565656a89ae34525d15e", size = 1736611, upload-time = "2025-06-14T15:14:21.988Z" },
+ { url = "https://files.pythonhosted.org/packages/c3/8d/e04569aae853302648e2c138a680a6a2f02e374c5b6711732b29f1e129cc/aiohttp-3.12.13-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:2637a60910b58f50f22379b6797466c3aa6ae28a6ab6404e09175ce4955b4e6a", size = 1764586, upload-time = "2025-06-14T15:14:23.979Z" },
+ { url = "https://files.pythonhosted.org/packages/ac/98/c193c1d1198571d988454e4ed75adc21c55af247a9fda08236602921c8c8/aiohttp-3.12.13-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e986067357550d1aaa21cfe9897fa19e680110551518a5a7cf44e6c5638cb8b5", size = 1724197, upload-time = "2025-06-14T15:14:25.692Z" },
+ { url = "https://files.pythonhosted.org/packages/e7/9e/07bb8aa11eec762c6b1ff61575eeeb2657df11ab3d3abfa528d95f3e9337/aiohttp-3.12.13-cp312-cp312-win32.whl", hash = "sha256:ac941a80aeea2aaae2875c9500861a3ba356f9ff17b9cb2dbfb5cbf91baaf5bf", size = 421771, upload-time = "2025-06-14T15:14:27.364Z" },
+ { url = "https://files.pythonhosted.org/packages/52/66/3ce877e56ec0813069cdc9607cd979575859c597b6fb9b4182c6d5f31886/aiohttp-3.12.13-cp312-cp312-win_amd64.whl", hash = "sha256:671f41e6146a749b6c81cb7fd07f5a8356d46febdaaaf07b0e774ff04830461e", size = 447869, upload-time = "2025-06-14T15:14:29.05Z" },
]
[[package]]
@@ -99,28 +99,29 @@ wheels = [
[[package]]
name = "aiosignal"
-version = "1.3.2"
+version = "1.4.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "frozenlist" },
+ { name = "typing-extensions" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/ba/b5/6d55e80f6d8a08ce22b982eafa278d823b541c925f11ee774b0b9c43473d/aiosignal-1.3.2.tar.gz", hash = "sha256:a8c255c66fafb1e499c9351d0bf32ff2d8a0321595ebac3b93713656d2436f54", size = 19424, upload-time = "2024-12-13T17:10:40.86Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/61/62/06741b579156360248d1ec624842ad0edf697050bbaf7c3e46394e106ad1/aiosignal-1.4.0.tar.gz", hash = "sha256:f47eecd9468083c2029cc99945502cb7708b082c232f9aca65da147157b251c7", size = 25007, upload-time = "2025-07-03T22:54:43.528Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/ec/6a/bc7e17a3e87a2985d3e8f4da4cd0f481060eb78fb08596c42be62c90a4d9/aiosignal-1.3.2-py2.py3-none-any.whl", hash = "sha256:45cde58e409a301715980c2b01d0c28bdde3770d8290b5eb2173759d9acb31a5", size = 7597, upload-time = "2024-12-13T17:10:38.469Z" },
+ { url = "https://files.pythonhosted.org/packages/fb/76/641ae371508676492379f16e2fa48f4e2c11741bd63c48be4b12a6b09cba/aiosignal-1.4.0-py3-none-any.whl", hash = "sha256:053243f8b92b990551949e63930a839ff0cf0b0ebbe0597b0f3fb19e1a0fe82e", size = 7490, upload-time = "2025-07-03T22:54:42.156Z" },
]
[[package]]
name = "alembic"
-version = "1.16.1"
+version = "1.16.3"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "mako" },
{ name = "sqlalchemy" },
{ name = "typing-extensions" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/20/89/bfb4fe86e3fc3972d35431af7bedbc60fa606e8b17196704a1747f7aa4c3/alembic-1.16.1.tar.gz", hash = "sha256:43d37ba24b3d17bc1eb1024fe0f51cd1dc95aeb5464594a02c6bb9ca9864bfa4", size = 1955006, upload-time = "2025-05-21T23:11:05.991Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/b9/40/28683414cc8711035a65256ca689e159471aa9ef08e8741ad1605bc01066/alembic-1.16.3.tar.gz", hash = "sha256:18ad13c1f40a5796deee4b2346d1a9c382f44b8af98053897484fa6cf88025e4", size = 1967462, upload-time = "2025-07-08T18:57:50.991Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/31/59/565286efff3692c5716c212202af61466480f6357c4ae3089d4453bff1f3/alembic-1.16.1-py3-none-any.whl", hash = "sha256:0cdd48acada30d93aa1035767d67dff25702f8de74d7c3919f2e8492c8db2e67", size = 242488, upload-time = "2025-05-21T23:11:07.783Z" },
+ { url = "https://files.pythonhosted.org/packages/e6/68/1dea77887af7304528ea944c355d769a7ccc4599d3a23bd39182486deb42/alembic-1.16.3-py3-none-any.whl", hash = "sha256:70a7c7829b792de52d08ca0e3aefaf060687cb8ed6bebfa557e597a1a5e5a481", size = 246933, upload-time = "2025-07-08T18:57:52.793Z" },
]
[[package]]
@@ -143,12 +144,9 @@ sdist = { url = "https://files.pythonhosted.org/packages/a0/87/1d7019d23891897cb
[[package]]
name = "alibabacloud-endpoint-util"
-version = "0.0.3"
+version = "0.0.4"
source = { registry = "https://pypi.org/simple" }
-dependencies = [
- { name = "alibabacloud-tea" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/24/54/56736a0f224b3f2b65bb9c9ff9e20fa390351a7587c99f19ca1f8d596ae1/alibabacloud_endpoint_util-0.0.3.tar.gz", hash = "sha256:8c0efb76fdcc3af4ca716ef24bbce770201a3f83f98c0afcf81655f684b9c7d2", size = 2756, upload-time = "2020-09-16T07:27:42.19Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/92/7d/8cc92a95c920e344835b005af6ea45a0db98763ad6ad19299d26892e6c8d/alibabacloud_endpoint_util-0.0.4.tar.gz", hash = "sha256:a593eb8ddd8168d5dc2216cd33111b144f9189fcd6e9ca20e48f358a739bbf90", size = 2813, upload-time = "2025-06-12T07:20:52.572Z" }
[[package]]
name = "alibabacloud-gateway-spi"
@@ -246,7 +244,7 @@ sdist = { url = "https://files.pythonhosted.org/packages/22/8a/ef8ddf5ee0350984c
[[package]]
name = "alibabacloud-tea-openapi"
-version = "0.3.15"
+version = "0.3.16"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "alibabacloud-credentials" },
@@ -255,7 +253,7 @@ dependencies = [
{ name = "alibabacloud-tea-util" },
{ name = "alibabacloud-tea-xml" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/be/cb/f1b10b1da37e4c0de2aa9ca1e7153a6960a7f2dc496664e85fdc8b621f84/alibabacloud_tea_openapi-0.3.15.tar.gz", hash = "sha256:56a0aa6d51d8cf18c0cf3d219d861f4697f59d3e17fa6726b1101826d93988a2", size = 13021, upload-time = "2025-05-06T12:56:29.402Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/09/be/f594e79625e5ccfcfe7f12d7d70709a3c59e920878469c998886211c850d/alibabacloud_tea_openapi-0.3.16.tar.gz", hash = "sha256:6bffed8278597592e67860156f424bde4173a6599d7b6039fb640a3612bae292", size = 13087, upload-time = "2025-07-04T09:30:10.689Z" }
[[package]]
name = "alibabacloud-tea-util"
@@ -268,12 +266,12 @@ sdist = { url = "https://files.pythonhosted.org/packages/23/18/35be17103c8f40f9e
[[package]]
name = "alibabacloud-tea-xml"
-version = "0.0.2"
+version = "0.0.3"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "alibabacloud-tea" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/3b/30/f934051b1f65525d450cb225e4ac81dc3b77d808b0f79d51059d2a7ad3d3/alibabacloud_tea_xml-0.0.2.tar.gz", hash = "sha256:f0135e8148fd7d9c1f029db161863f37f144f837c280cba16c2edeb2f9c549d8", size = 3378, upload-time = "2020-07-02T09:03:55.866Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/32/eb/5e82e419c3061823f3feae9b5681588762929dc4da0176667297c2784c1a/alibabacloud_tea_xml-0.0.3.tar.gz", hash = "sha256:979cb51fadf43de77f41c69fc69c12529728919f849723eb0cd24eb7b048a90c", size = 3466, upload-time = "2025-07-01T08:04:55.144Z" }
[[package]]
name = "aliyun-python-sdk-core"
@@ -353,13 +351,31 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/d0/ae/9a053dd9229c0fde6b1f1f33f609ccff1ee79ddda364c756a924c6d8563b/APScheduler-3.11.0-py3-none-any.whl", hash = "sha256:fc134ca32e50f5eadcc4938e3a4545ab19131435e851abb40b34d63d5141c6da", size = 64004, upload-time = "2024-11-24T19:39:24.442Z" },
]
+[[package]]
+name = "arize-phoenix-otel"
+version = "0.9.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+ { name = "openinference-instrumentation" },
+ { name = "openinference-semantic-conventions" },
+ { name = "opentelemetry-exporter-otlp" },
+ { name = "opentelemetry-proto" },
+ { name = "opentelemetry-sdk" },
+ { name = "opentelemetry-semantic-conventions" },
+ { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/27/b9/8c89191eb46915e9ba7bdb473e2fb1c510b7db3635ae5ede5e65b2176b9d/arize_phoenix_otel-0.9.2.tar.gz", hash = "sha256:a48c7d41f3ac60dc75b037f036bf3306d2af4af371cdb55e247e67957749bc31", size = 11599, upload-time = "2025-04-14T22:05:28.637Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/3a/3d/f64136a758c649e883315939f30fe51ad0747024b0db05fd78450801a78d/arize_phoenix_otel-0.9.2-py3-none-any.whl", hash = "sha256:5286b33c58b596ef8edd9a4255ee00fd74f774b1e5dbd9393e77e87870a14d76", size = 12560, upload-time = "2025-04-14T22:05:27.162Z" },
+]
+
[[package]]
name = "asgiref"
-version = "3.8.1"
+version = "3.9.1"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/29/38/b3395cc9ad1b56d2ddac9970bc8f4141312dbaec28bc7c218b0dfafd0f42/asgiref-3.8.1.tar.gz", hash = "sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590", size = 35186, upload-time = "2024-03-22T14:39:36.863Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/90/61/0aa957eec22ff70b830b22ff91f825e70e1ef732c06666a805730f28b36b/asgiref-3.9.1.tar.gz", hash = "sha256:a5ab6582236218e5ef1648f242fd9f10626cfd4de8dc377db215d5d5098e3142", size = 36870, upload-time = "2025-07-08T09:07:43.344Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/39/e3/893e8757be2612e6c266d9bb58ad2e3651524b5b40cf56761e985a28b13e/asgiref-3.8.1-py3-none-any.whl", hash = "sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47", size = 23828, upload-time = "2024-03-22T14:39:34.521Z" },
+ { url = "https://files.pythonhosted.org/packages/7c/3c/0464dcada90d5da0e71018c04a140ad6349558afb30b3051b4264cc5b965/asgiref-3.9.1-py3-none-any.whl", hash = "sha256:f3bba7092a48005b5f5bacd747d36ee4a5a61f4a269a6df590b43144355ebd2c", size = 23790, upload-time = "2025-07-08T09:07:41.548Z" },
]
[[package]]
@@ -394,16 +410,16 @@ wheels = [
[[package]]
name = "azure-core"
-version = "1.34.0"
+version = "1.35.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "requests" },
{ name = "six" },
{ name = "typing-extensions" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/c9/29/ff7a519a315e41c85bab92a7478c6acd1cf0b14353139a08caee4c691f77/azure_core-1.34.0.tar.gz", hash = "sha256:bdb544989f246a0ad1c85d72eeb45f2f835afdcbc5b45e43f0dbde7461c81ece", size = 297999, upload-time = "2025-05-01T23:17:27.59Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ce/89/f53968635b1b2e53e4aad2dd641488929fef4ca9dfb0b97927fa7697ddf3/azure_core-1.35.0.tar.gz", hash = "sha256:c0be528489485e9ede59b6971eb63c1eaacf83ef53001bfe3904e475e972be5c", size = 339689, upload-time = "2025-07-03T00:55:23.496Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/84/9e/5c87b49f65bb16571599bc789857d0ded2f53014d3392bc88a5d1f3ad779/azure_core-1.34.0-py3-none-any.whl", hash = "sha256:0615d3b756beccdb6624d1c0ae97284f38b78fb59a2a9839bf927c66fbbdddd6", size = 207409, upload-time = "2025-05-01T23:17:29.818Z" },
+ { url = "https://files.pythonhosted.org/packages/d4/78/bf94897361fdd650850f0f2e405b2293e2f12808239046232bdedf554301/azure_core-1.35.0-py3-none-any.whl", hash = "sha256:8db78c72868a58f3de8991eb4d22c4d368fae226dac1002998d6c50437e7dad1", size = 210708, upload-time = "2025-07-03T00:55:25.238Z" },
]
[[package]]
@@ -544,16 +560,16 @@ wheels = [
[[package]]
name = "boto3-stubs"
-version = "1.38.28"
+version = "1.39.3"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "botocore-stubs" },
{ name = "types-s3transfer" },
{ name = "typing-extensions", marker = "python_full_version < '3.12'" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/7b/dc/c4b318bdf66ff4973d3cbf0f218e47bdf558b94d921c8ff27d401e8ca4f9/boto3_stubs-1.38.28.tar.gz", hash = "sha256:fae8e009ea4d810b77e49d88247183b5d8d153bf268ebde8b4abdf58a701802f", size = 99065, upload-time = "2025-06-02T19:42:51.659Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/f0/ea/85b9940d6eedc04d0c6febf24d27311b6ee54f85ccc37192eb4db0dff5d6/boto3_stubs-1.39.3.tar.gz", hash = "sha256:9aad443b1d690951fd9ccb6fa20ad387bd0b1054c704566ff65dd0043a63fc26", size = 99947, upload-time = "2025-07-03T19:28:15.602Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/8b/4a/d70ef76080e0d37e45d07d65801a6680f5bc1d156333a4e5d0ca6103d45f/boto3_stubs-1.38.28-py3-none-any.whl", hash = "sha256:accd8c0943a8d960c5c2d4a7aa661fd43e842893e76adf1b5b163c02f4f62537", size = 68668, upload-time = "2025-06-02T19:42:43.426Z" },
+ { url = "https://files.pythonhosted.org/packages/be/b8/0c56297e5f290de17e838c7e4ff338f5b94351c6566aed70ee197a671dc5/boto3_stubs-1.39.3-py3-none-any.whl", hash = "sha256:4daddb19374efa6d1bef7aded9cede0075f380722a9e60ab129ebba14ae66b69", size = 69196, upload-time = "2025-07-03T19:28:09.4Z" },
]
[package.optional-dependencies]
@@ -577,14 +593,14 @@ wheels = [
[[package]]
name = "botocore-stubs"
-version = "1.38.28"
+version = "1.38.46"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "types-awscrt" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/bc/0e/a47d392ee3fbd444a628f1b7257affc0a13c45e8742de4eb31fa4e2758f2/botocore_stubs-1.38.28.tar.gz", hash = "sha256:b9549050b81051bdbb91966323d6a2b6c5c78ca8dcc328e16dfc44b765be39be", size = 42312, upload-time = "2025-06-02T20:18:13.928Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/05/45/27cabc7c3022dcb12de5098cc646b374065f5e72fae13600ff1756f365ee/botocore_stubs-1.38.46.tar.gz", hash = "sha256:a04e69766ab8bae338911c1897492f88d05cd489cd75f06e6eb4f135f9da8c7b", size = 42299, upload-time = "2025-06-29T22:58:24.765Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/6f/3d/26c1a62b379f0dd401798f9f8f9331ac40f3c3917c34b5eed3ed0b85e2b0/botocore_stubs-1.38.28-py3-none-any.whl", hash = "sha256:9151ced682edb44b28202d268f4dc5ef5534be8b592b87e07ce4c99650818bce", size = 65629, upload-time = "2025-06-02T20:18:11.886Z" },
+ { url = "https://files.pythonhosted.org/packages/cc/84/06490071e26bab22ac79a684e98445df118adcf80c58c33ba5af184030f2/botocore_stubs-1.38.46-py3-none-any.whl", hash = "sha256:cc21d9a7dd994bdd90872db4664d817c4719b51cda8004fd507a4bf65b085a75", size = 66083, upload-time = "2025-06-29T22:58:22.234Z" },
]
[[package]]
@@ -727,11 +743,11 @@ wheels = [
[[package]]
name = "certifi"
-version = "2025.4.26"
+version = "2025.6.15"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/e8/9e/c05b3920a3b7d20d3d3310465f50348e5b3694f4f88c6daf736eef3024c4/certifi-2025.4.26.tar.gz", hash = "sha256:0a816057ea3cdefcef70270d2c515e4506bbc954f417fa5ade2021213bb8f0c6", size = 160705, upload-time = "2025-04-26T02:12:29.51Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/73/f7/f14b46d4bcd21092d7d3ccef689615220d8a08fb25e564b65d20738e672e/certifi-2025.6.15.tar.gz", hash = "sha256:d747aa5a8b9bbbb1bb8c22bb13e22bd1f18e9796defa16bab421f7f7a317323b", size = 158753, upload-time = "2025-06-15T02:45:51.329Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/4a/7e/3db2bd1b1f9e95f7cddca6d6e75e2f2bd9f51b1246e546d88addca0106bd/certifi-2025.4.26-py3-none-any.whl", hash = "sha256:30350364dfe371162649852c63336a15c70c6510c2ad5015b21c2345311805f3", size = 159618, upload-time = "2025-04-26T02:12:27.662Z" },
+ { url = "https://files.pythonhosted.org/packages/84/ae/320161bd181fc06471eed047ecce67b693fd7515b16d495d8932db763426/certifi-2025.6.15-py3-none-any.whl", hash = "sha256:2e0c7ce7cb5d8f8634ca55d2ba7e6ec2689a2fd6537d8dec1296a477a4910057", size = 157650, upload-time = "2025-06-15T02:45:49.977Z" },
]
[[package]]
@@ -909,14 +925,14 @@ wheels = [
[[package]]
name = "click-plugins"
-version = "1.1.1"
+version = "1.1.1.2"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "click" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/5f/1d/45434f64ed749540af821fd7e42b8e4d23ac04b1eda7c26613288d6cd8a8/click-plugins-1.1.1.tar.gz", hash = "sha256:46ab999744a9d831159c3411bb0c79346d94a444df9a3a3742e9ed63645f264b", size = 8164, upload-time = "2019-04-04T04:27:04.82Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/c3/a4/34847b59150da33690a36da3681d6bbc2ec14ee9a846bc30a6746e5984e4/click_plugins-1.1.1.2.tar.gz", hash = "sha256:d7af3984a99d243c131aa1a828331e7630f4a88a9741fd05c927b204bcf92261", size = 8343, upload-time = "2025-06-25T00:47:37.555Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/e9/da/824b92d9942f4e472702488857914bdd50f73021efea15b4cad9aca8ecef/click_plugins-1.1.1-py2.py3-none-any.whl", hash = "sha256:5d262006d3222f5057fd81e1623d4443e41dcda5dc815c06b442aa3c02889fc8", size = 7497, upload-time = "2019-04-04T04:27:03.36Z" },
+ { url = "https://files.pythonhosted.org/packages/3d/9a/2abecb28ae875e39c8cad711eb1186d8d14eab564705325e77e4e6ab9ae5/click_plugins-1.1.1.2-py2.py3-none-any.whl", hash = "sha256:008d65743833ffc1f5417bf0e78e8d2c23aab04d9745ba817bd3e71b0feb6aa6", size = 11051, upload-time = "2025-06-25T00:47:36.731Z" },
]
[[package]]
@@ -1105,36 +1121,43 @@ sdist = { url = "https://files.pythonhosted.org/packages/6b/b0/e595ce2a2527e169c
[[package]]
name = "cryptography"
-version = "42.0.8"
+version = "45.0.5"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "cffi", marker = "platform_python_implementation != 'PyPy'" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/93/a7/1498799a2ea06148463a9a2c10ab2f6a921a74fb19e231b27dc412a748e2/cryptography-42.0.8.tar.gz", hash = "sha256:8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2", size = 671250, upload-time = "2024-06-04T19:55:08.609Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/f9/8b/1b929ba8139430e09e140e6939c2b29c18df1f2fc2149e41bdbdcdaf5d1f/cryptography-42.0.8-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:81d8a521705787afe7a18d5bfb47ea9d9cc068206270aad0b96a725022e18d2e", size = 5899961, upload-time = "2024-06-04T19:53:57.933Z" },
- { url = "https://files.pythonhosted.org/packages/fa/5d/31d833daa800e4fab33209843095df7adb4a78ea536929145534cbc15026/cryptography-42.0.8-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:961e61cefdcb06e0c6d7e3a1b22ebe8b996eb2bf50614e89384be54c48c6b63d", size = 3114353, upload-time = "2024-06-04T19:54:12.171Z" },
- { url = "https://files.pythonhosted.org/packages/5d/32/f6326c70a9f0f258a201d3b2632bca586ea24d214cec3cf36e374040e273/cryptography-42.0.8-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e3ec3672626e1b9e55afd0df6d774ff0e953452886e06e0f1eb7eb0c832e8902", size = 3647773, upload-time = "2024-06-04T19:54:07.051Z" },
- { url = "https://files.pythonhosted.org/packages/35/66/2d87e9ca95c82c7ee5f2c09716fc4c4242c1ae6647b9bd27e55e920e9f10/cryptography-42.0.8-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e599b53fd95357d92304510fb7bda8523ed1f79ca98dce2f43c115950aa78801", size = 3839763, upload-time = "2024-06-04T19:54:30.383Z" },
- { url = "https://files.pythonhosted.org/packages/c2/de/8083fa2e68d403553a01a9323f4f8b9d7ffed09928ba25635c29fb28c1e7/cryptography-42.0.8-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:5226d5d21ab681f432a9c1cf8b658c0cb02533eece706b155e5fbd8a0cdd3949", size = 3632661, upload-time = "2024-06-04T19:54:32.955Z" },
- { url = "https://files.pythonhosted.org/packages/07/40/d6f6819c62e808ea74639c3c640f7edd636b86cce62cb14943996a15df92/cryptography-42.0.8-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:6b7c4f03ce01afd3b76cf69a5455caa9cfa3de8c8f493e0d3ab7d20611c8dae9", size = 3851536, upload-time = "2024-06-04T19:53:53.131Z" },
- { url = "https://files.pythonhosted.org/packages/5c/46/de71d48abf2b6d3c808f4fbb0f4dc44a4e72786be23df0541aa2a3f6fd7e/cryptography-42.0.8-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:2346b911eb349ab547076f47f2e035fc8ff2c02380a7cbbf8d87114fa0f1c583", size = 3754209, upload-time = "2024-06-04T19:54:55.259Z" },
- { url = "https://files.pythonhosted.org/packages/25/c9/86f04e150c5d5d5e4a731a2c1e0e43da84d901f388e3fea3d5de98d689a7/cryptography-42.0.8-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:ad803773e9df0b92e0a817d22fd8a3675493f690b96130a5e24f1b8fabbea9c7", size = 3923551, upload-time = "2024-06-04T19:54:16.46Z" },
- { url = "https://files.pythonhosted.org/packages/53/c2/903014dafb7271fb148887d4355b2e90319cad6e810663be622b0c933fc9/cryptography-42.0.8-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:2f66d9cd9147ee495a8374a45ca445819f8929a3efcd2e3df6428e46c3cbb10b", size = 3739265, upload-time = "2024-06-04T19:54:23.194Z" },
- { url = "https://files.pythonhosted.org/packages/95/26/82d704d988a193cbdc69ac3b41c687c36eaed1642cce52530ad810c35645/cryptography-42.0.8-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:d45b940883a03e19e944456a558b67a41160e367a719833c53de6911cabba2b7", size = 3937371, upload-time = "2024-06-04T19:55:04.303Z" },
- { url = "https://files.pythonhosted.org/packages/cf/71/4e0d05c9acd638a225f57fb6162aa3d03613c11b76893c23ea4675bb28c5/cryptography-42.0.8-cp37-abi3-win32.whl", hash = "sha256:a0c5b2b0585b6af82d7e385f55a8bc568abff8923af147ee3c07bd8b42cda8b2", size = 2438849, upload-time = "2024-06-04T19:54:27.39Z" },
- { url = "https://files.pythonhosted.org/packages/06/0f/78da3cad74f2ba6c45321dc90394d70420ea846730dc042ef527f5a224b5/cryptography-42.0.8-cp37-abi3-win_amd64.whl", hash = "sha256:57080dee41209e556a9a4ce60d229244f7a66ef52750f813bfbe18959770cfba", size = 2889090, upload-time = "2024-06-04T19:54:14.245Z" },
- { url = "https://files.pythonhosted.org/packages/60/12/f064af29190cdb1d38fe07f3db6126091639e1dece7ec77c4ff037d49193/cryptography-42.0.8-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:dea567d1b0e8bc5764b9443858b673b734100c2871dc93163f58c46a97a83d28", size = 5901232, upload-time = "2024-06-04T19:54:52.722Z" },
- { url = "https://files.pythonhosted.org/packages/43/c2/4a3eef67e009a522711ebd8ac89424c3a7fe591ece7035d964419ad52a1d/cryptography-42.0.8-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4783183f7cb757b73b2ae9aed6599b96338eb957233c58ca8f49a49cc32fd5e", size = 3648711, upload-time = "2024-06-04T19:54:44.323Z" },
- { url = "https://files.pythonhosted.org/packages/49/1c/9f6d13cc8041c05eebff1154e4e71bedd1db8e174fff999054435994187a/cryptography-42.0.8-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0608251135d0e03111152e41f0cc2392d1e74e35703960d4190b2e0f4ca9c70", size = 3841968, upload-time = "2024-06-04T19:54:57.911Z" },
- { url = "https://files.pythonhosted.org/packages/5f/f9/c3d4f19b82bdb25a3d857fe96e7e571c981810e47e3f299cc13ac429066a/cryptography-42.0.8-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:dc0fdf6787f37b1c6b08e6dfc892d9d068b5bdb671198c72072828b80bd5fe4c", size = 3633032, upload-time = "2024-06-04T19:54:48.518Z" },
- { url = "https://files.pythonhosted.org/packages/fa/e2/b7e6e8c261536c489d9cf908769880d94bd5d9a187e166b0dc838d2e6a56/cryptography-42.0.8-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:9c0c1716c8447ee7dbf08d6db2e5c41c688544c61074b54fc4564196f55c25a7", size = 3852478, upload-time = "2024-06-04T19:54:50.599Z" },
- { url = "https://files.pythonhosted.org/packages/a2/68/e16751f6b859bc120f53fddbf3ebada5c34f0e9689d8af32884d8b2e4b4c/cryptography-42.0.8-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:fff12c88a672ab9c9c1cf7b0c80e3ad9e2ebd9d828d955c126be4fd3e5578c9e", size = 3754102, upload-time = "2024-06-04T19:54:46.231Z" },
- { url = "https://files.pythonhosted.org/packages/0f/38/85c74d0ac4c540780e072b1e6f148ecb718418c1062edcb20d22f3ec5bbb/cryptography-42.0.8-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:cafb92b2bc622cd1aa6a1dce4b93307792633f4c5fe1f46c6b97cf67073ec961", size = 3925042, upload-time = "2024-06-04T19:54:34.767Z" },
- { url = "https://files.pythonhosted.org/packages/89/f4/a8b982e88eb5350407ebdbf4717b55043271d878705329e107f4783555f2/cryptography-42.0.8-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:31f721658a29331f895a5a54e7e82075554ccfb8b163a18719d342f5ffe5ecb1", size = 3738833, upload-time = "2024-06-04T19:54:05.231Z" },
- { url = "https://files.pythonhosted.org/packages/fd/2b/be327b580645927bb1a1f32d5a175b897a9b956bc085b095e15c40bac9ed/cryptography-42.0.8-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b297f90c5723d04bcc8265fc2a0f86d4ea2e0f7ab4b6994459548d3a6b992a14", size = 3938751, upload-time = "2024-06-04T19:54:37.837Z" },
- { url = "https://files.pythonhosted.org/packages/3c/d5/c6a78ffccdbe4516711ebaa9ed2c7eb6ac5dfa3dc920f2c7e920af2418b0/cryptography-42.0.8-cp39-abi3-win32.whl", hash = "sha256:2f88d197e66c65be5e42cd72e5c18afbfae3f741742070e3019ac8f4ac57262c", size = 2439281, upload-time = "2024-06-04T19:53:55.903Z" },
- { url = "https://files.pythonhosted.org/packages/a2/7b/b0d330852dd5953daee6b15f742f15d9f18e9c0154eb4cfcc8718f0436da/cryptography-42.0.8-cp39-abi3-win_amd64.whl", hash = "sha256:fa76fbb7596cc5839320000cdd5d0955313696d9511debab7ee7278fc8b5c84a", size = 2886038, upload-time = "2024-06-04T19:54:18.707Z" },
+sdist = { url = "https://files.pythonhosted.org/packages/95/1e/49527ac611af559665f71cbb8f92b332b5ec9c6fbc4e88b0f8e92f5e85df/cryptography-45.0.5.tar.gz", hash = "sha256:72e76caa004ab63accdf26023fccd1d087f6d90ec6048ff33ad0445abf7f605a", size = 744903, upload-time = "2025-07-02T13:06:25.941Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/f0/fb/09e28bc0c46d2c547085e60897fea96310574c70fb21cd58a730a45f3403/cryptography-45.0.5-cp311-abi3-macosx_10_9_universal2.whl", hash = "sha256:101ee65078f6dd3e5a028d4f19c07ffa4dd22cce6a20eaa160f8b5219911e7d8", size = 7043092, upload-time = "2025-07-02T13:05:01.514Z" },
+ { url = "https://files.pythonhosted.org/packages/b1/05/2194432935e29b91fb649f6149c1a4f9e6d3d9fc880919f4ad1bcc22641e/cryptography-45.0.5-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:3a264aae5f7fbb089dbc01e0242d3b67dffe3e6292e1f5182122bdf58e65215d", size = 4205926, upload-time = "2025-07-02T13:05:04.741Z" },
+ { url = "https://files.pythonhosted.org/packages/07/8b/9ef5da82350175e32de245646b1884fc01124f53eb31164c77f95a08d682/cryptography-45.0.5-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e74d30ec9c7cb2f404af331d5b4099a9b322a8a6b25c4632755c8757345baac5", size = 4429235, upload-time = "2025-07-02T13:05:07.084Z" },
+ { url = "https://files.pythonhosted.org/packages/7c/e1/c809f398adde1994ee53438912192d92a1d0fc0f2d7582659d9ef4c28b0c/cryptography-45.0.5-cp311-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:3af26738f2db354aafe492fb3869e955b12b2ef2e16908c8b9cb928128d42c57", size = 4209785, upload-time = "2025-07-02T13:05:09.321Z" },
+ { url = "https://files.pythonhosted.org/packages/d0/8b/07eb6bd5acff58406c5e806eff34a124936f41a4fb52909ffa4d00815f8c/cryptography-45.0.5-cp311-abi3-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:e6c00130ed423201c5bc5544c23359141660b07999ad82e34e7bb8f882bb78e0", size = 3893050, upload-time = "2025-07-02T13:05:11.069Z" },
+ { url = "https://files.pythonhosted.org/packages/ec/ef/3333295ed58d900a13c92806b67e62f27876845a9a908c939f040887cca9/cryptography-45.0.5-cp311-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:dd420e577921c8c2d31289536c386aaa30140b473835e97f83bc71ea9d2baf2d", size = 4457379, upload-time = "2025-07-02T13:05:13.32Z" },
+ { url = "https://files.pythonhosted.org/packages/d9/9d/44080674dee514dbb82b21d6fa5d1055368f208304e2ab1828d85c9de8f4/cryptography-45.0.5-cp311-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:d05a38884db2ba215218745f0781775806bde4f32e07b135348355fe8e4991d9", size = 4209355, upload-time = "2025-07-02T13:05:15.017Z" },
+ { url = "https://files.pythonhosted.org/packages/c9/d8/0749f7d39f53f8258e5c18a93131919ac465ee1f9dccaf1b3f420235e0b5/cryptography-45.0.5-cp311-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:ad0caded895a00261a5b4aa9af828baede54638754b51955a0ac75576b831b27", size = 4456087, upload-time = "2025-07-02T13:05:16.945Z" },
+ { url = "https://files.pythonhosted.org/packages/09/d7/92acac187387bf08902b0bf0699816f08553927bdd6ba3654da0010289b4/cryptography-45.0.5-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:9024beb59aca9d31d36fcdc1604dd9bbeed0a55bface9f1908df19178e2f116e", size = 4332873, upload-time = "2025-07-02T13:05:18.743Z" },
+ { url = "https://files.pythonhosted.org/packages/03/c2/840e0710da5106a7c3d4153c7215b2736151bba60bf4491bdb421df5056d/cryptography-45.0.5-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:91098f02ca81579c85f66df8a588c78f331ca19089763d733e34ad359f474174", size = 4564651, upload-time = "2025-07-02T13:05:21.382Z" },
+ { url = "https://files.pythonhosted.org/packages/2e/92/cc723dd6d71e9747a887b94eb3827825c6c24b9e6ce2bb33b847d31d5eaa/cryptography-45.0.5-cp311-abi3-win32.whl", hash = "sha256:926c3ea71a6043921050eaa639137e13dbe7b4ab25800932a8498364fc1abec9", size = 2929050, upload-time = "2025-07-02T13:05:23.39Z" },
+ { url = "https://files.pythonhosted.org/packages/1f/10/197da38a5911a48dd5389c043de4aec4b3c94cb836299b01253940788d78/cryptography-45.0.5-cp311-abi3-win_amd64.whl", hash = "sha256:b85980d1e345fe769cfc57c57db2b59cff5464ee0c045d52c0df087e926fbe63", size = 3403224, upload-time = "2025-07-02T13:05:25.202Z" },
+ { url = "https://files.pythonhosted.org/packages/fe/2b/160ce8c2765e7a481ce57d55eba1546148583e7b6f85514472b1d151711d/cryptography-45.0.5-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:f3562c2f23c612f2e4a6964a61d942f891d29ee320edb62ff48ffb99f3de9ae8", size = 7017143, upload-time = "2025-07-02T13:05:27.229Z" },
+ { url = "https://files.pythonhosted.org/packages/c2/e7/2187be2f871c0221a81f55ee3105d3cf3e273c0a0853651d7011eada0d7e/cryptography-45.0.5-cp37-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:3fcfbefc4a7f332dece7272a88e410f611e79458fab97b5efe14e54fe476f4fd", size = 4197780, upload-time = "2025-07-02T13:05:29.299Z" },
+ { url = "https://files.pythonhosted.org/packages/b9/cf/84210c447c06104e6be9122661159ad4ce7a8190011669afceeaea150524/cryptography-45.0.5-cp37-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:460f8c39ba66af7db0545a8c6f2eabcbc5a5528fc1cf6c3fa9a1e44cec33385e", size = 4420091, upload-time = "2025-07-02T13:05:31.221Z" },
+ { url = "https://files.pythonhosted.org/packages/3e/6a/cb8b5c8bb82fafffa23aeff8d3a39822593cee6e2f16c5ca5c2ecca344f7/cryptography-45.0.5-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:9b4cf6318915dccfe218e69bbec417fdd7c7185aa7aab139a2c0beb7468c89f0", size = 4198711, upload-time = "2025-07-02T13:05:33.062Z" },
+ { url = "https://files.pythonhosted.org/packages/04/f7/36d2d69df69c94cbb2473871926daf0f01ad8e00fe3986ac3c1e8c4ca4b3/cryptography-45.0.5-cp37-abi3-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:2089cc8f70a6e454601525e5bf2779e665d7865af002a5dec8d14e561002e135", size = 3883299, upload-time = "2025-07-02T13:05:34.94Z" },
+ { url = "https://files.pythonhosted.org/packages/82/c7/f0ea40f016de72f81288e9fe8d1f6748036cb5ba6118774317a3ffc6022d/cryptography-45.0.5-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:0027d566d65a38497bc37e0dd7c2f8ceda73597d2ac9ba93810204f56f52ebc7", size = 4450558, upload-time = "2025-07-02T13:05:37.288Z" },
+ { url = "https://files.pythonhosted.org/packages/06/ae/94b504dc1a3cdf642d710407c62e86296f7da9e66f27ab12a1ee6fdf005b/cryptography-45.0.5-cp37-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:be97d3a19c16a9be00edf79dca949c8fa7eff621763666a145f9f9535a5d7f42", size = 4198020, upload-time = "2025-07-02T13:05:39.102Z" },
+ { url = "https://files.pythonhosted.org/packages/05/2b/aaf0adb845d5dabb43480f18f7ca72e94f92c280aa983ddbd0bcd6ecd037/cryptography-45.0.5-cp37-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:7760c1c2e1a7084153a0f68fab76e754083b126a47d0117c9ed15e69e2103492", size = 4449759, upload-time = "2025-07-02T13:05:41.398Z" },
+ { url = "https://files.pythonhosted.org/packages/91/e4/f17e02066de63e0100a3a01b56f8f1016973a1d67551beaf585157a86b3f/cryptography-45.0.5-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:6ff8728d8d890b3dda5765276d1bc6fb099252915a2cd3aff960c4c195745dd0", size = 4319991, upload-time = "2025-07-02T13:05:43.64Z" },
+ { url = "https://files.pythonhosted.org/packages/f2/2e/e2dbd629481b499b14516eed933f3276eb3239f7cee2dcfa4ee6b44d4711/cryptography-45.0.5-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:7259038202a47fdecee7e62e0fd0b0738b6daa335354396c6ddebdbe1206af2a", size = 4554189, upload-time = "2025-07-02T13:05:46.045Z" },
+ { url = "https://files.pythonhosted.org/packages/f8/ea/a78a0c38f4c8736287b71c2ea3799d173d5ce778c7d6e3c163a95a05ad2a/cryptography-45.0.5-cp37-abi3-win32.whl", hash = "sha256:1e1da5accc0c750056c556a93c3e9cb828970206c68867712ca5805e46dc806f", size = 2911769, upload-time = "2025-07-02T13:05:48.329Z" },
+ { url = "https://files.pythonhosted.org/packages/79/b3/28ac139109d9005ad3f6b6f8976ffede6706a6478e21c889ce36c840918e/cryptography-45.0.5-cp37-abi3-win_amd64.whl", hash = "sha256:90cb0a7bb35959f37e23303b7eed0a32280510030daba3f7fdfbb65defde6a97", size = 3390016, upload-time = "2025-07-02T13:05:50.811Z" },
+ { url = "https://files.pythonhosted.org/packages/c0/71/9bdbcfd58d6ff5084687fe722c58ac718ebedbc98b9f8f93781354e6d286/cryptography-45.0.5-pp311-pypy311_pp73-macosx_10_9_x86_64.whl", hash = "sha256:8c4a6ff8a30e9e3d38ac0539e9a9e02540ab3f827a3394f8852432f6b0ea152e", size = 3587878, upload-time = "2025-07-02T13:06:06.339Z" },
+ { url = "https://files.pythonhosted.org/packages/f0/63/83516cfb87f4a8756eaa4203f93b283fda23d210fc14e1e594bd5f20edb6/cryptography-45.0.5-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:bd4c45986472694e5121084c6ebbd112aa919a25e783b87eb95953c9573906d6", size = 4152447, upload-time = "2025-07-02T13:06:08.345Z" },
+ { url = "https://files.pythonhosted.org/packages/22/11/d2823d2a5a0bd5802b3565437add16f5c8ce1f0778bf3822f89ad2740a38/cryptography-45.0.5-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:982518cd64c54fcada9d7e5cf28eabd3ee76bd03ab18e08a48cad7e8b6f31b18", size = 4386778, upload-time = "2025-07-02T13:06:10.263Z" },
+ { url = "https://files.pythonhosted.org/packages/5f/38/6bf177ca6bce4fe14704ab3e93627c5b0ca05242261a2e43ef3168472540/cryptography-45.0.5-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl", hash = "sha256:12e55281d993a793b0e883066f590c1ae1e802e3acb67f8b442e721e475e6463", size = 4151627, upload-time = "2025-07-02T13:06:13.097Z" },
+ { url = "https://files.pythonhosted.org/packages/38/6a/69fc67e5266bff68a91bcb81dff8fb0aba4d79a78521a08812048913e16f/cryptography-45.0.5-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl", hash = "sha256:5aa1e32983d4443e310f726ee4b071ab7569f58eedfdd65e9675484a4eb67bd1", size = 4385593, upload-time = "2025-07-02T13:06:15.689Z" },
+ { url = "https://files.pythonhosted.org/packages/f6/34/31a1604c9a9ade0fdab61eb48570e09a796f4d9836121266447b0eaf7feb/cryptography-45.0.5-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:e357286c1b76403dd384d938f93c46b2b058ed4dfcdce64a770f0537ed3feb6f", size = 3331106, upload-time = "2025-07-02T13:06:18.058Z" },
]
[[package]]
@@ -1194,8 +1217,10 @@ wheels = [
[[package]]
name = "dify-api"
+version = "1.6.0"
source = { virtual = "." }
dependencies = [
+ { name = "arize-phoenix-otel" },
{ name = "authlib" },
{ name = "azure-identity" },
{ name = "beautifulsoup4" },
@@ -1221,6 +1246,7 @@ dependencies = [
{ name = "googleapis-common-protos" },
{ name = "gunicorn" },
{ name = "httpx", extra = ["socks"] },
+ { name = "httpx-sse" },
{ name = "jieba" },
{ name = "json-repair" },
{ name = "langfuse" },
@@ -1262,8 +1288,10 @@ dependencies = [
{ name = "readabilipy" },
{ name = "redis", extra = ["hiredis"] },
{ name = "resend" },
+ { name = "sendgrid" },
{ name = "sentry-sdk", extra = ["flask"] },
{ name = "sqlalchemy" },
+ { name = "sseclient-py" },
{ name = "starlette" },
{ name = "tiktoken" },
{ name = "transformers" },
@@ -1279,6 +1307,7 @@ dev = [
{ name = "coverage" },
{ name = "dotenv-linter" },
{ name = "faker" },
+ { name = "hypothesis" },
{ name = "lxml-stubs" },
{ name = "mypy" },
{ name = "pandas-stubs" },
@@ -1317,6 +1346,7 @@ dev = [
{ name = "types-pymysql" },
{ name = "types-pyopenssl" },
{ name = "types-python-dateutil" },
+ { name = "types-python-http-client" },
{ name = "types-pywin32" },
{ name = "types-pyyaml" },
{ name = "types-regex" },
@@ -1352,6 +1382,7 @@ vdb = [
{ name = "clickhouse-connect" },
{ name = "couchbase" },
{ name = "elasticsearch" },
+ { name = "mo-vector" },
{ name = "opensearch-py" },
{ name = "oracledb" },
{ name = "pgvecto-rs", extra = ["sqlalchemy"] },
@@ -1371,6 +1402,7 @@ vdb = [
[package.metadata]
requires-dist = [
+ { name = "arize-phoenix-otel", specifier = "~=0.9.2" },
{ name = "authlib", specifier = "==1.3.1" },
{ name = "azure-identity", specifier = "==1.16.1" },
{ name = "beautifulsoup4", specifier = "==4.12.2" },
@@ -1396,6 +1428,7 @@ requires-dist = [
{ name = "googleapis-common-protos", specifier = "==1.63.0" },
{ name = "gunicorn", specifier = "~=23.0.0" },
{ name = "httpx", extras = ["socks"], specifier = "~=0.27.0" },
+ { name = "httpx-sse", specifier = ">=0.4.0" },
{ name = "jieba", specifier = "==0.42.1" },
{ name = "json-repair", specifier = ">=0.41.1" },
{ name = "langfuse", specifier = "~=2.51.3" },
@@ -1437,8 +1470,10 @@ requires-dist = [
{ name = "readabilipy", specifier = "~=0.3.0" },
{ name = "redis", extras = ["hiredis"], specifier = "~=6.1.0" },
{ name = "resend", specifier = "~=2.9.0" },
+ { name = "sendgrid", specifier = "~=6.12.3" },
{ name = "sentry-sdk", extras = ["flask"], specifier = "~=2.28.0" },
{ name = "sqlalchemy", specifier = "~=2.0.29" },
+ { name = "sseclient-py", specifier = ">=1.8.0" },
{ name = "starlette", specifier = "==0.41.0" },
{ name = "tiktoken", specifier = "~=0.9.0" },
{ name = "transformers", specifier = "~=4.51.0" },
@@ -1454,6 +1489,7 @@ dev = [
{ name = "coverage", specifier = "~=7.2.4" },
{ name = "dotenv-linter", specifier = "~=0.5.0" },
{ name = "faker", specifier = "~=32.1.0" },
+ { name = "hypothesis", specifier = ">=6.131.15" },
{ name = "lxml-stubs", specifier = "~=0.5.1" },
{ name = "mypy", specifier = "~=1.16.0" },
{ name = "pandas-stubs", specifier = "~=2.2.3" },
@@ -1462,7 +1498,7 @@ dev = [
{ name = "pytest-cov", specifier = "~=4.1.0" },
{ name = "pytest-env", specifier = "~=1.1.3" },
{ name = "pytest-mock", specifier = "~=3.14.0" },
- { name = "ruff", specifier = "~=0.11.5" },
+ { name = "ruff", specifier = "~=0.12.3" },
{ name = "scipy-stubs", specifier = ">=1.15.3.0" },
{ name = "types-aiofiles", specifier = "~=24.1.0" },
{ name = "types-beautifulsoup4", specifier = "~=4.12.0" },
@@ -1492,6 +1528,7 @@ dev = [
{ name = "types-pymysql", specifier = "~=1.1.0" },
{ name = "types-pyopenssl", specifier = ">=24.1.0" },
{ name = "types-python-dateutil", specifier = "~=2.9.0" },
+ { name = "types-python-http-client", specifier = ">=3.3.7.20240910" },
{ name = "types-pywin32", specifier = "~=310.0.0" },
{ name = "types-pyyaml", specifier = "~=6.0.12" },
{ name = "types-regex", specifier = "~=2024.11.6" },
@@ -1527,6 +1564,7 @@ vdb = [
{ name = "clickhouse-connect", specifier = "~=0.7.16" },
{ name = "couchbase", specifier = "~=4.3.0" },
{ name = "elasticsearch", specifier = "==8.14.0" },
+ { name = "mo-vector", specifier = "~=0.1.13" },
{ name = "opensearch-py", specifier = "==2.4.0" },
{ name = "oracledb", specifier = "==3.0.0" },
{ name = "pgvecto-rs", extras = ["sqlalchemy"], specifier = "~=0.2.1" },
@@ -1535,7 +1573,7 @@ vdb = [
{ name = "pymochow", specifier = "==1.3.1" },
{ name = "pyobvector", specifier = "~=0.1.6" },
{ name = "qdrant-client", specifier = "==1.9.0" },
- { name = "tablestore", specifier = "==6.1.0" },
+ { name = "tablestore", specifier = "==6.2.0" },
{ name = "tcvectordb", specifier = "~=1.6.4" },
{ name = "tidb-vector", specifier = "==0.0.9" },
{ name = "upstash-vector", specifier = "==0.6.0" },
@@ -1562,18 +1600,6 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/12/b3/231ffd4ab1fc9d679809f356cebee130ac7daa00d6d6f3206dd4fd137e9e/distro-1.9.0-py3-none-any.whl", hash = "sha256:7bffd925d65168f85027d8da9af6bddab658135b840670a223589bc0c8ef02b2", size = 20277, upload-time = "2023-12-24T09:54:30.421Z" },
]
-[[package]]
-name = "docker-pycreds"
-version = "0.4.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
- { name = "six" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/c5/e6/d1f6c00b7221e2d7c4b470132c931325c8b22c51ca62417e300f5ce16009/docker-pycreds-0.4.0.tar.gz", hash = "sha256:6ce3270bcaf404cc4c3e27e4b6c70d3521deae82fb508767870fdbf772d584d4", size = 8754, upload-time = "2018-11-29T03:26:50.996Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/f5/e8/f6bd1eee09314e7e6dee49cbe2c5e22314ccdb38db16c9fc72d2fa80d054/docker_pycreds-0.4.0-py2.py3-none-any.whl", hash = "sha256:7266112468627868005106ec19cd0d722702d2b7d5912a28e19b826c3d37af49", size = 8982, upload-time = "2018-11-29T03:26:49.575Z" },
-]
-
[[package]]
name = "docstring-parser"
version = "0.16"
@@ -1608,6 +1634,18 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/b0/0d/9feae160378a3553fa9a339b0e9c1a048e147a4127210e286ef18b730f03/durationpy-0.10-py3-none-any.whl", hash = "sha256:3b41e1b601234296b4fb368338fdcd3e13e0b4fb5b67345948f4f2bf9868b286", size = 3922, upload-time = "2025-05-17T13:52:36.463Z" },
]
+[[package]]
+name = "ecdsa"
+version = "0.19.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+ { name = "six" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c0/1f/924e3caae75f471eae4b26bd13b698f6af2c44279f67af317439c2f4c46a/ecdsa-0.19.1.tar.gz", hash = "sha256:478cba7b62555866fcb3bb3fe985e06decbdb68ef55713c4e5ab98c57d508e61", size = 201793, upload-time = "2025-03-13T11:52:43.25Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/cb/a3/460c57f094a4a165c84a1341c373b0a4f5ec6ac244b998d5021aade89b77/ecdsa-0.19.1-py2.py3-none-any.whl", hash = "sha256:30638e27cf77b7e15c4c4cc1973720149e1033827cfd00661ca5c8cc0cdb24c3", size = 150607, upload-time = "2025-03-13T11:52:41.757Z" },
+]
+
[[package]]
name = "elastic-transport"
version = "8.17.1"
@@ -1642,15 +1680,6 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/91/db/a0335710caaa6d0aebdaa65ad4df789c15d89b7babd9a30277838a7d9aac/emoji-2.14.1-py3-none-any.whl", hash = "sha256:35a8a486c1460addb1499e3bf7929d3889b2e2841a57401903699fef595e942b", size = 590617, upload-time = "2025-01-16T06:31:23.526Z" },
]
-[[package]]
-name = "enum34"
-version = "1.1.10"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/11/c4/2da1f4952ba476677a42f25cd32ab8aaf0e1c0d0e00b89822b835c7e654c/enum34-1.1.10.tar.gz", hash = "sha256:cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248", size = 28187, upload-time = "2020-03-10T17:48:00.865Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/63/f6/ccb1c83687756aeabbf3ca0f213508fcfb03883ff200d201b3a4c60cedcc/enum34-1.1.10-py3-none-any.whl", hash = "sha256:c3858660960c984d6ab0ebad691265180da2b43f07e061c0f8dca9ef3cffd328", size = 11224, upload-time = "2020-03-10T17:48:03.174Z" },
-]
-
[[package]]
name = "esdk-obs-python"
version = "3.24.6.1"
@@ -1684,16 +1713,16 @@ wheels = [
[[package]]
name = "fastapi"
-version = "0.115.12"
+version = "0.116.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "pydantic" },
{ name = "starlette" },
{ name = "typing-extensions" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/f4/55/ae499352d82338331ca1e28c7f4a63bfd09479b16395dce38cf50a39e2c2/fastapi-0.115.12.tar.gz", hash = "sha256:1e2c2a2646905f9e83d32f04a3f86aff4a286669c6c950ca95b5fd68c2602681", size = 295236, upload-time = "2025-03-23T22:55:43.822Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/20/38/e1da78736143fd885c36213a3ccc493c384ae8fea6a0f0bc272ef42ebea8/fastapi-0.116.0.tar.gz", hash = "sha256:80dc0794627af0390353a6d1171618276616310d37d24faba6648398e57d687a", size = 296518, upload-time = "2025-07-07T15:09:27.82Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/50/b3/b51f09c2ba432a576fe63758bddc81f78f0c6309d9e5c10d194313bf021e/fastapi-0.115.12-py3-none-any.whl", hash = "sha256:e94613d6c05e27be7ffebdd6ea5f388112e5e430c8f7d6494a9d1d88d43e814d", size = 95164, upload-time = "2025-03-23T22:55:42.101Z" },
+ { url = "https://files.pythonhosted.org/packages/2f/68/d80347fe2360445b5f58cf290e588a4729746e7501080947e6cdae114b1f/fastapi-0.116.0-py3-none-any.whl", hash = "sha256:fdcc9ed272eaef038952923bef2b735c02372402d1203ee1210af4eea7a78d2b", size = 95625, upload-time = "2025-07-07T15:09:26.348Z" },
]
[[package]]
@@ -1749,15 +1778,15 @@ wheels = [
[[package]]
name = "flask-cors"
-version = "6.0.0"
+version = "6.0.1"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "flask" },
{ name = "werkzeug" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/20/e7/b3c6afdd984672b55dff07482699c688af6c01bd7fd5dd55f9c9d1a88d1c/flask_cors-6.0.0.tar.gz", hash = "sha256:4592c1570246bf7beee96b74bc0adbbfcb1b0318f6ba05c412e8909eceec3393", size = 11875, upload-time = "2025-05-17T14:35:16.98Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/76/37/bcfa6c7d5eec777c4c7cf45ce6b27631cebe5230caf88d85eadd63edd37a/flask_cors-6.0.1.tar.gz", hash = "sha256:d81bcb31f07b0985be7f48406247e9243aced229b7747219160a0559edd678db", size = 13463, upload-time = "2025-06-11T01:32:08.518Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/ba/f0/0ee29090016345938f016ee98aa8b5de1c500ee93491dc0c76495848fca1/flask_cors-6.0.0-py3-none-any.whl", hash = "sha256:6332073356452343a8ccddbfec7befdc3fdd040141fe776ec9b94c262f058657", size = 11549, upload-time = "2025-05-17T14:35:15.766Z" },
+ { url = "https://files.pythonhosted.org/packages/17/f8/01bf35a3afd734345528f98d0353f2a978a476528ad4d7e78b70c4d149dd/flask_cors-6.0.1-py3-none-any.whl", hash = "sha256:c7b2cbfb1a31aa0d2e5341eea03a6805349f7a61647daee1a15c46bbe981494c", size = 13244, upload-time = "2025-06-11T01:32:07.352Z" },
]
[[package]]
@@ -1826,45 +1855,45 @@ wheels = [
[[package]]
name = "frozenlist"
-version = "1.6.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/ee/f4/d744cba2da59b5c1d88823cf9e8a6c74e4659e2b27604ed973be2a0bf5ab/frozenlist-1.6.0.tar.gz", hash = "sha256:b99655c32c1c8e06d111e7f41c06c29a5318cb1835df23a45518e02a47c63b68", size = 42831, upload-time = "2025-04-17T22:38:53.099Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/53/b5/bc883b5296ec902115c00be161da93bf661199c465ec4c483feec6ea4c32/frozenlist-1.6.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ae8337990e7a45683548ffb2fee1af2f1ed08169284cd829cdd9a7fa7470530d", size = 160912, upload-time = "2025-04-17T22:36:17.235Z" },
- { url = "https://files.pythonhosted.org/packages/6f/93/51b058b563d0704b39c56baa222828043aafcac17fd3734bec5dbeb619b1/frozenlist-1.6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:8c952f69dd524558694818a461855f35d36cc7f5c0adddce37e962c85d06eac0", size = 124315, upload-time = "2025-04-17T22:36:18.735Z" },
- { url = "https://files.pythonhosted.org/packages/c9/e0/46cd35219428d350558b874d595e132d1c17a9471a1bd0d01d518a261e7c/frozenlist-1.6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:8f5fef13136c4e2dee91bfb9a44e236fff78fc2cd9f838eddfc470c3d7d90afe", size = 122230, upload-time = "2025-04-17T22:36:20.6Z" },
- { url = "https://files.pythonhosted.org/packages/d1/0f/7ad2ce928ad06d6dd26a61812b959ded573d3e9d0ee6109d96c2be7172e9/frozenlist-1.6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:716bbba09611b4663ecbb7cd022f640759af8259e12a6ca939c0a6acd49eedba", size = 314842, upload-time = "2025-04-17T22:36:22.088Z" },
- { url = "https://files.pythonhosted.org/packages/34/76/98cbbd8a20a5c3359a2004ae5e5b216af84a150ccbad67c8f8f30fb2ea91/frozenlist-1.6.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:7b8c4dc422c1a3ffc550b465090e53b0bf4839047f3e436a34172ac67c45d595", size = 304919, upload-time = "2025-04-17T22:36:24.247Z" },
- { url = "https://files.pythonhosted.org/packages/9a/fa/258e771ce3a44348c05e6b01dffc2bc67603fba95761458c238cd09a2c77/frozenlist-1.6.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b11534872256e1666116f6587a1592ef395a98b54476addb5e8d352925cb5d4a", size = 324074, upload-time = "2025-04-17T22:36:26.291Z" },
- { url = "https://files.pythonhosted.org/packages/d5/a4/047d861fd8c538210e12b208c0479912273f991356b6bdee7ea8356b07c9/frozenlist-1.6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1c6eceb88aaf7221f75be6ab498dc622a151f5f88d536661af3ffc486245a626", size = 321292, upload-time = "2025-04-17T22:36:27.909Z" },
- { url = "https://files.pythonhosted.org/packages/c0/25/cfec8af758b4525676cabd36efcaf7102c1348a776c0d1ad046b8a7cdc65/frozenlist-1.6.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:62c828a5b195570eb4b37369fcbbd58e96c905768d53a44d13044355647838ff", size = 301569, upload-time = "2025-04-17T22:36:29.448Z" },
- { url = "https://files.pythonhosted.org/packages/87/2f/0c819372fa9f0c07b153124bf58683b8d0ca7bb73ea5ccde9b9ef1745beb/frozenlist-1.6.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e1c6bd2c6399920c9622362ce95a7d74e7f9af9bfec05fff91b8ce4b9647845a", size = 313625, upload-time = "2025-04-17T22:36:31.55Z" },
- { url = "https://files.pythonhosted.org/packages/50/5f/f0cf8b0fdedffdb76b3745aa13d5dbe404d63493cc211ce8250f2025307f/frozenlist-1.6.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:49ba23817781e22fcbd45fd9ff2b9b8cdb7b16a42a4851ab8025cae7b22e96d0", size = 312523, upload-time = "2025-04-17T22:36:33.078Z" },
- { url = "https://files.pythonhosted.org/packages/e1/6c/38c49108491272d3e84125bbabf2c2d0b304899b52f49f0539deb26ad18d/frozenlist-1.6.0-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:431ef6937ae0f853143e2ca67d6da76c083e8b1fe3df0e96f3802fd37626e606", size = 322657, upload-time = "2025-04-17T22:36:34.688Z" },
- { url = "https://files.pythonhosted.org/packages/bd/4b/3bd3bad5be06a9d1b04b1c22be80b5fe65b502992d62fab4bdb25d9366ee/frozenlist-1.6.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:9d124b38b3c299ca68433597ee26b7819209cb8a3a9ea761dfe9db3a04bba584", size = 303414, upload-time = "2025-04-17T22:36:36.363Z" },
- { url = "https://files.pythonhosted.org/packages/5b/89/7e225a30bef6e85dbfe22622c24afe932e9444de3b40d58b1ea589a14ef8/frozenlist-1.6.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:118e97556306402e2b010da1ef21ea70cb6d6122e580da64c056b96f524fbd6a", size = 320321, upload-time = "2025-04-17T22:36:38.16Z" },
- { url = "https://files.pythonhosted.org/packages/22/72/7e3acef4dd9e86366cb8f4d8f28e852c2b7e116927e9722b31a6f71ea4b0/frozenlist-1.6.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:fb3b309f1d4086b5533cf7bbcf3f956f0ae6469664522f1bde4feed26fba60f1", size = 323975, upload-time = "2025-04-17T22:36:40.289Z" },
- { url = "https://files.pythonhosted.org/packages/d8/85/e5da03d20507e13c66ce612c9792b76811b7a43e3320cce42d95b85ac755/frozenlist-1.6.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:54dece0d21dce4fdb188a1ffc555926adf1d1c516e493c2914d7c370e454bc9e", size = 316553, upload-time = "2025-04-17T22:36:42.045Z" },
- { url = "https://files.pythonhosted.org/packages/ac/8e/6c609cbd0580ae8a0661c408149f196aade7d325b1ae7adc930501b81acb/frozenlist-1.6.0-cp311-cp311-win32.whl", hash = "sha256:654e4ba1d0b2154ca2f096bed27461cf6160bc7f504a7f9a9ef447c293caf860", size = 115511, upload-time = "2025-04-17T22:36:44.067Z" },
- { url = "https://files.pythonhosted.org/packages/f2/13/a84804cfde6de12d44ed48ecbf777ba62b12ff09e761f76cdd1ff9e14bb1/frozenlist-1.6.0-cp311-cp311-win_amd64.whl", hash = "sha256:3e911391bffdb806001002c1f860787542f45916c3baf764264a52765d5a5603", size = 120863, upload-time = "2025-04-17T22:36:45.465Z" },
- { url = "https://files.pythonhosted.org/packages/9c/8a/289b7d0de2fbac832ea80944d809759976f661557a38bb8e77db5d9f79b7/frozenlist-1.6.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:c5b9e42ace7d95bf41e19b87cec8f262c41d3510d8ad7514ab3862ea2197bfb1", size = 160193, upload-time = "2025-04-17T22:36:47.382Z" },
- { url = "https://files.pythonhosted.org/packages/19/80/2fd17d322aec7f430549f0669f599997174f93ee17929ea5b92781ec902c/frozenlist-1.6.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:ca9973735ce9f770d24d5484dcb42f68f135351c2fc81a7a9369e48cf2998a29", size = 123831, upload-time = "2025-04-17T22:36:49.401Z" },
- { url = "https://files.pythonhosted.org/packages/99/06/f5812da431273f78c6543e0b2f7de67dfd65eb0a433978b2c9c63d2205e4/frozenlist-1.6.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6ac40ec76041c67b928ca8aaffba15c2b2ee3f5ae8d0cb0617b5e63ec119ca25", size = 121862, upload-time = "2025-04-17T22:36:51.899Z" },
- { url = "https://files.pythonhosted.org/packages/d0/31/9e61c6b5fc493cf24d54881731204d27105234d09878be1a5983182cc4a5/frozenlist-1.6.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:95b7a8a3180dfb280eb044fdec562f9b461614c0ef21669aea6f1d3dac6ee576", size = 316361, upload-time = "2025-04-17T22:36:53.402Z" },
- { url = "https://files.pythonhosted.org/packages/9d/55/22ca9362d4f0222324981470fd50192be200154d51509ee6eb9baa148e96/frozenlist-1.6.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:c444d824e22da6c9291886d80c7d00c444981a72686e2b59d38b285617cb52c8", size = 307115, upload-time = "2025-04-17T22:36:55.016Z" },
- { url = "https://files.pythonhosted.org/packages/ae/39/4fff42920a57794881e7bb3898dc7f5f539261711ea411b43bba3cde8b79/frozenlist-1.6.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bb52c8166499a8150bfd38478248572c924c003cbb45fe3bcd348e5ac7c000f9", size = 322505, upload-time = "2025-04-17T22:36:57.12Z" },
- { url = "https://files.pythonhosted.org/packages/55/f2/88c41f374c1e4cf0092a5459e5f3d6a1e17ed274c98087a76487783df90c/frozenlist-1.6.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b35298b2db9c2468106278537ee529719228950a5fdda686582f68f247d1dc6e", size = 322666, upload-time = "2025-04-17T22:36:58.735Z" },
- { url = "https://files.pythonhosted.org/packages/75/51/034eeb75afdf3fd03997856195b500722c0b1a50716664cde64e28299c4b/frozenlist-1.6.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d108e2d070034f9d57210f22fefd22ea0d04609fc97c5f7f5a686b3471028590", size = 302119, upload-time = "2025-04-17T22:37:00.512Z" },
- { url = "https://files.pythonhosted.org/packages/2b/a6/564ecde55ee633270a793999ef4fd1d2c2b32b5a7eec903b1012cb7c5143/frozenlist-1.6.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4e1be9111cb6756868ac242b3c2bd1f09d9aea09846e4f5c23715e7afb647103", size = 316226, upload-time = "2025-04-17T22:37:02.102Z" },
- { url = "https://files.pythonhosted.org/packages/f1/c8/6c0682c32377f402b8a6174fb16378b683cf6379ab4d2827c580892ab3c7/frozenlist-1.6.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:94bb451c664415f02f07eef4ece976a2c65dcbab9c2f1705b7031a3a75349d8c", size = 312788, upload-time = "2025-04-17T22:37:03.578Z" },
- { url = "https://files.pythonhosted.org/packages/b6/b8/10fbec38f82c5d163ca1750bfff4ede69713badf236a016781cf1f10a0f0/frozenlist-1.6.0-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:d1a686d0b0949182b8faddea596f3fc11f44768d1f74d4cad70213b2e139d821", size = 325914, upload-time = "2025-04-17T22:37:05.213Z" },
- { url = "https://files.pythonhosted.org/packages/62/ca/2bf4f3a1bd40cdedd301e6ecfdbb291080d5afc5f9ce350c0739f773d6b9/frozenlist-1.6.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:ea8e59105d802c5a38bdbe7362822c522230b3faba2aa35c0fa1765239b7dd70", size = 305283, upload-time = "2025-04-17T22:37:06.985Z" },
- { url = "https://files.pythonhosted.org/packages/09/64/20cc13ccf94abc2a1f482f74ad210703dc78a590d0b805af1c9aa67f76f9/frozenlist-1.6.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:abc4e880a9b920bc5020bf6a431a6bb40589d9bca3975c980495f63632e8382f", size = 319264, upload-time = "2025-04-17T22:37:08.618Z" },
- { url = "https://files.pythonhosted.org/packages/20/ff/86c6a2bbe98cfc231519f5e6d712a0898488ceac804a917ce014f32e68f6/frozenlist-1.6.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:9a79713adfe28830f27a3c62f6b5406c37376c892b05ae070906f07ae4487046", size = 326482, upload-time = "2025-04-17T22:37:10.196Z" },
- { url = "https://files.pythonhosted.org/packages/2f/da/8e381f66367d79adca245d1d71527aac774e30e291d41ef161ce2d80c38e/frozenlist-1.6.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9a0318c2068e217a8f5e3b85e35899f5a19e97141a45bb925bb357cfe1daf770", size = 318248, upload-time = "2025-04-17T22:37:12.284Z" },
- { url = "https://files.pythonhosted.org/packages/39/24/1a1976563fb476ab6f0fa9fefaac7616a4361dbe0461324f9fd7bf425dbe/frozenlist-1.6.0-cp312-cp312-win32.whl", hash = "sha256:853ac025092a24bb3bf09ae87f9127de9fe6e0c345614ac92536577cf956dfcc", size = 115161, upload-time = "2025-04-17T22:37:13.902Z" },
- { url = "https://files.pythonhosted.org/packages/80/2e/fb4ed62a65f8cd66044706b1013f0010930d8cbb0729a2219561ea075434/frozenlist-1.6.0-cp312-cp312-win_amd64.whl", hash = "sha256:2bdfe2d7e6c9281c6e55523acd6c2bf77963cb422fdc7d142fb0cb6621b66878", size = 120548, upload-time = "2025-04-17T22:37:15.326Z" },
- { url = "https://files.pythonhosted.org/packages/71/3e/b04a0adda73bd52b390d730071c0d577073d3d26740ee1bad25c3ad0f37b/frozenlist-1.6.0-py3-none-any.whl", hash = "sha256:535eec9987adb04701266b92745d6cdcef2e77669299359c3009c3404dd5d191", size = 12404, upload-time = "2025-04-17T22:38:51.668Z" },
+version = "1.7.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/79/b1/b64018016eeb087db503b038296fd782586432b9c077fc5c7839e9cb6ef6/frozenlist-1.7.0.tar.gz", hash = "sha256:2e310d81923c2437ea8670467121cc3e9b0f76d3043cc1d2331d56c7fb7a3a8f", size = 45078, upload-time = "2025-06-09T23:02:35.538Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/34/7e/803dde33760128acd393a27eb002f2020ddb8d99d30a44bfbaab31c5f08a/frozenlist-1.7.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:aa51e147a66b2d74de1e6e2cf5921890de6b0f4820b257465101d7f37b49fb5a", size = 82251, upload-time = "2025-06-09T23:00:16.279Z" },
+ { url = "https://files.pythonhosted.org/packages/75/a9/9c2c5760b6ba45eae11334db454c189d43d34a4c0b489feb2175e5e64277/frozenlist-1.7.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9b35db7ce1cd71d36ba24f80f0c9e7cff73a28d7a74e91fe83e23d27c7828750", size = 48183, upload-time = "2025-06-09T23:00:17.698Z" },
+ { url = "https://files.pythonhosted.org/packages/47/be/4038e2d869f8a2da165f35a6befb9158c259819be22eeaf9c9a8f6a87771/frozenlist-1.7.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:34a69a85e34ff37791e94542065c8416c1afbf820b68f720452f636d5fb990cd", size = 47107, upload-time = "2025-06-09T23:00:18.952Z" },
+ { url = "https://files.pythonhosted.org/packages/79/26/85314b8a83187c76a37183ceed886381a5f992975786f883472fcb6dc5f2/frozenlist-1.7.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a646531fa8d82c87fe4bb2e596f23173caec9185bfbca5d583b4ccfb95183e2", size = 237333, upload-time = "2025-06-09T23:00:20.275Z" },
+ { url = "https://files.pythonhosted.org/packages/1f/fd/e5b64f7d2c92a41639ffb2ad44a6a82f347787abc0c7df5f49057cf11770/frozenlist-1.7.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:79b2ffbba483f4ed36a0f236ccb85fbb16e670c9238313709638167670ba235f", size = 231724, upload-time = "2025-06-09T23:00:21.705Z" },
+ { url = "https://files.pythonhosted.org/packages/20/fb/03395c0a43a5976af4bf7534759d214405fbbb4c114683f434dfdd3128ef/frozenlist-1.7.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a26f205c9ca5829cbf82bb2a84b5c36f7184c4316617d7ef1b271a56720d6b30", size = 245842, upload-time = "2025-06-09T23:00:23.148Z" },
+ { url = "https://files.pythonhosted.org/packages/d0/15/c01c8e1dffdac5d9803507d824f27aed2ba76b6ed0026fab4d9866e82f1f/frozenlist-1.7.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:bcacfad3185a623fa11ea0e0634aac7b691aa925d50a440f39b458e41c561d98", size = 239767, upload-time = "2025-06-09T23:00:25.103Z" },
+ { url = "https://files.pythonhosted.org/packages/14/99/3f4c6fe882c1f5514b6848aa0a69b20cb5e5d8e8f51a339d48c0e9305ed0/frozenlist-1.7.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:72c1b0fe8fe451b34f12dce46445ddf14bd2a5bcad7e324987194dc8e3a74c86", size = 224130, upload-time = "2025-06-09T23:00:27.061Z" },
+ { url = "https://files.pythonhosted.org/packages/4d/83/220a374bd7b2aeba9d0725130665afe11de347d95c3620b9b82cc2fcab97/frozenlist-1.7.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61d1a5baeaac6c0798ff6edfaeaa00e0e412d49946c53fae8d4b8e8b3566c4ae", size = 235301, upload-time = "2025-06-09T23:00:29.02Z" },
+ { url = "https://files.pythonhosted.org/packages/03/3c/3e3390d75334a063181625343e8daab61b77e1b8214802cc4e8a1bb678fc/frozenlist-1.7.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:7edf5c043c062462f09b6820de9854bf28cc6cc5b6714b383149745e287181a8", size = 234606, upload-time = "2025-06-09T23:00:30.514Z" },
+ { url = "https://files.pythonhosted.org/packages/23/1e/58232c19608b7a549d72d9903005e2d82488f12554a32de2d5fb59b9b1ba/frozenlist-1.7.0-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:d50ac7627b3a1bd2dcef6f9da89a772694ec04d9a61b66cf87f7d9446b4a0c31", size = 248372, upload-time = "2025-06-09T23:00:31.966Z" },
+ { url = "https://files.pythonhosted.org/packages/c0/a4/e4a567e01702a88a74ce8a324691e62a629bf47d4f8607f24bf1c7216e7f/frozenlist-1.7.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:ce48b2fece5aeb45265bb7a58259f45027db0abff478e3077e12b05b17fb9da7", size = 229860, upload-time = "2025-06-09T23:00:33.375Z" },
+ { url = "https://files.pythonhosted.org/packages/73/a6/63b3374f7d22268b41a9db73d68a8233afa30ed164c46107b33c4d18ecdd/frozenlist-1.7.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:fe2365ae915a1fafd982c146754e1de6ab3478def8a59c86e1f7242d794f97d5", size = 245893, upload-time = "2025-06-09T23:00:35.002Z" },
+ { url = "https://files.pythonhosted.org/packages/6d/eb/d18b3f6e64799a79673c4ba0b45e4cfbe49c240edfd03a68be20002eaeaa/frozenlist-1.7.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:45a6f2fdbd10e074e8814eb98b05292f27bad7d1883afbe009d96abdcf3bc898", size = 246323, upload-time = "2025-06-09T23:00:36.468Z" },
+ { url = "https://files.pythonhosted.org/packages/5a/f5/720f3812e3d06cd89a1d5db9ff6450088b8f5c449dae8ffb2971a44da506/frozenlist-1.7.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:21884e23cffabb157a9dd7e353779077bf5b8f9a58e9b262c6caad2ef5f80a56", size = 233149, upload-time = "2025-06-09T23:00:37.963Z" },
+ { url = "https://files.pythonhosted.org/packages/69/68/03efbf545e217d5db8446acfd4c447c15b7c8cf4dbd4a58403111df9322d/frozenlist-1.7.0-cp311-cp311-win32.whl", hash = "sha256:284d233a8953d7b24f9159b8a3496fc1ddc00f4db99c324bd5fb5f22d8698ea7", size = 39565, upload-time = "2025-06-09T23:00:39.753Z" },
+ { url = "https://files.pythonhosted.org/packages/58/17/fe61124c5c333ae87f09bb67186d65038834a47d974fc10a5fadb4cc5ae1/frozenlist-1.7.0-cp311-cp311-win_amd64.whl", hash = "sha256:387cbfdcde2f2353f19c2f66bbb52406d06ed77519ac7ee21be0232147c2592d", size = 44019, upload-time = "2025-06-09T23:00:40.988Z" },
+ { url = "https://files.pythonhosted.org/packages/ef/a2/c8131383f1e66adad5f6ecfcce383d584ca94055a34d683bbb24ac5f2f1c/frozenlist-1.7.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:3dbf9952c4bb0e90e98aec1bd992b3318685005702656bc6f67c1a32b76787f2", size = 81424, upload-time = "2025-06-09T23:00:42.24Z" },
+ { url = "https://files.pythonhosted.org/packages/4c/9d/02754159955088cb52567337d1113f945b9e444c4960771ea90eb73de8db/frozenlist-1.7.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:1f5906d3359300b8a9bb194239491122e6cf1444c2efb88865426f170c262cdb", size = 47952, upload-time = "2025-06-09T23:00:43.481Z" },
+ { url = "https://files.pythonhosted.org/packages/01/7a/0046ef1bd6699b40acd2067ed6d6670b4db2f425c56980fa21c982c2a9db/frozenlist-1.7.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:3dabd5a8f84573c8d10d8859a50ea2dec01eea372031929871368c09fa103478", size = 46688, upload-time = "2025-06-09T23:00:44.793Z" },
+ { url = "https://files.pythonhosted.org/packages/d6/a2/a910bafe29c86997363fb4c02069df4ff0b5bc39d33c5198b4e9dd42d8f8/frozenlist-1.7.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aa57daa5917f1738064f302bf2626281a1cb01920c32f711fbc7bc36111058a8", size = 243084, upload-time = "2025-06-09T23:00:46.125Z" },
+ { url = "https://files.pythonhosted.org/packages/64/3e/5036af9d5031374c64c387469bfcc3af537fc0f5b1187d83a1cf6fab1639/frozenlist-1.7.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:c193dda2b6d49f4c4398962810fa7d7c78f032bf45572b3e04dd5249dff27e08", size = 233524, upload-time = "2025-06-09T23:00:47.73Z" },
+ { url = "https://files.pythonhosted.org/packages/06/39/6a17b7c107a2887e781a48ecf20ad20f1c39d94b2a548c83615b5b879f28/frozenlist-1.7.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bfe2b675cf0aaa6d61bf8fbffd3c274b3c9b7b1623beb3809df8a81399a4a9c4", size = 248493, upload-time = "2025-06-09T23:00:49.742Z" },
+ { url = "https://files.pythonhosted.org/packages/be/00/711d1337c7327d88c44d91dd0f556a1c47fb99afc060ae0ef66b4d24793d/frozenlist-1.7.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8fc5d5cda37f62b262405cf9652cf0856839c4be8ee41be0afe8858f17f4c94b", size = 244116, upload-time = "2025-06-09T23:00:51.352Z" },
+ { url = "https://files.pythonhosted.org/packages/24/fe/74e6ec0639c115df13d5850e75722750adabdc7de24e37e05a40527ca539/frozenlist-1.7.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b0d5ce521d1dd7d620198829b87ea002956e4319002ef0bc8d3e6d045cb4646e", size = 224557, upload-time = "2025-06-09T23:00:52.855Z" },
+ { url = "https://files.pythonhosted.org/packages/8d/db/48421f62a6f77c553575201e89048e97198046b793f4a089c79a6e3268bd/frozenlist-1.7.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:488d0a7d6a0008ca0db273c542098a0fa9e7dfaa7e57f70acef43f32b3f69dca", size = 241820, upload-time = "2025-06-09T23:00:54.43Z" },
+ { url = "https://files.pythonhosted.org/packages/1d/fa/cb4a76bea23047c8462976ea7b7a2bf53997a0ca171302deae9d6dd12096/frozenlist-1.7.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:15a7eaba63983d22c54d255b854e8108e7e5f3e89f647fc854bd77a237e767df", size = 236542, upload-time = "2025-06-09T23:00:56.409Z" },
+ { url = "https://files.pythonhosted.org/packages/5d/32/476a4b5cfaa0ec94d3f808f193301debff2ea42288a099afe60757ef6282/frozenlist-1.7.0-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:1eaa7e9c6d15df825bf255649e05bd8a74b04a4d2baa1ae46d9c2d00b2ca2cb5", size = 249350, upload-time = "2025-06-09T23:00:58.468Z" },
+ { url = "https://files.pythonhosted.org/packages/8d/ba/9a28042f84a6bf8ea5dbc81cfff8eaef18d78b2a1ad9d51c7bc5b029ad16/frozenlist-1.7.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:e4389e06714cfa9d47ab87f784a7c5be91d3934cd6e9a7b85beef808297cc025", size = 225093, upload-time = "2025-06-09T23:01:00.015Z" },
+ { url = "https://files.pythonhosted.org/packages/bc/29/3a32959e68f9cf000b04e79ba574527c17e8842e38c91d68214a37455786/frozenlist-1.7.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:73bd45e1488c40b63fe5a7df892baf9e2a4d4bb6409a2b3b78ac1c6236178e01", size = 245482, upload-time = "2025-06-09T23:01:01.474Z" },
+ { url = "https://files.pythonhosted.org/packages/80/e8/edf2f9e00da553f07f5fa165325cfc302dead715cab6ac8336a5f3d0adc2/frozenlist-1.7.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:99886d98e1643269760e5fe0df31e5ae7050788dd288947f7f007209b8c33f08", size = 249590, upload-time = "2025-06-09T23:01:02.961Z" },
+ { url = "https://files.pythonhosted.org/packages/1c/80/9a0eb48b944050f94cc51ee1c413eb14a39543cc4f760ed12657a5a3c45a/frozenlist-1.7.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:290a172aae5a4c278c6da8a96222e6337744cd9c77313efe33d5670b9f65fc43", size = 237785, upload-time = "2025-06-09T23:01:05.095Z" },
+ { url = "https://files.pythonhosted.org/packages/f3/74/87601e0fb0369b7a2baf404ea921769c53b7ae00dee7dcfe5162c8c6dbf0/frozenlist-1.7.0-cp312-cp312-win32.whl", hash = "sha256:426c7bc70e07cfebc178bc4c2bf2d861d720c4fff172181eeb4a4c41d4ca2ad3", size = 39487, upload-time = "2025-06-09T23:01:06.54Z" },
+ { url = "https://files.pythonhosted.org/packages/0b/15/c026e9a9fc17585a9d461f65d8593d281fedf55fbf7eb53f16c6df2392f9/frozenlist-1.7.0-cp312-cp312-win_amd64.whl", hash = "sha256:563b72efe5da92e02eb68c59cb37205457c977aa7a449ed1b37e6939e5c47c6a", size = 43874, upload-time = "2025-06-09T23:01:07.752Z" },
+ { url = "https://files.pythonhosted.org/packages/ee/45/b82e3c16be2182bff01179db177fe144d58b5dc787a7d4492c6ed8b9317f/frozenlist-1.7.0-py3-none-any.whl", hash = "sha256:9a5af342e34f7e97caf8c995864c7a396418ae2859cc6fdf1b1073020d516a7e", size = 13106, upload-time = "2025-06-09T23:02:34.204Z" },
]
[[package]]
@@ -2221,28 +2250,28 @@ wheels = [
[[package]]
name = "greenlet"
-version = "3.2.2"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/34/c1/a82edae11d46c0d83481aacaa1e578fea21d94a1ef400afd734d47ad95ad/greenlet-3.2.2.tar.gz", hash = "sha256:ad053d34421a2debba45aa3cc39acf454acbcd025b3fc1a9f8a0dee237abd485", size = 185797, upload-time = "2025-05-09T19:47:35.066Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/a3/9f/a47e19261747b562ce88219e5ed8c859d42c6e01e73da6fbfa3f08a7be13/greenlet-3.2.2-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:dcb9cebbf3f62cb1e5afacae90761ccce0effb3adaa32339a0670fe7805d8068", size = 268635, upload-time = "2025-05-09T14:50:39.007Z" },
- { url = "https://files.pythonhosted.org/packages/11/80/a0042b91b66975f82a914d515e81c1944a3023f2ce1ed7a9b22e10b46919/greenlet-3.2.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf3fc9145141250907730886b031681dfcc0de1c158f3cc51c092223c0f381ce", size = 628786, upload-time = "2025-05-09T15:24:00.692Z" },
- { url = "https://files.pythonhosted.org/packages/38/a2/8336bf1e691013f72a6ebab55da04db81a11f68e82bb691f434909fa1327/greenlet-3.2.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:efcdfb9df109e8a3b475c016f60438fcd4be68cd13a365d42b35914cdab4bb2b", size = 640866, upload-time = "2025-05-09T15:24:48.153Z" },
- { url = "https://files.pythonhosted.org/packages/f8/7e/f2a3a13e424670a5d08826dab7468fa5e403e0fbe0b5f951ff1bc4425b45/greenlet-3.2.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4bd139e4943547ce3a56ef4b8b1b9479f9e40bb47e72cc906f0f66b9d0d5cab3", size = 636752, upload-time = "2025-05-09T15:29:23.182Z" },
- { url = "https://files.pythonhosted.org/packages/fd/5d/ce4a03a36d956dcc29b761283f084eb4a3863401c7cb505f113f73af8774/greenlet-3.2.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:71566302219b17ca354eb274dfd29b8da3c268e41b646f330e324e3967546a74", size = 636028, upload-time = "2025-05-09T14:53:32.854Z" },
- { url = "https://files.pythonhosted.org/packages/4b/29/b130946b57e3ceb039238413790dd3793c5e7b8e14a54968de1fe449a7cf/greenlet-3.2.2-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3091bc45e6b0c73f225374fefa1536cd91b1e987377b12ef5b19129b07d93ebe", size = 583869, upload-time = "2025-05-09T14:53:43.614Z" },
- { url = "https://files.pythonhosted.org/packages/ac/30/9f538dfe7f87b90ecc75e589d20cbd71635531a617a336c386d775725a8b/greenlet-3.2.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:44671c29da26539a5f142257eaba5110f71887c24d40df3ac87f1117df589e0e", size = 1112886, upload-time = "2025-05-09T15:27:01.304Z" },
- { url = "https://files.pythonhosted.org/packages/be/92/4b7deeb1a1e9c32c1b59fdca1cac3175731c23311ddca2ea28a8b6ada91c/greenlet-3.2.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:c23ea227847c9dbe0b3910f5c0dd95658b607137614eb821e6cbaecd60d81cc6", size = 1138355, upload-time = "2025-05-09T14:53:58.011Z" },
- { url = "https://files.pythonhosted.org/packages/c5/eb/7551c751a2ea6498907b2fcbe31d7a54b602ba5e8eb9550a9695ca25d25c/greenlet-3.2.2-cp311-cp311-win_amd64.whl", hash = "sha256:0a16fb934fcabfdfacf21d79e6fed81809d8cd97bc1be9d9c89f0e4567143d7b", size = 295437, upload-time = "2025-05-09T15:00:57.733Z" },
- { url = "https://files.pythonhosted.org/packages/2c/a1/88fdc6ce0df6ad361a30ed78d24c86ea32acb2b563f33e39e927b1da9ea0/greenlet-3.2.2-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:df4d1509efd4977e6a844ac96d8be0b9e5aa5d5c77aa27ca9f4d3f92d3fcf330", size = 270413, upload-time = "2025-05-09T14:51:32.455Z" },
- { url = "https://files.pythonhosted.org/packages/a6/2e/6c1caffd65490c68cd9bcec8cb7feb8ac7b27d38ba1fea121fdc1f2331dc/greenlet-3.2.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da956d534a6d1b9841f95ad0f18ace637668f680b1339ca4dcfb2c1837880a0b", size = 637242, upload-time = "2025-05-09T15:24:02.63Z" },
- { url = "https://files.pythonhosted.org/packages/98/28/088af2cedf8823b6b7ab029a5626302af4ca1037cf8b998bed3a8d3cb9e2/greenlet-3.2.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9c7b15fb9b88d9ee07e076f5a683027bc3befd5bb5d25954bb633c385d8b737e", size = 651444, upload-time = "2025-05-09T15:24:49.856Z" },
- { url = "https://files.pythonhosted.org/packages/4a/9f/0116ab876bb0bc7a81eadc21c3f02cd6100dcd25a1cf2a085a130a63a26a/greenlet-3.2.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:752f0e79785e11180ebd2e726c8a88109ded3e2301d40abced2543aa5d164275", size = 646067, upload-time = "2025-05-09T15:29:24.989Z" },
- { url = "https://files.pythonhosted.org/packages/35/17/bb8f9c9580e28a94a9575da847c257953d5eb6e39ca888239183320c1c28/greenlet-3.2.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9ae572c996ae4b5e122331e12bbb971ea49c08cc7c232d1bd43150800a2d6c65", size = 648153, upload-time = "2025-05-09T14:53:34.716Z" },
- { url = "https://files.pythonhosted.org/packages/2c/ee/7f31b6f7021b8df6f7203b53b9cc741b939a2591dcc6d899d8042fcf66f2/greenlet-3.2.2-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:02f5972ff02c9cf615357c17ab713737cccfd0eaf69b951084a9fd43f39833d3", size = 603865, upload-time = "2025-05-09T14:53:45.738Z" },
- { url = "https://files.pythonhosted.org/packages/b5/2d/759fa59323b521c6f223276a4fc3d3719475dc9ae4c44c2fe7fc750f8de0/greenlet-3.2.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4fefc7aa68b34b9224490dfda2e70ccf2131368493add64b4ef2d372955c207e", size = 1119575, upload-time = "2025-05-09T15:27:04.248Z" },
- { url = "https://files.pythonhosted.org/packages/30/05/356813470060bce0e81c3df63ab8cd1967c1ff6f5189760c1a4734d405ba/greenlet-3.2.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a31ead8411a027c2c4759113cf2bd473690517494f3d6e4bf67064589afcd3c5", size = 1147460, upload-time = "2025-05-09T14:54:00.315Z" },
- { url = "https://files.pythonhosted.org/packages/07/f4/b2a26a309a04fb844c7406a4501331b9400e1dd7dd64d3450472fd47d2e1/greenlet-3.2.2-cp312-cp312-win_amd64.whl", hash = "sha256:b24c7844c0a0afc3ccbeb0b807adeefb7eff2b5599229ecedddcfeb0ef333bec", size = 296239, upload-time = "2025-05-09T14:57:17.633Z" },
+version = "3.2.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/c9/92/bb85bd6e80148a4d2e0c59f7c0c2891029f8fd510183afc7d8d2feeed9b6/greenlet-3.2.3.tar.gz", hash = "sha256:8b0dd8ae4c0d6f5e54ee55ba935eeb3d735a9b58a8a1e5b5cbab64e01a39f365", size = 185752, upload-time = "2025-06-05T16:16:09.955Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/fc/2e/d4fcb2978f826358b673f779f78fa8a32ee37df11920dc2bb5589cbeecef/greenlet-3.2.3-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:784ae58bba89fa1fa5733d170d42486580cab9decda3484779f4759345b29822", size = 270219, upload-time = "2025-06-05T16:10:10.414Z" },
+ { url = "https://files.pythonhosted.org/packages/16/24/929f853e0202130e4fe163bc1d05a671ce8dcd604f790e14896adac43a52/greenlet-3.2.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0921ac4ea42a5315d3446120ad48f90c3a6b9bb93dd9b3cf4e4d84a66e42de83", size = 630383, upload-time = "2025-06-05T16:38:51.785Z" },
+ { url = "https://files.pythonhosted.org/packages/d1/b2/0320715eb61ae70c25ceca2f1d5ae620477d246692d9cc284c13242ec31c/greenlet-3.2.3-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:d2971d93bb99e05f8c2c0c2f4aa9484a18d98c4c3bd3c62b65b7e6ae33dfcfaf", size = 642422, upload-time = "2025-06-05T16:41:35.259Z" },
+ { url = "https://files.pythonhosted.org/packages/bd/49/445fd1a210f4747fedf77615d941444349c6a3a4a1135bba9701337cd966/greenlet-3.2.3-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:c667c0bf9d406b77a15c924ef3285e1e05250948001220368e039b6aa5b5034b", size = 638375, upload-time = "2025-06-05T16:48:18.235Z" },
+ { url = "https://files.pythonhosted.org/packages/7e/c8/ca19760cf6eae75fa8dc32b487e963d863b3ee04a7637da77b616703bc37/greenlet-3.2.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:592c12fb1165be74592f5de0d70f82bc5ba552ac44800d632214b76089945147", size = 637627, upload-time = "2025-06-05T16:13:02.858Z" },
+ { url = "https://files.pythonhosted.org/packages/65/89/77acf9e3da38e9bcfca881e43b02ed467c1dedc387021fc4d9bd9928afb8/greenlet-3.2.3-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:29e184536ba333003540790ba29829ac14bb645514fbd7e32af331e8202a62a5", size = 585502, upload-time = "2025-06-05T16:12:49.642Z" },
+ { url = "https://files.pythonhosted.org/packages/97/c6/ae244d7c95b23b7130136e07a9cc5aadd60d59b5951180dc7dc7e8edaba7/greenlet-3.2.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:93c0bb79844a367782ec4f429d07589417052e621aa39a5ac1fb99c5aa308edc", size = 1114498, upload-time = "2025-06-05T16:36:46.598Z" },
+ { url = "https://files.pythonhosted.org/packages/89/5f/b16dec0cbfd3070658e0d744487919740c6d45eb90946f6787689a7efbce/greenlet-3.2.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:751261fc5ad7b6705f5f76726567375bb2104a059454e0226e1eef6c756748ba", size = 1139977, upload-time = "2025-06-05T16:12:38.262Z" },
+ { url = "https://files.pythonhosted.org/packages/66/77/d48fb441b5a71125bcac042fc5b1494c806ccb9a1432ecaa421e72157f77/greenlet-3.2.3-cp311-cp311-win_amd64.whl", hash = "sha256:83a8761c75312361aa2b5b903b79da97f13f556164a7dd2d5448655425bd4c34", size = 297017, upload-time = "2025-06-05T16:25:05.225Z" },
+ { url = "https://files.pythonhosted.org/packages/f3/94/ad0d435f7c48debe960c53b8f60fb41c2026b1d0fa4a99a1cb17c3461e09/greenlet-3.2.3-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:25ad29caed5783d4bd7a85c9251c651696164622494c00802a139c00d639242d", size = 271992, upload-time = "2025-06-05T16:11:23.467Z" },
+ { url = "https://files.pythonhosted.org/packages/93/5d/7c27cf4d003d6e77749d299c7c8f5fd50b4f251647b5c2e97e1f20da0ab5/greenlet-3.2.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:88cd97bf37fe24a6710ec6a3a7799f3f81d9cd33317dcf565ff9950c83f55e0b", size = 638820, upload-time = "2025-06-05T16:38:52.882Z" },
+ { url = "https://files.pythonhosted.org/packages/c6/7e/807e1e9be07a125bb4c169144937910bf59b9d2f6d931578e57f0bce0ae2/greenlet-3.2.3-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:baeedccca94880d2f5666b4fa16fc20ef50ba1ee353ee2d7092b383a243b0b0d", size = 653046, upload-time = "2025-06-05T16:41:36.343Z" },
+ { url = "https://files.pythonhosted.org/packages/9d/ab/158c1a4ea1068bdbc78dba5a3de57e4c7aeb4e7fa034320ea94c688bfb61/greenlet-3.2.3-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:be52af4b6292baecfa0f397f3edb3c6092ce071b499dd6fe292c9ac9f2c8f264", size = 647701, upload-time = "2025-06-05T16:48:19.604Z" },
+ { url = "https://files.pythonhosted.org/packages/cc/0d/93729068259b550d6a0288da4ff72b86ed05626eaf1eb7c0d3466a2571de/greenlet-3.2.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0cc73378150b8b78b0c9fe2ce56e166695e67478550769536a6742dca3651688", size = 649747, upload-time = "2025-06-05T16:13:04.628Z" },
+ { url = "https://files.pythonhosted.org/packages/f6/f6/c82ac1851c60851302d8581680573245c8fc300253fc1ff741ae74a6c24d/greenlet-3.2.3-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:706d016a03e78df129f68c4c9b4c4f963f7d73534e48a24f5f5a7101ed13dbbb", size = 605461, upload-time = "2025-06-05T16:12:50.792Z" },
+ { url = "https://files.pythonhosted.org/packages/98/82/d022cf25ca39cf1200650fc58c52af32c90f80479c25d1cbf57980ec3065/greenlet-3.2.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:419e60f80709510c343c57b4bb5a339d8767bf9aef9b8ce43f4f143240f88b7c", size = 1121190, upload-time = "2025-06-05T16:36:48.59Z" },
+ { url = "https://files.pythonhosted.org/packages/f5/e1/25297f70717abe8104c20ecf7af0a5b82d2f5a980eb1ac79f65654799f9f/greenlet-3.2.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:93d48533fade144203816783373f27a97e4193177ebaaf0fc396db19e5d61163", size = 1149055, upload-time = "2025-06-05T16:12:40.457Z" },
+ { url = "https://files.pythonhosted.org/packages/1f/8f/8f9e56c5e82eb2c26e8cde787962e66494312dc8cb261c460e1f3a9c88bc/greenlet-3.2.3-cp312-cp312-win_amd64.whl", hash = "sha256:7454d37c740bb27bdeddfc3f358f26956a07d5220818ceb467a483197d84f849", size = 297817, upload-time = "2025-06-05T16:29:49.244Z" },
]
[[package]]
@@ -2364,17 +2393,17 @@ wheels = [
[[package]]
name = "hf-xet"
-version = "1.1.2"
+version = "1.1.5"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/95/be/58f20728a5b445f8b064e74f0618897b3439f5ef90934da1916b9dfac76f/hf_xet-1.1.2.tar.gz", hash = "sha256:3712d6d4819d3976a1c18e36db9f503e296283f9363af818f50703506ed63da3", size = 467009, upload-time = "2025-05-16T20:44:34.944Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ed/d4/7685999e85945ed0d7f0762b686ae7015035390de1161dcea9d5276c134c/hf_xet-1.1.5.tar.gz", hash = "sha256:69ebbcfd9ec44fdc2af73441619eeb06b94ee34511bbcf57cd423820090f5694", size = 495969, upload-time = "2025-06-20T21:48:38.007Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/45/ae/f1a63f75d9886f18a80220ba31a1c7b9c4752f03aae452f358f538c6a991/hf_xet-1.1.2-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:dfd1873fd648488c70735cb60f7728512bca0e459e61fcd107069143cd798469", size = 2642559, upload-time = "2025-05-16T20:44:30.217Z" },
- { url = "https://files.pythonhosted.org/packages/50/ab/d2c83ae18f1015d926defd5bfbe94c62d15e93f900e6a192e318ee947105/hf_xet-1.1.2-cp37-abi3-macosx_11_0_arm64.whl", hash = "sha256:29b584983b2d977c44157d9241dcf0fd50acde0b7bff8897fe4386912330090d", size = 2541360, upload-time = "2025-05-16T20:44:29.056Z" },
- { url = "https://files.pythonhosted.org/packages/9f/a7/693dc9f34f979e30a378125e2150a0b2d8d166e6d83ce3950eeb81e560aa/hf_xet-1.1.2-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b29ac84298147fe9164cc55ad994ba47399f90b5d045b0b803b99cf5f06d8ec", size = 5183081, upload-time = "2025-05-16T20:44:27.505Z" },
- { url = "https://files.pythonhosted.org/packages/3d/23/c48607883f692a36c0a7735f47f98bad32dbe459a32d1568c0f21576985d/hf_xet-1.1.2-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:d921ba32615676e436a0d15e162331abc9ed43d440916b1d836dc27ce1546173", size = 5356100, upload-time = "2025-05-16T20:44:25.681Z" },
- { url = "https://files.pythonhosted.org/packages/eb/5b/b2316c7f1076da0582b52ea228f68bea95e243c388440d1dc80297c9d813/hf_xet-1.1.2-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:d9b03c34e13c44893ab6e8fea18ee8d2a6878c15328dd3aabedbdd83ee9f2ed3", size = 5647688, upload-time = "2025-05-16T20:44:31.867Z" },
- { url = "https://files.pythonhosted.org/packages/2c/98/e6995f0fa579929da7795c961f403f4ee84af36c625963f52741d56f242c/hf_xet-1.1.2-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:01b18608955b3d826307d37da8bd38b28a46cd2d9908b3a3655d1363274f941a", size = 5322627, upload-time = "2025-05-16T20:44:33.677Z" },
- { url = "https://files.pythonhosted.org/packages/59/40/8f1d5a44a64d8bf9e3c19576e789f716af54875b46daae65426714e75db1/hf_xet-1.1.2-cp37-abi3-win_amd64.whl", hash = "sha256:3562902c81299b09f3582ddfb324400c6a901a2f3bc854f83556495755f4954c", size = 2739542, upload-time = "2025-05-16T20:44:36.287Z" },
+ { url = "https://files.pythonhosted.org/packages/00/89/a1119eebe2836cb25758e7661d6410d3eae982e2b5e974bcc4d250be9012/hf_xet-1.1.5-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:f52c2fa3635b8c37c7764d8796dfa72706cc4eded19d638331161e82b0792e23", size = 2687929, upload-time = "2025-06-20T21:48:32.284Z" },
+ { url = "https://files.pythonhosted.org/packages/de/5f/2c78e28f309396e71ec8e4e9304a6483dcbc36172b5cea8f291994163425/hf_xet-1.1.5-cp37-abi3-macosx_11_0_arm64.whl", hash = "sha256:9fa6e3ee5d61912c4a113e0708eaaef987047616465ac7aa30f7121a48fc1af8", size = 2556338, upload-time = "2025-06-20T21:48:30.079Z" },
+ { url = "https://files.pythonhosted.org/packages/6d/2f/6cad7b5fe86b7652579346cb7f85156c11761df26435651cbba89376cd2c/hf_xet-1.1.5-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fc874b5c843e642f45fd85cda1ce599e123308ad2901ead23d3510a47ff506d1", size = 3102894, upload-time = "2025-06-20T21:48:28.114Z" },
+ { url = "https://files.pythonhosted.org/packages/d0/54/0fcf2b619720a26fbb6cc941e89f2472a522cd963a776c089b189559447f/hf_xet-1.1.5-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:dbba1660e5d810bd0ea77c511a99e9242d920790d0e63c0e4673ed36c4022d18", size = 3002134, upload-time = "2025-06-20T21:48:25.906Z" },
+ { url = "https://files.pythonhosted.org/packages/f3/92/1d351ac6cef7c4ba8c85744d37ffbfac2d53d0a6c04d2cabeba614640a78/hf_xet-1.1.5-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:ab34c4c3104133c495785d5d8bba3b1efc99de52c02e759cf711a91fd39d3a14", size = 3171009, upload-time = "2025-06-20T21:48:33.987Z" },
+ { url = "https://files.pythonhosted.org/packages/c9/65/4b2ddb0e3e983f2508528eb4501288ae2f84963586fbdfae596836d5e57a/hf_xet-1.1.5-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:83088ecea236d5113de478acb2339f92c95b4fb0462acaa30621fac02f5a534a", size = 3279245, upload-time = "2025-06-20T21:48:36.051Z" },
+ { url = "https://files.pythonhosted.org/packages/f0/55/ef77a85ee443ae05a9e9cba1c9f0dd9241eb42da2aeba1dc50f51154c81a/hf_xet-1.1.5-cp37-abi3-win_amd64.whl", hash = "sha256:73e167d9807d166596b4b2f0b585c6d5bd84a26dea32843665a8b58f6edba245", size = 2738931, upload-time = "2025-06-20T21:48:39.482Z" },
]
[[package]]
@@ -2508,9 +2537,18 @@ socks = [
{ name = "socksio" },
]
+[[package]]
+name = "httpx-sse"
+version = "0.4.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/6e/fa/66bd985dd0b7c109a3bcb89272ee0bfb7e2b4d06309ad7b38ff866734b2a/httpx_sse-0.4.1.tar.gz", hash = "sha256:8f44d34414bc7b21bf3602713005c5df4917884f76072479b21f68befa4ea26e", size = 12998, upload-time = "2025-06-24T13:21:05.71Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/25/0a/6269e3473b09aed2dab8aa1a600c70f31f00ae1349bee30658f7e358a159/httpx_sse-0.4.1-py3-none-any.whl", hash = "sha256:cba42174344c3a5b06f255ce65b350880f962d99ead85e776f23c6618a377a37", size = 8054, upload-time = "2025-06-24T13:21:04.772Z" },
+]
+
[[package]]
name = "huggingface-hub"
-version = "0.32.3"
+version = "0.33.2"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "filelock" },
@@ -2522,9 +2560,9 @@ dependencies = [
{ name = "tqdm" },
{ name = "typing-extensions" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/59/74/c4961b31e0f142a032ea24f477c3a7524dfabfd8126398a968b3cc6bf804/huggingface_hub-0.32.3.tar.gz", hash = "sha256:752c889ebf3a63cbd39803f6d87ccc135a463bbcb36abfa2faff0ccbf1cec087", size = 424525, upload-time = "2025-05-30T08:23:56.042Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/fa/42/8a95c5632080ae312c0498744b2b852195e10b05a20b1be11c5141092f4c/huggingface_hub-0.33.2.tar.gz", hash = "sha256:84221defaec8fa09c090390cd68c78b88e3c4c2b7befba68d3dc5aacbc3c2c5f", size = 426637, upload-time = "2025-07-02T06:26:05.156Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/df/dc/4f4d8080cbce7a38c1d0f1ba4932f9134480b9761af8ef4c65d49254b2bd/huggingface_hub-0.32.3-py3-none-any.whl", hash = "sha256:e46f7ea7fe2b5e5f67cc4e37eb201140091946a314d7c2b134a9673dadd80b6a", size = 512094, upload-time = "2025-05-30T08:23:54.091Z" },
+ { url = "https://files.pythonhosted.org/packages/44/f4/5f3f22e762ad1965f01122b42dae5bf0e009286e2dba601ce1d0dba72424/huggingface_hub-0.33.2-py3-none-any.whl", hash = "sha256:3749498bfa91e8cde2ddc2c1db92c79981f40e66434c20133b39e5928ac9bcc5", size = 515373, upload-time = "2025-07-02T06:26:03.072Z" },
]
[[package]]
@@ -2548,6 +2586,19 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/48/30/47d0bf6072f7252e6521f3447ccfa40b421b6824517f82854703d0f5a98b/hyperframe-6.1.0-py3-none-any.whl", hash = "sha256:b03380493a519fce58ea5af42e4a42317bf9bd425596f7a0835ffce80f1a42e5", size = 13007, upload-time = "2025-01-22T21:41:47.295Z" },
]
+[[package]]
+name = "hypothesis"
+version = "6.135.26"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+ { name = "attrs" },
+ { name = "sortedcontainers" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/da/83/15c4e30561a0d8c8d076c88cb159187823d877118f34c851ada3b9b02a7b/hypothesis-6.135.26.tar.gz", hash = "sha256:73af0e46cd5039c6806f514fed6a3c185d91ef88b5a1577477099ddbd1a2e300", size = 454523, upload-time = "2025-07-05T04:59:45.443Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/3c/78/db4fdc464219455f8dde90074660c3faf8429101b2d1299cac7d219e3176/hypothesis-6.135.26-py3-none-any.whl", hash = "sha256:fa237cbe2ae2c31d65f7230dcb866139ace635dcfec6c30dddf25974dd8ff4b9", size = 521517, upload-time = "2025-07-05T04:59:42.061Z" },
+]
+
[[package]]
name = "idna"
version = "3.10"
@@ -2675,11 +2726,11 @@ wheels = [
[[package]]
name = "json-repair"
-version = "0.46.0"
+version = "0.47.6"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/79/5a/5c14f14735438eb27fd4eb9bb4eb273c996c0d1d959182382cbc618f99dd/json_repair-0.46.0.tar.gz", hash = "sha256:abc751162baf8e384685558acba978478e833c1207be31468d9babfaf8029ab6", size = 33321, upload-time = "2025-05-22T06:22:07.305Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ae/9e/e8bcda4fd47b16fcd4f545af258d56ba337fa43b847beb213818d7641515/json_repair-0.47.6.tar.gz", hash = "sha256:4af5a14b9291d4d005a11537bae5a6b7912376d7584795f0ac1b23724b999620", size = 34400, upload-time = "2025-07-01T15:42:07.458Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/33/ea/8ca71883f10acf4449720b86dd85cea51d7a71bec2558d5275ae0dcc66e4/json_repair-0.46.0-py3-none-any.whl", hash = "sha256:54d6a9889fba0846b80befb2b1aca619103ad3ed74612fb3fedd965a4a3b1653", size = 22255, upload-time = "2025-05-22T06:22:06.206Z" },
+ { url = "https://files.pythonhosted.org/packages/bb/f8/f464ce2afc4be5decf53d0171c2d399d9ee6cd70d2273b8e85e7c6d00324/json_repair-0.47.6-py3-none-any.whl", hash = "sha256:1c9da58fb6240f99b8405f63534e08f8402793f09074dea25800a0b232d4fb19", size = 25754, upload-time = "2025-07-01T15:42:06.418Z" },
]
[[package]]
@@ -2726,7 +2777,7 @@ wheels = [
[[package]]
name = "kubernetes"
-version = "32.0.1"
+version = "33.1.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "certifi" },
@@ -2741,9 +2792,9 @@ dependencies = [
{ name = "urllib3" },
{ name = "websocket-client" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/b7/e8/0598f0e8b4af37cd9b10d8b87386cf3173cb8045d834ab5f6ec347a758b3/kubernetes-32.0.1.tar.gz", hash = "sha256:42f43d49abd437ada79a79a16bd48a604d3471a117a8347e87db693f2ba0ba28", size = 946691, upload-time = "2025-02-18T21:06:34.148Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ae/52/19ebe8004c243fdfa78268a96727c71e08f00ff6fe69a301d0b7fcbce3c2/kubernetes-33.1.0.tar.gz", hash = "sha256:f64d829843a54c251061a8e7a14523b521f2dc5c896cf6d65ccf348648a88993", size = 1036779, upload-time = "2025-06-09T21:57:58.521Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/08/10/9f8af3e6f569685ce3af7faab51c8dd9d93b9c38eba339ca31c746119447/kubernetes-32.0.1-py2.py3-none-any.whl", hash = "sha256:35282ab8493b938b08ab5526c7ce66588232df00ef5e1dbe88a419107dc10998", size = 1988070, upload-time = "2025-02-18T21:06:31.391Z" },
+ { url = "https://files.pythonhosted.org/packages/89/43/d9bebfc3db7dea6ec80df5cb2aad8d274dd18ec2edd6c4f21f32c237cbbb/kubernetes-33.1.0-py2.py3-none-any.whl", hash = "sha256:544de42b24b64287f7e0aa9513c93cb503f7f40eea39b20f66810011a86eabc5", size = 1941335, upload-time = "2025-06-09T21:57:56.327Z" },
]
[[package]]
@@ -2789,53 +2840,6 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/de/f0/63b06b99b730b9954f8709f6f7d9b8d076fa0a973e472efe278089bde42b/langsmith-0.1.147-py3-none-any.whl", hash = "sha256:7166fc23b965ccf839d64945a78e9f1157757add228b086141eb03a60d699a15", size = 311812, upload-time = "2024-11-27T17:32:39.569Z" },
]
-[[package]]
-name = "levenshtein"
-version = "0.27.1"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
- { name = "rapidfuzz" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/7e/b3/b5f8011483ba9083a0bc74c4d58705e9cf465fbe55c948a1b1357d0a2aa8/levenshtein-0.27.1.tar.gz", hash = "sha256:3e18b73564cfc846eec94dd13fab6cb006b5d2e0cc56bad1fd7d5585881302e3", size = 382571, upload-time = "2025-03-02T19:44:56.148Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/22/84/110136e740655779aceb0da2399977362f21b2dbf3ea3646557f9c2237c4/levenshtein-0.27.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:2e6f1760108319a108dceb2f02bc7cdb78807ad1f9c673c95eaa1d0fe5dfcaae", size = 174555, upload-time = "2025-03-02T19:42:51.781Z" },
- { url = "https://files.pythonhosted.org/packages/19/5b/176d96959f5c5969f356d8856f8e20d2e72f7e4879f6d1cda8e5c2ac2614/levenshtein-0.27.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c4ed8400d94ab348099395e050b8ed9dd6a5d6b5b9e75e78b2b3d0b5f5b10f38", size = 156286, upload-time = "2025-03-02T19:42:53.106Z" },
- { url = "https://files.pythonhosted.org/packages/2a/2d/a75abaafc8a46b0dc52ab14dc96708989a31799a02a4914f9210c3415f04/levenshtein-0.27.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7826efe51be8ff58bc44a633e022fdd4b9fc07396375a6dbc4945a3bffc7bf8f", size = 152413, upload-time = "2025-03-02T19:42:55.129Z" },
- { url = "https://files.pythonhosted.org/packages/9a/5f/533f4adf964b10817a1d0ecca978b3542b3b9915c96172d20162afe18bed/levenshtein-0.27.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ff5afb78719659d353055863c7cb31599fbea6865c0890b2d840ee40214b3ddb", size = 184236, upload-time = "2025-03-02T19:42:56.427Z" },
- { url = "https://files.pythonhosted.org/packages/02/79/e698623795e36e0d166a3aa1eac6fe1e446cac3a5c456664a95c351571d1/levenshtein-0.27.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:201dafd5c004cd52018560cf3213da799534d130cf0e4db839b51f3f06771de0", size = 185502, upload-time = "2025-03-02T19:42:57.596Z" },
- { url = "https://files.pythonhosted.org/packages/ac/94/76b64762f4af6e20bbab79713c4c48783240e6e502b2f52e5037ddda688a/levenshtein-0.27.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e5ddd59f3cfaec216811ee67544779d9e2d6ed33f79337492a248245d6379e3d", size = 161749, upload-time = "2025-03-02T19:42:59.222Z" },
- { url = "https://files.pythonhosted.org/packages/56/d0/d10eff9224c94a478078a469aaeb43471fdeddad035f443091224c7544b8/levenshtein-0.27.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6afc241d27ecf5b921063b796812c55b0115423ca6fa4827aa4b1581643d0a65", size = 246686, upload-time = "2025-03-02T19:43:00.454Z" },
- { url = "https://files.pythonhosted.org/packages/b2/8a/ebbeff74461da3230d00e8a8197480a2ea1a9bbb7dbc273214d7ea3896cb/levenshtein-0.27.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:ee2e766277cceb8ca9e584ea03b8dc064449ba588d3e24c1923e4b07576db574", size = 1116616, upload-time = "2025-03-02T19:43:02.431Z" },
- { url = "https://files.pythonhosted.org/packages/1d/9b/e7323684f833ede13113fba818c3afe665a78b47d720afdeb2e530c1ecb3/levenshtein-0.27.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:920b23d6109453913ce78ec451bc402ff19d020ee8be4722e9d11192ec2fac6f", size = 1401483, upload-time = "2025-03-02T19:43:04.62Z" },
- { url = "https://files.pythonhosted.org/packages/ef/1d/9b6ab30ff086a33492d6f7de86a07050b15862ccf0d9feeccfbe26af52d8/levenshtein-0.27.1-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:560d7edba126e2eea3ac3f2f12e7bd8bc9c6904089d12b5b23b6dfa98810b209", size = 1225805, upload-time = "2025-03-02T19:43:06.734Z" },
- { url = "https://files.pythonhosted.org/packages/1b/07/ae2f31e87ff65ba4857e25192646f1f3c8cca83c2ac1c27e551215b7e1b6/levenshtein-0.27.1-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:8d5362b6c7aa4896dc0cb1e7470a4ad3c06124e0af055dda30d81d3c5549346b", size = 1419860, upload-time = "2025-03-02T19:43:08.084Z" },
- { url = "https://files.pythonhosted.org/packages/43/d2/dfcc5c22c07bab9be99f3f47a907be583bcd37bfd2eec57a205e59671019/levenshtein-0.27.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:65ba880815b0f80a80a293aeebac0fab8069d03ad2d6f967a886063458f9d7a1", size = 1188823, upload-time = "2025-03-02T19:43:09.592Z" },
- { url = "https://files.pythonhosted.org/packages/8b/96/713335623f8ab50eba0627c8685618dc3a985aedaaea9f492986b9443551/levenshtein-0.27.1-cp311-cp311-win32.whl", hash = "sha256:fcc08effe77fec0bc5b0f6f10ff20b9802b961c4a69047b5499f383119ddbe24", size = 88156, upload-time = "2025-03-02T19:43:11.442Z" },
- { url = "https://files.pythonhosted.org/packages/aa/ae/444d6e8ba9a35379a56926716f18bb2e77c6cf69e5324521fbe6885f14f6/levenshtein-0.27.1-cp311-cp311-win_amd64.whl", hash = "sha256:0ed402d8902be7df212ac598fc189f9b2d520817fdbc6a05e2ce44f7f3ef6857", size = 100399, upload-time = "2025-03-02T19:43:13.066Z" },
- { url = "https://files.pythonhosted.org/packages/80/c0/ff226897a238a2deb2ca2c00d658755a1aa01884b0ddc8f5d406cb5f2b0d/levenshtein-0.27.1-cp311-cp311-win_arm64.whl", hash = "sha256:7fdaab29af81a8eb981043737f42450efca64b9761ca29385487b29c506da5b5", size = 88033, upload-time = "2025-03-02T19:43:14.211Z" },
- { url = "https://files.pythonhosted.org/packages/0d/73/84a7126b9e6441c2547f1fbfd65f3c15c387d1fc04e0dd1d025a12107771/levenshtein-0.27.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:25fb540d8c55d1dc7bdc59b7de518ea5ed9df92eb2077e74bcb9bb6de7b06f69", size = 173953, upload-time = "2025-03-02T19:43:16.029Z" },
- { url = "https://files.pythonhosted.org/packages/8f/5c/06c01870c0cf336f9f29397bbfbfbbfd3a59918868716e7bb15828e89367/levenshtein-0.27.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f09cfab6387e9c908c7b37961c045e8e10eb9b7ec4a700367f8e080ee803a562", size = 156399, upload-time = "2025-03-02T19:43:17.233Z" },
- { url = "https://files.pythonhosted.org/packages/c7/4a/c1d3f27ec8b3fff5a96617251bf3f61c67972869ac0a0419558fc3e2cbe6/levenshtein-0.27.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dafa29c0e616f322b574e0b2aeb5b1ff2f8d9a1a6550f22321f3bd9bb81036e3", size = 151061, upload-time = "2025-03-02T19:43:18.414Z" },
- { url = "https://files.pythonhosted.org/packages/4d/8f/2521081e9a265891edf46aa30e1b59c1f347a452aed4c33baafbec5216fa/levenshtein-0.27.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:be7a7642ea64392fa1e6ef7968c2e50ef2152c60948f95d0793361ed97cf8a6f", size = 183119, upload-time = "2025-03-02T19:43:19.975Z" },
- { url = "https://files.pythonhosted.org/packages/1f/a0/a63e3bce6376127596d04be7f57e672d2f3d5f540265b1e30b9dd9b3c5a9/levenshtein-0.27.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:060b48c45ed54bcea9582ce79c6365b20a1a7473767e0b3d6be712fa3a22929c", size = 185352, upload-time = "2025-03-02T19:43:21.424Z" },
- { url = "https://files.pythonhosted.org/packages/17/8c/8352e992063952b38fb61d49bad8d193a4a713e7eeceb3ae74b719d7863d/levenshtein-0.27.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:712f562c5e64dd0398d3570fe99f8fbb88acec7cc431f101cb66c9d22d74c542", size = 159879, upload-time = "2025-03-02T19:43:22.792Z" },
- { url = "https://files.pythonhosted.org/packages/69/b4/564866e2038acf47c3de3e9292fc7fc7cc18d2593fedb04f001c22ac6e15/levenshtein-0.27.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a6141ad65cab49aa4527a3342d76c30c48adb2393b6cdfeca65caae8d25cb4b8", size = 245005, upload-time = "2025-03-02T19:43:24.069Z" },
- { url = "https://files.pythonhosted.org/packages/ba/f9/7367f87e3a6eed282f3654ec61a174b4d1b78a7a73f2cecb91f0ab675153/levenshtein-0.27.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:799b8d73cda3265331116f62932f553804eae16c706ceb35aaf16fc2a704791b", size = 1116865, upload-time = "2025-03-02T19:43:25.4Z" },
- { url = "https://files.pythonhosted.org/packages/f5/02/b5b3bfb4b4cd430e9d110bad2466200d51c6061dae7c5a64e36047c8c831/levenshtein-0.27.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:ec99871d98e517e1cc4a15659c62d6ea63ee5a2d72c5ddbebd7bae8b9e2670c8", size = 1401723, upload-time = "2025-03-02T19:43:28.099Z" },
- { url = "https://files.pythonhosted.org/packages/ef/69/b93bccd093b3f06a99e67e11ebd6e100324735dc2834958ba5852a1b9fed/levenshtein-0.27.1-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:8799164e1f83588dbdde07f728ea80796ea72196ea23484d78d891470241b222", size = 1226276, upload-time = "2025-03-02T19:43:30.192Z" },
- { url = "https://files.pythonhosted.org/packages/ab/32/37dd1bc5ce866c136716619e6f7081d7078d7dd1c1da7025603dcfd9cf5f/levenshtein-0.27.1-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:583943813898326516ab451a83f734c6f07488cda5c361676150d3e3e8b47927", size = 1420132, upload-time = "2025-03-02T19:43:33.322Z" },
- { url = "https://files.pythonhosted.org/packages/4b/08/f3bc828dd9f0f8433b26f37c4fceab303186ad7b9b70819f2ccb493d99fc/levenshtein-0.27.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:5bb22956af44bb4eade93546bf95be610c8939b9a9d4d28b2dfa94abf454fed7", size = 1189144, upload-time = "2025-03-02T19:43:34.814Z" },
- { url = "https://files.pythonhosted.org/packages/2d/54/5ecd89066cf579223d504abe3ac37ba11f63b01a19fd12591083acc00eb6/levenshtein-0.27.1-cp312-cp312-win32.whl", hash = "sha256:d9099ed1bcfa7ccc5540e8ad27b5dc6f23d16addcbe21fdd82af6440f4ed2b6d", size = 88279, upload-time = "2025-03-02T19:43:38.86Z" },
- { url = "https://files.pythonhosted.org/packages/53/79/4f8fabcc5aca9305b494d1d6c7a98482e90a855e0050ae9ff5d7bf4ab2c6/levenshtein-0.27.1-cp312-cp312-win_amd64.whl", hash = "sha256:7f071ecdb50aa6c15fd8ae5bcb67e9da46ba1df7bba7c6bf6803a54c7a41fd96", size = 100659, upload-time = "2025-03-02T19:43:40.082Z" },
- { url = "https://files.pythonhosted.org/packages/cb/81/f8e4c0f571c2aac2e0c56a6e0e41b679937a2b7013e79415e4aef555cff0/levenshtein-0.27.1-cp312-cp312-win_arm64.whl", hash = "sha256:83b9033a984ccace7703f35b688f3907d55490182fd39b33a8e434d7b2e249e6", size = 88168, upload-time = "2025-03-02T19:43:41.42Z" },
- { url = "https://files.pythonhosted.org/packages/7d/44/c5955d0b6830925559b00617d80c9f6e03a9b00c451835ee4da7010e71cd/levenshtein-0.27.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:909b7b6bce27a4ec90576c9a9bd9af5a41308dfecf364b410e80b58038277bbe", size = 170533, upload-time = "2025-03-02T19:44:38.096Z" },
- { url = "https://files.pythonhosted.org/packages/e7/3f/858572d68b33e13a9c154b99f153317efe68381bf63cc4e986e820935fc3/levenshtein-0.27.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:d193a7f97b8c6a350e36ec58e41a627c06fa4157c3ce4b2b11d90cfc3c2ebb8f", size = 153119, upload-time = "2025-03-02T19:44:39.388Z" },
- { url = "https://files.pythonhosted.org/packages/d1/60/2bd8d001ea4eb53ca16faa7a649d56005ba22b1bcc2a4f1617ab27ed7e48/levenshtein-0.27.1-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:614be316e3c06118705fae1f717f9072d35108e5fd4e66a7dd0e80356135340b", size = 149576, upload-time = "2025-03-02T19:44:40.617Z" },
- { url = "https://files.pythonhosted.org/packages/e4/db/0580797e1e4ac26cf67761a235b29b49f62d2b175dbbc609882f2aecd4e4/levenshtein-0.27.1-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31fc0a5bb070722bdabb6f7e14955a294a4a968c68202d294699817f21545d22", size = 157445, upload-time = "2025-03-02T19:44:41.901Z" },
- { url = "https://files.pythonhosted.org/packages/f4/de/9c171c96d1f15c900086d7212b5543a85539e767689fc4933d14048ba1ec/levenshtein-0.27.1-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9415aa5257227af543be65768a80c7a75e266c3c818468ce6914812f88f9c3df", size = 243141, upload-time = "2025-03-02T19:44:43.228Z" },
- { url = "https://files.pythonhosted.org/packages/dc/1e/408fd10217eac0e43aea0604be22b4851a09e03d761d44d4ea12089dd70e/levenshtein-0.27.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:7987ef006a3cf56a4532bd4c90c2d3b7b4ca9ad3bf8ae1ee5713c4a3bdfda913", size = 98045, upload-time = "2025-03-02T19:44:44.527Z" },
-]
-
[[package]]
name = "litellm"
version = "1.63.7"
@@ -2878,44 +2882,40 @@ wheels = [
[[package]]
name = "lxml"
-version = "5.4.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/76/3d/14e82fc7c8fb1b7761f7e748fd47e2ec8276d137b6acfe5a4bb73853e08f/lxml-5.4.0.tar.gz", hash = "sha256:d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd", size = 3679479, upload-time = "2025-04-23T01:50:29.322Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/81/2d/67693cc8a605a12e5975380d7ff83020dcc759351b5a066e1cced04f797b/lxml-5.4.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:98a3912194c079ef37e716ed228ae0dcb960992100461b704aea4e93af6b0bb9", size = 8083240, upload-time = "2025-04-23T01:45:18.566Z" },
- { url = "https://files.pythonhosted.org/packages/73/53/b5a05ab300a808b72e848efd152fe9c022c0181b0a70b8bca1199f1bed26/lxml-5.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0ea0252b51d296a75f6118ed0d8696888e7403408ad42345d7dfd0d1e93309a7", size = 4387685, upload-time = "2025-04-23T01:45:21.387Z" },
- { url = "https://files.pythonhosted.org/packages/d8/cb/1a3879c5f512bdcd32995c301886fe082b2edd83c87d41b6d42d89b4ea4d/lxml-5.4.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b92b69441d1bd39f4940f9eadfa417a25862242ca2c396b406f9272ef09cdcaa", size = 4991164, upload-time = "2025-04-23T01:45:23.849Z" },
- { url = "https://files.pythonhosted.org/packages/f9/94/bbc66e42559f9d04857071e3b3d0c9abd88579367fd2588a4042f641f57e/lxml-5.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20e16c08254b9b6466526bc1828d9370ee6c0d60a4b64836bc3ac2917d1e16df", size = 4746206, upload-time = "2025-04-23T01:45:26.361Z" },
- { url = "https://files.pythonhosted.org/packages/66/95/34b0679bee435da2d7cae895731700e519a8dfcab499c21662ebe671603e/lxml-5.4.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7605c1c32c3d6e8c990dd28a0970a3cbbf1429d5b92279e37fda05fb0c92190e", size = 5342144, upload-time = "2025-04-23T01:45:28.939Z" },
- { url = "https://files.pythonhosted.org/packages/e0/5d/abfcc6ab2fa0be72b2ba938abdae1f7cad4c632f8d552683ea295d55adfb/lxml-5.4.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ecf4c4b83f1ab3d5a7ace10bafcb6f11df6156857a3c418244cef41ca9fa3e44", size = 4825124, upload-time = "2025-04-23T01:45:31.361Z" },
- { url = "https://files.pythonhosted.org/packages/5a/78/6bd33186c8863b36e084f294fc0a5e5eefe77af95f0663ef33809cc1c8aa/lxml-5.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0cef4feae82709eed352cd7e97ae062ef6ae9c7b5dbe3663f104cd2c0e8d94ba", size = 4876520, upload-time = "2025-04-23T01:45:34.191Z" },
- { url = "https://files.pythonhosted.org/packages/3b/74/4d7ad4839bd0fc64e3d12da74fc9a193febb0fae0ba6ebd5149d4c23176a/lxml-5.4.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:df53330a3bff250f10472ce96a9af28628ff1f4efc51ccba351a8820bca2a8ba", size = 4765016, upload-time = "2025-04-23T01:45:36.7Z" },
- { url = "https://files.pythonhosted.org/packages/24/0d/0a98ed1f2471911dadfc541003ac6dd6879fc87b15e1143743ca20f3e973/lxml-5.4.0-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:aefe1a7cb852fa61150fcb21a8c8fcea7b58c4cb11fbe59c97a0a4b31cae3c8c", size = 5362884, upload-time = "2025-04-23T01:45:39.291Z" },
- { url = "https://files.pythonhosted.org/packages/48/de/d4f7e4c39740a6610f0f6959052b547478107967362e8424e1163ec37ae8/lxml-5.4.0-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:ef5a7178fcc73b7d8c07229e89f8eb45b2908a9238eb90dcfc46571ccf0383b8", size = 4902690, upload-time = "2025-04-23T01:45:42.386Z" },
- { url = "https://files.pythonhosted.org/packages/07/8c/61763abd242af84f355ca4ef1ee096d3c1b7514819564cce70fd18c22e9a/lxml-5.4.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:d2ed1b3cb9ff1c10e6e8b00941bb2e5bb568b307bfc6b17dffbbe8be5eecba86", size = 4944418, upload-time = "2025-04-23T01:45:46.051Z" },
- { url = "https://files.pythonhosted.org/packages/f9/c5/6d7e3b63e7e282619193961a570c0a4c8a57fe820f07ca3fe2f6bd86608a/lxml-5.4.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:72ac9762a9f8ce74c9eed4a4e74306f2f18613a6b71fa065495a67ac227b3056", size = 4827092, upload-time = "2025-04-23T01:45:48.943Z" },
- { url = "https://files.pythonhosted.org/packages/71/4a/e60a306df54680b103348545706a98a7514a42c8b4fbfdcaa608567bb065/lxml-5.4.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:f5cb182f6396706dc6cc1896dd02b1c889d644c081b0cdec38747573db88a7d7", size = 5418231, upload-time = "2025-04-23T01:45:51.481Z" },
- { url = "https://files.pythonhosted.org/packages/27/f2/9754aacd6016c930875854f08ac4b192a47fe19565f776a64004aa167521/lxml-5.4.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:3a3178b4873df8ef9457a4875703488eb1622632a9cee6d76464b60e90adbfcd", size = 5261798, upload-time = "2025-04-23T01:45:54.146Z" },
- { url = "https://files.pythonhosted.org/packages/38/a2/0c49ec6941428b1bd4f280650d7b11a0f91ace9db7de32eb7aa23bcb39ff/lxml-5.4.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:e094ec83694b59d263802ed03a8384594fcce477ce484b0cbcd0008a211ca751", size = 4988195, upload-time = "2025-04-23T01:45:56.685Z" },
- { url = "https://files.pythonhosted.org/packages/7a/75/87a3963a08eafc46a86c1131c6e28a4de103ba30b5ae903114177352a3d7/lxml-5.4.0-cp311-cp311-win32.whl", hash = "sha256:4329422de653cdb2b72afa39b0aa04252fca9071550044904b2e7036d9d97fe4", size = 3474243, upload-time = "2025-04-23T01:45:58.863Z" },
- { url = "https://files.pythonhosted.org/packages/fa/f9/1f0964c4f6c2be861c50db380c554fb8befbea98c6404744ce243a3c87ef/lxml-5.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:fd3be6481ef54b8cfd0e1e953323b7aa9d9789b94842d0e5b142ef4bb7999539", size = 3815197, upload-time = "2025-04-23T01:46:01.096Z" },
- { url = "https://files.pythonhosted.org/packages/f8/4c/d101ace719ca6a4ec043eb516fcfcb1b396a9fccc4fcd9ef593df34ba0d5/lxml-5.4.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:b5aff6f3e818e6bdbbb38e5967520f174b18f539c2b9de867b1e7fde6f8d95a4", size = 8127392, upload-time = "2025-04-23T01:46:04.09Z" },
- { url = "https://files.pythonhosted.org/packages/11/84/beddae0cec4dd9ddf46abf156f0af451c13019a0fa25d7445b655ba5ccb7/lxml-5.4.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:942a5d73f739ad7c452bf739a62a0f83e2578afd6b8e5406308731f4ce78b16d", size = 4415103, upload-time = "2025-04-23T01:46:07.227Z" },
- { url = "https://files.pythonhosted.org/packages/d0/25/d0d93a4e763f0462cccd2b8a665bf1e4343dd788c76dcfefa289d46a38a9/lxml-5.4.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:460508a4b07364d6abf53acaa0a90b6d370fafde5693ef37602566613a9b0779", size = 5024224, upload-time = "2025-04-23T01:46:10.237Z" },
- { url = "https://files.pythonhosted.org/packages/31/ce/1df18fb8f7946e7f3388af378b1f34fcf253b94b9feedb2cec5969da8012/lxml-5.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:529024ab3a505fed78fe3cc5ddc079464e709f6c892733e3f5842007cec8ac6e", size = 4769913, upload-time = "2025-04-23T01:46:12.757Z" },
- { url = "https://files.pythonhosted.org/packages/4e/62/f4a6c60ae7c40d43657f552f3045df05118636be1165b906d3423790447f/lxml-5.4.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ca56ebc2c474e8f3d5761debfd9283b8b18c76c4fc0967b74aeafba1f5647f9", size = 5290441, upload-time = "2025-04-23T01:46:16.037Z" },
- { url = "https://files.pythonhosted.org/packages/9e/aa/04f00009e1e3a77838c7fc948f161b5d2d5de1136b2b81c712a263829ea4/lxml-5.4.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a81e1196f0a5b4167a8dafe3a66aa67c4addac1b22dc47947abd5d5c7a3f24b5", size = 4820165, upload-time = "2025-04-23T01:46:19.137Z" },
- { url = "https://files.pythonhosted.org/packages/c9/1f/e0b2f61fa2404bf0f1fdf1898377e5bd1b74cc9b2cf2c6ba8509b8f27990/lxml-5.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00b8686694423ddae324cf614e1b9659c2edb754de617703c3d29ff568448df5", size = 4932580, upload-time = "2025-04-23T01:46:21.963Z" },
- { url = "https://files.pythonhosted.org/packages/24/a2/8263f351b4ffe0ed3e32ea7b7830f845c795349034f912f490180d88a877/lxml-5.4.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:c5681160758d3f6ac5b4fea370495c48aac0989d6a0f01bb9a72ad8ef5ab75c4", size = 4759493, upload-time = "2025-04-23T01:46:24.316Z" },
- { url = "https://files.pythonhosted.org/packages/05/00/41db052f279995c0e35c79d0f0fc9f8122d5b5e9630139c592a0b58c71b4/lxml-5.4.0-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:2dc191e60425ad70e75a68c9fd90ab284df64d9cd410ba8d2b641c0c45bc006e", size = 5324679, upload-time = "2025-04-23T01:46:27.097Z" },
- { url = "https://files.pythonhosted.org/packages/1d/be/ee99e6314cdef4587617d3b3b745f9356d9b7dd12a9663c5f3b5734b64ba/lxml-5.4.0-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:67f779374c6b9753ae0a0195a892a1c234ce8416e4448fe1e9f34746482070a7", size = 4890691, upload-time = "2025-04-23T01:46:30.009Z" },
- { url = "https://files.pythonhosted.org/packages/ad/36/239820114bf1d71f38f12208b9c58dec033cbcf80101cde006b9bde5cffd/lxml-5.4.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:79d5bfa9c1b455336f52343130b2067164040604e41f6dc4d8313867ed540079", size = 4955075, upload-time = "2025-04-23T01:46:32.33Z" },
- { url = "https://files.pythonhosted.org/packages/d4/e1/1b795cc0b174efc9e13dbd078a9ff79a58728a033142bc6d70a1ee8fc34d/lxml-5.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3d3c30ba1c9b48c68489dc1829a6eede9873f52edca1dda900066542528d6b20", size = 4838680, upload-time = "2025-04-23T01:46:34.852Z" },
- { url = "https://files.pythonhosted.org/packages/72/48/3c198455ca108cec5ae3662ae8acd7fd99476812fd712bb17f1b39a0b589/lxml-5.4.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:1af80c6316ae68aded77e91cd9d80648f7dd40406cef73df841aa3c36f6907c8", size = 5391253, upload-time = "2025-04-23T01:46:37.608Z" },
- { url = "https://files.pythonhosted.org/packages/d6/10/5bf51858971c51ec96cfc13e800a9951f3fd501686f4c18d7d84fe2d6352/lxml-5.4.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:4d885698f5019abe0de3d352caf9466d5de2baded00a06ef3f1216c1a58ae78f", size = 5261651, upload-time = "2025-04-23T01:46:40.183Z" },
- { url = "https://files.pythonhosted.org/packages/2b/11/06710dd809205377da380546f91d2ac94bad9ff735a72b64ec029f706c85/lxml-5.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:aea53d51859b6c64e7c51d522c03cc2c48b9b5d6172126854cc7f01aa11f52bc", size = 5024315, upload-time = "2025-04-23T01:46:43.333Z" },
- { url = "https://files.pythonhosted.org/packages/f5/b0/15b6217834b5e3a59ebf7f53125e08e318030e8cc0d7310355e6edac98ef/lxml-5.4.0-cp312-cp312-win32.whl", hash = "sha256:d90b729fd2732df28130c064aac9bb8aff14ba20baa4aee7bd0795ff1187545f", size = 3486149, upload-time = "2025-04-23T01:46:45.684Z" },
- { url = "https://files.pythonhosted.org/packages/91/1e/05ddcb57ad2f3069101611bd5f5084157d90861a2ef460bf42f45cced944/lxml-5.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:1dc4ca99e89c335a7ed47d38964abcb36c5910790f9bd106f2a8fa2ee0b909d2", size = 3817095, upload-time = "2025-04-23T01:46:48.521Z" },
+version = "6.0.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/c5/ed/60eb6fa2923602fba988d9ca7c5cdbd7cf25faa795162ed538b527a35411/lxml-6.0.0.tar.gz", hash = "sha256:032e65120339d44cdc3efc326c9f660f5f7205f3a535c1fdbf898b29ea01fb72", size = 4096938, upload-time = "2025-06-26T16:28:19.373Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/7c/23/828d4cc7da96c611ec0ce6147bbcea2fdbde023dc995a165afa512399bbf/lxml-6.0.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:4ee56288d0df919e4aac43b539dd0e34bb55d6a12a6562038e8d6f3ed07f9e36", size = 8438217, upload-time = "2025-06-26T16:25:34.349Z" },
+ { url = "https://files.pythonhosted.org/packages/f1/33/5ac521212c5bcb097d573145d54b2b4a3c9766cda88af5a0e91f66037c6e/lxml-6.0.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b8dd6dd0e9c1992613ccda2bcb74fc9d49159dbe0f0ca4753f37527749885c25", size = 4590317, upload-time = "2025-06-26T16:25:38.103Z" },
+ { url = "https://files.pythonhosted.org/packages/2b/2e/45b7ca8bee304c07f54933c37afe7dd4d39ff61ba2757f519dcc71bc5d44/lxml-6.0.0-cp311-cp311-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:d7ae472f74afcc47320238b5dbfd363aba111a525943c8a34a1b657c6be934c3", size = 5221628, upload-time = "2025-06-26T16:25:40.878Z" },
+ { url = "https://files.pythonhosted.org/packages/32/23/526d19f7eb2b85da1f62cffb2556f647b049ebe2a5aa8d4d41b1fb2c7d36/lxml-6.0.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5592401cdf3dc682194727c1ddaa8aa0f3ddc57ca64fd03226a430b955eab6f6", size = 4949429, upload-time = "2025-06-28T18:47:20.046Z" },
+ { url = "https://files.pythonhosted.org/packages/ac/cc/f6be27a5c656a43a5344e064d9ae004d4dcb1d3c9d4f323c8189ddfe4d13/lxml-6.0.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:58ffd35bd5425c3c3b9692d078bf7ab851441434531a7e517c4984d5634cd65b", size = 5087909, upload-time = "2025-06-28T18:47:22.834Z" },
+ { url = "https://files.pythonhosted.org/packages/3b/e6/8ec91b5bfbe6972458bc105aeb42088e50e4b23777170404aab5dfb0c62d/lxml-6.0.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f720a14aa102a38907c6d5030e3d66b3b680c3e6f6bc95473931ea3c00c59967", size = 5031713, upload-time = "2025-06-26T16:25:43.226Z" },
+ { url = "https://files.pythonhosted.org/packages/33/cf/05e78e613840a40e5be3e40d892c48ad3e475804db23d4bad751b8cadb9b/lxml-6.0.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c2a5e8d207311a0170aca0eb6b160af91adc29ec121832e4ac151a57743a1e1e", size = 5232417, upload-time = "2025-06-26T16:25:46.111Z" },
+ { url = "https://files.pythonhosted.org/packages/ac/8c/6b306b3e35c59d5f0b32e3b9b6b3b0739b32c0dc42a295415ba111e76495/lxml-6.0.0-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:2dd1cc3ea7e60bfb31ff32cafe07e24839df573a5e7c2d33304082a5019bcd58", size = 4681443, upload-time = "2025-06-26T16:25:48.837Z" },
+ { url = "https://files.pythonhosted.org/packages/59/43/0bd96bece5f7eea14b7220476835a60d2b27f8e9ca99c175f37c085cb154/lxml-6.0.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2cfcf84f1defed7e5798ef4f88aa25fcc52d279be731ce904789aa7ccfb7e8d2", size = 5074542, upload-time = "2025-06-26T16:25:51.65Z" },
+ { url = "https://files.pythonhosted.org/packages/e2/3d/32103036287a8ca012d8518071f8852c68f2b3bfe048cef2a0202eb05910/lxml-6.0.0-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:a52a4704811e2623b0324a18d41ad4b9fabf43ce5ff99b14e40a520e2190c851", size = 4729471, upload-time = "2025-06-26T16:25:54.571Z" },
+ { url = "https://files.pythonhosted.org/packages/ca/a8/7be5d17df12d637d81854bd8648cd329f29640a61e9a72a3f77add4a311b/lxml-6.0.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:c16304bba98f48a28ae10e32a8e75c349dd742c45156f297e16eeb1ba9287a1f", size = 5256285, upload-time = "2025-06-26T16:25:56.997Z" },
+ { url = "https://files.pythonhosted.org/packages/cd/d0/6cb96174c25e0d749932557c8d51d60c6e292c877b46fae616afa23ed31a/lxml-6.0.0-cp311-cp311-win32.whl", hash = "sha256:f8d19565ae3eb956d84da3ef367aa7def14a2735d05bd275cd54c0301f0d0d6c", size = 3612004, upload-time = "2025-06-26T16:25:59.11Z" },
+ { url = "https://files.pythonhosted.org/packages/ca/77/6ad43b165dfc6dead001410adeb45e88597b25185f4479b7ca3b16a5808f/lxml-6.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:b2d71cdefda9424adff9a3607ba5bbfc60ee972d73c21c7e3c19e71037574816", size = 4003470, upload-time = "2025-06-26T16:26:01.655Z" },
+ { url = "https://files.pythonhosted.org/packages/a0/bc/4c50ec0eb14f932a18efc34fc86ee936a66c0eb5f2fe065744a2da8a68b2/lxml-6.0.0-cp311-cp311-win_arm64.whl", hash = "sha256:8a2e76efbf8772add72d002d67a4c3d0958638696f541734304c7f28217a9cab", size = 3682477, upload-time = "2025-06-26T16:26:03.808Z" },
+ { url = "https://files.pythonhosted.org/packages/89/c3/d01d735c298d7e0ddcedf6f028bf556577e5ab4f4da45175ecd909c79378/lxml-6.0.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:78718d8454a6e928470d511bf8ac93f469283a45c354995f7d19e77292f26108", size = 8429515, upload-time = "2025-06-26T16:26:06.776Z" },
+ { url = "https://files.pythonhosted.org/packages/06/37/0e3eae3043d366b73da55a86274a590bae76dc45aa004b7042e6f97803b1/lxml-6.0.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:84ef591495ffd3f9dcabffd6391db7bb70d7230b5c35ef5148354a134f56f2be", size = 4601387, upload-time = "2025-06-26T16:26:09.511Z" },
+ { url = "https://files.pythonhosted.org/packages/a3/28/e1a9a881e6d6e29dda13d633885d13acb0058f65e95da67841c8dd02b4a8/lxml-6.0.0-cp312-cp312-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:2930aa001a3776c3e2601cb8e0a15d21b8270528d89cc308be4843ade546b9ab", size = 5228928, upload-time = "2025-06-26T16:26:12.337Z" },
+ { url = "https://files.pythonhosted.org/packages/9a/55/2cb24ea48aa30c99f805921c1c7860c1f45c0e811e44ee4e6a155668de06/lxml-6.0.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:219e0431ea8006e15005767f0351e3f7f9143e793e58519dc97fe9e07fae5563", size = 4952289, upload-time = "2025-06-28T18:47:25.602Z" },
+ { url = "https://files.pythonhosted.org/packages/31/c0/b25d9528df296b9a3306ba21ff982fc5b698c45ab78b94d18c2d6ae71fd9/lxml-6.0.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:bd5913b4972681ffc9718bc2d4c53cde39ef81415e1671ff93e9aa30b46595e7", size = 5111310, upload-time = "2025-06-28T18:47:28.136Z" },
+ { url = "https://files.pythonhosted.org/packages/e9/af/681a8b3e4f668bea6e6514cbcb297beb6de2b641e70f09d3d78655f4f44c/lxml-6.0.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:390240baeb9f415a82eefc2e13285016f9c8b5ad71ec80574ae8fa9605093cd7", size = 5025457, upload-time = "2025-06-26T16:26:15.068Z" },
+ { url = "https://files.pythonhosted.org/packages/99/b6/3a7971aa05b7be7dfebc7ab57262ec527775c2c3c5b2f43675cac0458cad/lxml-6.0.0-cp312-cp312-manylinux_2_27_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:d6e200909a119626744dd81bae409fc44134389e03fbf1d68ed2a55a2fb10991", size = 5657016, upload-time = "2025-07-03T19:19:06.008Z" },
+ { url = "https://files.pythonhosted.org/packages/69/f8/693b1a10a891197143c0673fcce5b75fc69132afa81a36e4568c12c8faba/lxml-6.0.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ca50bd612438258a91b5b3788c6621c1f05c8c478e7951899f492be42defc0da", size = 5257565, upload-time = "2025-06-26T16:26:17.906Z" },
+ { url = "https://files.pythonhosted.org/packages/a8/96/e08ff98f2c6426c98c8964513c5dab8d6eb81dadcd0af6f0c538ada78d33/lxml-6.0.0-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:c24b8efd9c0f62bad0439283c2c795ef916c5a6b75f03c17799775c7ae3c0c9e", size = 4713390, upload-time = "2025-06-26T16:26:20.292Z" },
+ { url = "https://files.pythonhosted.org/packages/a8/83/6184aba6cc94d7413959f6f8f54807dc318fdcd4985c347fe3ea6937f772/lxml-6.0.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:afd27d8629ae94c5d863e32ab0e1d5590371d296b87dae0a751fb22bf3685741", size = 5066103, upload-time = "2025-06-26T16:26:22.765Z" },
+ { url = "https://files.pythonhosted.org/packages/ee/01/8bf1f4035852d0ff2e36a4d9aacdbcc57e93a6cd35a54e05fa984cdf73ab/lxml-6.0.0-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:54c4855eabd9fc29707d30141be99e5cd1102e7d2258d2892314cf4c110726c3", size = 4791428, upload-time = "2025-06-26T16:26:26.461Z" },
+ { url = "https://files.pythonhosted.org/packages/29/31/c0267d03b16954a85ed6b065116b621d37f559553d9339c7dcc4943a76f1/lxml-6.0.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:c907516d49f77f6cd8ead1322198bdfd902003c3c330c77a1c5f3cc32a0e4d16", size = 5678523, upload-time = "2025-07-03T19:19:09.837Z" },
+ { url = "https://files.pythonhosted.org/packages/5c/f7/5495829a864bc5f8b0798d2b52a807c89966523140f3d6fa3a58ab6720ea/lxml-6.0.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:36531f81c8214e293097cd2b7873f178997dae33d3667caaae8bdfb9666b76c0", size = 5281290, upload-time = "2025-06-26T16:26:29.406Z" },
+ { url = "https://files.pythonhosted.org/packages/79/56/6b8edb79d9ed294ccc4e881f4db1023af56ba451909b9ce79f2a2cd7c532/lxml-6.0.0-cp312-cp312-win32.whl", hash = "sha256:690b20e3388a7ec98e899fd54c924e50ba6693874aa65ef9cb53de7f7de9d64a", size = 3613495, upload-time = "2025-06-26T16:26:31.588Z" },
+ { url = "https://files.pythonhosted.org/packages/0b/1e/cc32034b40ad6af80b6fd9b66301fc0f180f300002e5c3eb5a6110a93317/lxml-6.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:310b719b695b3dd442cdfbbe64936b2f2e231bb91d998e99e6f0daf991a3eba3", size = 4014711, upload-time = "2025-06-26T16:26:33.723Z" },
+ { url = "https://files.pythonhosted.org/packages/55/10/dc8e5290ae4c94bdc1a4c55865be7e1f31dfd857a88b21cbba68b5fea61b/lxml-6.0.0-cp312-cp312-win_arm64.whl", hash = "sha256:8cb26f51c82d77483cdcd2b4a53cda55bbee29b3c2f3ddeb47182a2a9064e4eb", size = 3674431, upload-time = "2025-06-26T16:26:35.959Z" },
]
[[package]]
@@ -3050,16 +3050,16 @@ wheels = [
[[package]]
name = "milvus-lite"
-version = "2.4.12"
+version = "2.5.1"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "tqdm" },
]
wheels = [
- { url = "https://files.pythonhosted.org/packages/64/3a/110e46db650ced604f97307e48e353726cfa6d26b1bf72acb81bbf07ecbd/milvus_lite-2.4.12-py3-none-macosx_10_9_x86_64.whl", hash = "sha256:e8d4f7cdd5f731efd6faeee3715d280fd91a5f9b4d89312664d56401f65b1473", size = 19843871, upload-time = "2025-03-21T06:20:26.141Z" },
- { url = "https://files.pythonhosted.org/packages/a5/a7/11c21f2d6f3299ad07af8142b007e4297ff12d4bdc53e1e1ba48f661954b/milvus_lite-2.4.12-py3-none-macosx_11_0_arm64.whl", hash = "sha256:20087663e7b4385050b7ad08f1f03404426d4c87b1ff91d5a8723eee7fd49e88", size = 17411635, upload-time = "2025-03-21T06:20:43.548Z" },
- { url = "https://files.pythonhosted.org/packages/a8/cc/b6f465e984439adf24da0a8ff3035d5c9ece30b6ff19f9a53f73f9ef901a/milvus_lite-2.4.12-py3-none-manylinux2014_aarch64.whl", hash = "sha256:a0f3a5ddbfd19f4a6b842b2fd3445693c796cde272b701a1646a94c1ac45d3d7", size = 35693118, upload-time = "2025-03-21T06:21:14.921Z" },
- { url = "https://files.pythonhosted.org/packages/44/43/b3f6e9defd1f3927b972beac7abe3d5b4a3bdb287e3bad69618e2e76cf0a/milvus_lite-2.4.12-py3-none-manylinux2014_x86_64.whl", hash = "sha256:334037ebbab60243b5d8b43d54ca2f835d81d48c3cda0c6a462605e588deb05d", size = 45182549, upload-time = "2025-03-21T06:21:45.425Z" },
+ { url = "https://files.pythonhosted.org/packages/a9/b2/acc5024c8e8b6a0b034670b8e8af306ebd633ede777dcbf557eac4785937/milvus_lite-2.5.1-py3-none-macosx_10_9_x86_64.whl", hash = "sha256:6b014453200ba977be37ba660cb2d021030375fa6a35bc53c2e1d92980a0c512", size = 27934713, upload-time = "2025-06-30T04:23:37.028Z" },
+ { url = "https://files.pythonhosted.org/packages/9b/2e/746f5bb1d6facd1e73eb4af6dd5efda11125b0f29d7908a097485ca6cad9/milvus_lite-2.5.1-py3-none-macosx_11_0_arm64.whl", hash = "sha256:a2e031088bf308afe5f8567850412d618cfb05a65238ed1a6117f60decccc95a", size = 24421451, upload-time = "2025-06-30T04:23:51.747Z" },
+ { url = "https://files.pythonhosted.org/packages/2e/cf/3d1fee5c16c7661cf53977067a34820f7269ed8ba99fe9cf35efc1700866/milvus_lite-2.5.1-py3-none-manylinux2014_aarch64.whl", hash = "sha256:a13277e9bacc6933dea172e42231f7e6135bd3bdb073dd2688ee180418abd8d9", size = 45337093, upload-time = "2025-06-30T04:24:06.706Z" },
+ { url = "https://files.pythonhosted.org/packages/d3/82/41d9b80f09b82e066894d9b508af07b7b0fa325ce0322980674de49106a0/milvus_lite-2.5.1-py3-none-manylinux2014_x86_64.whl", hash = "sha256:25ce13f4b8d46876dd2b7ac8563d7d8306da7ff3999bb0d14b116b30f71d706c", size = 55263911, upload-time = "2025-06-30T04:24:19.434Z" },
]
[[package]]
@@ -3102,6 +3102,20 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/80/9d/627375bab4c90dd066093fc2c9a26b86f87e26d980dbf71667b44cbee3eb/mmh3-5.1.0-cp312-cp312-win_arm64.whl", hash = "sha256:a4c1a76808dfea47f7407a0b07aaff9087447ef6280716fd0783409b3088bb3c", size = 38888, upload-time = "2025-01-25T08:39:05.174Z" },
]
+[[package]]
+name = "mo-vector"
+version = "0.1.13"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+ { name = "numpy" },
+ { name = "pymysql" },
+ { name = "sqlalchemy" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/01/03/2ef4de1c8d970288f018b6b63439563336c51f26f57706dc51e4c395fdbe/mo_vector-0.1.13.tar.gz", hash = "sha256:8526c37e99157a0c9866bf3868600e877980464eccb212f8ea71971c0630eb69", size = 16926, upload-time = "2025-06-18T09:27:27.906Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/0d/e7/514f5cf5909f96adf09b78146a9e5c92f82abcc212bc3f88456bf2640c23/mo_vector-0.1.13-py3-none-any.whl", hash = "sha256:f7d619acc3e92ed59631e6b3a12508240e22cf428c87daf022c0d87fbd5da459", size = 20091, upload-time = "2025-06-18T09:27:26.899Z" },
+]
+
[[package]]
name = "mpmath"
version = "1.3.0"
@@ -3155,83 +3169,85 @@ wheels = [
[[package]]
name = "multidict"
-version = "6.4.4"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/91/2f/a3470242707058fe856fe59241eee5635d79087100b7042a867368863a27/multidict-6.4.4.tar.gz", hash = "sha256:69ee9e6ba214b5245031b76233dd95408a0fd57fdb019ddcc1ead4790932a8e8", size = 90183, upload-time = "2025-05-19T14:16:37.381Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/19/1b/4c6e638195851524a63972c5773c7737bea7e47b1ba402186a37773acee2/multidict-6.4.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:4f5f29794ac0e73d2a06ac03fd18870adc0135a9d384f4a306a951188ed02f95", size = 65515, upload-time = "2025-05-19T14:14:19.767Z" },
- { url = "https://files.pythonhosted.org/packages/25/d5/10e6bca9a44b8af3c7f920743e5fc0c2bcf8c11bf7a295d4cfe00b08fb46/multidict-6.4.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c04157266344158ebd57b7120d9b0b35812285d26d0e78193e17ef57bfe2979a", size = 38609, upload-time = "2025-05-19T14:14:21.538Z" },
- { url = "https://files.pythonhosted.org/packages/26/b4/91fead447ccff56247edc7f0535fbf140733ae25187a33621771ee598a18/multidict-6.4.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:bb61ffd3ab8310d93427e460f565322c44ef12769f51f77277b4abad7b6f7223", size = 37871, upload-time = "2025-05-19T14:14:22.666Z" },
- { url = "https://files.pythonhosted.org/packages/3b/37/cbc977cae59277e99d15bbda84cc53b5e0c4929ffd91d958347200a42ad0/multidict-6.4.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e0ba18a9afd495f17c351d08ebbc4284e9c9f7971d715f196b79636a4d0de44", size = 226661, upload-time = "2025-05-19T14:14:24.124Z" },
- { url = "https://files.pythonhosted.org/packages/15/cd/7e0b57fbd4dc2fc105169c4ecce5be1a63970f23bb4ec8c721b67e11953d/multidict-6.4.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:9faf1b1dcaadf9f900d23a0e6d6c8eadd6a95795a0e57fcca73acce0eb912065", size = 223422, upload-time = "2025-05-19T14:14:25.437Z" },
- { url = "https://files.pythonhosted.org/packages/f1/01/1de268da121bac9f93242e30cd3286f6a819e5f0b8896511162d6ed4bf8d/multidict-6.4.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a4d1cb1327c6082c4fce4e2a438483390964c02213bc6b8d782cf782c9b1471f", size = 235447, upload-time = "2025-05-19T14:14:26.793Z" },
- { url = "https://files.pythonhosted.org/packages/d2/8c/8b9a5e4aaaf4f2de14e86181a3a3d7b105077f668b6a06f043ec794f684c/multidict-6.4.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:941f1bec2f5dbd51feeb40aea654c2747f811ab01bdd3422a48a4e4576b7d76a", size = 231455, upload-time = "2025-05-19T14:14:28.149Z" },
- { url = "https://files.pythonhosted.org/packages/35/db/e1817dcbaa10b319c412769cf999b1016890849245d38905b73e9c286862/multidict-6.4.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e5f8a146184da7ea12910a4cec51ef85e44f6268467fb489c3caf0cd512f29c2", size = 223666, upload-time = "2025-05-19T14:14:29.584Z" },
- { url = "https://files.pythonhosted.org/packages/4a/e1/66e8579290ade8a00e0126b3d9a93029033ffd84f0e697d457ed1814d0fc/multidict-6.4.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:232b7237e57ec3c09be97206bfb83a0aa1c5d7d377faa019c68a210fa35831f1", size = 217392, upload-time = "2025-05-19T14:14:30.961Z" },
- { url = "https://files.pythonhosted.org/packages/7b/6f/f8639326069c24a48c7747c2a5485d37847e142a3f741ff3340c88060a9a/multidict-6.4.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:55ae0721c1513e5e3210bca4fc98456b980b0c2c016679d3d723119b6b202c42", size = 228969, upload-time = "2025-05-19T14:14:32.672Z" },
- { url = "https://files.pythonhosted.org/packages/d2/c3/3d58182f76b960eeade51c89fcdce450f93379340457a328e132e2f8f9ed/multidict-6.4.4-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:51d662c072579f63137919d7bb8fc250655ce79f00c82ecf11cab678f335062e", size = 217433, upload-time = "2025-05-19T14:14:34.016Z" },
- { url = "https://files.pythonhosted.org/packages/e1/4b/f31a562906f3bd375f3d0e83ce314e4a660c01b16c2923e8229b53fba5d7/multidict-6.4.4-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:0e05c39962baa0bb19a6b210e9b1422c35c093b651d64246b6c2e1a7e242d9fd", size = 225418, upload-time = "2025-05-19T14:14:35.376Z" },
- { url = "https://files.pythonhosted.org/packages/99/89/78bb95c89c496d64b5798434a3deee21996114d4d2c28dd65850bf3a691e/multidict-6.4.4-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:d5b1cc3ab8c31d9ebf0faa6e3540fb91257590da330ffe6d2393d4208e638925", size = 235042, upload-time = "2025-05-19T14:14:36.723Z" },
- { url = "https://files.pythonhosted.org/packages/74/91/8780a6e5885a8770442a8f80db86a0887c4becca0e5a2282ba2cae702bc4/multidict-6.4.4-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:93ec84488a384cd7b8a29c2c7f467137d8a73f6fe38bb810ecf29d1ade011a7c", size = 230280, upload-time = "2025-05-19T14:14:38.194Z" },
- { url = "https://files.pythonhosted.org/packages/68/c1/fcf69cabd542eb6f4b892469e033567ee6991d361d77abdc55e3a0f48349/multidict-6.4.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b308402608493638763abc95f9dc0030bbd6ac6aff784512e8ac3da73a88af08", size = 223322, upload-time = "2025-05-19T14:14:40.015Z" },
- { url = "https://files.pythonhosted.org/packages/b8/85/5b80bf4b83d8141bd763e1d99142a9cdfd0db83f0739b4797172a4508014/multidict-6.4.4-cp311-cp311-win32.whl", hash = "sha256:343892a27d1a04d6ae455ecece12904d242d299ada01633d94c4f431d68a8c49", size = 35070, upload-time = "2025-05-19T14:14:41.904Z" },
- { url = "https://files.pythonhosted.org/packages/09/66/0bed198ffd590ab86e001f7fa46b740d58cf8ff98c2f254e4a36bf8861ad/multidict-6.4.4-cp311-cp311-win_amd64.whl", hash = "sha256:73484a94f55359780c0f458bbd3c39cb9cf9c182552177d2136e828269dee529", size = 38667, upload-time = "2025-05-19T14:14:43.534Z" },
- { url = "https://files.pythonhosted.org/packages/d2/b5/5675377da23d60875fe7dae6be841787755878e315e2f517235f22f59e18/multidict-6.4.4-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:dc388f75a1c00000824bf28b7633e40854f4127ede80512b44c3cfeeea1839a2", size = 64293, upload-time = "2025-05-19T14:14:44.724Z" },
- { url = "https://files.pythonhosted.org/packages/34/a7/be384a482754bb8c95d2bbe91717bf7ccce6dc38c18569997a11f95aa554/multidict-6.4.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:98af87593a666f739d9dba5d0ae86e01b0e1a9cfcd2e30d2d361fbbbd1a9162d", size = 38096, upload-time = "2025-05-19T14:14:45.95Z" },
- { url = "https://files.pythonhosted.org/packages/66/6d/d59854bb4352306145bdfd1704d210731c1bb2c890bfee31fb7bbc1c4c7f/multidict-6.4.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:aff4cafea2d120327d55eadd6b7f1136a8e5a0ecf6fb3b6863e8aca32cd8e50a", size = 37214, upload-time = "2025-05-19T14:14:47.158Z" },
- { url = "https://files.pythonhosted.org/packages/99/e0/c29d9d462d7cfc5fc8f9bf24f9c6843b40e953c0b55e04eba2ad2cf54fba/multidict-6.4.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:169c4ba7858176b797fe551d6e99040c531c775d2d57b31bcf4de6d7a669847f", size = 224686, upload-time = "2025-05-19T14:14:48.366Z" },
- { url = "https://files.pythonhosted.org/packages/dc/4a/da99398d7fd8210d9de068f9a1b5f96dfaf67d51e3f2521f17cba4ee1012/multidict-6.4.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:b9eb4c59c54421a32b3273d4239865cb14ead53a606db066d7130ac80cc8ec93", size = 231061, upload-time = "2025-05-19T14:14:49.952Z" },
- { url = "https://files.pythonhosted.org/packages/21/f5/ac11add39a0f447ac89353e6ca46666847051103649831c08a2800a14455/multidict-6.4.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7cf3bd54c56aa16fdb40028d545eaa8d051402b61533c21e84046e05513d5780", size = 232412, upload-time = "2025-05-19T14:14:51.812Z" },
- { url = "https://files.pythonhosted.org/packages/d9/11/4b551e2110cded705a3c13a1d4b6a11f73891eb5a1c449f1b2b6259e58a6/multidict-6.4.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f682c42003c7264134bfe886376299db4cc0c6cd06a3295b41b347044bcb5482", size = 231563, upload-time = "2025-05-19T14:14:53.262Z" },
- { url = "https://files.pythonhosted.org/packages/4c/02/751530c19e78fe73b24c3da66618eda0aa0d7f6e7aa512e46483de6be210/multidict-6.4.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a920f9cf2abdf6e493c519492d892c362007f113c94da4c239ae88429835bad1", size = 223811, upload-time = "2025-05-19T14:14:55.232Z" },
- { url = "https://files.pythonhosted.org/packages/c7/cb/2be8a214643056289e51ca356026c7b2ce7225373e7a1f8c8715efee8988/multidict-6.4.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:530d86827a2df6504526106b4c104ba19044594f8722d3e87714e847c74a0275", size = 216524, upload-time = "2025-05-19T14:14:57.226Z" },
- { url = "https://files.pythonhosted.org/packages/19/f3/6d5011ec375c09081f5250af58de85f172bfcaafebff286d8089243c4bd4/multidict-6.4.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ecde56ea2439b96ed8a8d826b50c57364612ddac0438c39e473fafad7ae1c23b", size = 229012, upload-time = "2025-05-19T14:14:58.597Z" },
- { url = "https://files.pythonhosted.org/packages/67/9c/ca510785df5cf0eaf5b2a8132d7d04c1ce058dcf2c16233e596ce37a7f8e/multidict-6.4.4-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:dc8c9736d8574b560634775ac0def6bdc1661fc63fa27ffdfc7264c565bcb4f2", size = 226765, upload-time = "2025-05-19T14:15:00.048Z" },
- { url = "https://files.pythonhosted.org/packages/36/c8/ca86019994e92a0f11e642bda31265854e6ea7b235642f0477e8c2e25c1f/multidict-6.4.4-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:7f3d3b3c34867579ea47cbd6c1f2ce23fbfd20a273b6f9e3177e256584f1eacc", size = 222888, upload-time = "2025-05-19T14:15:01.568Z" },
- { url = "https://files.pythonhosted.org/packages/c6/67/bc25a8e8bd522935379066950ec4e2277f9b236162a73548a2576d4b9587/multidict-6.4.4-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:87a728af265e08f96b6318ebe3c0f68b9335131f461efab2fc64cc84a44aa6ed", size = 234041, upload-time = "2025-05-19T14:15:03.759Z" },
- { url = "https://files.pythonhosted.org/packages/f1/a0/70c4c2d12857fccbe607b334b7ee28b6b5326c322ca8f73ee54e70d76484/multidict-6.4.4-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:9f193eeda1857f8e8d3079a4abd258f42ef4a4bc87388452ed1e1c4d2b0c8740", size = 231046, upload-time = "2025-05-19T14:15:05.698Z" },
- { url = "https://files.pythonhosted.org/packages/c1/0f/52954601d02d39742aab01d6b92f53c1dd38b2392248154c50797b4df7f1/multidict-6.4.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:be06e73c06415199200e9a2324a11252a3d62030319919cde5e6950ffeccf72e", size = 227106, upload-time = "2025-05-19T14:15:07.124Z" },
- { url = "https://files.pythonhosted.org/packages/af/24/679d83ec4379402d28721790dce818e5d6b9f94ce1323a556fb17fa9996c/multidict-6.4.4-cp312-cp312-win32.whl", hash = "sha256:622f26ea6a7e19b7c48dd9228071f571b2fbbd57a8cd71c061e848f281550e6b", size = 35351, upload-time = "2025-05-19T14:15:08.556Z" },
- { url = "https://files.pythonhosted.org/packages/52/ef/40d98bc5f986f61565f9b345f102409534e29da86a6454eb6b7c00225a13/multidict-6.4.4-cp312-cp312-win_amd64.whl", hash = "sha256:5e2bcda30d5009996ff439e02a9f2b5c3d64a20151d34898c000a6281faa3781", size = 38791, upload-time = "2025-05-19T14:15:09.825Z" },
- { url = "https://files.pythonhosted.org/packages/84/5d/e17845bb0fa76334477d5de38654d27946d5b5d3695443987a094a71b440/multidict-6.4.4-py3-none-any.whl", hash = "sha256:bd4557071b561a8b3b6075c3ce93cf9bfb6182cb241805c3d66ced3b75eff4ac", size = 10481, upload-time = "2025-05-19T14:16:36.024Z" },
+version = "6.6.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/3d/2c/5dad12e82fbdf7470f29bff2171484bf07cb3b16ada60a6589af8f376440/multidict-6.6.3.tar.gz", hash = "sha256:798a9eb12dab0a6c2e29c1de6f3468af5cb2da6053a20dfa3344907eed0937cc", size = 101006, upload-time = "2025-06-30T15:53:46.929Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/08/f0/1a39863ced51f639c81a5463fbfa9eb4df59c20d1a8769ab9ef4ca57ae04/multidict-6.6.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:18f4eba0cbac3546b8ae31e0bbc55b02c801ae3cbaf80c247fcdd89b456ff58c", size = 76445, upload-time = "2025-06-30T15:51:24.01Z" },
+ { url = "https://files.pythonhosted.org/packages/c9/0e/a7cfa451c7b0365cd844e90b41e21fab32edaa1e42fc0c9f68461ce44ed7/multidict-6.6.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ef43b5dd842382329e4797c46f10748d8c2b6e0614f46b4afe4aee9ac33159df", size = 44610, upload-time = "2025-06-30T15:51:25.158Z" },
+ { url = "https://files.pythonhosted.org/packages/c6/bb/a14a4efc5ee748cc1904b0748be278c31b9295ce5f4d2ef66526f410b94d/multidict-6.6.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:bf9bd1fd5eec01494e0f2e8e446a74a85d5e49afb63d75a9934e4a5423dba21d", size = 44267, upload-time = "2025-06-30T15:51:26.326Z" },
+ { url = "https://files.pythonhosted.org/packages/c2/f8/410677d563c2d55e063ef74fe578f9d53fe6b0a51649597a5861f83ffa15/multidict-6.6.3-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:5bd8d6f793a787153956cd35e24f60485bf0651c238e207b9a54f7458b16d539", size = 230004, upload-time = "2025-06-30T15:51:27.491Z" },
+ { url = "https://files.pythonhosted.org/packages/fd/df/2b787f80059314a98e1ec6a4cc7576244986df3e56b3c755e6fc7c99e038/multidict-6.6.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1bf99b4daf908c73856bd87ee0a2499c3c9a3d19bb04b9c6025e66af3fd07462", size = 247196, upload-time = "2025-06-30T15:51:28.762Z" },
+ { url = "https://files.pythonhosted.org/packages/05/f2/f9117089151b9a8ab39f9019620d10d9718eec2ac89e7ca9d30f3ec78e96/multidict-6.6.3-cp311-cp311-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:0b9e59946b49dafaf990fd9c17ceafa62976e8471a14952163d10a7a630413a9", size = 225337, upload-time = "2025-06-30T15:51:30.025Z" },
+ { url = "https://files.pythonhosted.org/packages/93/2d/7115300ec5b699faa152c56799b089a53ed69e399c3c2d528251f0aeda1a/multidict-6.6.3-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e2db616467070d0533832d204c54eea6836a5e628f2cb1e6dfd8cd6ba7277cb7", size = 257079, upload-time = "2025-06-30T15:51:31.716Z" },
+ { url = "https://files.pythonhosted.org/packages/15/ea/ff4bab367623e39c20d3b07637225c7688d79e4f3cc1f3b9f89867677f9a/multidict-6.6.3-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:7394888236621f61dcdd25189b2768ae5cc280f041029a5bcf1122ac63df79f9", size = 255461, upload-time = "2025-06-30T15:51:33.029Z" },
+ { url = "https://files.pythonhosted.org/packages/74/07/2c9246cda322dfe08be85f1b8739646f2c4c5113a1422d7a407763422ec4/multidict-6.6.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f114d8478733ca7388e7c7e0ab34b72547476b97009d643644ac33d4d3fe1821", size = 246611, upload-time = "2025-06-30T15:51:34.47Z" },
+ { url = "https://files.pythonhosted.org/packages/a8/62/279c13d584207d5697a752a66ffc9bb19355a95f7659140cb1b3cf82180e/multidict-6.6.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:cdf22e4db76d323bcdc733514bf732e9fb349707c98d341d40ebcc6e9318ef3d", size = 243102, upload-time = "2025-06-30T15:51:36.525Z" },
+ { url = "https://files.pythonhosted.org/packages/69/cc/e06636f48c6d51e724a8bc8d9e1db5f136fe1df066d7cafe37ef4000f86a/multidict-6.6.3-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:e995a34c3d44ab511bfc11aa26869b9d66c2d8c799fa0e74b28a473a692532d6", size = 238693, upload-time = "2025-06-30T15:51:38.278Z" },
+ { url = "https://files.pythonhosted.org/packages/89/a4/66c9d8fb9acf3b226cdd468ed009537ac65b520aebdc1703dd6908b19d33/multidict-6.6.3-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:766a4a5996f54361d8d5a9050140aa5362fe48ce51c755a50c0bc3706460c430", size = 246582, upload-time = "2025-06-30T15:51:39.709Z" },
+ { url = "https://files.pythonhosted.org/packages/cf/01/c69e0317be556e46257826d5449feb4e6aa0d18573e567a48a2c14156f1f/multidict-6.6.3-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:3893a0d7d28a7fe6ca7a1f760593bc13038d1d35daf52199d431b61d2660602b", size = 253355, upload-time = "2025-06-30T15:51:41.013Z" },
+ { url = "https://files.pythonhosted.org/packages/c0/da/9cc1da0299762d20e626fe0042e71b5694f9f72d7d3f9678397cbaa71b2b/multidict-6.6.3-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:934796c81ea996e61914ba58064920d6cad5d99140ac3167901eb932150e2e56", size = 247774, upload-time = "2025-06-30T15:51:42.291Z" },
+ { url = "https://files.pythonhosted.org/packages/e6/91/b22756afec99cc31105ddd4a52f95ab32b1a4a58f4d417979c570c4a922e/multidict-6.6.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:9ed948328aec2072bc00f05d961ceadfd3e9bfc2966c1319aeaf7b7c21219183", size = 242275, upload-time = "2025-06-30T15:51:43.642Z" },
+ { url = "https://files.pythonhosted.org/packages/be/f1/adcc185b878036a20399d5be5228f3cbe7f823d78985d101d425af35c800/multidict-6.6.3-cp311-cp311-win32.whl", hash = "sha256:9f5b28c074c76afc3e4c610c488e3493976fe0e596dd3db6c8ddfbb0134dcac5", size = 41290, upload-time = "2025-06-30T15:51:45.264Z" },
+ { url = "https://files.pythonhosted.org/packages/e0/d4/27652c1c6526ea6b4f5ddd397e93f4232ff5de42bea71d339bc6a6cc497f/multidict-6.6.3-cp311-cp311-win_amd64.whl", hash = "sha256:bc7f6fbc61b1c16050a389c630da0b32fc6d4a3d191394ab78972bf5edc568c2", size = 45942, upload-time = "2025-06-30T15:51:46.377Z" },
+ { url = "https://files.pythonhosted.org/packages/16/18/23f4932019804e56d3c2413e237f866444b774b0263bcb81df2fdecaf593/multidict-6.6.3-cp311-cp311-win_arm64.whl", hash = "sha256:d4e47d8faffaae822fb5cba20937c048d4f734f43572e7079298a6c39fb172cb", size = 42880, upload-time = "2025-06-30T15:51:47.561Z" },
+ { url = "https://files.pythonhosted.org/packages/0e/a0/6b57988ea102da0623ea814160ed78d45a2645e4bbb499c2896d12833a70/multidict-6.6.3-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:056bebbeda16b2e38642d75e9e5310c484b7c24e3841dc0fb943206a72ec89d6", size = 76514, upload-time = "2025-06-30T15:51:48.728Z" },
+ { url = "https://files.pythonhosted.org/packages/07/7a/d1e92665b0850c6c0508f101f9cf0410c1afa24973e1115fe9c6a185ebf7/multidict-6.6.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:e5f481cccb3c5c5e5de5d00b5141dc589c1047e60d07e85bbd7dea3d4580d63f", size = 45394, upload-time = "2025-06-30T15:51:49.986Z" },
+ { url = "https://files.pythonhosted.org/packages/52/6f/dd104490e01be6ef8bf9573705d8572f8c2d2c561f06e3826b081d9e6591/multidict-6.6.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:10bea2ee839a759ee368b5a6e47787f399b41e70cf0c20d90dfaf4158dfb4e55", size = 43590, upload-time = "2025-06-30T15:51:51.331Z" },
+ { url = "https://files.pythonhosted.org/packages/44/fe/06e0e01b1b0611e6581b7fd5a85b43dacc08b6cea3034f902f383b0873e5/multidict-6.6.3-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:2334cfb0fa9549d6ce2c21af2bfbcd3ac4ec3646b1b1581c88e3e2b1779ec92b", size = 237292, upload-time = "2025-06-30T15:51:52.584Z" },
+ { url = "https://files.pythonhosted.org/packages/ce/71/4f0e558fb77696b89c233c1ee2d92f3e1d5459070a0e89153c9e9e804186/multidict-6.6.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b8fee016722550a2276ca2cb5bb624480e0ed2bd49125b2b73b7010b9090e888", size = 258385, upload-time = "2025-06-30T15:51:53.913Z" },
+ { url = "https://files.pythonhosted.org/packages/e3/25/cca0e68228addad24903801ed1ab42e21307a1b4b6dd2cf63da5d3ae082a/multidict-6.6.3-cp312-cp312-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:e5511cb35f5c50a2db21047c875eb42f308c5583edf96bd8ebf7d770a9d68f6d", size = 242328, upload-time = "2025-06-30T15:51:55.672Z" },
+ { url = "https://files.pythonhosted.org/packages/6e/a3/46f2d420d86bbcb8fe660b26a10a219871a0fbf4d43cb846a4031533f3e0/multidict-6.6.3-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:712b348f7f449948e0a6c4564a21c7db965af900973a67db432d724619b3c680", size = 268057, upload-time = "2025-06-30T15:51:57.037Z" },
+ { url = "https://files.pythonhosted.org/packages/9e/73/1c743542fe00794a2ec7466abd3f312ccb8fad8dff9f36d42e18fb1ec33e/multidict-6.6.3-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:e4e15d2138ee2694e038e33b7c3da70e6b0ad8868b9f8094a72e1414aeda9c1a", size = 269341, upload-time = "2025-06-30T15:51:59.111Z" },
+ { url = "https://files.pythonhosted.org/packages/a4/11/6ec9dcbe2264b92778eeb85407d1df18812248bf3506a5a1754bc035db0c/multidict-6.6.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8df25594989aebff8a130f7899fa03cbfcc5d2b5f4a461cf2518236fe6f15961", size = 256081, upload-time = "2025-06-30T15:52:00.533Z" },
+ { url = "https://files.pythonhosted.org/packages/9b/2b/631b1e2afeb5f1696846d747d36cda075bfdc0bc7245d6ba5c319278d6c4/multidict-6.6.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:159ca68bfd284a8860f8d8112cf0521113bffd9c17568579e4d13d1f1dc76b65", size = 253581, upload-time = "2025-06-30T15:52:02.43Z" },
+ { url = "https://files.pythonhosted.org/packages/bf/0e/7e3b93f79efeb6111d3bf9a1a69e555ba1d07ad1c11bceb56b7310d0d7ee/multidict-6.6.3-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:e098c17856a8c9ade81b4810888c5ad1914099657226283cab3062c0540b0643", size = 250750, upload-time = "2025-06-30T15:52:04.26Z" },
+ { url = "https://files.pythonhosted.org/packages/ad/9e/086846c1d6601948e7de556ee464a2d4c85e33883e749f46b9547d7b0704/multidict-6.6.3-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:67c92ed673049dec52d7ed39f8cf9ebbadf5032c774058b4406d18c8f8fe7063", size = 251548, upload-time = "2025-06-30T15:52:06.002Z" },
+ { url = "https://files.pythonhosted.org/packages/8c/7b/86ec260118e522f1a31550e87b23542294880c97cfbf6fb18cc67b044c66/multidict-6.6.3-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:bd0578596e3a835ef451784053cfd327d607fc39ea1a14812139339a18a0dbc3", size = 262718, upload-time = "2025-06-30T15:52:07.707Z" },
+ { url = "https://files.pythonhosted.org/packages/8c/bd/22ce8f47abb0be04692c9fc4638508b8340987b18691aa7775d927b73f72/multidict-6.6.3-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:346055630a2df2115cd23ae271910b4cae40f4e336773550dca4889b12916e75", size = 259603, upload-time = "2025-06-30T15:52:09.58Z" },
+ { url = "https://files.pythonhosted.org/packages/07/9c/91b7ac1691be95cd1f4a26e36a74b97cda6aa9820632d31aab4410f46ebd/multidict-6.6.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:555ff55a359302b79de97e0468e9ee80637b0de1fce77721639f7cd9440b3a10", size = 251351, upload-time = "2025-06-30T15:52:10.947Z" },
+ { url = "https://files.pythonhosted.org/packages/6f/5c/4d7adc739884f7a9fbe00d1eac8c034023ef8bad71f2ebe12823ca2e3649/multidict-6.6.3-cp312-cp312-win32.whl", hash = "sha256:73ab034fb8d58ff85c2bcbadc470efc3fafeea8affcf8722855fb94557f14cc5", size = 41860, upload-time = "2025-06-30T15:52:12.334Z" },
+ { url = "https://files.pythonhosted.org/packages/6a/a3/0fbc7afdf7cb1aa12a086b02959307848eb6bcc8f66fcb66c0cb57e2a2c1/multidict-6.6.3-cp312-cp312-win_amd64.whl", hash = "sha256:04cbcce84f63b9af41bad04a54d4cc4e60e90c35b9e6ccb130be2d75b71f8c17", size = 45982, upload-time = "2025-06-30T15:52:13.6Z" },
+ { url = "https://files.pythonhosted.org/packages/b8/95/8c825bd70ff9b02462dc18d1295dd08d3e9e4eb66856d292ffa62cfe1920/multidict-6.6.3-cp312-cp312-win_arm64.whl", hash = "sha256:0f1130b896ecb52d2a1e615260f3ea2af55fa7dc3d7c3003ba0c3121a759b18b", size = 43210, upload-time = "2025-06-30T15:52:14.893Z" },
+ { url = "https://files.pythonhosted.org/packages/d8/30/9aec301e9772b098c1f5c0ca0279237c9766d94b97802e9888010c64b0ed/multidict-6.6.3-py3-none-any.whl", hash = "sha256:8db10f29c7541fc5da4defd8cd697e1ca429db743fa716325f236079b96f775a", size = 12313, upload-time = "2025-06-30T15:53:45.437Z" },
]
[[package]]
name = "mypy"
-version = "1.16.0"
+version = "1.16.1"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "mypy-extensions" },
{ name = "pathspec" },
{ name = "typing-extensions" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/d4/38/13c2f1abae94d5ea0354e146b95a1be9b2137a0d506728e0da037c4276f6/mypy-1.16.0.tar.gz", hash = "sha256:84b94283f817e2aa6350a14b4a8fb2a35a53c286f97c9d30f53b63620e7af8ab", size = 3323139, upload-time = "2025-05-29T13:46:12.532Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/81/69/92c7fa98112e4d9eb075a239caa4ef4649ad7d441545ccffbd5e34607cbb/mypy-1.16.1.tar.gz", hash = "sha256:6bd00a0a2094841c5e47e7374bb42b83d64c527a502e3334e1173a0c24437bab", size = 3324747, upload-time = "2025-06-16T16:51:35.145Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/24/c4/ff2f79db7075c274fe85b5fff8797d29c6b61b8854c39e3b7feb556aa377/mypy-1.16.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9f826aaa7ff8443bac6a494cf743f591488ea940dd360e7dd330e30dd772a5ab", size = 10884498, upload-time = "2025-05-29T13:18:54.066Z" },
- { url = "https://files.pythonhosted.org/packages/02/07/12198e83006235f10f6a7808917376b5d6240a2fd5dce740fe5d2ebf3247/mypy-1.16.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:82d056e6faa508501af333a6af192c700b33e15865bda49611e3d7d8358ebea2", size = 10011755, upload-time = "2025-05-29T13:34:00.851Z" },
- { url = "https://files.pythonhosted.org/packages/f1/9b/5fd5801a72b5d6fb6ec0105ea1d0e01ab2d4971893076e558d4b6d6b5f80/mypy-1.16.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:089bedc02307c2548eb51f426e085546db1fa7dd87fbb7c9fa561575cf6eb1ff", size = 11800138, upload-time = "2025-05-29T13:32:55.082Z" },
- { url = "https://files.pythonhosted.org/packages/2e/81/a117441ea5dfc3746431e51d78a4aca569c677aa225bca2cc05a7c239b61/mypy-1.16.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6a2322896003ba66bbd1318c10d3afdfe24e78ef12ea10e2acd985e9d684a666", size = 12533156, upload-time = "2025-05-29T13:19:12.963Z" },
- { url = "https://files.pythonhosted.org/packages/3f/38/88ec57c6c86014d3f06251e00f397b5a7daa6888884d0abf187e4f5f587f/mypy-1.16.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:021a68568082c5b36e977d54e8f1de978baf401a33884ffcea09bd8e88a98f4c", size = 12742426, upload-time = "2025-05-29T13:20:22.72Z" },
- { url = "https://files.pythonhosted.org/packages/bd/53/7e9d528433d56e6f6f77ccf24af6ce570986c2d98a5839e4c2009ef47283/mypy-1.16.0-cp311-cp311-win_amd64.whl", hash = "sha256:54066fed302d83bf5128632d05b4ec68412e1f03ef2c300434057d66866cea4b", size = 9478319, upload-time = "2025-05-29T13:21:17.582Z" },
- { url = "https://files.pythonhosted.org/packages/70/cf/158e5055e60ca2be23aec54a3010f89dcffd788732634b344fc9cb1e85a0/mypy-1.16.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:c5436d11e89a3ad16ce8afe752f0f373ae9620841c50883dc96f8b8805620b13", size = 11062927, upload-time = "2025-05-29T13:35:52.328Z" },
- { url = "https://files.pythonhosted.org/packages/94/34/cfff7a56be1609f5d10ef386342ce3494158e4d506516890142007e6472c/mypy-1.16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f2622af30bf01d8fc36466231bdd203d120d7a599a6d88fb22bdcb9dbff84090", size = 10083082, upload-time = "2025-05-29T13:35:33.378Z" },
- { url = "https://files.pythonhosted.org/packages/b3/7f/7242062ec6288c33d8ad89574df87c3903d394870e5e6ba1699317a65075/mypy-1.16.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d045d33c284e10a038f5e29faca055b90eee87da3fc63b8889085744ebabb5a1", size = 11828306, upload-time = "2025-05-29T13:21:02.164Z" },
- { url = "https://files.pythonhosted.org/packages/6f/5f/b392f7b4f659f5b619ce5994c5c43caab3d80df2296ae54fa888b3d17f5a/mypy-1.16.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b4968f14f44c62e2ec4a038c8797a87315be8df7740dc3ee8d3bfe1c6bf5dba8", size = 12702764, upload-time = "2025-05-29T13:20:42.826Z" },
- { url = "https://files.pythonhosted.org/packages/9b/c0/7646ef3a00fa39ac9bc0938626d9ff29d19d733011be929cfea59d82d136/mypy-1.16.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:eb14a4a871bb8efb1e4a50360d4e3c8d6c601e7a31028a2c79f9bb659b63d730", size = 12896233, upload-time = "2025-05-29T13:18:37.446Z" },
- { url = "https://files.pythonhosted.org/packages/6d/38/52f4b808b3fef7f0ef840ee8ff6ce5b5d77381e65425758d515cdd4f5bb5/mypy-1.16.0-cp312-cp312-win_amd64.whl", hash = "sha256:bd4e1ebe126152a7bbaa4daedd781c90c8f9643c79b9748caa270ad542f12bec", size = 9565547, upload-time = "2025-05-29T13:20:02.836Z" },
- { url = "https://files.pythonhosted.org/packages/99/a3/6ed10530dec8e0fdc890d81361260c9ef1f5e5c217ad8c9b21ecb2b8366b/mypy-1.16.0-py3-none-any.whl", hash = "sha256:29e1499864a3888bca5c1542f2d7232c6e586295183320caa95758fc84034031", size = 2265773, upload-time = "2025-05-29T13:35:18.762Z" },
+ { url = "https://files.pythonhosted.org/packages/9a/61/ec1245aa1c325cb7a6c0f8570a2eee3bfc40fa90d19b1267f8e50b5c8645/mypy-1.16.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:472e4e4c100062488ec643f6162dd0d5208e33e2f34544e1fc931372e806c0cc", size = 10890557, upload-time = "2025-06-16T16:37:21.421Z" },
+ { url = "https://files.pythonhosted.org/packages/6b/bb/6eccc0ba0aa0c7a87df24e73f0ad34170514abd8162eb0c75fd7128171fb/mypy-1.16.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ea16e2a7d2714277e349e24d19a782a663a34ed60864006e8585db08f8ad1782", size = 10012921, upload-time = "2025-06-16T16:51:28.659Z" },
+ { url = "https://files.pythonhosted.org/packages/5f/80/b337a12e2006715f99f529e732c5f6a8c143bb58c92bb142d5ab380963a5/mypy-1.16.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:08e850ea22adc4d8a4014651575567b0318ede51e8e9fe7a68f25391af699507", size = 11802887, upload-time = "2025-06-16T16:50:53.627Z" },
+ { url = "https://files.pythonhosted.org/packages/d9/59/f7af072d09793d581a745a25737c7c0a945760036b16aeb620f658a017af/mypy-1.16.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:22d76a63a42619bfb90122889b903519149879ddbf2ba4251834727944c8baca", size = 12531658, upload-time = "2025-06-16T16:33:55.002Z" },
+ { url = "https://files.pythonhosted.org/packages/82/c4/607672f2d6c0254b94a646cfc45ad589dd71b04aa1f3d642b840f7cce06c/mypy-1.16.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:2c7ce0662b6b9dc8f4ed86eb7a5d505ee3298c04b40ec13b30e572c0e5ae17c4", size = 12732486, upload-time = "2025-06-16T16:37:03.301Z" },
+ { url = "https://files.pythonhosted.org/packages/b6/5e/136555ec1d80df877a707cebf9081bd3a9f397dedc1ab9750518d87489ec/mypy-1.16.1-cp311-cp311-win_amd64.whl", hash = "sha256:211287e98e05352a2e1d4e8759c5490925a7c784ddc84207f4714822f8cf99b6", size = 9479482, upload-time = "2025-06-16T16:47:37.48Z" },
+ { url = "https://files.pythonhosted.org/packages/b4/d6/39482e5fcc724c15bf6280ff5806548c7185e0c090712a3736ed4d07e8b7/mypy-1.16.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:af4792433f09575d9eeca5c63d7d90ca4aeceda9d8355e136f80f8967639183d", size = 11066493, upload-time = "2025-06-16T16:47:01.683Z" },
+ { url = "https://files.pythonhosted.org/packages/e6/e5/26c347890efc6b757f4d5bb83f4a0cf5958b8cf49c938ac99b8b72b420a6/mypy-1.16.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:66df38405fd8466ce3517eda1f6640611a0b8e70895e2a9462d1d4323c5eb4b9", size = 10081687, upload-time = "2025-06-16T16:48:19.367Z" },
+ { url = "https://files.pythonhosted.org/packages/44/c7/b5cb264c97b86914487d6a24bd8688c0172e37ec0f43e93b9691cae9468b/mypy-1.16.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:44e7acddb3c48bd2713994d098729494117803616e116032af192871aed80b79", size = 11839723, upload-time = "2025-06-16T16:49:20.912Z" },
+ { url = "https://files.pythonhosted.org/packages/15/f8/491997a9b8a554204f834ed4816bda813aefda31cf873bb099deee3c9a99/mypy-1.16.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0ab5eca37b50188163fa7c1b73c685ac66c4e9bdee4a85c9adac0e91d8895e15", size = 12722980, upload-time = "2025-06-16T16:37:40.929Z" },
+ { url = "https://files.pythonhosted.org/packages/df/f0/2bd41e174b5fd93bc9de9a28e4fb673113633b8a7f3a607fa4a73595e468/mypy-1.16.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:dedb6229b2c9086247e21a83c309754b9058b438704ad2f6807f0d8227f6ebdd", size = 12903328, upload-time = "2025-06-16T16:34:35.099Z" },
+ { url = "https://files.pythonhosted.org/packages/61/81/5572108a7bec2c46b8aff7e9b524f371fe6ab5efb534d38d6b37b5490da8/mypy-1.16.1-cp312-cp312-win_amd64.whl", hash = "sha256:1f0435cf920e287ff68af3d10a118a73f212deb2ce087619eb4e648116d1fe9b", size = 9562321, upload-time = "2025-06-16T16:48:58.823Z" },
+ { url = "https://files.pythonhosted.org/packages/cf/d3/53e684e78e07c1a2bf7105715e5edd09ce951fc3f47cf9ed095ec1b7a037/mypy-1.16.1-py3-none-any.whl", hash = "sha256:5fc2ac4027d0ef28d6ba69a0343737a23c4d1b83672bf38d1fe237bdc0643b37", size = 2265923, upload-time = "2025-06-16T16:48:02.366Z" },
]
[[package]]
name = "mypy-boto3-bedrock-runtime"
-version = "1.38.4"
+version = "1.39.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "typing-extensions", marker = "python_full_version < '3.12'" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/7d/55/56ce6f23d7fb98ce5b8a4261f089890bc94250666ea7089539dab55f6c25/mypy_boto3_bedrock_runtime-1.38.4.tar.gz", hash = "sha256:315a5f84c014c54e5406fdb80b030aba5cc79eb27982aff3d09ef331fb2cdd4d", size = 26169, upload-time = "2025-04-28T19:26:13.437Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/c6/6d/65c684441a91cd16f00e442a7ebb34bba5ee335ba8bb9ec5ad8f08e71e27/mypy_boto3_bedrock_runtime-1.39.0.tar.gz", hash = "sha256:f3eb0972bd3801013470cffd9dd094ff93ddcd6fae7ca17ec5bad1e357ab8117", size = 26901, upload-time = "2025-06-30T19:34:15.089Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/43/eb/3015c6504540ca4888789ee14f47590c0340b748a33b059eeb6a48b406bb/mypy_boto3_bedrock_runtime-1.38.4-py3-none-any.whl", hash = "sha256:af14320532e9b798095129a3307f4b186ba80258917bb31410cda7f423592d72", size = 31858, upload-time = "2025-04-28T19:26:09.667Z" },
+ { url = "https://files.pythonhosted.org/packages/05/92/ed01279bf155a1afe78a57d8e34f22604be66f59cb2b7c2f26e73715ced5/mypy_boto3_bedrock_runtime-1.39.0-py3-none-any.whl", hash = "sha256:2925d76b72ec77a7dc2169a0483c36567078de74cf2fcfff084e87b0e2c5ca8b", size = 32623, upload-time = "2025-06-30T19:34:13.663Z" },
]
[[package]]
@@ -3291,27 +3307,25 @@ wheels = [
[[package]]
name = "numexpr"
-version = "2.10.2"
+version = "2.11.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "numpy" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/21/67/c7415cf04ebe418193cfd6595ae03e3a64d76dac7b9c010098b39cc7992e/numexpr-2.10.2.tar.gz", hash = "sha256:b0aff6b48ebc99d2f54f27b5f73a58cb92fde650aeff1b397c71c8788b4fff1a", size = 106787, upload-time = "2024-11-23T13:34:23.127Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/d2/8f/2cc977e91adbfbcdb6b49fdb9147e1d1c7566eb2c0c1e737e9a47020b5ca/numexpr-2.11.0.tar.gz", hash = "sha256:75b2c01a4eda2e7c357bc67a3f5c3dd76506c15b5fd4dc42845ef2e182181bad", size = 108960, upload-time = "2025-06-09T11:05:56.79Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/de/b7/f25d6166f92ef23737c1c90416144492a664f0a56510d90f7c6577c2cd14/numexpr-2.10.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6b360eb8d392483410fe6a3d5a7144afa298c9a0aa3e9fe193e89590b47dd477", size = 145055, upload-time = "2024-11-23T13:33:36.154Z" },
- { url = "https://files.pythonhosted.org/packages/66/64/428361ea6415826332f38ef2dd5c3abf4e7e601f033bfc9be68b680cb765/numexpr-2.10.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d9a42f5c24880350d88933c4efee91b857c378aaea7e8b86221fff569069841e", size = 134743, upload-time = "2024-11-23T13:33:37.273Z" },
- { url = "https://files.pythonhosted.org/packages/3f/fb/639ec91d2ea7b4a5d66e26e8ef8e06b020c8e9b9ebaf3bab7b0a9bee472e/numexpr-2.10.2-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:83fcb11988b57cc25b028a36d285287d706d1f536ebf2662ea30bd990e0de8b9", size = 410397, upload-time = "2024-11-23T13:33:38.474Z" },
- { url = "https://files.pythonhosted.org/packages/89/5a/0f5c5b8a3a6d34eeecb30d0e2f722d50b9b38c0e175937e7c6268ffab997/numexpr-2.10.2-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4213a92efa9770bc28e3792134e27c7e5c7e97068bdfb8ba395baebbd12f991b", size = 398902, upload-time = "2024-11-23T13:33:39.802Z" },
- { url = "https://files.pythonhosted.org/packages/a2/d5/ec734e735eba5a753efed5be3707ee7447ebd371772f8081b65a4153fb97/numexpr-2.10.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ebdbef5763ca057eea0c2b5698e4439d084a0505d9d6e94f4804f26e8890c45e", size = 1380354, upload-time = "2024-11-23T13:33:41.68Z" },
- { url = "https://files.pythonhosted.org/packages/30/51/406e572531d817480bd612ee08239a36ee82865fea02fce569f15631f4ee/numexpr-2.10.2-cp311-cp311-win32.whl", hash = "sha256:3bf01ec502d89944e49e9c1b5cc7c7085be8ca2eb9dd46a0eafd218afbdbd5f5", size = 151938, upload-time = "2024-11-23T13:33:43.998Z" },
- { url = "https://files.pythonhosted.org/packages/04/32/5882ed1dbd96234f327a73316a481add151ff827cfaf2ea24fb4d5ad04db/numexpr-2.10.2-cp311-cp311-win_amd64.whl", hash = "sha256:e2d0ae24b0728e4bc3f1d3f33310340d67321d36d6043f7ce26897f4f1042db0", size = 144961, upload-time = "2024-11-23T13:33:45.329Z" },
- { url = "https://files.pythonhosted.org/packages/2b/96/d5053dea06d8298ae8052b4b049cbf8ef74998e28d57166cc27b8ae909e2/numexpr-2.10.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b5323a46e75832334f1af86da1ef6ff0add00fbacdd266250be872b438bdf2be", size = 145029, upload-time = "2024-11-23T13:33:46.892Z" },
- { url = "https://files.pythonhosted.org/packages/3e/3c/fcd5a812ed5dda757b2d9ef2764a3e1cca6f6d1f02dbf113dc23a2c7702a/numexpr-2.10.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a42963bd4c62d8afa4f51e7974debfa39a048383f653544ab54f50a2f7ec6c42", size = 134851, upload-time = "2024-11-23T13:33:47.986Z" },
- { url = "https://files.pythonhosted.org/packages/0a/52/0ed3b306d8c9944129bce97fec73a2caff13adbd7e1df148d546d7eb2d4d/numexpr-2.10.2-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5191ba8f2975cb9703afc04ae845a929e193498c0e8bcd408ecb147b35978470", size = 411837, upload-time = "2024-11-23T13:33:49.223Z" },
- { url = "https://files.pythonhosted.org/packages/7d/9c/6b671dd3fb67d7e7da93cb76b7c5277743f310a216b7856bb18776bb3371/numexpr-2.10.2-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:97298b14f0105a794bea06fd9fbc5c423bd3ff4d88cbc618860b83eb7a436ad6", size = 400577, upload-time = "2024-11-23T13:33:50.559Z" },
- { url = "https://files.pythonhosted.org/packages/ea/4d/a167d1a215fe10ce58c45109f2869fd13aa0eef66f7e8c69af68be45d436/numexpr-2.10.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f9d7805ccb6be2d3b0f7f6fad3707a09ac537811e8e9964f4074d28cb35543db", size = 1381735, upload-time = "2024-11-23T13:33:51.918Z" },
- { url = "https://files.pythonhosted.org/packages/c1/d4/17e4434f989e4917d31cbd88a043e1c9c16958149cf43fa622987111392b/numexpr-2.10.2-cp312-cp312-win32.whl", hash = "sha256:cb845b2d4f9f8ef0eb1c9884f2b64780a85d3b5ae4eeb26ae2b0019f489cd35e", size = 152102, upload-time = "2024-11-23T13:33:53.93Z" },
- { url = "https://files.pythonhosted.org/packages/b8/25/9ae599994076ef2a42d35ff6b0430da002647f212567851336a6c7b132d6/numexpr-2.10.2-cp312-cp312-win_amd64.whl", hash = "sha256:57b59cbb5dcce4edf09cd6ce0b57ff60312479930099ca8d944c2fac896a1ead", size = 145061, upload-time = "2024-11-23T13:33:55.161Z" },
+ { url = "https://files.pythonhosted.org/packages/d8/d1/1cf8137990b3f3d445556ed63b9bc347aec39bde8c41146b02d3b35c1adc/numexpr-2.11.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:450eba3c93c3e3e8070566ad8d70590949d6e574b1c960bf68edd789811e7da8", size = 147535, upload-time = "2025-06-09T11:05:08.929Z" },
+ { url = "https://files.pythonhosted.org/packages/b6/5e/bac7649d043f47c7c14c797efe60dbd19476468a149399cd706fe2e47f8c/numexpr-2.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f0eb88dbac8a7e61ee433006d0ddfd6eb921f5c6c224d1b50855bc98fb304c44", size = 136710, upload-time = "2025-06-09T11:05:10.366Z" },
+ { url = "https://files.pythonhosted.org/packages/1b/9f/c88fc34d82d23c66ea0b78b00a1fb3b64048e0f7ac7791b2cd0d2a4ce14d/numexpr-2.11.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a194e3684b3553ea199c3f4837f422a521c7e2f0cce13527adc3a6b4049f9e7c", size = 411169, upload-time = "2025-06-09T11:05:11.797Z" },
+ { url = "https://files.pythonhosted.org/packages/e4/8d/4d78dad430b41d836146f9e6f545f5c4f7d1972a6aa427d8570ab232bf16/numexpr-2.11.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f677668ab2bb2452fee955af3702fbb3b71919e61e4520762b1e5f54af59c0d8", size = 401671, upload-time = "2025-06-09T11:05:13.127Z" },
+ { url = "https://files.pythonhosted.org/packages/83/1c/414670eb41a82b78bd09769a4f5fb49a934f9b3990957f02c833637a511e/numexpr-2.11.0-cp311-cp311-win32.whl", hash = "sha256:7d9e76a77c9644fbd60da3984e516ead5b84817748c2da92515cd36f1941a04d", size = 153159, upload-time = "2025-06-09T11:05:14.452Z" },
+ { url = "https://files.pythonhosted.org/packages/0c/97/8d00ca9b36f3ac68a8fd85e930ab0c9448d8c9ca7ce195ee75c188dabd45/numexpr-2.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:7163b488bfdcd13c300a8407c309e4cee195ef95d07facf5ac2678d66c988805", size = 146224, upload-time = "2025-06-09T11:05:15.877Z" },
+ { url = "https://files.pythonhosted.org/packages/38/45/7a0e5a0b800d92e73825494ac695fa05a52c7fc7088d69a336880136b437/numexpr-2.11.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:4229060be866813122385c608bbd3ea48fe0b33e91f2756810d28c1cdbfc98f1", size = 147494, upload-time = "2025-06-09T11:05:17.015Z" },
+ { url = "https://files.pythonhosted.org/packages/74/46/3a26b84e44f4739ec98de0ede4b95b4b8096f721e22d0e97517eeb02017e/numexpr-2.11.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:097aa8835d32d6ac52f2be543384019b4b134d1fb67998cbfc4271155edfe54a", size = 136832, upload-time = "2025-06-09T11:05:18.55Z" },
+ { url = "https://files.pythonhosted.org/packages/75/05/e3076ff25d4a108b47640c169c0a64811748c43b63d9cc052ea56de1631e/numexpr-2.11.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7f082321c244ff5d0e252071fb2c4fe02063a45934144a1456a5370ca139bec2", size = 412618, upload-time = "2025-06-09T11:05:20.093Z" },
+ { url = "https://files.pythonhosted.org/packages/70/e8/15e0e077a004db0edd530da96c60c948689c888c464ee5d14b82405ebd86/numexpr-2.11.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d7a19435ca3d7dd502b8d8dce643555eb1b6013989e3f7577857289f6db6be16", size = 403363, upload-time = "2025-06-09T11:05:21.217Z" },
+ { url = "https://files.pythonhosted.org/packages/10/14/f22afb3a7ae41d03ba87f62d00fbcfb76389f9cc91b7a82593c39c509318/numexpr-2.11.0-cp312-cp312-win32.whl", hash = "sha256:f326218262c8d8537887cc4bbd613c8409d62f2cac799835c0360e0d9cefaa5c", size = 153307, upload-time = "2025-06-09T11:05:22.855Z" },
+ { url = "https://files.pythonhosted.org/packages/18/70/abc585269424582b3cd6db261e33b2ec96b5d4971da3edb29fc9b62a8926/numexpr-2.11.0-cp312-cp312-win_amd64.whl", hash = "sha256:0a184e5930c77ab91dd9beee4df403b825cd9dfc4e9ba4670d31c9fcb4e2c08e", size = 146337, upload-time = "2025-06-09T11:05:23.976Z" },
]
[[package]]
@@ -3340,11 +3354,11 @@ wheels = [
[[package]]
name = "oauthlib"
-version = "3.2.2"
+version = "3.3.1"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/6d/fa/fbf4001037904031639e6bfbfc02badfc7e12f137a8afa254df6c4c8a670/oauthlib-3.2.2.tar.gz", hash = "sha256:9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918", size = 177352, upload-time = "2022-10-17T20:04:27.471Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/0b/5f/19930f824ffeb0ad4372da4812c50edbd1434f678c90c2733e1188edfc63/oauthlib-3.3.1.tar.gz", hash = "sha256:0f0f8aa759826a193cf66c12ea1af1637f87b9b4622d46e866952bb022e538c9", size = 185918, upload-time = "2025-06-19T22:48:08.269Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/7e/80/cab10959dc1faead58dc8384a781dfbf93cb4d33d50988f7a69f1b7c9bbe/oauthlib-3.2.2-py3-none-any.whl", hash = "sha256:8139f29aac13e25d502680e9e19963e83f16838d48a0d71c287fe40e7067fbca", size = 151688, upload-time = "2022-10-17T20:04:24.037Z" },
+ { url = "https://files.pythonhosted.org/packages/be/9c/92789c596b8df838baa98fa71844d84283302f7604ed565dafe5a6b5041a/oauthlib-3.3.1-py3-none-any.whl", hash = "sha256:88119c938d2b8fb88561af5f6ee0eec8cc8d552b7bb1f712743136eb7523b7a1", size = 160065, upload-time = "2025-06-19T22:48:06.508Z" },
]
[[package]]
@@ -3423,6 +3437,29 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/74/83/cc7c6de29b0a7585cd445258d174ca204d37729c3874ad08e515b0bf331c/opendal-0.45.20-cp311-abi3-win_amd64.whl", hash = "sha256:145efd56aa33b493d5b652c3e4f5ae5097ab69d38c132d80f108e9f5c1e4d863", size = 14929888, upload-time = "2025-05-26T07:01:46.929Z" },
]
+[[package]]
+name = "openinference-instrumentation"
+version = "0.1.34"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+ { name = "openinference-semantic-conventions" },
+ { name = "opentelemetry-api" },
+ { name = "opentelemetry-sdk" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/2e/18/d074b45b04ba69bd03260d2dc0a034e5d586d8854e957695f40569278136/openinference_instrumentation-0.1.34.tar.gz", hash = "sha256:fa0328e8b92fc3e22e150c46f108794946ce39fe13670aed15f23ba0105f72ab", size = 22373, upload-time = "2025-06-17T16:47:22.641Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/c1/ad/1a0a5c0a755918269f71fbca225fd70759dd79dd5bffc4723e44f0d87240/openinference_instrumentation-0.1.34-py3-none-any.whl", hash = "sha256:0fff1cc6d9b86f3450fc1c88347c51c5467855992b75e7addb85bf09fd048d2d", size = 28137, upload-time = "2025-06-17T16:47:21.658Z" },
+]
+
+[[package]]
+name = "openinference-semantic-conventions"
+version = "0.1.21"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/75/0f/b794eb009846d4b10af50e205a323ca359f284563ef4d1778f35a80522ac/openinference_semantic_conventions-0.1.21.tar.gz", hash = "sha256:328405b9f79ff72a659c7712b8429c0d7ea68c6a4a1679e3eb44372aa228119b", size = 12534, upload-time = "2025-06-13T05:22:18.982Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/6e/4d/092766f8e610f2c513e483c4adc892eea1634945022a73371fe01f621165/openinference_semantic_conventions-0.1.21-py3-none-any.whl", hash = "sha256:acde8282c20da1de900cdc0d6258a793ec3eb8031bfc496bd823dae17d32e326", size = 10167, upload-time = "2025-06-13T05:22:18.118Z" },
+]
+
[[package]]
name = "openpyxl"
version = "3.1.5"
@@ -3711,28 +3748,28 @@ wheels = [
[[package]]
name = "opik"
-version = "1.7.29"
+version = "1.7.43"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "boto3-stubs", extra = ["bedrock-runtime"] },
{ name = "click" },
{ name = "httpx" },
{ name = "jinja2" },
- { name = "levenshtein" },
{ name = "litellm" },
{ name = "openai" },
{ name = "pydantic" },
{ name = "pydantic-settings" },
{ name = "pytest" },
+ { name = "rapidfuzz" },
{ name = "rich" },
{ name = "sentry-sdk" },
{ name = "tenacity" },
{ name = "tqdm" },
{ name = "uuid6" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/48/94/52faf9277891bfa77dc4bac80b5d88d78103d8fad7f6a6c9495ae083e4da/opik-1.7.29.tar.gz", hash = "sha256:5a13692b233d90663a32cbab452937bf8b6fdc2d516c671c102c3beb34301b64", size = 300856, upload-time = "2025-06-02T11:11:27.955Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ba/52/cea0317bc3207bc967b48932781995d9cdb2c490e7e05caa00ff660f7205/opik-1.7.43.tar.gz", hash = "sha256:0b02522b0b74d0a67b141939deda01f8bb69690eda6b04a7cecb1c7f0649ccd0", size = 326886, upload-time = "2025-07-07T10:30:07.715Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/2a/43/462b700030c70f525eebf4bc63a226ae46109eca598cd59db081de9a8b21/opik-1.7.29-py3-none-any.whl", hash = "sha256:3eb893e7b612d0b799682060193e4f2eebf55b65811203c4fe46af04cf84fa8c", size = 566635, upload-time = "2025-06-02T11:11:26.225Z" },
+ { url = "https://files.pythonhosted.org/packages/76/ae/f3566bdc3c49a1a8f795b1b6e726ef211c87e31f92d870ca6d63999c9bbf/opik-1.7.43-py3-none-any.whl", hash = "sha256:a66395c8b5ea7c24846f72dafc70c74d5b8f24ffbc4c8a1b3a7f9456e550568d", size = 625356, upload-time = "2025-07-07T10:30:06.389Z" },
]
[[package]]
@@ -3948,39 +3985,39 @@ wheels = [
[[package]]
name = "pillow"
-version = "11.2.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/af/cb/bb5c01fcd2a69335b86c22142b2bccfc3464087efb7fd382eee5ffc7fdf7/pillow-11.2.1.tar.gz", hash = "sha256:a64dd61998416367b7ef979b73d3a85853ba9bec4c2925f74e588879a58716b6", size = 47026707, upload-time = "2025-04-12T17:50:03.289Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/68/08/3fbf4b98924c73037a8e8b4c2c774784805e0fb4ebca6c5bb60795c40125/pillow-11.2.1-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:35ca289f712ccfc699508c4658a1d14652e8033e9b69839edf83cbdd0ba39e70", size = 3198450, upload-time = "2025-04-12T17:47:37.135Z" },
- { url = "https://files.pythonhosted.org/packages/84/92/6505b1af3d2849d5e714fc75ba9e69b7255c05ee42383a35a4d58f576b16/pillow-11.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e0409af9f829f87a2dfb7e259f78f317a5351f2045158be321fd135973fff7bf", size = 3030550, upload-time = "2025-04-12T17:47:39.345Z" },
- { url = "https://files.pythonhosted.org/packages/3c/8c/ac2f99d2a70ff966bc7eb13dacacfaab57c0549b2ffb351b6537c7840b12/pillow-11.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4e5c5edee874dce4f653dbe59db7c73a600119fbea8d31f53423586ee2aafd7", size = 4415018, upload-time = "2025-04-12T17:47:41.128Z" },
- { url = "https://files.pythonhosted.org/packages/1f/e3/0a58b5d838687f40891fff9cbaf8669f90c96b64dc8f91f87894413856c6/pillow-11.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b93a07e76d13bff9444f1a029e0af2964e654bfc2e2c2d46bfd080df5ad5f3d8", size = 4498006, upload-time = "2025-04-12T17:47:42.912Z" },
- { url = "https://files.pythonhosted.org/packages/21/f5/6ba14718135f08fbfa33308efe027dd02b781d3f1d5c471444a395933aac/pillow-11.2.1-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:e6def7eed9e7fa90fde255afaf08060dc4b343bbe524a8f69bdd2a2f0018f600", size = 4517773, upload-time = "2025-04-12T17:47:44.611Z" },
- { url = "https://files.pythonhosted.org/packages/20/f2/805ad600fc59ebe4f1ba6129cd3a75fb0da126975c8579b8f57abeb61e80/pillow-11.2.1-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:8f4f3724c068be008c08257207210c138d5f3731af6c155a81c2b09a9eb3a788", size = 4607069, upload-time = "2025-04-12T17:47:46.46Z" },
- { url = "https://files.pythonhosted.org/packages/71/6b/4ef8a288b4bb2e0180cba13ca0a519fa27aa982875882392b65131401099/pillow-11.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a0a6709b47019dff32e678bc12c63008311b82b9327613f534e496dacaefb71e", size = 4583460, upload-time = "2025-04-12T17:47:49.255Z" },
- { url = "https://files.pythonhosted.org/packages/62/ae/f29c705a09cbc9e2a456590816e5c234382ae5d32584f451c3eb41a62062/pillow-11.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f6b0c664ccb879109ee3ca702a9272d877f4fcd21e5eb63c26422fd6e415365e", size = 4661304, upload-time = "2025-04-12T17:47:51.067Z" },
- { url = "https://files.pythonhosted.org/packages/6e/1a/c8217b6f2f73794a5e219fbad087701f412337ae6dbb956db37d69a9bc43/pillow-11.2.1-cp311-cp311-win32.whl", hash = "sha256:cc5d875d56e49f112b6def6813c4e3d3036d269c008bf8aef72cd08d20ca6df6", size = 2331809, upload-time = "2025-04-12T17:47:54.425Z" },
- { url = "https://files.pythonhosted.org/packages/e2/72/25a8f40170dc262e86e90f37cb72cb3de5e307f75bf4b02535a61afcd519/pillow-11.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:0f5c7eda47bf8e3c8a283762cab94e496ba977a420868cb819159980b6709193", size = 2676338, upload-time = "2025-04-12T17:47:56.535Z" },
- { url = "https://files.pythonhosted.org/packages/06/9e/76825e39efee61efea258b479391ca77d64dbd9e5804e4ad0fa453b4ba55/pillow-11.2.1-cp311-cp311-win_arm64.whl", hash = "sha256:4d375eb838755f2528ac8cbc926c3e31cc49ca4ad0cf79cff48b20e30634a4a7", size = 2414918, upload-time = "2025-04-12T17:47:58.217Z" },
- { url = "https://files.pythonhosted.org/packages/c7/40/052610b15a1b8961f52537cc8326ca6a881408bc2bdad0d852edeb6ed33b/pillow-11.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:78afba22027b4accef10dbd5eed84425930ba41b3ea0a86fa8d20baaf19d807f", size = 3190185, upload-time = "2025-04-12T17:48:00.417Z" },
- { url = "https://files.pythonhosted.org/packages/e5/7e/b86dbd35a5f938632093dc40d1682874c33dcfe832558fc80ca56bfcb774/pillow-11.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:78092232a4ab376a35d68c4e6d5e00dfd73454bd12b230420025fbe178ee3b0b", size = 3030306, upload-time = "2025-04-12T17:48:02.391Z" },
- { url = "https://files.pythonhosted.org/packages/a4/5c/467a161f9ed53e5eab51a42923c33051bf8d1a2af4626ac04f5166e58e0c/pillow-11.2.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:25a5f306095c6780c52e6bbb6109624b95c5b18e40aab1c3041da3e9e0cd3e2d", size = 4416121, upload-time = "2025-04-12T17:48:04.554Z" },
- { url = "https://files.pythonhosted.org/packages/62/73/972b7742e38ae0e2ac76ab137ca6005dcf877480da0d9d61d93b613065b4/pillow-11.2.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0c7b29dbd4281923a2bfe562acb734cee96bbb129e96e6972d315ed9f232bef4", size = 4501707, upload-time = "2025-04-12T17:48:06.831Z" },
- { url = "https://files.pythonhosted.org/packages/e4/3a/427e4cb0b9e177efbc1a84798ed20498c4f233abde003c06d2650a6d60cb/pillow-11.2.1-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:3e645b020f3209a0181a418bffe7b4a93171eef6c4ef6cc20980b30bebf17b7d", size = 4522921, upload-time = "2025-04-12T17:48:09.229Z" },
- { url = "https://files.pythonhosted.org/packages/fe/7c/d8b1330458e4d2f3f45d9508796d7caf0c0d3764c00c823d10f6f1a3b76d/pillow-11.2.1-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:b2dbea1012ccb784a65349f57bbc93730b96e85b42e9bf7b01ef40443db720b4", size = 4612523, upload-time = "2025-04-12T17:48:11.631Z" },
- { url = "https://files.pythonhosted.org/packages/b3/2f/65738384e0b1acf451de5a573d8153fe84103772d139e1e0bdf1596be2ea/pillow-11.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:da3104c57bbd72948d75f6a9389e6727d2ab6333c3617f0a89d72d4940aa0443", size = 4587836, upload-time = "2025-04-12T17:48:13.592Z" },
- { url = "https://files.pythonhosted.org/packages/6a/c5/e795c9f2ddf3debb2dedd0df889f2fe4b053308bb59a3cc02a0cd144d641/pillow-11.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:598174aef4589af795f66f9caab87ba4ff860ce08cd5bb447c6fc553ffee603c", size = 4669390, upload-time = "2025-04-12T17:48:15.938Z" },
- { url = "https://files.pythonhosted.org/packages/96/ae/ca0099a3995976a9fce2f423166f7bff9b12244afdc7520f6ed38911539a/pillow-11.2.1-cp312-cp312-win32.whl", hash = "sha256:1d535df14716e7f8776b9e7fee118576d65572b4aad3ed639be9e4fa88a1cad3", size = 2332309, upload-time = "2025-04-12T17:48:17.885Z" },
- { url = "https://files.pythonhosted.org/packages/7c/18/24bff2ad716257fc03da964c5e8f05d9790a779a8895d6566e493ccf0189/pillow-11.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:14e33b28bf17c7a38eede290f77db7c664e4eb01f7869e37fa98a5aa95978941", size = 2676768, upload-time = "2025-04-12T17:48:19.655Z" },
- { url = "https://files.pythonhosted.org/packages/da/bb/e8d656c9543276517ee40184aaa39dcb41e683bca121022f9323ae11b39d/pillow-11.2.1-cp312-cp312-win_arm64.whl", hash = "sha256:21e1470ac9e5739ff880c211fc3af01e3ae505859392bf65458c224d0bf283eb", size = 2415087, upload-time = "2025-04-12T17:48:21.991Z" },
- { url = "https://files.pythonhosted.org/packages/a4/ad/2613c04633c7257d9481ab21d6b5364b59fc5d75faafd7cb8693523945a3/pillow-11.2.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:80f1df8dbe9572b4b7abdfa17eb5d78dd620b1d55d9e25f834efdbee872d3aed", size = 3181734, upload-time = "2025-04-12T17:49:46.789Z" },
- { url = "https://files.pythonhosted.org/packages/a4/fd/dcdda4471ed667de57bb5405bb42d751e6cfdd4011a12c248b455c778e03/pillow-11.2.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:ea926cfbc3957090becbcbbb65ad177161a2ff2ad578b5a6ec9bb1e1cd78753c", size = 2999841, upload-time = "2025-04-12T17:49:48.812Z" },
- { url = "https://files.pythonhosted.org/packages/ac/89/8a2536e95e77432833f0db6fd72a8d310c8e4272a04461fb833eb021bf94/pillow-11.2.1-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:738db0e0941ca0376804d4de6a782c005245264edaa253ffce24e5a15cbdc7bd", size = 3437470, upload-time = "2025-04-12T17:49:50.831Z" },
- { url = "https://files.pythonhosted.org/packages/9d/8f/abd47b73c60712f88e9eda32baced7bfc3e9bd6a7619bb64b93acff28c3e/pillow-11.2.1-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9db98ab6565c69082ec9b0d4e40dd9f6181dab0dd236d26f7a50b8b9bfbd5076", size = 3460013, upload-time = "2025-04-12T17:49:53.278Z" },
- { url = "https://files.pythonhosted.org/packages/f6/20/5c0a0aa83b213b7a07ec01e71a3d6ea2cf4ad1d2c686cc0168173b6089e7/pillow-11.2.1-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:036e53f4170e270ddb8797d4c590e6dd14d28e15c7da375c18978045f7e6c37b", size = 3527165, upload-time = "2025-04-12T17:49:55.164Z" },
- { url = "https://files.pythonhosted.org/packages/58/0e/2abab98a72202d91146abc839e10c14f7cf36166f12838ea0c4db3ca6ecb/pillow-11.2.1-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:14f73f7c291279bd65fda51ee87affd7c1e097709f7fdd0188957a16c264601f", size = 3571586, upload-time = "2025-04-12T17:49:57.171Z" },
- { url = "https://files.pythonhosted.org/packages/21/2c/5e05f58658cf49b6667762cca03d6e7d85cededde2caf2ab37b81f80e574/pillow-11.2.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:208653868d5c9ecc2b327f9b9ef34e0e42a4cdd172c2988fd81d62d2bc9bc044", size = 2674751, upload-time = "2025-04-12T17:49:59.628Z" },
+version = "11.3.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f3/0d/d0d6dea55cd152ce3d6767bb38a8fc10e33796ba4ba210cbab9354b6d238/pillow-11.3.0.tar.gz", hash = "sha256:3828ee7586cd0b2091b6209e5ad53e20d0649bbe87164a459d0676e035e8f523", size = 47113069, upload-time = "2025-07-01T09:16:30.666Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/db/26/77f8ed17ca4ffd60e1dcd220a6ec6d71210ba398cfa33a13a1cd614c5613/pillow-11.3.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:1cd110edf822773368b396281a2293aeb91c90a2db00d78ea43e7e861631b722", size = 5316531, upload-time = "2025-07-01T09:13:59.203Z" },
+ { url = "https://files.pythonhosted.org/packages/cb/39/ee475903197ce709322a17a866892efb560f57900d9af2e55f86db51b0a5/pillow-11.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9c412fddd1b77a75aa904615ebaa6001f169b26fd467b4be93aded278266b288", size = 4686560, upload-time = "2025-07-01T09:14:01.101Z" },
+ { url = "https://files.pythonhosted.org/packages/d5/90/442068a160fd179938ba55ec8c97050a612426fae5ec0a764e345839f76d/pillow-11.3.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:7d1aa4de119a0ecac0a34a9c8bde33f34022e2e8f99104e47a3ca392fd60e37d", size = 5870978, upload-time = "2025-07-03T13:09:55.638Z" },
+ { url = "https://files.pythonhosted.org/packages/13/92/dcdd147ab02daf405387f0218dcf792dc6dd5b14d2573d40b4caeef01059/pillow-11.3.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:91da1d88226663594e3f6b4b8c3c8d85bd504117d043740a8e0ec449087cc494", size = 7641168, upload-time = "2025-07-03T13:10:00.37Z" },
+ { url = "https://files.pythonhosted.org/packages/6e/db/839d6ba7fd38b51af641aa904e2960e7a5644d60ec754c046b7d2aee00e5/pillow-11.3.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:643f189248837533073c405ec2f0bb250ba54598cf80e8c1e043381a60632f58", size = 5973053, upload-time = "2025-07-01T09:14:04.491Z" },
+ { url = "https://files.pythonhosted.org/packages/f2/2f/d7675ecae6c43e9f12aa8d58b6012683b20b6edfbdac7abcb4e6af7a3784/pillow-11.3.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:106064daa23a745510dabce1d84f29137a37224831d88eb4ce94bb187b1d7e5f", size = 6640273, upload-time = "2025-07-01T09:14:06.235Z" },
+ { url = "https://files.pythonhosted.org/packages/45/ad/931694675ede172e15b2ff03c8144a0ddaea1d87adb72bb07655eaffb654/pillow-11.3.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:cd8ff254faf15591e724dc7c4ddb6bf4793efcbe13802a4ae3e863cd300b493e", size = 6082043, upload-time = "2025-07-01T09:14:07.978Z" },
+ { url = "https://files.pythonhosted.org/packages/3a/04/ba8f2b11fc80d2dd462d7abec16351b45ec99cbbaea4387648a44190351a/pillow-11.3.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:932c754c2d51ad2b2271fd01c3d121daaa35e27efae2a616f77bf164bc0b3e94", size = 6715516, upload-time = "2025-07-01T09:14:10.233Z" },
+ { url = "https://files.pythonhosted.org/packages/48/59/8cd06d7f3944cc7d892e8533c56b0acb68399f640786313275faec1e3b6f/pillow-11.3.0-cp311-cp311-win32.whl", hash = "sha256:b4b8f3efc8d530a1544e5962bd6b403d5f7fe8b9e08227c6b255f98ad82b4ba0", size = 6274768, upload-time = "2025-07-01T09:14:11.921Z" },
+ { url = "https://files.pythonhosted.org/packages/f1/cc/29c0f5d64ab8eae20f3232da8f8571660aa0ab4b8f1331da5c2f5f9a938e/pillow-11.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:1a992e86b0dd7aeb1f053cd506508c0999d710a8f07b4c791c63843fc6a807ac", size = 6986055, upload-time = "2025-07-01T09:14:13.623Z" },
+ { url = "https://files.pythonhosted.org/packages/c6/df/90bd886fabd544c25addd63e5ca6932c86f2b701d5da6c7839387a076b4a/pillow-11.3.0-cp311-cp311-win_arm64.whl", hash = "sha256:30807c931ff7c095620fe04448e2c2fc673fcbb1ffe2a7da3fb39613489b1ddd", size = 2423079, upload-time = "2025-07-01T09:14:15.268Z" },
+ { url = "https://files.pythonhosted.org/packages/40/fe/1bc9b3ee13f68487a99ac9529968035cca2f0a51ec36892060edcc51d06a/pillow-11.3.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:fdae223722da47b024b867c1ea0be64e0df702c5e0a60e27daad39bf960dd1e4", size = 5278800, upload-time = "2025-07-01T09:14:17.648Z" },
+ { url = "https://files.pythonhosted.org/packages/2c/32/7e2ac19b5713657384cec55f89065fb306b06af008cfd87e572035b27119/pillow-11.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:921bd305b10e82b4d1f5e802b6850677f965d8394203d182f078873851dada69", size = 4686296, upload-time = "2025-07-01T09:14:19.828Z" },
+ { url = "https://files.pythonhosted.org/packages/8e/1e/b9e12bbe6e4c2220effebc09ea0923a07a6da1e1f1bfbc8d7d29a01ce32b/pillow-11.3.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:eb76541cba2f958032d79d143b98a3a6b3ea87f0959bbe256c0b5e416599fd5d", size = 5871726, upload-time = "2025-07-03T13:10:04.448Z" },
+ { url = "https://files.pythonhosted.org/packages/8d/33/e9200d2bd7ba00dc3ddb78df1198a6e80d7669cce6c2bdbeb2530a74ec58/pillow-11.3.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:67172f2944ebba3d4a7b54f2e95c786a3a50c21b88456329314caaa28cda70f6", size = 7644652, upload-time = "2025-07-03T13:10:10.391Z" },
+ { url = "https://files.pythonhosted.org/packages/41/f1/6f2427a26fc683e00d985bc391bdd76d8dd4e92fac33d841127eb8fb2313/pillow-11.3.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:97f07ed9f56a3b9b5f49d3661dc9607484e85c67e27f3e8be2c7d28ca032fec7", size = 5977787, upload-time = "2025-07-01T09:14:21.63Z" },
+ { url = "https://files.pythonhosted.org/packages/e4/c9/06dd4a38974e24f932ff5f98ea3c546ce3f8c995d3f0985f8e5ba48bba19/pillow-11.3.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:676b2815362456b5b3216b4fd5bd89d362100dc6f4945154ff172e206a22c024", size = 6645236, upload-time = "2025-07-01T09:14:23.321Z" },
+ { url = "https://files.pythonhosted.org/packages/40/e7/848f69fb79843b3d91241bad658e9c14f39a32f71a301bcd1d139416d1be/pillow-11.3.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3e184b2f26ff146363dd07bde8b711833d7b0202e27d13540bfe2e35a323a809", size = 6086950, upload-time = "2025-07-01T09:14:25.237Z" },
+ { url = "https://files.pythonhosted.org/packages/0b/1a/7cff92e695a2a29ac1958c2a0fe4c0b2393b60aac13b04a4fe2735cad52d/pillow-11.3.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:6be31e3fc9a621e071bc17bb7de63b85cbe0bfae91bb0363c893cbe67247780d", size = 6723358, upload-time = "2025-07-01T09:14:27.053Z" },
+ { url = "https://files.pythonhosted.org/packages/26/7d/73699ad77895f69edff76b0f332acc3d497f22f5d75e5360f78cbcaff248/pillow-11.3.0-cp312-cp312-win32.whl", hash = "sha256:7b161756381f0918e05e7cb8a371fff367e807770f8fe92ecb20d905d0e1c149", size = 6275079, upload-time = "2025-07-01T09:14:30.104Z" },
+ { url = "https://files.pythonhosted.org/packages/8c/ce/e7dfc873bdd9828f3b6e5c2bbb74e47a98ec23cc5c74fc4e54462f0d9204/pillow-11.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:a6444696fce635783440b7f7a9fc24b3ad10a9ea3f0ab66c5905be1c19ccf17d", size = 6986324, upload-time = "2025-07-01T09:14:31.899Z" },
+ { url = "https://files.pythonhosted.org/packages/16/8f/b13447d1bf0b1f7467ce7d86f6e6edf66c0ad7cf44cf5c87a37f9bed9936/pillow-11.3.0-cp312-cp312-win_arm64.whl", hash = "sha256:2aceea54f957dd4448264f9bf40875da0415c83eb85f55069d89c0ed436e3542", size = 2423067, upload-time = "2025-07-01T09:14:33.709Z" },
+ { url = "https://files.pythonhosted.org/packages/9e/e3/6fa84033758276fb31da12e5fb66ad747ae83b93c67af17f8c6ff4cc8f34/pillow-11.3.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:7c8ec7a017ad1bd562f93dbd8505763e688d388cde6e4a010ae1486916e713e6", size = 5270566, upload-time = "2025-07-01T09:16:19.801Z" },
+ { url = "https://files.pythonhosted.org/packages/5b/ee/e8d2e1ab4892970b561e1ba96cbd59c0d28cf66737fc44abb2aec3795a4e/pillow-11.3.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:9ab6ae226de48019caa8074894544af5b53a117ccb9d3b3dcb2871464c829438", size = 4654618, upload-time = "2025-07-01T09:16:21.818Z" },
+ { url = "https://files.pythonhosted.org/packages/f2/6d/17f80f4e1f0761f02160fc433abd4109fa1548dcfdca46cfdadaf9efa565/pillow-11.3.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:fe27fb049cdcca11f11a7bfda64043c37b30e6b91f10cb5bab275806c32f6ab3", size = 4874248, upload-time = "2025-07-03T13:11:20.738Z" },
+ { url = "https://files.pythonhosted.org/packages/de/5f/c22340acd61cef960130585bbe2120e2fd8434c214802f07e8c03596b17e/pillow-11.3.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:465b9e8844e3c3519a983d58b80be3f668e2a7a5db97f2784e7079fbc9f9822c", size = 6583963, upload-time = "2025-07-03T13:11:26.283Z" },
+ { url = "https://files.pythonhosted.org/packages/31/5e/03966aedfbfcbb4d5f8aa042452d3361f325b963ebbadddac05b122e47dd/pillow-11.3.0-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5418b53c0d59b3824d05e029669efa023bbef0f3e92e75ec8428f3799487f361", size = 4957170, upload-time = "2025-07-01T09:16:23.762Z" },
+ { url = "https://files.pythonhosted.org/packages/cc/2d/e082982aacc927fc2cab48e1e731bdb1643a1406acace8bed0900a61464e/pillow-11.3.0-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:504b6f59505f08ae014f724b6207ff6222662aab5cc9542577fb084ed0676ac7", size = 5581505, upload-time = "2025-07-01T09:16:25.593Z" },
+ { url = "https://files.pythonhosted.org/packages/34/e7/ae39f538fd6844e982063c3a5e4598b8ced43b9633baa3a85ef33af8c05c/pillow-11.3.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:c84d689db21a1c397d001aa08241044aa2069e7587b398c8cc63020390b1c1b8", size = 6984598, upload-time = "2025-07-01T09:16:27.732Z" },
]
[[package]]
@@ -4050,7 +4087,7 @@ wheels = [
[[package]]
name = "posthog"
-version = "4.2.0"
+version = "6.0.3"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "backoff" },
@@ -4058,10 +4095,11 @@ dependencies = [
{ name = "python-dateutil" },
{ name = "requests" },
{ name = "six" },
+ { name = "typing-extensions" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/ce/5b/2e9890700b7b55a370edbfbe5948eae780d48af9b46ad06ea2e7970576f4/posthog-4.2.0.tar.gz", hash = "sha256:c4abc95de03294be005b3b7e8735e9d7abab88583da26262112bacce64b0c3b5", size = 80727, upload-time = "2025-05-23T23:23:55.943Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/39/a2/1b68562124b0d0e615fa8431cc88c84b3db6526275c2c19a419579a49277/posthog-6.0.3.tar.gz", hash = "sha256:9005abb341af8fedd9d82ca0359b3d35a9537555cdc9881bfb469f7c0b4b0ec5", size = 91861, upload-time = "2025-07-07T07:14:08.21Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/51/16/7b6c5844acee2d343d463ee0e3143cd8c7c48a6c0d079a2f7daf0c80b95c/posthog-4.2.0-py2.py3-none-any.whl", hash = "sha256:60c7066caac43e43e326e9196d8c1aadeafc8b0be9e5c108446e352711fa456b", size = 96692, upload-time = "2025-05-23T23:23:54.384Z" },
+ { url = "https://files.pythonhosted.org/packages/ca/f1/a8d86245d41c8686f7d828a4959bdf483e8ac331b249b48b8c61fc884a1c/posthog-6.0.3-py3-none-any.whl", hash = "sha256:4b808c907f3623216a9362d91fdafce8e2f57a8387fb3020475c62ec809be56d", size = 108978, upload-time = "2025-07-07T07:14:06.451Z" },
]
[[package]]
@@ -4078,43 +4116,43 @@ wheels = [
[[package]]
name = "propcache"
-version = "0.3.1"
+version = "0.3.2"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/07/c8/fdc6686a986feae3541ea23dcaa661bd93972d3940460646c6bb96e21c40/propcache-0.3.1.tar.gz", hash = "sha256:40d980c33765359098837527e18eddefc9a24cea5b45e078a7f3bb5b032c6ecf", size = 43651, upload-time = "2025-03-26T03:06:12.05Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/90/0f/5a5319ee83bd651f75311fcb0c492c21322a7fc8f788e4eef23f44243427/propcache-0.3.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:7f30241577d2fef2602113b70ef7231bf4c69a97e04693bde08ddab913ba0ce5", size = 80243, upload-time = "2025-03-26T03:04:01.912Z" },
- { url = "https://files.pythonhosted.org/packages/ce/84/3db5537e0879942783e2256616ff15d870a11d7ac26541336fe1b673c818/propcache-0.3.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:43593c6772aa12abc3af7784bff4a41ffa921608dd38b77cf1dfd7f5c4e71371", size = 46503, upload-time = "2025-03-26T03:04:03.704Z" },
- { url = "https://files.pythonhosted.org/packages/e2/c8/b649ed972433c3f0d827d7f0cf9ea47162f4ef8f4fe98c5f3641a0bc63ff/propcache-0.3.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a75801768bbe65499495660b777e018cbe90c7980f07f8aa57d6be79ea6f71da", size = 45934, upload-time = "2025-03-26T03:04:05.257Z" },
- { url = "https://files.pythonhosted.org/packages/59/f9/4c0a5cf6974c2c43b1a6810c40d889769cc8f84cea676cbe1e62766a45f8/propcache-0.3.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f6f1324db48f001c2ca26a25fa25af60711e09b9aaf4b28488602776f4f9a744", size = 233633, upload-time = "2025-03-26T03:04:07.044Z" },
- { url = "https://files.pythonhosted.org/packages/e7/64/66f2f4d1b4f0007c6e9078bd95b609b633d3957fe6dd23eac33ebde4b584/propcache-0.3.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5cdb0f3e1eb6dfc9965d19734d8f9c481b294b5274337a8cb5cb01b462dcb7e0", size = 241124, upload-time = "2025-03-26T03:04:08.676Z" },
- { url = "https://files.pythonhosted.org/packages/aa/bf/7b8c9fd097d511638fa9b6af3d986adbdf567598a567b46338c925144c1b/propcache-0.3.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1eb34d90aac9bfbced9a58b266f8946cb5935869ff01b164573a7634d39fbcb5", size = 240283, upload-time = "2025-03-26T03:04:10.172Z" },
- { url = "https://files.pythonhosted.org/packages/fa/c9/e85aeeeaae83358e2a1ef32d6ff50a483a5d5248bc38510d030a6f4e2816/propcache-0.3.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f35c7070eeec2cdaac6fd3fe245226ed2a6292d3ee8c938e5bb645b434c5f256", size = 232498, upload-time = "2025-03-26T03:04:11.616Z" },
- { url = "https://files.pythonhosted.org/packages/8e/66/acb88e1f30ef5536d785c283af2e62931cb934a56a3ecf39105887aa8905/propcache-0.3.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b23c11c2c9e6d4e7300c92e022046ad09b91fd00e36e83c44483df4afa990073", size = 221486, upload-time = "2025-03-26T03:04:13.102Z" },
- { url = "https://files.pythonhosted.org/packages/f5/f9/233ddb05ffdcaee4448508ee1d70aa7deff21bb41469ccdfcc339f871427/propcache-0.3.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:3e19ea4ea0bf46179f8a3652ac1426e6dcbaf577ce4b4f65be581e237340420d", size = 222675, upload-time = "2025-03-26T03:04:14.658Z" },
- { url = "https://files.pythonhosted.org/packages/98/b8/eb977e28138f9e22a5a789daf608d36e05ed93093ef12a12441030da800a/propcache-0.3.1-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:bd39c92e4c8f6cbf5f08257d6360123af72af9f4da75a690bef50da77362d25f", size = 215727, upload-time = "2025-03-26T03:04:16.207Z" },
- { url = "https://files.pythonhosted.org/packages/89/2d/5f52d9c579f67b8ee1edd9ec073c91b23cc5b7ff7951a1e449e04ed8fdf3/propcache-0.3.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:b0313e8b923b3814d1c4a524c93dfecea5f39fa95601f6a9b1ac96cd66f89ea0", size = 217878, upload-time = "2025-03-26T03:04:18.11Z" },
- { url = "https://files.pythonhosted.org/packages/7a/fd/5283e5ed8a82b00c7a989b99bb6ea173db1ad750bf0bf8dff08d3f4a4e28/propcache-0.3.1-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:e861ad82892408487be144906a368ddbe2dc6297074ade2d892341b35c59844a", size = 230558, upload-time = "2025-03-26T03:04:19.562Z" },
- { url = "https://files.pythonhosted.org/packages/90/38/ab17d75938ef7ac87332c588857422ae126b1c76253f0f5b1242032923ca/propcache-0.3.1-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:61014615c1274df8da5991a1e5da85a3ccb00c2d4701ac6f3383afd3ca47ab0a", size = 233754, upload-time = "2025-03-26T03:04:21.065Z" },
- { url = "https://files.pythonhosted.org/packages/06/5d/3b921b9c60659ae464137508d3b4c2b3f52f592ceb1964aa2533b32fcf0b/propcache-0.3.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:71ebe3fe42656a2328ab08933d420df5f3ab121772eef78f2dc63624157f0ed9", size = 226088, upload-time = "2025-03-26T03:04:22.718Z" },
- { url = "https://files.pythonhosted.org/packages/54/6e/30a11f4417d9266b5a464ac5a8c5164ddc9dd153dfa77bf57918165eb4ae/propcache-0.3.1-cp311-cp311-win32.whl", hash = "sha256:58aa11f4ca8b60113d4b8e32d37e7e78bd8af4d1a5b5cb4979ed856a45e62005", size = 40859, upload-time = "2025-03-26T03:04:24.039Z" },
- { url = "https://files.pythonhosted.org/packages/1d/3a/8a68dd867da9ca2ee9dfd361093e9cb08cb0f37e5ddb2276f1b5177d7731/propcache-0.3.1-cp311-cp311-win_amd64.whl", hash = "sha256:9532ea0b26a401264b1365146c440a6d78269ed41f83f23818d4b79497aeabe7", size = 45153, upload-time = "2025-03-26T03:04:25.211Z" },
- { url = "https://files.pythonhosted.org/packages/41/aa/ca78d9be314d1e15ff517b992bebbed3bdfef5b8919e85bf4940e57b6137/propcache-0.3.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:f78eb8422acc93d7b69964012ad7048764bb45a54ba7a39bb9e146c72ea29723", size = 80430, upload-time = "2025-03-26T03:04:26.436Z" },
- { url = "https://files.pythonhosted.org/packages/1a/d8/f0c17c44d1cda0ad1979af2e593ea290defdde9eaeb89b08abbe02a5e8e1/propcache-0.3.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:89498dd49c2f9a026ee057965cdf8192e5ae070ce7d7a7bd4b66a8e257d0c976", size = 46637, upload-time = "2025-03-26T03:04:27.932Z" },
- { url = "https://files.pythonhosted.org/packages/ae/bd/c1e37265910752e6e5e8a4c1605d0129e5b7933c3dc3cf1b9b48ed83b364/propcache-0.3.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:09400e98545c998d57d10035ff623266927cb784d13dd2b31fd33b8a5316b85b", size = 46123, upload-time = "2025-03-26T03:04:30.659Z" },
- { url = "https://files.pythonhosted.org/packages/d4/b0/911eda0865f90c0c7e9f0415d40a5bf681204da5fd7ca089361a64c16b28/propcache-0.3.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aa8efd8c5adc5a2c9d3b952815ff8f7710cefdcaf5f2c36d26aff51aeca2f12f", size = 243031, upload-time = "2025-03-26T03:04:31.977Z" },
- { url = "https://files.pythonhosted.org/packages/0a/06/0da53397c76a74271621807265b6eb61fb011451b1ddebf43213df763669/propcache-0.3.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c2fe5c910f6007e716a06d269608d307b4f36e7babee5f36533722660e8c4a70", size = 249100, upload-time = "2025-03-26T03:04:33.45Z" },
- { url = "https://files.pythonhosted.org/packages/f1/eb/13090e05bf6b963fc1653cdc922133ced467cb4b8dab53158db5a37aa21e/propcache-0.3.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a0ab8cf8cdd2194f8ff979a43ab43049b1df0b37aa64ab7eca04ac14429baeb7", size = 250170, upload-time = "2025-03-26T03:04:35.542Z" },
- { url = "https://files.pythonhosted.org/packages/3b/4c/f72c9e1022b3b043ec7dc475a0f405d4c3e10b9b1d378a7330fecf0652da/propcache-0.3.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:563f9d8c03ad645597b8d010ef4e9eab359faeb11a0a2ac9f7b4bc8c28ebef25", size = 245000, upload-time = "2025-03-26T03:04:37.501Z" },
- { url = "https://files.pythonhosted.org/packages/e8/fd/970ca0e22acc829f1adf5de3724085e778c1ad8a75bec010049502cb3a86/propcache-0.3.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fb6e0faf8cb6b4beea5d6ed7b5a578254c6d7df54c36ccd3d8b3eb00d6770277", size = 230262, upload-time = "2025-03-26T03:04:39.532Z" },
- { url = "https://files.pythonhosted.org/packages/c4/42/817289120c6b9194a44f6c3e6b2c3277c5b70bbad39e7df648f177cc3634/propcache-0.3.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1c5c7ab7f2bb3f573d1cb921993006ba2d39e8621019dffb1c5bc94cdbae81e8", size = 236772, upload-time = "2025-03-26T03:04:41.109Z" },
- { url = "https://files.pythonhosted.org/packages/7c/9c/3b3942b302badd589ad6b672da3ca7b660a6c2f505cafd058133ddc73918/propcache-0.3.1-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:050b571b2e96ec942898f8eb46ea4bfbb19bd5502424747e83badc2d4a99a44e", size = 231133, upload-time = "2025-03-26T03:04:42.544Z" },
- { url = "https://files.pythonhosted.org/packages/98/a1/75f6355f9ad039108ff000dfc2e19962c8dea0430da9a1428e7975cf24b2/propcache-0.3.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:e1c4d24b804b3a87e9350f79e2371a705a188d292fd310e663483af6ee6718ee", size = 230741, upload-time = "2025-03-26T03:04:44.06Z" },
- { url = "https://files.pythonhosted.org/packages/67/0c/3e82563af77d1f8731132166da69fdfd95e71210e31f18edce08a1eb11ea/propcache-0.3.1-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:e4fe2a6d5ce975c117a6bb1e8ccda772d1e7029c1cca1acd209f91d30fa72815", size = 244047, upload-time = "2025-03-26T03:04:45.983Z" },
- { url = "https://files.pythonhosted.org/packages/f7/50/9fb7cca01532a08c4d5186d7bb2da6c4c587825c0ae134b89b47c7d62628/propcache-0.3.1-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:feccd282de1f6322f56f6845bf1207a537227812f0a9bf5571df52bb418d79d5", size = 246467, upload-time = "2025-03-26T03:04:47.699Z" },
- { url = "https://files.pythonhosted.org/packages/a9/02/ccbcf3e1c604c16cc525309161d57412c23cf2351523aedbb280eb7c9094/propcache-0.3.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:ec314cde7314d2dd0510c6787326bbffcbdc317ecee6b7401ce218b3099075a7", size = 241022, upload-time = "2025-03-26T03:04:49.195Z" },
- { url = "https://files.pythonhosted.org/packages/db/19/e777227545e09ca1e77a6e21274ae9ec45de0f589f0ce3eca2a41f366220/propcache-0.3.1-cp312-cp312-win32.whl", hash = "sha256:7d2d5a0028d920738372630870e7d9644ce437142197f8c827194fca404bf03b", size = 40647, upload-time = "2025-03-26T03:04:50.595Z" },
- { url = "https://files.pythonhosted.org/packages/24/bb/3b1b01da5dd04c77a204c84e538ff11f624e31431cfde7201d9110b092b1/propcache-0.3.1-cp312-cp312-win_amd64.whl", hash = "sha256:88c423efef9d7a59dae0614eaed718449c09a5ac79a5f224a8b9664d603f04a3", size = 44784, upload-time = "2025-03-26T03:04:51.791Z" },
- { url = "https://files.pythonhosted.org/packages/b8/d3/c3cb8f1d6ae3b37f83e1de806713a9b3642c5895f0215a62e1a4bd6e5e34/propcache-0.3.1-py3-none-any.whl", hash = "sha256:9a8ecf38de50a7f518c21568c80f985e776397b902f1ce0b01f799aba1608b40", size = 12376, upload-time = "2025-03-26T03:06:10.5Z" },
+sdist = { url = "https://files.pythonhosted.org/packages/a6/16/43264e4a779dd8588c21a70f0709665ee8f611211bdd2c87d952cfa7c776/propcache-0.3.2.tar.gz", hash = "sha256:20d7d62e4e7ef05f221e0db2856b979540686342e7dd9973b815599c7057e168", size = 44139, upload-time = "2025-06-09T22:56:06.081Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/80/8d/e8b436717ab9c2cfc23b116d2c297305aa4cd8339172a456d61ebf5669b8/propcache-0.3.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0b8d2f607bd8f80ddc04088bc2a037fdd17884a6fcadc47a96e334d72f3717be", size = 74207, upload-time = "2025-06-09T22:54:05.399Z" },
+ { url = "https://files.pythonhosted.org/packages/d6/29/1e34000e9766d112171764b9fa3226fa0153ab565d0c242c70e9945318a7/propcache-0.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:06766d8f34733416e2e34f46fea488ad5d60726bb9481d3cddf89a6fa2d9603f", size = 43648, upload-time = "2025-06-09T22:54:08.023Z" },
+ { url = "https://files.pythonhosted.org/packages/46/92/1ad5af0df781e76988897da39b5f086c2bf0f028b7f9bd1f409bb05b6874/propcache-0.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a2dc1f4a1df4fecf4e6f68013575ff4af84ef6f478fe5344317a65d38a8e6dc9", size = 43496, upload-time = "2025-06-09T22:54:09.228Z" },
+ { url = "https://files.pythonhosted.org/packages/b3/ce/e96392460f9fb68461fabab3e095cb00c8ddf901205be4eae5ce246e5b7e/propcache-0.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:be29c4f4810c5789cf10ddf6af80b041c724e629fa51e308a7a0fb19ed1ef7bf", size = 217288, upload-time = "2025-06-09T22:54:10.466Z" },
+ { url = "https://files.pythonhosted.org/packages/c5/2a/866726ea345299f7ceefc861a5e782b045545ae6940851930a6adaf1fca6/propcache-0.3.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:59d61f6970ecbd8ff2e9360304d5c8876a6abd4530cb752c06586849ac8a9dc9", size = 227456, upload-time = "2025-06-09T22:54:11.828Z" },
+ { url = "https://files.pythonhosted.org/packages/de/03/07d992ccb6d930398689187e1b3c718339a1c06b8b145a8d9650e4726166/propcache-0.3.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:62180e0b8dbb6b004baec00a7983e4cc52f5ada9cd11f48c3528d8cfa7b96a66", size = 225429, upload-time = "2025-06-09T22:54:13.823Z" },
+ { url = "https://files.pythonhosted.org/packages/5d/e6/116ba39448753b1330f48ab8ba927dcd6cf0baea8a0ccbc512dfb49ba670/propcache-0.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c144ca294a204c470f18cf4c9d78887810d04a3e2fbb30eea903575a779159df", size = 213472, upload-time = "2025-06-09T22:54:15.232Z" },
+ { url = "https://files.pythonhosted.org/packages/a6/85/f01f5d97e54e428885a5497ccf7f54404cbb4f906688a1690cd51bf597dc/propcache-0.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5c2a784234c28854878d68978265617aa6dc0780e53d44b4d67f3651a17a9a2", size = 204480, upload-time = "2025-06-09T22:54:17.104Z" },
+ { url = "https://files.pythonhosted.org/packages/e3/79/7bf5ab9033b8b8194cc3f7cf1aaa0e9c3256320726f64a3e1f113a812dce/propcache-0.3.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:5745bc7acdafa978ca1642891b82c19238eadc78ba2aaa293c6863b304e552d7", size = 214530, upload-time = "2025-06-09T22:54:18.512Z" },
+ { url = "https://files.pythonhosted.org/packages/31/0b/bd3e0c00509b609317df4a18e6b05a450ef2d9a963e1d8bc9c9415d86f30/propcache-0.3.2-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:c0075bf773d66fa8c9d41f66cc132ecc75e5bb9dd7cce3cfd14adc5ca184cb95", size = 205230, upload-time = "2025-06-09T22:54:19.947Z" },
+ { url = "https://files.pythonhosted.org/packages/7a/23/fae0ff9b54b0de4e819bbe559508da132d5683c32d84d0dc2ccce3563ed4/propcache-0.3.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:5f57aa0847730daceff0497f417c9de353c575d8da3579162cc74ac294c5369e", size = 206754, upload-time = "2025-06-09T22:54:21.716Z" },
+ { url = "https://files.pythonhosted.org/packages/b7/7f/ad6a3c22630aaa5f618b4dc3c3598974a72abb4c18e45a50b3cdd091eb2f/propcache-0.3.2-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:eef914c014bf72d18efb55619447e0aecd5fb7c2e3fa7441e2e5d6099bddff7e", size = 218430, upload-time = "2025-06-09T22:54:23.17Z" },
+ { url = "https://files.pythonhosted.org/packages/5b/2c/ba4f1c0e8a4b4c75910742f0d333759d441f65a1c7f34683b4a74c0ee015/propcache-0.3.2-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:2a4092e8549031e82facf3decdbc0883755d5bbcc62d3aea9d9e185549936dcf", size = 223884, upload-time = "2025-06-09T22:54:25.539Z" },
+ { url = "https://files.pythonhosted.org/packages/88/e4/ebe30fc399e98572019eee82ad0caf512401661985cbd3da5e3140ffa1b0/propcache-0.3.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:85871b050f174bc0bfb437efbdb68aaf860611953ed12418e4361bc9c392749e", size = 211480, upload-time = "2025-06-09T22:54:26.892Z" },
+ { url = "https://files.pythonhosted.org/packages/96/0a/7d5260b914e01d1d0906f7f38af101f8d8ed0dc47426219eeaf05e8ea7c2/propcache-0.3.2-cp311-cp311-win32.whl", hash = "sha256:36c8d9b673ec57900c3554264e630d45980fd302458e4ac801802a7fd2ef7897", size = 37757, upload-time = "2025-06-09T22:54:28.241Z" },
+ { url = "https://files.pythonhosted.org/packages/e1/2d/89fe4489a884bc0da0c3278c552bd4ffe06a1ace559db5ef02ef24ab446b/propcache-0.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:e53af8cb6a781b02d2ea079b5b853ba9430fcbe18a8e3ce647d5982a3ff69f39", size = 41500, upload-time = "2025-06-09T22:54:29.4Z" },
+ { url = "https://files.pythonhosted.org/packages/a8/42/9ca01b0a6f48e81615dca4765a8f1dd2c057e0540f6116a27dc5ee01dfb6/propcache-0.3.2-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:8de106b6c84506b31c27168582cd3cb3000a6412c16df14a8628e5871ff83c10", size = 73674, upload-time = "2025-06-09T22:54:30.551Z" },
+ { url = "https://files.pythonhosted.org/packages/af/6e/21293133beb550f9c901bbece755d582bfaf2176bee4774000bd4dd41884/propcache-0.3.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:28710b0d3975117239c76600ea351934ac7b5ff56e60953474342608dbbb6154", size = 43570, upload-time = "2025-06-09T22:54:32.296Z" },
+ { url = "https://files.pythonhosted.org/packages/0c/c8/0393a0a3a2b8760eb3bde3c147f62b20044f0ddac81e9d6ed7318ec0d852/propcache-0.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ce26862344bdf836650ed2487c3d724b00fbfec4233a1013f597b78c1cb73615", size = 43094, upload-time = "2025-06-09T22:54:33.929Z" },
+ { url = "https://files.pythonhosted.org/packages/37/2c/489afe311a690399d04a3e03b069225670c1d489eb7b044a566511c1c498/propcache-0.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bca54bd347a253af2cf4544bbec232ab982f4868de0dd684246b67a51bc6b1db", size = 226958, upload-time = "2025-06-09T22:54:35.186Z" },
+ { url = "https://files.pythonhosted.org/packages/9d/ca/63b520d2f3d418c968bf596839ae26cf7f87bead026b6192d4da6a08c467/propcache-0.3.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:55780d5e9a2ddc59711d727226bb1ba83a22dd32f64ee15594b9392b1f544eb1", size = 234894, upload-time = "2025-06-09T22:54:36.708Z" },
+ { url = "https://files.pythonhosted.org/packages/11/60/1d0ed6fff455a028d678df30cc28dcee7af77fa2b0e6962ce1df95c9a2a9/propcache-0.3.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:035e631be25d6975ed87ab23153db6a73426a48db688070d925aa27e996fe93c", size = 233672, upload-time = "2025-06-09T22:54:38.062Z" },
+ { url = "https://files.pythonhosted.org/packages/37/7c/54fd5301ef38505ab235d98827207176a5c9b2aa61939b10a460ca53e123/propcache-0.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ee6f22b6eaa39297c751d0e80c0d3a454f112f5c6481214fcf4c092074cecd67", size = 224395, upload-time = "2025-06-09T22:54:39.634Z" },
+ { url = "https://files.pythonhosted.org/packages/ee/1a/89a40e0846f5de05fdc6779883bf46ba980e6df4d2ff8fb02643de126592/propcache-0.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7ca3aee1aa955438c4dba34fc20a9f390e4c79967257d830f137bd5a8a32ed3b", size = 212510, upload-time = "2025-06-09T22:54:41.565Z" },
+ { url = "https://files.pythonhosted.org/packages/5e/33/ca98368586c9566a6b8d5ef66e30484f8da84c0aac3f2d9aec6d31a11bd5/propcache-0.3.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7a4f30862869fa2b68380d677cc1c5fcf1e0f2b9ea0cf665812895c75d0ca3b8", size = 222949, upload-time = "2025-06-09T22:54:43.038Z" },
+ { url = "https://files.pythonhosted.org/packages/ba/11/ace870d0aafe443b33b2f0b7efdb872b7c3abd505bfb4890716ad7865e9d/propcache-0.3.2-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:b77ec3c257d7816d9f3700013639db7491a434644c906a2578a11daf13176251", size = 217258, upload-time = "2025-06-09T22:54:44.376Z" },
+ { url = "https://files.pythonhosted.org/packages/5b/d2/86fd6f7adffcfc74b42c10a6b7db721d1d9ca1055c45d39a1a8f2a740a21/propcache-0.3.2-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:cab90ac9d3f14b2d5050928483d3d3b8fb6b4018893fc75710e6aa361ecb2474", size = 213036, upload-time = "2025-06-09T22:54:46.243Z" },
+ { url = "https://files.pythonhosted.org/packages/07/94/2d7d1e328f45ff34a0a284cf5a2847013701e24c2a53117e7c280a4316b3/propcache-0.3.2-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:0b504d29f3c47cf6b9e936c1852246c83d450e8e063d50562115a6be6d3a2535", size = 227684, upload-time = "2025-06-09T22:54:47.63Z" },
+ { url = "https://files.pythonhosted.org/packages/b7/05/37ae63a0087677e90b1d14710e532ff104d44bc1efa3b3970fff99b891dc/propcache-0.3.2-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:ce2ac2675a6aa41ddb2a0c9cbff53780a617ac3d43e620f8fd77ba1c84dcfc06", size = 234562, upload-time = "2025-06-09T22:54:48.982Z" },
+ { url = "https://files.pythonhosted.org/packages/a4/7c/3f539fcae630408d0bd8bf3208b9a647ccad10976eda62402a80adf8fc34/propcache-0.3.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:62b4239611205294cc433845b914131b2a1f03500ff3c1ed093ed216b82621e1", size = 222142, upload-time = "2025-06-09T22:54:50.424Z" },
+ { url = "https://files.pythonhosted.org/packages/7c/d2/34b9eac8c35f79f8a962546b3e97e9d4b990c420ee66ac8255d5d9611648/propcache-0.3.2-cp312-cp312-win32.whl", hash = "sha256:df4a81b9b53449ebc90cc4deefb052c1dd934ba85012aa912c7ea7b7e38b60c1", size = 37711, upload-time = "2025-06-09T22:54:52.072Z" },
+ { url = "https://files.pythonhosted.org/packages/19/61/d582be5d226cf79071681d1b46b848d6cb03d7b70af7063e33a2787eaa03/propcache-0.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:7046e79b989d7fe457bb755844019e10f693752d169076138abf17f31380800c", size = 41479, upload-time = "2025-06-09T22:54:53.234Z" },
+ { url = "https://files.pythonhosted.org/packages/cc/35/cc0aaecf278bb4575b8555f2b137de5ab821595ddae9da9d3cd1da4072c7/propcache-0.3.2-py3-none-any.whl", hash = "sha256:98f1ec44fb675f5052cccc8e609c46ed23a35a1cfd18545ad4e29002d858a43f", size = 12663, upload-time = "2025-06-09T22:56:04.484Z" },
]
[[package]]
@@ -4264,7 +4302,7 @@ wheels = [
[[package]]
name = "pydantic"
-version = "2.11.5"
+version = "2.11.7"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "annotated-types" },
@@ -4272,9 +4310,9 @@ dependencies = [
{ name = "typing-extensions" },
{ name = "typing-inspection" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/f0/86/8ce9040065e8f924d642c58e4a344e33163a07f6b57f836d0d734e0ad3fb/pydantic-2.11.5.tar.gz", hash = "sha256:7f853db3d0ce78ce8bbb148c401c2cdd6431b3473c0cdff2755c7690952a7b7a", size = 787102, upload-time = "2025-05-22T21:18:08.761Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/00/dd/4325abf92c39ba8623b5af936ddb36ffcfe0beae70405d456ab1fb2f5b8c/pydantic-2.11.7.tar.gz", hash = "sha256:d989c3c6cb79469287b1569f7447a17848c998458d49ebe294e975b9baf0f0db", size = 788350, upload-time = "2025-06-14T08:33:17.137Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/b5/69/831ed22b38ff9b4b64b66569f0e5b7b97cf3638346eb95a2147fdb49ad5f/pydantic-2.11.5-py3-none-any.whl", hash = "sha256:f9c26ba06f9747749ca1e5c94d6a85cb84254577553c8785576fd38fa64dc0f7", size = 444229, upload-time = "2025-05-22T21:18:06.329Z" },
+ { url = "https://files.pythonhosted.org/packages/6a/c0/ec2b1c8712ca690e5d61979dee872603e92b8a32f94cc1b72d53beab008a/pydantic-2.11.7-py3-none-any.whl", hash = "sha256:dde5df002701f6de26248661f6835bbe296a47bf73990135c7d07ce741b9623b", size = 444782, upload-time = "2025-06-14T08:33:14.905Z" },
]
[[package]]
@@ -4354,11 +4392,11 @@ wheels = [
[[package]]
name = "pygments"
-version = "2.19.1"
+version = "2.19.2"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/7c/2d/c3338d48ea6cc0feb8446d8e6937e1408088a72a39937982cc6111d17f84/pygments-2.19.1.tar.gz", hash = "sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f", size = 4968581, upload-time = "2025-01-06T17:26:30.443Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/b0/77/a5b8c569bf593b0140bde72ea885a803b82086995367bf2037de0159d924/pygments-2.19.2.tar.gz", hash = "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887", size = 4968631, upload-time = "2025-06-21T13:39:12.283Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/8a/0b/9fcc47d19c48b59121088dd6da2488a49d5f72dacf8262e2790a1d2c7d15/pygments-2.19.1-py3-none-any.whl", hash = "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c", size = 1225293, upload-time = "2025-01-06T17:26:25.553Z" },
+ { url = "https://files.pythonhosted.org/packages/c7/21/705964c7812476f378728bdf590ca4b771ec72385c533964653c68e86bdc/pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b", size = 1225217, upload-time = "2025-06-21T13:39:07.939Z" },
]
[[package]]
@@ -4377,7 +4415,7 @@ crypto = [
[[package]]
name = "pymilvus"
-version = "2.5.10"
+version = "2.5.12"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "grpcio" },
@@ -4388,9 +4426,9 @@ dependencies = [
{ name = "setuptools" },
{ name = "ujson" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/da/e2/88f126a08d8eefba7341e3eb323406a227146094aab7137a2b91d882e98d/pymilvus-2.5.10.tar.gz", hash = "sha256:cc44ad776aeab781ee4c4a4d334b73e746066ab2fb6722c5311f02efa6fc54a2", size = 1260364, upload-time = "2025-05-23T06:08:06.992Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/fa/53/4af820a37163225a76656222ee43a0eb8f1bd2ceec063315680a585435da/pymilvus-2.5.12.tar.gz", hash = "sha256:79ec7dc0616c2484f77abe98bca8deafb613645b5703c492b51961afd4f985d8", size = 1265893, upload-time = "2025-07-02T15:34:00.385Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/b0/4b/847704930ad8ddd0d0975e9a3a5e3fe704f642debe97454135c2b9ee7081/pymilvus-2.5.10-py3-none-any.whl", hash = "sha256:7da540f93068871cda3941602c55227aeaafb66f2f0d9c05e8f9db783716b100", size = 227635, upload-time = "2025-05-23T06:08:05.397Z" },
+ { url = "https://files.pythonhosted.org/packages/68/4f/80a4940f2772d10272c3292444af767a5aa1a5bbb631874568713ca01d54/pymilvus-2.5.12-py3-none-any.whl", hash = "sha256:ef77a4a0076469a30b05f0bb23b5a058acfbdca83d82af9574ca651764017f44", size = 231425, upload-time = "2025-07-02T15:33:58.938Z" },
]
[[package]]
@@ -4418,19 +4456,17 @@ wheels = [
[[package]]
name = "pyobvector"
-version = "0.1.20"
+version = "0.1.14"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "aiomysql" },
{ name = "numpy" },
- { name = "pydantic" },
{ name = "pymysql" },
{ name = "sqlalchemy" },
- { name = "sqlglot" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/13/f7/fcc99e41bac6aee0822667809957800b2f512f2d96d1fa52c283cb58db16/pyobvector-0.1.20.tar.gz", hash = "sha256:26e8155d5b933333a2ab21b08e51df84e374d188f5fb26520347450e72f34c6e", size = 35256, upload-time = "2025-03-17T12:32:16.66Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/dc/59/7d762061808948dd6aad165a000b34e22163dc83fb5014184eeacc0fabe5/pyobvector-0.1.14.tar.gz", hash = "sha256:4f85cdd63064d040e94c0a96099a0cd5cda18ce625865382e89429f28422fc02", size = 26780, upload-time = "2024-11-20T11:46:18.017Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/e6/7d/00cd33c18814bec0a4f6f4a89becdbe2c6c28d78f87d765d0259a22b117e/pyobvector-0.1.20-py3-none-any.whl", hash = "sha256:1a991f8b9f53e1a749fc396ccb90c7591e64b2c5679930023f00789c62e7af72", size = 46264, upload-time = "2025-03-17T12:32:15.356Z" },
+ { url = "https://files.pythonhosted.org/packages/88/68/ecb21b74c974e7be7f9034e205d08db62d614ff5c221581ae96d37ef853e/pyobvector-0.1.14-py3-none-any.whl", hash = "sha256:828e0bec49a177355b70c7a1270af3b0bf5239200ee0d096e4165b267eeff97c", size = 35526, upload-time = "2024-11-20T11:46:16.809Z" },
]
[[package]]
@@ -4453,11 +4489,11 @@ wheels = [
[[package]]
name = "pypdf"
-version = "5.6.0"
+version = "5.7.0"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/40/46/67de1d7a65412aa1c896e6b280829b70b57d203fadae6859b690006b8e0a/pypdf-5.6.0.tar.gz", hash = "sha256:a4b6538b77fc796622000db7127e4e58039ec5e6afd292f8e9bf42e2e985a749", size = 5023749, upload-time = "2025-06-01T12:19:40.101Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/7b/42/fbc37af367b20fa6c53da81b1780025f6046a0fac8cbf0663a17e743b033/pypdf-5.7.0.tar.gz", hash = "sha256:68c92f2e1aae878bab1150e74447f31ab3848b1c0a6f8becae9f0b1904460b6f", size = 5026120, upload-time = "2025-06-29T08:49:48.305Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/71/8b/dc3a72d98c22be7a4cbd664ad14c5a3e6295c2dbdf572865ed61e24b5e38/pypdf-5.6.0-py3-none-any.whl", hash = "sha256:ca6bf446bfb0a2d8d71d6d6bb860798d864c36a29b3d9ae8d7fc7958c59f88e7", size = 304208, upload-time = "2025-06-01T12:19:38.003Z" },
+ { url = "https://files.pythonhosted.org/packages/73/9f/78d096ef795a813fa0e1cb9b33fa574b205f2b563d9c1e9366c854cf0364/pypdf-5.7.0-py3-none-any.whl", hash = "sha256:203379453439f5b68b7a1cd43cdf4c5f7a02b84810cefa7f93a47b350aaaba48", size = 305524, upload-time = "2025-06-29T08:49:46.16Z" },
]
[[package]]
@@ -4571,39 +4607,39 @@ wheels = [
[[package]]
name = "python-calamine"
-version = "0.3.2"
+version = "0.4.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "packaging" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/6b/21/387b92059909e741af7837194d84250335d2a057f614752b6364aaaa2f56/python_calamine-0.3.2.tar.gz", hash = "sha256:5cf12f2086373047cdea681711857b672cba77a34a66dd3755d60686fc974e06", size = 117336, upload-time = "2025-04-02T10:06:23.14Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/ef/b7/d59863ebe319150739d0c352c6dea2710a2f90254ed32304d52e8349edce/python_calamine-0.3.2-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:5251746816069c38eafdd1e4eb7b83870e1fe0ff6191ce9a809b187ffba8ce93", size = 830854, upload-time = "2025-04-02T10:04:14.673Z" },
- { url = "https://files.pythonhosted.org/packages/d3/01/b48c6f2c2e530a1a031199c5c5bf35f7c2cf7f16f3989263e616e3bc86ce/python_calamine-0.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9775dbc93bc635d48f45433f8869a546cca28c2a86512581a05333f97a18337b", size = 809411, upload-time = "2025-04-02T10:04:16.067Z" },
- { url = "https://files.pythonhosted.org/packages/fe/6d/69c53ffb11b3ee1bf5bd945cc2514848adea492c879a50f38e2ed4424727/python_calamine-0.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6ff4318b72ba78e8a04fb4c45342cfa23eab6f81ecdb85548cdab9f2db8ac9c7", size = 872905, upload-time = "2025-04-02T10:04:17.487Z" },
- { url = "https://files.pythonhosted.org/packages/be/ec/b02c4bc04c426d153af1f5ff07e797dd81ada6f47c170e0207d07c90b53a/python_calamine-0.3.2-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0cd8eb1ef8644da71788a33d3de602d1c08ff1c4136942d87e25f09580b512ef", size = 876464, upload-time = "2025-04-02T10:04:19.53Z" },
- { url = "https://files.pythonhosted.org/packages/46/ef/8403ee595207de5bd277279b56384b31390987df8a61c280b4176802481a/python_calamine-0.3.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9dcfd560d8f88f39d23b829f666ebae4bd8daeec7ed57adfb9313543f3c5fa35", size = 942289, upload-time = "2025-04-02T10:04:20.902Z" },
- { url = "https://files.pythonhosted.org/packages/89/97/b4e5b77c70b36613c10f2dbeece75b5d43727335a33bf5176792ec83c3fc/python_calamine-0.3.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e5e79b9eae4b30c82d045f9952314137c7089c88274e1802947f9e3adb778a59", size = 978699, upload-time = "2025-04-02T10:04:22.263Z" },
- { url = "https://files.pythonhosted.org/packages/5f/e9/03bbafd6b11cdf70c004f2e856978fc252ec5ea7e77529f14f969134c7a8/python_calamine-0.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ce5e8cc518c8e3e5988c5c658f9dcd8229f5541ca63353175bb15b6ad8c456d0", size = 886008, upload-time = "2025-04-02T10:04:23.754Z" },
- { url = "https://files.pythonhosted.org/packages/7b/20/e18f534e49b403ba0b979a4dfead146001d867f5be846b91f81ed5377972/python_calamine-0.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2a0e596b1346c28b2de15c9f86186cceefa4accb8882992aa0b7499c593446ed", size = 925104, upload-time = "2025-04-02T10:04:25.255Z" },
- { url = "https://files.pythonhosted.org/packages/54/4c/58933e69a0a7871487d10b958c1f83384bc430d53efbbfbf1dea141a0d85/python_calamine-0.3.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:f521de16a9f3e951ec2e5e35d76752fe004088dbac4cdbf4dd62d0ad2bbf650f", size = 1050448, upload-time = "2025-04-02T10:04:26.649Z" },
- { url = "https://files.pythonhosted.org/packages/83/95/5c96d093eaaa2d15c63b43bcf8c87708eaab8428c72b6ebdcafc2604aa47/python_calamine-0.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:417d6825a36bba526ae17bed1b6ca576fbb54e23dc60c97eeb536c622e77c62f", size = 1056840, upload-time = "2025-04-02T10:04:28.18Z" },
- { url = "https://files.pythonhosted.org/packages/23/e0/b03cc3ad4f40fd3be0ebac0b71d273864ddf2bf0e611ec309328fdedded9/python_calamine-0.3.2-cp311-cp311-win32.whl", hash = "sha256:cd3ea1ca768139753633f9f0b16997648db5919894579f363d71f914f85f7ade", size = 663268, upload-time = "2025-04-02T10:04:29.659Z" },
- { url = "https://files.pythonhosted.org/packages/6b/bd/550da64770257fc70a185482f6353c0654a11f381227e146bb0170db040f/python_calamine-0.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:4560100412d8727c49048cca102eadeb004f91cfb9c99ae63cd7d4dc0a61333a", size = 692393, upload-time = "2025-04-02T10:04:31.534Z" },
- { url = "https://files.pythonhosted.org/packages/be/2e/0b4b7a146c3bb41116fe8e59a2f616340786db12aed51c7a9e75817cfa03/python_calamine-0.3.2-cp311-cp311-win_arm64.whl", hash = "sha256:a2526e6ba79087b1634f49064800339edb7316780dd7e1e86d10a0ca9de4e90f", size = 667312, upload-time = "2025-04-02T10:04:32.911Z" },
- { url = "https://files.pythonhosted.org/packages/f2/0f/c2e3e3bae774dae47cba6ffa640ff95525bd6a10a13d3cd998f33aeafc7f/python_calamine-0.3.2-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:7c063b1f783352d6c6792305b2b0123784882e2436b638a9b9a1e97f6d74fa51", size = 825179, upload-time = "2025-04-02T10:04:34.377Z" },
- { url = "https://files.pythonhosted.org/packages/c7/81/a05285f06d71ea38ab99b09f3119f93f575487c9d24d7a1bab65657b258b/python_calamine-0.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:85016728937e8f5d1810ff3c9603ffd2458d66e34d495202d7759fa8219871cd", size = 804036, upload-time = "2025-04-02T10:04:35.938Z" },
- { url = "https://files.pythonhosted.org/packages/24/b5/320f366ffd91ee5d5f0f77817d4fb684f62a5a68e438dcdb90e4f5f35137/python_calamine-0.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81f243323bf712bb0b2baf0b938a2e6d6c9fa3b9902a44c0654474d04f999fac", size = 871527, upload-time = "2025-04-02T10:04:38.272Z" },
- { url = "https://files.pythonhosted.org/packages/13/19/063afced19620b829697b90329c62ad73274cc38faaa91d9ee41047f5f8c/python_calamine-0.3.2-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0b719dd2b10237b0cfb2062e3eaf199f220918a5623197e8449f37c8de845a7c", size = 875411, upload-time = "2025-04-02T10:04:39.647Z" },
- { url = "https://files.pythonhosted.org/packages/d7/6a/c93c52414ec62cc51c4820aff434f03c4a1c69ced15cec3e4b93885e4012/python_calamine-0.3.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d5158310b9140e8ee8665c9541a11030901e7275eb036988150c93f01c5133bf", size = 943525, upload-time = "2025-04-02T10:04:41.025Z" },
- { url = "https://files.pythonhosted.org/packages/0a/0a/5bdecee03d235e8d111b1e8ee3ea0c0ed4ae43a402f75cebbe719930cf04/python_calamine-0.3.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b2c1b248e8bf10194c449cb57e6ccb3f2fe3dc86975a6d746908cf2d37b048cc", size = 976332, upload-time = "2025-04-02T10:04:42.454Z" },
- { url = "https://files.pythonhosted.org/packages/05/ad/43ff92366856ee34f958e9cf4f5b98e63b0dc219e06ccba4ad6f63463756/python_calamine-0.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f3a13ad8e5b6843a73933b8d1710bc4df39a9152cb57c11227ad51f47b5838a4", size = 885549, upload-time = "2025-04-02T10:04:43.869Z" },
- { url = "https://files.pythonhosted.org/packages/ff/b9/76afb867e2bb4bfc296446b741cee01ae4ce6a094b43f4ed4eaed5189de4/python_calamine-0.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fe950975a5758423c982ce1e2fdcb5c9c664d1a20b41ea21e619e5003bb4f96b", size = 926005, upload-time = "2025-04-02T10:04:45.884Z" },
- { url = "https://files.pythonhosted.org/packages/23/cf/5252b237b0e70c263f86741aea02e8e57aedb2bce9898468be1d9d55b9da/python_calamine-0.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:8707622ba816d6c26e36f1506ecda66a6a6cf43e55a43a8ef4c3bf8a805d3cfb", size = 1049380, upload-time = "2025-04-02T10:04:49.202Z" },
- { url = "https://files.pythonhosted.org/packages/1a/4d/f151e8923e53457ca49ceeaa3a34cb23afee7d7b46e6546ab2a29adc9125/python_calamine-0.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:e6eac46475c26e162a037f6711b663767f61f8fca3daffeb35aa3fc7ee6267cc", size = 1056720, upload-time = "2025-04-02T10:04:51.002Z" },
- { url = "https://files.pythonhosted.org/packages/f5/cb/1b5db3e4a8bbaaaa7706b270570d4a65133618fa0ca7efafe5ce680f6cee/python_calamine-0.3.2-cp312-cp312-win32.whl", hash = "sha256:0dee82aedef3db27368a388d6741d69334c1d4d7a8087ddd33f1912166e17e37", size = 663502, upload-time = "2025-04-02T10:04:52.402Z" },
- { url = "https://files.pythonhosted.org/packages/5a/53/920fa8e7b570647c08da0f1158d781db2e318918b06cb28fe0363c3398ac/python_calamine-0.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:ae09b779718809d31ca5d722464be2776b7d79278b1da56e159bbbe11880eecf", size = 692660, upload-time = "2025-04-02T10:04:53.721Z" },
- { url = "https://files.pythonhosted.org/packages/a5/ea/5d0ecf5c345c4d78964a5f97e61848bc912965b276a54fb8ae698a9419a8/python_calamine-0.3.2-cp312-cp312-win_arm64.whl", hash = "sha256:435546e401a5821fa70048b6c03a70db3b27d00037e2c4999c2126d8c40b51df", size = 666205, upload-time = "2025-04-02T10:04:56.377Z" },
+sdist = { url = "https://files.pythonhosted.org/packages/cc/03/269f96535705b2f18c8977fa58e76763b4e4727a9b3ae277a9468c8ffe05/python_calamine-0.4.0.tar.gz", hash = "sha256:94afcbae3fec36d2d7475095a59d4dc6fae45829968c743cb799ebae269d7bbf", size = 127737, upload-time = "2025-07-04T06:05:28.626Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/d4/a5/bcd82326d0ff1ab5889e7a5e13c868b483fc56398e143aae8e93149ba43b/python_calamine-0.4.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:d1687f8c4d7852920c7b4e398072f183f88dd273baf5153391edc88b7454b8c0", size = 833019, upload-time = "2025-07-04T06:03:32.214Z" },
+ { url = "https://files.pythonhosted.org/packages/f6/1a/a681f1d2f28164552e91ef47bcde6708098aa64a5f5fe3952f22362d340a/python_calamine-0.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:258d04230bebbbafa370a15838049d912d6a0a2c4da128943d8160ca4b6db58e", size = 812268, upload-time = "2025-07-04T06:03:33.855Z" },
+ { url = "https://files.pythonhosted.org/packages/3d/92/2fc911431733739d4e7a633cefa903fa49a6b7a61e8765bad29a4a7c47b1/python_calamine-0.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c686e491634934f059553d55f77ac67ca4c235452d5b444f98fe79b3579f1ea5", size = 875733, upload-time = "2025-07-04T06:03:35.154Z" },
+ { url = "https://files.pythonhosted.org/packages/f4/f0/48bfae6802eb360028ca6c15e9edf42243aadd0006b6ac3e9edb41a57119/python_calamine-0.4.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:4480af7babcc2f919c638a554b06b7b145d9ab3da47fd696d68c2fc6f67f9541", size = 878325, upload-time = "2025-07-04T06:03:36.638Z" },
+ { url = "https://files.pythonhosted.org/packages/a4/dc/f8c956e15bac9d5d1e05cd1b907ae780e40522d2fd103c8c6e2f21dff4ed/python_calamine-0.4.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e405b87a8cd1e90a994e570705898634f105442029f25bab7da658ee9cbaa771", size = 1015038, upload-time = "2025-07-04T06:03:37.971Z" },
+ { url = "https://files.pythonhosted.org/packages/54/3f/e69ab97c7734fb850fba2f506b775912fd59f04e17488582c8fbf52dbc72/python_calamine-0.4.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a831345ee42615f0dfcb0ed60a3b1601d2f946d4166edae64fd9a6f9bbd57fc1", size = 924969, upload-time = "2025-07-04T06:03:39.253Z" },
+ { url = "https://files.pythonhosted.org/packages/79/03/b4c056b468908d87a3de94389166e0f4dba725a70bc39e03bc039ba96f6b/python_calamine-0.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9951b8e4cafb3e1623bb5dfc31a18d38ef43589275f9657e99dfcbe4c8c4b33e", size = 888020, upload-time = "2025-07-04T06:03:41.099Z" },
+ { url = "https://files.pythonhosted.org/packages/86/4f/b9092f7c970894054083656953184e44cb2dadff8852425e950d4ca419af/python_calamine-0.4.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a6619fe3b5c9633ed8b178684605f8076c9d8d85b29ade15f7a7713fcfdee2d0", size = 930337, upload-time = "2025-07-04T06:03:42.89Z" },
+ { url = "https://files.pythonhosted.org/packages/64/da/137239027bf253aabe7063450950085ec9abd827d0cbc5170f585f38f464/python_calamine-0.4.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:2cc45b8e76ee331f6ea88ca23677be0b7a05b502cd4423ba2c2bc8dad53af1be", size = 1054568, upload-time = "2025-07-04T06:03:44.153Z" },
+ { url = "https://files.pythonhosted.org/packages/80/96/74c38bcf6b6825d5180c0e147b85be8c52dbfba11848b1e98ba358e32a64/python_calamine-0.4.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1b2cfb7ced1a7c80befa0cfddfe4aae65663eb4d63c4ae484b9b7a80ebe1b528", size = 1058317, upload-time = "2025-07-04T06:03:45.873Z" },
+ { url = "https://files.pythonhosted.org/packages/33/95/9d7b8fe8b32d99a6c79534df3132cfe40e9df4a0f5204048bf5e66ddbd93/python_calamine-0.4.0-cp311-cp311-win32.whl", hash = "sha256:04f4e32ee16814fc1fafc49300be8eeb280d94878461634768b51497e1444bd6", size = 663934, upload-time = "2025-07-04T06:03:47.407Z" },
+ { url = "https://files.pythonhosted.org/packages/7c/e3/1c6cd9fd499083bea6ff1c30033ee8215b9f64e862babf5be170cacae190/python_calamine-0.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:a8543f69afac2213c0257bb56215b03dadd11763064a9d6b19786f27d1bef586", size = 692535, upload-time = "2025-07-04T06:03:48.699Z" },
+ { url = "https://files.pythonhosted.org/packages/94/1c/3105d19fbab6b66874ce8831652caedd73b23b72e88ce18addf8ceca8c12/python_calamine-0.4.0-cp311-cp311-win_arm64.whl", hash = "sha256:54622e35ec7c3b6f07d119da49aa821731c185e951918f152c2dbf3bec1e15d6", size = 671751, upload-time = "2025-07-04T06:03:49.979Z" },
+ { url = "https://files.pythonhosted.org/packages/63/60/f951513aaaa470b3a38a87d65eca45e0a02bc329b47864f5a17db563f746/python_calamine-0.4.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:74bca5d44a73acf3dcfa5370820797fcfd225c8c71abcddea987c5b4f5077e98", size = 826603, upload-time = "2025-07-04T06:03:51.245Z" },
+ { url = "https://files.pythonhosted.org/packages/76/3f/789955bbc77831c639890758f945eb2b25d6358065edf00da6751226cf31/python_calamine-0.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:cf80178f5d1b0ee2ccfffb8549c50855f6249e930664adc5807f4d0d6c2b269c", size = 805826, upload-time = "2025-07-04T06:03:52.482Z" },
+ { url = "https://files.pythonhosted.org/packages/00/4c/f87d17d996f647030a40bfd124fe45fe893c002bee35ae6aca9910a923ae/python_calamine-0.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:65cfef345386ae86f7720f1be93495a40fd7e7feabb8caa1df5025d7fbc58a1f", size = 874989, upload-time = "2025-07-04T06:03:53.794Z" },
+ { url = "https://files.pythonhosted.org/packages/47/d2/3269367303f6c0488cf1bfebded3f9fe968d118a988222e04c9b2636bf2e/python_calamine-0.4.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f23e6214dbf9b29065a5dcfd6a6c674dd0e251407298c9138611c907d53423ff", size = 877504, upload-time = "2025-07-04T06:03:55.095Z" },
+ { url = "https://files.pythonhosted.org/packages/f9/6d/c7ac35f5c7125e8bd07eb36773f300fda20dd2da635eae78a8cebb0b6ab7/python_calamine-0.4.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d792d304ee232ab01598e1d3ab22e074a32c2511476b5fb4f16f4222d9c2a265", size = 1014171, upload-time = "2025-07-04T06:03:56.777Z" },
+ { url = "https://files.pythonhosted.org/packages/f0/81/5ea8792a2e9ab5e2a05872db3a4d3ed3538ad5af1861282c789e2f13a8cf/python_calamine-0.4.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:bf813425918fd68f3e991ef7c4b5015be0a1a95fc4a8ab7e73c016ef1b881bb4", size = 926737, upload-time = "2025-07-04T06:03:58.024Z" },
+ { url = "https://files.pythonhosted.org/packages/cc/6e/989e56e6f073fc0981a74ba7a393881eb351bb143e5486aa629b5e5d6a8b/python_calamine-0.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bbe2a0ccb4d003635888eea83a995ff56b0748c8c76fc71923544f5a4a7d4cd7", size = 887032, upload-time = "2025-07-04T06:03:59.298Z" },
+ { url = "https://files.pythonhosted.org/packages/5d/92/2c9bd64277c6fe4be695d7d5a803b38d953ec8565037486be7506642c27c/python_calamine-0.4.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a7b3bb5f0d910b9b03c240987560f843256626fd443279759df4e91b717826d2", size = 929700, upload-time = "2025-07-04T06:04:01.388Z" },
+ { url = "https://files.pythonhosted.org/packages/64/fa/fc758ca37701d354a6bc7d63118699f1c73788a1f2e1b44d720824992764/python_calamine-0.4.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bd2c0fc2b5eabd08ceac8a2935bffa88dbc6116db971aa8c3f244bad3fd0f644", size = 1053971, upload-time = "2025-07-04T06:04:02.704Z" },
+ { url = "https://files.pythonhosted.org/packages/65/52/40d7e08ae0ddba331cdc9f7fb3e92972f8f38d7afbd00228158ff6d1fceb/python_calamine-0.4.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:85b547cb1c5b692a0c2406678d666dbc1cec65a714046104683fe4f504a1721d", size = 1057057, upload-time = "2025-07-04T06:04:04.014Z" },
+ { url = "https://files.pythonhosted.org/packages/16/de/e8a071c0adfda73285d891898a24f6e99338328c404f497ff5b0e6bc3d45/python_calamine-0.4.0-cp312-cp312-win32.whl", hash = "sha256:4c2a1e3a0db4d6de4587999a21cc35845648c84fba81c03dd6f3072c690888e4", size = 665540, upload-time = "2025-07-04T06:04:05.679Z" },
+ { url = "https://files.pythonhosted.org/packages/5e/f2/7fdfada13f80db12356853cf08697ff4e38800a1809c2bdd26ee60962e7a/python_calamine-0.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:b193c89ffcc146019475cd121c552b23348411e19c04dedf5c766a20db64399a", size = 695366, upload-time = "2025-07-04T06:04:06.977Z" },
+ { url = "https://files.pythonhosted.org/packages/20/66/d37412ad854480ce32f50d9f74f2a2f88b1b8a6fbc32f70aabf3211ae89e/python_calamine-0.4.0-cp312-cp312-win_arm64.whl", hash = "sha256:43a0f15e0b60c75a71b21a012b911d5d6f5fa052afad2a8edbc728af43af0fcf", size = 670740, upload-time = "2025-07-04T06:04:08.656Z" },
]
[[package]]
@@ -4640,6 +4676,15 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/6a/3e/b68c118422ec867fa7ab88444e1274aa40681c606d59ac27de5a5588f082/python_dotenv-1.0.1-py3-none-any.whl", hash = "sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a", size = 19863, upload-time = "2024-01-23T06:32:58.246Z" },
]
+[[package]]
+name = "python-http-client"
+version = "3.3.7"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/56/fa/284e52a8c6dcbe25671f02d217bf2f85660db940088faf18ae7a05e97313/python_http_client-3.3.7.tar.gz", hash = "sha256:bf841ee45262747e00dec7ee9971dfb8c7d83083f5713596488d67739170cea0", size = 9377, upload-time = "2022-03-09T20:23:56.386Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/29/31/9b360138f4e4035ee9dac4fe1132b6437bd05751aaf1db2a2d83dc45db5f/python_http_client-3.3.7-py3-none-any.whl", hash = "sha256:ad371d2bbedc6ea15c26179c6222a78bc9308d272435ddf1d5c84f068f249a36", size = 8352, upload-time = "2022-03-09T20:23:54.862Z" },
+]
+
[[package]]
name = "python-iso639"
version = "2025.2.18"
@@ -4823,17 +4868,15 @@ wheels = [
[[package]]
name = "realtime"
-version = "2.5.0"
+version = "2.5.3"
source = { registry = "https://pypi.org/simple" }
dependencies = [
- { name = "aiohttp" },
- { name = "python-dateutil" },
{ name = "typing-extensions" },
{ name = "websockets" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/47/9e/d6e478ccc23869a450a5d0dd9ab0c8a4e37fee7aec43c925d89bb09fcaf5/realtime-2.5.0.tar.gz", hash = "sha256:03d744dedc823de019a7f9917c1a6509fb6e98d357adf7fd7f4015618dac7ecd", size = 18865, upload-time = "2025-05-15T12:40:14.868Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/48/94/3cf962b814303a1688eece56a94b25a7bd423d60705f1124cba0896c9c07/realtime-2.5.3.tar.gz", hash = "sha256:0587594f3bc1c84bf007ff625075b86db6528843e03250dc84f4f2808be3d99a", size = 18527, upload-time = "2025-06-26T22:39:01.59Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/52/09/a9ede9afa4a536ac84ad365bfa26116ab17463c8353f471b2396dc0e44d0/realtime-2.5.0-py3-none-any.whl", hash = "sha256:a54274a6cdc03c3eda61fbfec1d277e4a28e3aa9526d24b5c187385bb8a7e85a", size = 22086, upload-time = "2025-05-15T12:40:13.092Z" },
+ { url = "https://files.pythonhosted.org/packages/fe/2a/f69c156a58d44b7b9ca22dab181b91e4d93d074f99923c75907bf3953d40/realtime-2.5.3-py3-none-any.whl", hash = "sha256:eb0994636946eff04c4c7f044f980c8c633c7eb632994f549f61053a474ac970", size = 21784, upload-time = "2025-06-26T22:38:59.98Z" },
]
[[package]]
@@ -4907,7 +4950,7 @@ wheels = [
[[package]]
name = "requests"
-version = "2.32.3"
+version = "2.32.4"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "certifi" },
@@ -4915,9 +4958,9 @@ dependencies = [
{ name = "idna" },
{ name = "urllib3" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/63/70/2bf7780ad2d390a8d301ad0b550f1581eadbd9a20f896afe06353c2a2913/requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760", size = 131218, upload-time = "2024-05-29T15:37:49.536Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/e1/0a/929373653770d8a0d7ea76c37de6e41f11eb07559b103b1c02cafb3f7cf8/requests-2.32.4.tar.gz", hash = "sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422", size = 135258, upload-time = "2025-06-09T16:43:07.34Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6", size = 64928, upload-time = "2024-05-29T15:37:47.027Z" },
+ { url = "https://files.pythonhosted.org/packages/7c/e4/56027c4a6b4ae70ca9de302488c5ca95ad4a39e190093d6c1a8ace08341b/requests-2.32.4-py3-none-any.whl", hash = "sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c", size = 64847, upload-time = "2025-06-09T16:43:05.728Z" },
]
[[package]]
@@ -4986,49 +5029,49 @@ wheels = [
[[package]]
name = "rpds-py"
-version = "0.25.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/8c/a6/60184b7fc00dd3ca80ac635dd5b8577d444c57e8e8742cecabfacb829921/rpds_py-0.25.1.tar.gz", hash = "sha256:8960b6dac09b62dac26e75d7e2c4a22efb835d827a7278c34f72b2b84fa160e3", size = 27304, upload-time = "2025-05-21T12:46:12.502Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/95/e1/df13fe3ddbbea43567e07437f097863b20c99318ae1f58a0fe389f763738/rpds_py-0.25.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:5f048bbf18b1f9120685c6d6bb70cc1a52c8cc11bdd04e643d28d3be0baf666d", size = 373341, upload-time = "2025-05-21T12:43:02.978Z" },
- { url = "https://files.pythonhosted.org/packages/7a/58/deef4d30fcbcbfef3b6d82d17c64490d5c94585a2310544ce8e2d3024f83/rpds_py-0.25.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4fbb0dbba559959fcb5d0735a0f87cdbca9e95dac87982e9b95c0f8f7ad10255", size = 359111, upload-time = "2025-05-21T12:43:05.128Z" },
- { url = "https://files.pythonhosted.org/packages/bb/7e/39f1f4431b03e96ebaf159e29a0f82a77259d8f38b2dd474721eb3a8ac9b/rpds_py-0.25.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4ca54b9cf9d80b4016a67a0193ebe0bcf29f6b0a96f09db942087e294d3d4c2", size = 386112, upload-time = "2025-05-21T12:43:07.13Z" },
- { url = "https://files.pythonhosted.org/packages/db/e7/847068a48d63aec2ae695a1646089620b3b03f8ccf9f02c122ebaf778f3c/rpds_py-0.25.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:1ee3e26eb83d39b886d2cb6e06ea701bba82ef30a0de044d34626ede51ec98b0", size = 400362, upload-time = "2025-05-21T12:43:08.693Z" },
- { url = "https://files.pythonhosted.org/packages/3b/3d/9441d5db4343d0cee759a7ab4d67420a476cebb032081763de934719727b/rpds_py-0.25.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:89706d0683c73a26f76a5315d893c051324d771196ae8b13e6ffa1ffaf5e574f", size = 522214, upload-time = "2025-05-21T12:43:10.694Z" },
- { url = "https://files.pythonhosted.org/packages/a2/ec/2cc5b30d95f9f1a432c79c7a2f65d85e52812a8f6cbf8768724571710786/rpds_py-0.25.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c2013ee878c76269c7b557a9a9c042335d732e89d482606990b70a839635feb7", size = 411491, upload-time = "2025-05-21T12:43:12.739Z" },
- { url = "https://files.pythonhosted.org/packages/dc/6c/44695c1f035077a017dd472b6a3253553780837af2fac9b6ac25f6a5cb4d/rpds_py-0.25.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:45e484db65e5380804afbec784522de84fa95e6bb92ef1bd3325d33d13efaebd", size = 386978, upload-time = "2025-05-21T12:43:14.25Z" },
- { url = "https://files.pythonhosted.org/packages/b1/74/b4357090bb1096db5392157b4e7ed8bb2417dc7799200fcbaee633a032c9/rpds_py-0.25.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:48d64155d02127c249695abb87d39f0faf410733428d499867606be138161d65", size = 420662, upload-time = "2025-05-21T12:43:15.8Z" },
- { url = "https://files.pythonhosted.org/packages/26/dd/8cadbebf47b96e59dfe8b35868e5c38a42272699324e95ed522da09d3a40/rpds_py-0.25.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:048893e902132fd6548a2e661fb38bf4896a89eea95ac5816cf443524a85556f", size = 563385, upload-time = "2025-05-21T12:43:17.78Z" },
- { url = "https://files.pythonhosted.org/packages/c3/ea/92960bb7f0e7a57a5ab233662f12152085c7dc0d5468534c65991a3d48c9/rpds_py-0.25.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:0317177b1e8691ab5879f4f33f4b6dc55ad3b344399e23df2e499de7b10a548d", size = 592047, upload-time = "2025-05-21T12:43:19.457Z" },
- { url = "https://files.pythonhosted.org/packages/61/ad/71aabc93df0d05dabcb4b0c749277881f8e74548582d96aa1bf24379493a/rpds_py-0.25.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:bffcf57826d77a4151962bf1701374e0fc87f536e56ec46f1abdd6a903354042", size = 557863, upload-time = "2025-05-21T12:43:21.69Z" },
- { url = "https://files.pythonhosted.org/packages/93/0f/89df0067c41f122b90b76f3660028a466eb287cbe38efec3ea70e637ca78/rpds_py-0.25.1-cp311-cp311-win32.whl", hash = "sha256:cda776f1967cb304816173b30994faaf2fd5bcb37e73118a47964a02c348e1bc", size = 219627, upload-time = "2025-05-21T12:43:23.311Z" },
- { url = "https://files.pythonhosted.org/packages/7c/8d/93b1a4c1baa903d0229374d9e7aa3466d751f1d65e268c52e6039c6e338e/rpds_py-0.25.1-cp311-cp311-win_amd64.whl", hash = "sha256:dc3c1ff0abc91444cd20ec643d0f805df9a3661fcacf9c95000329f3ddf268a4", size = 231603, upload-time = "2025-05-21T12:43:25.145Z" },
- { url = "https://files.pythonhosted.org/packages/cb/11/392605e5247bead2f23e6888e77229fbd714ac241ebbebb39a1e822c8815/rpds_py-0.25.1-cp311-cp311-win_arm64.whl", hash = "sha256:5a3ddb74b0985c4387719fc536faced33cadf2172769540c62e2a94b7b9be1c4", size = 223967, upload-time = "2025-05-21T12:43:26.566Z" },
- { url = "https://files.pythonhosted.org/packages/7f/81/28ab0408391b1dc57393653b6a0cf2014cc282cc2909e4615e63e58262be/rpds_py-0.25.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:b5ffe453cde61f73fea9430223c81d29e2fbf412a6073951102146c84e19e34c", size = 364647, upload-time = "2025-05-21T12:43:28.559Z" },
- { url = "https://files.pythonhosted.org/packages/2c/9a/7797f04cad0d5e56310e1238434f71fc6939d0bc517192a18bb99a72a95f/rpds_py-0.25.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:115874ae5e2fdcfc16b2aedc95b5eef4aebe91b28e7e21951eda8a5dc0d3461b", size = 350454, upload-time = "2025-05-21T12:43:30.615Z" },
- { url = "https://files.pythonhosted.org/packages/69/3c/93d2ef941b04898011e5d6eaa56a1acf46a3b4c9f4b3ad1bbcbafa0bee1f/rpds_py-0.25.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a714bf6e5e81b0e570d01f56e0c89c6375101b8463999ead3a93a5d2a4af91fa", size = 389665, upload-time = "2025-05-21T12:43:32.629Z" },
- { url = "https://files.pythonhosted.org/packages/c1/57/ad0e31e928751dde8903a11102559628d24173428a0f85e25e187defb2c1/rpds_py-0.25.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:35634369325906bcd01577da4c19e3b9541a15e99f31e91a02d010816b49bfda", size = 403873, upload-time = "2025-05-21T12:43:34.576Z" },
- { url = "https://files.pythonhosted.org/packages/16/ad/c0c652fa9bba778b4f54980a02962748479dc09632e1fd34e5282cf2556c/rpds_py-0.25.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d4cb2b3ddc16710548801c6fcc0cfcdeeff9dafbc983f77265877793f2660309", size = 525866, upload-time = "2025-05-21T12:43:36.123Z" },
- { url = "https://files.pythonhosted.org/packages/2a/39/3e1839bc527e6fcf48d5fec4770070f872cdee6c6fbc9b259932f4e88a38/rpds_py-0.25.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9ceca1cf097ed77e1a51f1dbc8d174d10cb5931c188a4505ff9f3e119dfe519b", size = 416886, upload-time = "2025-05-21T12:43:38.034Z" },
- { url = "https://files.pythonhosted.org/packages/7a/95/dd6b91cd4560da41df9d7030a038298a67d24f8ca38e150562644c829c48/rpds_py-0.25.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2c2cd1a4b0c2b8c5e31ffff50d09f39906fe351389ba143c195566056c13a7ea", size = 390666, upload-time = "2025-05-21T12:43:40.065Z" },
- { url = "https://files.pythonhosted.org/packages/64/48/1be88a820e7494ce0a15c2d390ccb7c52212370badabf128e6a7bb4cb802/rpds_py-0.25.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:1de336a4b164c9188cb23f3703adb74a7623ab32d20090d0e9bf499a2203ad65", size = 425109, upload-time = "2025-05-21T12:43:42.263Z" },
- { url = "https://files.pythonhosted.org/packages/cf/07/3e2a17927ef6d7720b9949ec1b37d1e963b829ad0387f7af18d923d5cfa5/rpds_py-0.25.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9fca84a15333e925dd59ce01da0ffe2ffe0d6e5d29a9eeba2148916d1824948c", size = 567244, upload-time = "2025-05-21T12:43:43.846Z" },
- { url = "https://files.pythonhosted.org/packages/d2/e5/76cf010998deccc4f95305d827847e2eae9c568099c06b405cf96384762b/rpds_py-0.25.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:88ec04afe0c59fa64e2f6ea0dd9657e04fc83e38de90f6de201954b4d4eb59bd", size = 596023, upload-time = "2025-05-21T12:43:45.932Z" },
- { url = "https://files.pythonhosted.org/packages/52/9a/df55efd84403736ba37a5a6377b70aad0fd1cb469a9109ee8a1e21299a1c/rpds_py-0.25.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a8bd2f19e312ce3e1d2c635618e8a8d8132892bb746a7cf74780a489f0f6cdcb", size = 561634, upload-time = "2025-05-21T12:43:48.263Z" },
- { url = "https://files.pythonhosted.org/packages/ab/aa/dc3620dd8db84454aaf9374bd318f1aa02578bba5e567f5bf6b79492aca4/rpds_py-0.25.1-cp312-cp312-win32.whl", hash = "sha256:e5e2f7280d8d0d3ef06f3ec1b4fd598d386cc6f0721e54f09109a8132182fbfe", size = 222713, upload-time = "2025-05-21T12:43:49.897Z" },
- { url = "https://files.pythonhosted.org/packages/a3/7f/7cef485269a50ed5b4e9bae145f512d2a111ca638ae70cc101f661b4defd/rpds_py-0.25.1-cp312-cp312-win_amd64.whl", hash = "sha256:db58483f71c5db67d643857404da360dce3573031586034b7d59f245144cc192", size = 235280, upload-time = "2025-05-21T12:43:51.893Z" },
- { url = "https://files.pythonhosted.org/packages/99/f2/c2d64f6564f32af913bf5f3f7ae41c7c263c5ae4c4e8f1a17af8af66cd46/rpds_py-0.25.1-cp312-cp312-win_arm64.whl", hash = "sha256:6d50841c425d16faf3206ddbba44c21aa3310a0cebc3c1cdfc3e3f4f9f6f5728", size = 225399, upload-time = "2025-05-21T12:43:53.351Z" },
- { url = "https://files.pythonhosted.org/packages/49/74/48f3df0715a585cbf5d34919c9c757a4c92c1a9eba059f2d334e72471f70/rpds_py-0.25.1-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:ee86d81551ec68a5c25373c5643d343150cc54672b5e9a0cafc93c1870a53954", size = 374208, upload-time = "2025-05-21T12:45:26.306Z" },
- { url = "https://files.pythonhosted.org/packages/55/b0/9b01bb11ce01ec03d05e627249cc2c06039d6aa24ea5a22a39c312167c10/rpds_py-0.25.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:89c24300cd4a8e4a51e55c31a8ff3918e6651b241ee8876a42cc2b2a078533ba", size = 359262, upload-time = "2025-05-21T12:45:28.322Z" },
- { url = "https://files.pythonhosted.org/packages/a9/eb/5395621618f723ebd5116c53282052943a726dba111b49cd2071f785b665/rpds_py-0.25.1-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:771c16060ff4e79584dc48902a91ba79fd93eade3aa3a12d6d2a4aadaf7d542b", size = 387366, upload-time = "2025-05-21T12:45:30.42Z" },
- { url = "https://files.pythonhosted.org/packages/68/73/3d51442bdb246db619d75039a50ea1cf8b5b4ee250c3e5cd5c3af5981cd4/rpds_py-0.25.1-pp311-pypy311_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:785ffacd0ee61c3e60bdfde93baa6d7c10d86f15655bd706c89da08068dc5038", size = 400759, upload-time = "2025-05-21T12:45:32.516Z" },
- { url = "https://files.pythonhosted.org/packages/b7/4c/3a32d5955d7e6cb117314597bc0f2224efc798428318b13073efe306512a/rpds_py-0.25.1-pp311-pypy311_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2a40046a529cc15cef88ac5ab589f83f739e2d332cb4d7399072242400ed68c9", size = 523128, upload-time = "2025-05-21T12:45:34.396Z" },
- { url = "https://files.pythonhosted.org/packages/be/95/1ffccd3b0bb901ae60b1dd4b1be2ab98bb4eb834cd9b15199888f5702f7b/rpds_py-0.25.1-pp311-pypy311_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:85fc223d9c76cabe5d0bff82214459189720dc135db45f9f66aa7cffbf9ff6c1", size = 411597, upload-time = "2025-05-21T12:45:36.164Z" },
- { url = "https://files.pythonhosted.org/packages/ef/6d/6e6cd310180689db8b0d2de7f7d1eabf3fb013f239e156ae0d5a1a85c27f/rpds_py-0.25.1-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b0be9965f93c222fb9b4cc254235b3b2b215796c03ef5ee64f995b1b69af0762", size = 388053, upload-time = "2025-05-21T12:45:38.45Z" },
- { url = "https://files.pythonhosted.org/packages/4a/87/ec4186b1fe6365ced6fa470960e68fc7804bafbe7c0cf5a36237aa240efa/rpds_py-0.25.1-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:8378fa4a940f3fb509c081e06cb7f7f2adae8cf46ef258b0e0ed7519facd573e", size = 421821, upload-time = "2025-05-21T12:45:40.732Z" },
- { url = "https://files.pythonhosted.org/packages/7a/60/84f821f6bf4e0e710acc5039d91f8f594fae0d93fc368704920d8971680d/rpds_py-0.25.1-pp311-pypy311_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:33358883a4490287e67a2c391dfaea4d9359860281db3292b6886bf0be3d8692", size = 564534, upload-time = "2025-05-21T12:45:42.672Z" },
- { url = "https://files.pythonhosted.org/packages/41/3a/bc654eb15d3b38f9330fe0f545016ba154d89cdabc6177b0295910cd0ebe/rpds_py-0.25.1-pp311-pypy311_pp73-musllinux_1_2_i686.whl", hash = "sha256:1d1fadd539298e70cac2f2cb36f5b8a65f742b9b9f1014dd4ea1f7785e2470bf", size = 592674, upload-time = "2025-05-21T12:45:44.533Z" },
- { url = "https://files.pythonhosted.org/packages/2e/ba/31239736f29e4dfc7a58a45955c5db852864c306131fd6320aea214d5437/rpds_py-0.25.1-pp311-pypy311_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:9a46c2fb2545e21181445515960006e85d22025bd2fe6db23e76daec6eb689fe", size = 558781, upload-time = "2025-05-21T12:45:46.281Z" },
+version = "0.26.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a5/aa/4456d84bbb54adc6a916fb10c9b374f78ac840337644e4a5eda229c81275/rpds_py-0.26.0.tar.gz", hash = "sha256:20dae58a859b0906f0685642e591056f1e787f3a8b39c8e8749a45dc7d26bdb0", size = 27385, upload-time = "2025-07-01T15:57:13.958Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/09/4c/4ee8f7e512030ff79fda1df3243c88d70fc874634e2dbe5df13ba4210078/rpds_py-0.26.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:9e8cb77286025bdb21be2941d64ac6ca016130bfdcd228739e8ab137eb4406ed", size = 372610, upload-time = "2025-07-01T15:53:58.844Z" },
+ { url = "https://files.pythonhosted.org/packages/fa/9d/3dc16be00f14fc1f03c71b1d67c8df98263ab2710a2fbd65a6193214a527/rpds_py-0.26.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5e09330b21d98adc8ccb2dbb9fc6cb434e8908d4c119aeaa772cb1caab5440a0", size = 358032, upload-time = "2025-07-01T15:53:59.985Z" },
+ { url = "https://files.pythonhosted.org/packages/e7/5a/7f1bf8f045da2866324a08ae80af63e64e7bfaf83bd31f865a7b91a58601/rpds_py-0.26.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2c9c1b92b774b2e68d11193dc39620d62fd8ab33f0a3c77ecdabe19c179cdbc1", size = 381525, upload-time = "2025-07-01T15:54:01.162Z" },
+ { url = "https://files.pythonhosted.org/packages/45/8a/04479398c755a066ace10e3d158866beb600867cacae194c50ffa783abd0/rpds_py-0.26.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:824e6d3503ab990d7090768e4dfd9e840837bae057f212ff9f4f05ec6d1975e7", size = 397089, upload-time = "2025-07-01T15:54:02.319Z" },
+ { url = "https://files.pythonhosted.org/packages/72/88/9203f47268db488a1b6d469d69c12201ede776bb728b9d9f29dbfd7df406/rpds_py-0.26.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8ad7fd2258228bf288f2331f0a6148ad0186b2e3643055ed0db30990e59817a6", size = 514255, upload-time = "2025-07-01T15:54:03.38Z" },
+ { url = "https://files.pythonhosted.org/packages/f5/b4/01ce5d1e853ddf81fbbd4311ab1eff0b3cf162d559288d10fd127e2588b5/rpds_py-0.26.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0dc23bbb3e06ec1ea72d515fb572c1fea59695aefbffb106501138762e1e915e", size = 402283, upload-time = "2025-07-01T15:54:04.923Z" },
+ { url = "https://files.pythonhosted.org/packages/34/a2/004c99936997bfc644d590a9defd9e9c93f8286568f9c16cdaf3e14429a7/rpds_py-0.26.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d80bf832ac7b1920ee29a426cdca335f96a2b5caa839811803e999b41ba9030d", size = 383881, upload-time = "2025-07-01T15:54:06.482Z" },
+ { url = "https://files.pythonhosted.org/packages/05/1b/ef5fba4a8f81ce04c427bfd96223f92f05e6cd72291ce9d7523db3b03a6c/rpds_py-0.26.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0919f38f5542c0a87e7b4afcafab6fd2c15386632d249e9a087498571250abe3", size = 415822, upload-time = "2025-07-01T15:54:07.605Z" },
+ { url = "https://files.pythonhosted.org/packages/16/80/5c54195aec456b292f7bd8aa61741c8232964063fd8a75fdde9c1e982328/rpds_py-0.26.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d422b945683e409000c888e384546dbab9009bb92f7c0b456e217988cf316107", size = 558347, upload-time = "2025-07-01T15:54:08.591Z" },
+ { url = "https://files.pythonhosted.org/packages/f2/1c/1845c1b1fd6d827187c43afe1841d91678d7241cbdb5420a4c6de180a538/rpds_py-0.26.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:77a7711fa562ba2da1aa757e11024ad6d93bad6ad7ede5afb9af144623e5f76a", size = 587956, upload-time = "2025-07-01T15:54:09.963Z" },
+ { url = "https://files.pythonhosted.org/packages/2e/ff/9e979329dd131aa73a438c077252ddabd7df6d1a7ad7b9aacf6261f10faa/rpds_py-0.26.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:238e8c8610cb7c29460e37184f6799547f7e09e6a9bdbdab4e8edb90986a2318", size = 554363, upload-time = "2025-07-01T15:54:11.073Z" },
+ { url = "https://files.pythonhosted.org/packages/00/8b/d78cfe034b71ffbe72873a136e71acc7a831a03e37771cfe59f33f6de8a2/rpds_py-0.26.0-cp311-cp311-win32.whl", hash = "sha256:893b022bfbdf26d7bedb083efeea624e8550ca6eb98bf7fea30211ce95b9201a", size = 220123, upload-time = "2025-07-01T15:54:12.382Z" },
+ { url = "https://files.pythonhosted.org/packages/94/c1/3c8c94c7dd3905dbfde768381ce98778500a80db9924731d87ddcdb117e9/rpds_py-0.26.0-cp311-cp311-win_amd64.whl", hash = "sha256:87a5531de9f71aceb8af041d72fc4cab4943648d91875ed56d2e629bef6d4c03", size = 231732, upload-time = "2025-07-01T15:54:13.434Z" },
+ { url = "https://files.pythonhosted.org/packages/67/93/e936fbed1b734eabf36ccb5d93c6a2e9246fbb13c1da011624b7286fae3e/rpds_py-0.26.0-cp311-cp311-win_arm64.whl", hash = "sha256:de2713f48c1ad57f89ac25b3cb7daed2156d8e822cf0eca9b96a6f990718cc41", size = 221917, upload-time = "2025-07-01T15:54:14.559Z" },
+ { url = "https://files.pythonhosted.org/packages/ea/86/90eb87c6f87085868bd077c7a9938006eb1ce19ed4d06944a90d3560fce2/rpds_py-0.26.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:894514d47e012e794f1350f076c427d2347ebf82f9b958d554d12819849a369d", size = 363933, upload-time = "2025-07-01T15:54:15.734Z" },
+ { url = "https://files.pythonhosted.org/packages/63/78/4469f24d34636242c924626082b9586f064ada0b5dbb1e9d096ee7a8e0c6/rpds_py-0.26.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:fc921b96fa95a097add244da36a1d9e4f3039160d1d30f1b35837bf108c21136", size = 350447, upload-time = "2025-07-01T15:54:16.922Z" },
+ { url = "https://files.pythonhosted.org/packages/ad/91/c448ed45efdfdade82348d5e7995e15612754826ea640afc20915119734f/rpds_py-0.26.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3e1157659470aa42a75448b6e943c895be8c70531c43cb78b9ba990778955582", size = 384711, upload-time = "2025-07-01T15:54:18.101Z" },
+ { url = "https://files.pythonhosted.org/packages/ec/43/e5c86fef4be7f49828bdd4ecc8931f0287b1152c0bb0163049b3218740e7/rpds_py-0.26.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:521ccf56f45bb3a791182dc6b88ae5f8fa079dd705ee42138c76deb1238e554e", size = 400865, upload-time = "2025-07-01T15:54:19.295Z" },
+ { url = "https://files.pythonhosted.org/packages/55/34/e00f726a4d44f22d5c5fe2e5ddd3ac3d7fd3f74a175607781fbdd06fe375/rpds_py-0.26.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9def736773fd56b305c0eef698be5192c77bfa30d55a0e5885f80126c4831a15", size = 517763, upload-time = "2025-07-01T15:54:20.858Z" },
+ { url = "https://files.pythonhosted.org/packages/52/1c/52dc20c31b147af724b16104500fba13e60123ea0334beba7b40e33354b4/rpds_py-0.26.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cdad4ea3b4513b475e027be79e5a0ceac8ee1c113a1a11e5edc3c30c29f964d8", size = 406651, upload-time = "2025-07-01T15:54:22.508Z" },
+ { url = "https://files.pythonhosted.org/packages/2e/77/87d7bfabfc4e821caa35481a2ff6ae0b73e6a391bb6b343db2c91c2b9844/rpds_py-0.26.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:82b165b07f416bdccf5c84546a484cc8f15137ca38325403864bfdf2b5b72f6a", size = 386079, upload-time = "2025-07-01T15:54:23.987Z" },
+ { url = "https://files.pythonhosted.org/packages/e3/d4/7f2200c2d3ee145b65b3cddc4310d51f7da6a26634f3ac87125fd789152a/rpds_py-0.26.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d04cab0a54b9dba4d278fe955a1390da3cf71f57feb78ddc7cb67cbe0bd30323", size = 421379, upload-time = "2025-07-01T15:54:25.073Z" },
+ { url = "https://files.pythonhosted.org/packages/ae/13/9fdd428b9c820869924ab62236b8688b122baa22d23efdd1c566938a39ba/rpds_py-0.26.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:79061ba1a11b6a12743a2b0f72a46aa2758613d454aa6ba4f5a265cc48850158", size = 562033, upload-time = "2025-07-01T15:54:26.225Z" },
+ { url = "https://files.pythonhosted.org/packages/f3/e1/b69686c3bcbe775abac3a4c1c30a164a2076d28df7926041f6c0eb5e8d28/rpds_py-0.26.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:f405c93675d8d4c5ac87364bb38d06c988e11028a64b52a47158a355079661f3", size = 591639, upload-time = "2025-07-01T15:54:27.424Z" },
+ { url = "https://files.pythonhosted.org/packages/5c/c9/1e3d8c8863c84a90197ac577bbc3d796a92502124c27092413426f670990/rpds_py-0.26.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:dafd4c44b74aa4bed4b250f1aed165b8ef5de743bcca3b88fc9619b6087093d2", size = 557105, upload-time = "2025-07-01T15:54:29.93Z" },
+ { url = "https://files.pythonhosted.org/packages/9f/c5/90c569649057622959f6dcc40f7b516539608a414dfd54b8d77e3b201ac0/rpds_py-0.26.0-cp312-cp312-win32.whl", hash = "sha256:3da5852aad63fa0c6f836f3359647870e21ea96cf433eb393ffa45263a170d44", size = 223272, upload-time = "2025-07-01T15:54:31.128Z" },
+ { url = "https://files.pythonhosted.org/packages/7d/16/19f5d9f2a556cfed454eebe4d354c38d51c20f3db69e7b4ce6cff904905d/rpds_py-0.26.0-cp312-cp312-win_amd64.whl", hash = "sha256:cf47cfdabc2194a669dcf7a8dbba62e37a04c5041d2125fae0233b720da6f05c", size = 234995, upload-time = "2025-07-01T15:54:32.195Z" },
+ { url = "https://files.pythonhosted.org/packages/83/f0/7935e40b529c0e752dfaa7880224771b51175fce08b41ab4a92eb2fbdc7f/rpds_py-0.26.0-cp312-cp312-win_arm64.whl", hash = "sha256:20ab1ae4fa534f73647aad289003f1104092890849e0266271351922ed5574f8", size = 223198, upload-time = "2025-07-01T15:54:33.271Z" },
+ { url = "https://files.pythonhosted.org/packages/51/f2/b5c85b758a00c513bb0389f8fc8e61eb5423050c91c958cdd21843faa3e6/rpds_py-0.26.0-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:f61a9326f80ca59214d1cceb0a09bb2ece5b2563d4e0cd37bfd5515c28510674", size = 373505, upload-time = "2025-07-01T15:56:34.716Z" },
+ { url = "https://files.pythonhosted.org/packages/23/e0/25db45e391251118e915e541995bb5f5ac5691a3b98fb233020ba53afc9b/rpds_py-0.26.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:183f857a53bcf4b1b42ef0f57ca553ab56bdd170e49d8091e96c51c3d69ca696", size = 359468, upload-time = "2025-07-01T15:56:36.219Z" },
+ { url = "https://files.pythonhosted.org/packages/0b/73/dd5ee6075bb6491be3a646b301dfd814f9486d924137a5098e61f0487e16/rpds_py-0.26.0-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:941c1cfdf4799d623cf3aa1d326a6b4fdb7a5799ee2687f3516738216d2262fb", size = 382680, upload-time = "2025-07-01T15:56:37.644Z" },
+ { url = "https://files.pythonhosted.org/packages/2f/10/84b522ff58763a5c443f5bcedc1820240e454ce4e620e88520f04589e2ea/rpds_py-0.26.0-pp311-pypy311_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:72a8d9564a717ee291f554eeb4bfeafe2309d5ec0aa6c475170bdab0f9ee8e88", size = 397035, upload-time = "2025-07-01T15:56:39.241Z" },
+ { url = "https://files.pythonhosted.org/packages/06/ea/8667604229a10a520fcbf78b30ccc278977dcc0627beb7ea2c96b3becef0/rpds_py-0.26.0-pp311-pypy311_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:511d15193cbe013619dd05414c35a7dedf2088fcee93c6bbb7c77859765bd4e8", size = 514922, upload-time = "2025-07-01T15:56:40.645Z" },
+ { url = "https://files.pythonhosted.org/packages/24/e6/9ed5b625c0661c4882fc8cdf302bf8e96c73c40de99c31e0b95ed37d508c/rpds_py-0.26.0-pp311-pypy311_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:aea1f9741b603a8d8fedb0ed5502c2bc0accbc51f43e2ad1337fe7259c2b77a5", size = 402822, upload-time = "2025-07-01T15:56:42.137Z" },
+ { url = "https://files.pythonhosted.org/packages/8a/58/212c7b6fd51946047fb45d3733da27e2fa8f7384a13457c874186af691b1/rpds_py-0.26.0-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4019a9d473c708cf2f16415688ef0b4639e07abaa569d72f74745bbeffafa2c7", size = 384336, upload-time = "2025-07-01T15:56:44.239Z" },
+ { url = "https://files.pythonhosted.org/packages/aa/f5/a40ba78748ae8ebf4934d4b88e77b98497378bc2c24ba55ebe87a4e87057/rpds_py-0.26.0-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:093d63b4b0f52d98ebae33b8c50900d3d67e0666094b1be7a12fffd7f65de74b", size = 416871, upload-time = "2025-07-01T15:56:46.284Z" },
+ { url = "https://files.pythonhosted.org/packages/d5/a6/33b1fc0c9f7dcfcfc4a4353daa6308b3ece22496ceece348b3e7a7559a09/rpds_py-0.26.0-pp311-pypy311_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:2abe21d8ba64cded53a2a677e149ceb76dcf44284202d737178afe7ba540c1eb", size = 559439, upload-time = "2025-07-01T15:56:48.549Z" },
+ { url = "https://files.pythonhosted.org/packages/71/2d/ceb3f9c12f8cfa56d34995097f6cd99da1325642c60d1b6680dd9df03ed8/rpds_py-0.26.0-pp311-pypy311_pp73-musllinux_1_2_i686.whl", hash = "sha256:4feb7511c29f8442cbbc28149a92093d32e815a28aa2c50d333826ad2a20fdf0", size = 588380, upload-time = "2025-07-01T15:56:50.086Z" },
+ { url = "https://files.pythonhosted.org/packages/c8/ed/9de62c2150ca8e2e5858acf3f4f4d0d180a38feef9fdab4078bea63d8dba/rpds_py-0.26.0-pp311-pypy311_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:e99685fc95d386da368013e7fb4269dd39c30d99f812a8372d62f244f662709c", size = 555334, upload-time = "2025-07-01T15:56:51.703Z" },
]
[[package]]
@@ -5045,27 +5088,27 @@ wheels = [
[[package]]
name = "ruff"
-version = "0.11.12"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/15/0a/92416b159ec00cdf11e5882a9d80d29bf84bba3dbebc51c4898bfbca1da6/ruff-0.11.12.tar.gz", hash = "sha256:43cf7f69c7d7c7d7513b9d59c5d8cafd704e05944f978614aa9faff6ac202603", size = 4202289, upload-time = "2025-05-29T13:31:40.037Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/60/cc/53eb79f012d15e136d40a8e8fc519ba8f55a057f60b29c2df34efd47c6e3/ruff-0.11.12-py3-none-linux_armv6l.whl", hash = "sha256:c7680aa2f0d4c4f43353d1e72123955c7a2159b8646cd43402de6d4a3a25d7cc", size = 10285597, upload-time = "2025-05-29T13:30:57.539Z" },
- { url = "https://files.pythonhosted.org/packages/e7/d7/73386e9fb0232b015a23f62fea7503f96e29c29e6c45461d4a73bac74df9/ruff-0.11.12-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:2cad64843da9f134565c20bcc430642de897b8ea02e2e79e6e02a76b8dcad7c3", size = 11053154, upload-time = "2025-05-29T13:31:00.865Z" },
- { url = "https://files.pythonhosted.org/packages/4e/eb/3eae144c5114e92deb65a0cb2c72326c8469e14991e9bc3ec0349da1331c/ruff-0.11.12-py3-none-macosx_11_0_arm64.whl", hash = "sha256:9b6886b524a1c659cee1758140138455d3c029783d1b9e643f3624a5ee0cb0aa", size = 10403048, upload-time = "2025-05-29T13:31:03.413Z" },
- { url = "https://files.pythonhosted.org/packages/29/64/20c54b20e58b1058db6689e94731f2a22e9f7abab74e1a758dfba058b6ca/ruff-0.11.12-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3cc3a3690aad6e86c1958d3ec3c38c4594b6ecec75c1f531e84160bd827b2012", size = 10597062, upload-time = "2025-05-29T13:31:05.539Z" },
- { url = "https://files.pythonhosted.org/packages/29/3a/79fa6a9a39422a400564ca7233a689a151f1039110f0bbbabcb38106883a/ruff-0.11.12-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f97fdbc2549f456c65b3b0048560d44ddd540db1f27c778a938371424b49fe4a", size = 10155152, upload-time = "2025-05-29T13:31:07.986Z" },
- { url = "https://files.pythonhosted.org/packages/e5/a4/22c2c97b2340aa968af3a39bc38045e78d36abd4ed3fa2bde91c31e712e3/ruff-0.11.12-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:74adf84960236961090e2d1348c1a67d940fd12e811a33fb3d107df61eef8fc7", size = 11723067, upload-time = "2025-05-29T13:31:10.57Z" },
- { url = "https://files.pythonhosted.org/packages/bc/cf/3e452fbd9597bcd8058856ecd42b22751749d07935793a1856d988154151/ruff-0.11.12-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:b56697e5b8bcf1d61293ccfe63873aba08fdbcbbba839fc046ec5926bdb25a3a", size = 12460807, upload-time = "2025-05-29T13:31:12.88Z" },
- { url = "https://files.pythonhosted.org/packages/2f/ec/8f170381a15e1eb7d93cb4feef8d17334d5a1eb33fee273aee5d1f8241a3/ruff-0.11.12-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4d47afa45e7b0eaf5e5969c6b39cbd108be83910b5c74626247e366fd7a36a13", size = 12063261, upload-time = "2025-05-29T13:31:15.236Z" },
- { url = "https://files.pythonhosted.org/packages/0d/bf/57208f8c0a8153a14652a85f4116c0002148e83770d7a41f2e90b52d2b4e/ruff-0.11.12-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:692bf9603fe1bf949de8b09a2da896f05c01ed7a187f4a386cdba6760e7f61be", size = 11329601, upload-time = "2025-05-29T13:31:18.68Z" },
- { url = "https://files.pythonhosted.org/packages/c3/56/edf942f7fdac5888094d9ffa303f12096f1a93eb46570bcf5f14c0c70880/ruff-0.11.12-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:08033320e979df3b20dba567c62f69c45e01df708b0f9c83912d7abd3e0801cd", size = 11522186, upload-time = "2025-05-29T13:31:21.216Z" },
- { url = "https://files.pythonhosted.org/packages/ed/63/79ffef65246911ed7e2290aeece48739d9603b3a35f9529fec0fc6c26400/ruff-0.11.12-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:929b7706584f5bfd61d67d5070f399057d07c70585fa8c4491d78ada452d3bef", size = 10449032, upload-time = "2025-05-29T13:31:23.417Z" },
- { url = "https://files.pythonhosted.org/packages/88/19/8c9d4d8a1c2a3f5a1ea45a64b42593d50e28b8e038f1aafd65d6b43647f3/ruff-0.11.12-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:7de4a73205dc5756b8e09ee3ed67c38312dce1aa28972b93150f5751199981b5", size = 10129370, upload-time = "2025-05-29T13:31:25.777Z" },
- { url = "https://files.pythonhosted.org/packages/bc/0f/2d15533eaa18f460530a857e1778900cd867ded67f16c85723569d54e410/ruff-0.11.12-py3-none-musllinux_1_2_i686.whl", hash = "sha256:2635c2a90ac1b8ca9e93b70af59dfd1dd2026a40e2d6eebaa3efb0465dd9cf02", size = 11123529, upload-time = "2025-05-29T13:31:28.396Z" },
- { url = "https://files.pythonhosted.org/packages/4f/e2/4c2ac669534bdded835356813f48ea33cfb3a947dc47f270038364587088/ruff-0.11.12-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:d05d6a78a89166f03f03a198ecc9d18779076ad0eec476819467acb401028c0c", size = 11577642, upload-time = "2025-05-29T13:31:30.647Z" },
- { url = "https://files.pythonhosted.org/packages/a7/9b/c9ddf7f924d5617a1c94a93ba595f4b24cb5bc50e98b94433ab3f7ad27e5/ruff-0.11.12-py3-none-win32.whl", hash = "sha256:f5a07f49767c4be4772d161bfc049c1f242db0cfe1bd976e0f0886732a4765d6", size = 10475511, upload-time = "2025-05-29T13:31:32.917Z" },
- { url = "https://files.pythonhosted.org/packages/fd/d6/74fb6d3470c1aada019ffff33c0f9210af746cca0a4de19a1f10ce54968a/ruff-0.11.12-py3-none-win_amd64.whl", hash = "sha256:5a4d9f8030d8c3a45df201d7fb3ed38d0219bccd7955268e863ee4a115fa0832", size = 11523573, upload-time = "2025-05-29T13:31:35.782Z" },
- { url = "https://files.pythonhosted.org/packages/44/42/d58086ec20f52d2b0140752ae54b355ea2be2ed46f914231136dd1effcc7/ruff-0.11.12-py3-none-win_arm64.whl", hash = "sha256:65194e37853158d368e333ba282217941029a28ea90913c67e558c611d04daa5", size = 10697770, upload-time = "2025-05-29T13:31:38.009Z" },
+version = "0.12.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/c3/2a/43955b530c49684d3c38fcda18c43caf91e99204c2a065552528e0552d4f/ruff-0.12.3.tar.gz", hash = "sha256:f1b5a4b6668fd7b7ea3697d8d98857390b40c1320a63a178eee6be0899ea2d77", size = 4459341, upload-time = "2025-07-11T13:21:16.086Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/e2/fd/b44c5115539de0d598d75232a1cc7201430b6891808df111b8b0506aae43/ruff-0.12.3-py3-none-linux_armv6l.whl", hash = "sha256:47552138f7206454eaf0c4fe827e546e9ddac62c2a3d2585ca54d29a890137a2", size = 10430499, upload-time = "2025-07-11T13:20:26.321Z" },
+ { url = "https://files.pythonhosted.org/packages/43/c5/9eba4f337970d7f639a37077be067e4ec80a2ad359e4cc6c5b56805cbc66/ruff-0.12.3-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:0a9153b000c6fe169bb307f5bd1b691221c4286c133407b8827c406a55282041", size = 11213413, upload-time = "2025-07-11T13:20:30.017Z" },
+ { url = "https://files.pythonhosted.org/packages/e2/2c/fac3016236cf1fe0bdc8e5de4f24c76ce53c6dd9b5f350d902549b7719b2/ruff-0.12.3-py3-none-macosx_11_0_arm64.whl", hash = "sha256:fa6b24600cf3b750e48ddb6057e901dd5b9aa426e316addb2a1af185a7509882", size = 10586941, upload-time = "2025-07-11T13:20:33.046Z" },
+ { url = "https://files.pythonhosted.org/packages/c5/0f/41fec224e9dfa49a139f0b402ad6f5d53696ba1800e0f77b279d55210ca9/ruff-0.12.3-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2506961bf6ead54887ba3562604d69cb430f59b42133d36976421bc8bd45901", size = 10783001, upload-time = "2025-07-11T13:20:35.534Z" },
+ { url = "https://files.pythonhosted.org/packages/0d/ca/dd64a9ce56d9ed6cad109606ac014860b1c217c883e93bf61536400ba107/ruff-0.12.3-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c4faaff1f90cea9d3033cbbcdf1acf5d7fb11d8180758feb31337391691f3df0", size = 10269641, upload-time = "2025-07-11T13:20:38.459Z" },
+ { url = "https://files.pythonhosted.org/packages/63/5c/2be545034c6bd5ce5bb740ced3e7014d7916f4c445974be11d2a406d5088/ruff-0.12.3-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40dced4a79d7c264389de1c59467d5d5cefd79e7e06d1dfa2c75497b5269a5a6", size = 11875059, upload-time = "2025-07-11T13:20:41.517Z" },
+ { url = "https://files.pythonhosted.org/packages/8e/d4/a74ef1e801ceb5855e9527dae105eaff136afcb9cc4d2056d44feb0e4792/ruff-0.12.3-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:0262d50ba2767ed0fe212aa7e62112a1dcbfd46b858c5bf7bbd11f326998bafc", size = 12658890, upload-time = "2025-07-11T13:20:44.442Z" },
+ { url = "https://files.pythonhosted.org/packages/13/c8/1057916416de02e6d7c9bcd550868a49b72df94e3cca0aeb77457dcd9644/ruff-0.12.3-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:12371aec33e1a3758597c5c631bae9a5286f3c963bdfb4d17acdd2d395406687", size = 12232008, upload-time = "2025-07-11T13:20:47.374Z" },
+ { url = "https://files.pythonhosted.org/packages/f5/59/4f7c130cc25220392051fadfe15f63ed70001487eca21d1796db46cbcc04/ruff-0.12.3-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:560f13b6baa49785665276c963edc363f8ad4b4fc910a883e2625bdb14a83a9e", size = 11499096, upload-time = "2025-07-11T13:20:50.348Z" },
+ { url = "https://files.pythonhosted.org/packages/d4/01/a0ad24a5d2ed6be03a312e30d32d4e3904bfdbc1cdbe63c47be9d0e82c79/ruff-0.12.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:023040a3499f6f974ae9091bcdd0385dd9e9eb4942f231c23c57708147b06311", size = 11688307, upload-time = "2025-07-11T13:20:52.945Z" },
+ { url = "https://files.pythonhosted.org/packages/93/72/08f9e826085b1f57c9a0226e48acb27643ff19b61516a34c6cab9d6ff3fa/ruff-0.12.3-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:883d844967bffff5ab28bba1a4d246c1a1b2933f48cb9840f3fdc5111c603b07", size = 10661020, upload-time = "2025-07-11T13:20:55.799Z" },
+ { url = "https://files.pythonhosted.org/packages/80/a0/68da1250d12893466c78e54b4a0ff381370a33d848804bb51279367fc688/ruff-0.12.3-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:2120d3aa855ff385e0e562fdee14d564c9675edbe41625c87eeab744a7830d12", size = 10246300, upload-time = "2025-07-11T13:20:58.222Z" },
+ { url = "https://files.pythonhosted.org/packages/6a/22/5f0093d556403e04b6fd0984fc0fb32fbb6f6ce116828fd54306a946f444/ruff-0.12.3-py3-none-musllinux_1_2_i686.whl", hash = "sha256:6b16647cbb470eaf4750d27dddc6ebf7758b918887b56d39e9c22cce2049082b", size = 11263119, upload-time = "2025-07-11T13:21:01.503Z" },
+ { url = "https://files.pythonhosted.org/packages/92/c9/f4c0b69bdaffb9968ba40dd5fa7df354ae0c73d01f988601d8fac0c639b1/ruff-0.12.3-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:e1417051edb436230023575b149e8ff843a324557fe0a265863b7602df86722f", size = 11746990, upload-time = "2025-07-11T13:21:04.524Z" },
+ { url = "https://files.pythonhosted.org/packages/fe/84/7cc7bd73924ee6be4724be0db5414a4a2ed82d06b30827342315a1be9e9c/ruff-0.12.3-py3-none-win32.whl", hash = "sha256:dfd45e6e926deb6409d0616078a666ebce93e55e07f0fb0228d4b2608b2c248d", size = 10589263, upload-time = "2025-07-11T13:21:07.148Z" },
+ { url = "https://files.pythonhosted.org/packages/07/87/c070f5f027bd81f3efee7d14cb4d84067ecf67a3a8efb43aadfc72aa79a6/ruff-0.12.3-py3-none-win_amd64.whl", hash = "sha256:a946cf1e7ba3209bdef039eb97647f1c77f6f540e5845ec9c114d3af8df873e7", size = 11695072, upload-time = "2025-07-11T13:21:11.004Z" },
+ { url = "https://files.pythonhosted.org/packages/e0/30/f3eaf6563c637b6e66238ed6535f6775480db973c836336e4122161986fc/ruff-0.12.3-py3-none-win_arm64.whl", hash = "sha256:5f9c7c9c8f84c2d7f27e93674d27136fbf489720251544c4da7fb3d742e011b1", size = 10805855, upload-time = "2025-07-11T13:21:13.547Z" },
]
[[package]]
@@ -5104,14 +5147,28 @@ wheels = [
[[package]]
name = "scipy-stubs"
-version = "1.15.3.0"
+version = "1.16.0.2"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "optype" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/0b/5f/35c43bd7d412add4adcd68475702571b2489b50c40b6564f808b2355e452/scipy_stubs-1.15.3.0.tar.gz", hash = "sha256:e8f76c9887461cf9424c1e2ad78ea5dac71dd4cbb383dc85f91adfe8f74d1e17", size = 275699, upload-time = "2025-05-08T16:58:35.139Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/4b/19/a8461383f7328300e83c34f58bf38ccc05f57c2289c0e54e2bea757de83c/scipy_stubs-1.16.0.2.tar.gz", hash = "sha256:f83aacaf2e899d044de6483e6112bf7a1942d683304077bc9e78cf6f21353acd", size = 306747, upload-time = "2025-07-01T23:19:04.513Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/8f/30/b73418e6d3d8209fef684841d9a0e5b439d3528fa341a23b632fe47918dd/scipy_stubs-1.16.0.2-py3-none-any.whl", hash = "sha256:dc364d24a3accd1663e7576480bdb720533f94de8a05590354ff6d4a83d765c7", size = 491346, upload-time = "2025-07-01T23:19:03.222Z" },
+]
+
+[[package]]
+name = "sendgrid"
+version = "6.12.4"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+ { name = "ecdsa" },
+ { name = "python-http-client" },
+ { name = "werkzeug" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/11/31/62e00433878dccf33edf07f8efa417b9030a2464eb3b04bbd797a11b4447/sendgrid-6.12.4.tar.gz", hash = "sha256:9e88b849daf0fa4bdf256c3b5da9f5a3272402c0c2fd6b1928c9de440db0a03d", size = 50271, upload-time = "2025-06-12T10:29:37.213Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/6c/42/cd8dc81f8060de1f14960885ad5b2d2651f41de8b93d09f3f919d6567a5a/scipy_stubs-1.15.3.0-py3-none-any.whl", hash = "sha256:a251254cf4fd6e7fb87c55c1feee92d32ddbc1f542ecdf6a0159cdb81c2fb62d", size = 459062, upload-time = "2025-05-08T16:58:33.356Z" },
+ { url = "https://files.pythonhosted.org/packages/c2/9c/45d068fd831a65e6ed1e2ab3233de58784842afdc62fdcdd0a01bbb6b39d/sendgrid-6.12.4-py3-none-any.whl", hash = "sha256:9a211b96241e63bd5b9ed9afcc8608f4bcac426e4a319b3920ab877c8426e92c", size = 102122, upload-time = "2025-06-12T10:29:35.457Z" },
]
[[package]]
@@ -5134,38 +5191,6 @@ flask = [
{ name = "markupsafe" },
]
-[[package]]
-name = "setproctitle"
-version = "1.3.6"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/9e/af/56efe21c53ac81ac87e000b15e60b3d8104224b4313b6eacac3597bd183d/setproctitle-1.3.6.tar.gz", hash = "sha256:c9f32b96c700bb384f33f7cf07954bb609d35dd82752cef57fb2ee0968409169", size = 26889, upload-time = "2025-04-29T13:35:00.184Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/27/3b/8288d0cd969a63500dd62fc2c99ce6980f9909ccef0770ab1f86c361e0bf/setproctitle-1.3.6-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a1d856b0f4e4a33e31cdab5f50d0a14998f3a2d726a3fd5cb7c4d45a57b28d1b", size = 17412, upload-time = "2025-04-29T13:32:58.135Z" },
- { url = "https://files.pythonhosted.org/packages/39/37/43a5a3e25ca1048dbbf4db0d88d346226f5f1acd131bb8e660f4bfe2799f/setproctitle-1.3.6-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:50706b9c0eda55f7de18695bfeead5f28b58aa42fd5219b3b1692d554ecbc9ec", size = 11963, upload-time = "2025-04-29T13:32:59.17Z" },
- { url = "https://files.pythonhosted.org/packages/5b/47/f103c40e133154783c91a10ab08ac9fc410ed835aa85bcf7107cb882f505/setproctitle-1.3.6-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:af188f3305f0a65c3217c30c6d4c06891e79144076a91e8b454f14256acc7279", size = 31718, upload-time = "2025-04-29T13:33:00.36Z" },
- { url = "https://files.pythonhosted.org/packages/1f/13/7325dd1c008dd6c0ebd370ddb7505977054a87e406f142318e395031a792/setproctitle-1.3.6-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cce0ed8b3f64c71c140f0ec244e5fdf8ecf78ddf8d2e591d4a8b6aa1c1214235", size = 33027, upload-time = "2025-04-29T13:33:01.499Z" },
- { url = "https://files.pythonhosted.org/packages/0c/0a/6075bfea05a71379d77af98a9ac61163e8b6e5ef1ae58cd2b05871b2079c/setproctitle-1.3.6-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:70100e2087fe05359f249a0b5f393127b3a1819bf34dec3a3e0d4941138650c9", size = 30223, upload-time = "2025-04-29T13:33:03.259Z" },
- { url = "https://files.pythonhosted.org/packages/cc/41/fbf57ec52f4f0776193bd94334a841f0bc9d17e745f89c7790f336420c65/setproctitle-1.3.6-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1065ed36bd03a3fd4186d6c6de5f19846650b015789f72e2dea2d77be99bdca1", size = 31204, upload-time = "2025-04-29T13:33:04.455Z" },
- { url = "https://files.pythonhosted.org/packages/97/b5/f799fb7a00de29fb0ac1dfd015528dea425b9e31a8f1068a0b3df52d317f/setproctitle-1.3.6-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:4adf6a0013fe4e0844e3ba7583ec203ca518b9394c6cc0d3354df2bf31d1c034", size = 31181, upload-time = "2025-04-29T13:33:05.697Z" },
- { url = "https://files.pythonhosted.org/packages/b5/b7/81f101b612014ec61723436022c31146178813d6ca6b947f7b9c84e9daf4/setproctitle-1.3.6-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:eb7452849f6615871eabed6560ffedfe56bc8af31a823b6be4ce1e6ff0ab72c5", size = 30101, upload-time = "2025-04-29T13:33:07.223Z" },
- { url = "https://files.pythonhosted.org/packages/67/23/681232eed7640eab96719daa8647cc99b639e3daff5c287bd270ef179a73/setproctitle-1.3.6-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:a094b7ce455ca341b59a0f6ce6be2e11411ba6e2860b9aa3dbb37468f23338f4", size = 32438, upload-time = "2025-04-29T13:33:08.538Z" },
- { url = "https://files.pythonhosted.org/packages/19/f8/4d075a7bdc3609ac71535b849775812455e4c40aedfbf0778a6f123b1774/setproctitle-1.3.6-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ad1c2c2baaba62823a7f348f469a967ece0062140ca39e7a48e4bbb1f20d54c4", size = 30625, upload-time = "2025-04-29T13:33:09.707Z" },
- { url = "https://files.pythonhosted.org/packages/5f/73/a2a8259ebee166aee1ca53eead75de0e190b3ddca4f716e5c7470ebb7ef6/setproctitle-1.3.6-cp311-cp311-win32.whl", hash = "sha256:8050c01331135f77ec99d99307bfbc6519ea24d2f92964b06f3222a804a3ff1f", size = 11488, upload-time = "2025-04-29T13:33:10.953Z" },
- { url = "https://files.pythonhosted.org/packages/c9/15/52cf5e1ff0727d53704cfdde2858eaf237ce523b0b04db65faa84ff83e13/setproctitle-1.3.6-cp311-cp311-win_amd64.whl", hash = "sha256:9b73cf0fe28009a04a35bb2522e4c5b5176cc148919431dcb73fdbdfaab15781", size = 12201, upload-time = "2025-04-29T13:33:12.389Z" },
- { url = "https://files.pythonhosted.org/packages/8f/fb/99456fd94d4207c5f6c40746a048a33a52b4239cd7d9c8d4889e2210ec82/setproctitle-1.3.6-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:af44bb7a1af163806bbb679eb8432fa7b4fb6d83a5d403b541b675dcd3798638", size = 17399, upload-time = "2025-04-29T13:33:13.406Z" },
- { url = "https://files.pythonhosted.org/packages/d5/48/9699191fe6062827683c43bfa9caac33a2c89f8781dd8c7253fa3dba85fd/setproctitle-1.3.6-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:3cca16fd055316a48f0debfcbfb6af7cea715429fc31515ab3fcac05abd527d8", size = 11966, upload-time = "2025-04-29T13:33:14.976Z" },
- { url = "https://files.pythonhosted.org/packages/33/03/b085d192b9ecb9c7ce6ad6ef30ecf4110b7f39430b58a56245569827fcf4/setproctitle-1.3.6-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea002088d5554fd75e619742cefc78b84a212ba21632e59931b3501f0cfc8f67", size = 32017, upload-time = "2025-04-29T13:33:16.163Z" },
- { url = "https://files.pythonhosted.org/packages/ae/68/c53162e645816f97212002111420d1b2f75bf6d02632e37e961dc2cd6d8b/setproctitle-1.3.6-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bb465dd5825356c1191a038a86ee1b8166e3562d6e8add95eec04ab484cfb8a2", size = 33419, upload-time = "2025-04-29T13:33:18.239Z" },
- { url = "https://files.pythonhosted.org/packages/ac/0d/119a45d15a816a6cf5ccc61b19729f82620095b27a47e0a6838216a95fae/setproctitle-1.3.6-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d2c8e20487b3b73c1fa72c56f5c89430617296cd380373e7af3a538a82d4cd6d", size = 30711, upload-time = "2025-04-29T13:33:19.571Z" },
- { url = "https://files.pythonhosted.org/packages/e3/fb/5e9b5068df9e9f31a722a775a5e8322a29a638eaaa3eac5ea7f0b35e6314/setproctitle-1.3.6-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0d6252098e98129a1decb59b46920d4eca17b0395f3d71b0d327d086fefe77d", size = 31742, upload-time = "2025-04-29T13:33:21.172Z" },
- { url = "https://files.pythonhosted.org/packages/35/88/54de1e73e8fce87d587889c7eedb48fc4ee2bbe4e4ca6331690d03024f86/setproctitle-1.3.6-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:cf355fbf0d4275d86f9f57be705d8e5eaa7f8ddb12b24ced2ea6cbd68fdb14dc", size = 31925, upload-time = "2025-04-29T13:33:22.427Z" },
- { url = "https://files.pythonhosted.org/packages/f3/01/65948d7badd66e63e3db247b923143da142790fa293830fdecf832712c2d/setproctitle-1.3.6-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:e288f8a162d663916060beb5e8165a8551312b08efee9cf68302687471a6545d", size = 30981, upload-time = "2025-04-29T13:33:23.739Z" },
- { url = "https://files.pythonhosted.org/packages/22/20/c495e61786f1d38d5dc340b9d9077fee9be3dfc7e89f515afe12e1526dbc/setproctitle-1.3.6-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:b2e54f4a2dc6edf0f5ea5b1d0a608d2af3dcb5aa8c8eeab9c8841b23e1b054fe", size = 33209, upload-time = "2025-04-29T13:33:24.915Z" },
- { url = "https://files.pythonhosted.org/packages/98/3f/a457b8550fbd34d5b482fe20b8376b529e76bf1fbf9a474a6d9a641ab4ad/setproctitle-1.3.6-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b6f4abde9a2946f57e8daaf1160b2351bcf64274ef539e6675c1d945dbd75e2a", size = 31587, upload-time = "2025-04-29T13:33:26.123Z" },
- { url = "https://files.pythonhosted.org/packages/44/fe/743517340e5a635e3f1c4310baea20c16c66202f96a6f4cead222ffd6d84/setproctitle-1.3.6-cp312-cp312-win32.whl", hash = "sha256:db608db98ccc21248370d30044a60843b3f0f3d34781ceeea67067c508cd5a28", size = 11487, upload-time = "2025-04-29T13:33:27.403Z" },
- { url = "https://files.pythonhosted.org/packages/60/9a/d88f1c1f0f4efff1bd29d9233583ee341114dda7d9613941453984849674/setproctitle-1.3.6-cp312-cp312-win_amd64.whl", hash = "sha256:082413db8a96b1f021088e8ec23f0a61fec352e649aba20881895815388b66d3", size = 12208, upload-time = "2025-04-29T13:33:28.852Z" },
-]
-
[[package]]
name = "setuptools"
version = "80.9.0"
@@ -5247,6 +5272,15 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/37/c3/6eeb6034408dac0fa653d126c9204ade96b819c936e136c5e8a6897eee9c/socksio-1.0.0-py3-none-any.whl", hash = "sha256:95dc1f15f9b34e8d7b16f06d74b8ccf48f609af32ab33c608d08761c5dcbb1f3", size = 12763, upload-time = "2020-04-17T15:50:31.878Z" },
]
+[[package]]
+name = "sortedcontainers"
+version = "2.4.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/e8/c4/ba2f8066cceb6f23394729afe52f3bf7adec04bf9ed2c820b39e19299111/sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88", size = 30594, upload-time = "2021-05-16T22:03:42.897Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl", hash = "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0", size = 29575, upload-time = "2021-05-16T22:03:41.177Z" },
+]
+
[[package]]
name = "soupsieve"
version = "2.7"
@@ -5258,40 +5292,40 @@ wheels = [
[[package]]
name = "sqlalchemy"
-version = "2.0.35"
+version = "2.0.41"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "greenlet", marker = "platform_machine == 'AMD64' or platform_machine == 'WIN32' or platform_machine == 'aarch64' or platform_machine == 'amd64' or platform_machine == 'ppc64le' or platform_machine == 'win32' or platform_machine == 'x86_64'" },
{ name = "typing-extensions" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/36/48/4f190a83525f5cefefa44f6adc9e6386c4de5218d686c27eda92eb1f5424/sqlalchemy-2.0.35.tar.gz", hash = "sha256:e11d7ea4d24f0a262bccf9a7cd6284c976c5369dac21db237cff59586045ab9f", size = 9562798, upload-time = "2024-09-16T20:30:05.964Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/c3/46/9215a35bf98c3a2528e987791e6180eb51624d2c7d5cb8e2d96a6450b657/SQLAlchemy-2.0.35-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e21f66748ab725ade40fa7af8ec8b5019c68ab00b929f6643e1b1af461eddb60", size = 2091274, upload-time = "2024-09-16T21:07:13.344Z" },
- { url = "https://files.pythonhosted.org/packages/1e/69/919673c5101a0c633658d58b11b454b251ca82300941fba801201434755d/SQLAlchemy-2.0.35-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:8a6219108a15fc6d24de499d0d515c7235c617b2540d97116b663dade1a54d62", size = 2081672, upload-time = "2024-09-16T21:07:14.807Z" },
- { url = "https://files.pythonhosted.org/packages/67/ea/a6b0597cbda12796be2302153369dbbe90573fdab3bc4885f8efac499247/SQLAlchemy-2.0.35-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:042622a5306c23b972192283f4e22372da3b8ddf5f7aac1cc5d9c9b222ab3ff6", size = 3200083, upload-time = "2024-09-16T22:45:15.766Z" },
- { url = "https://files.pythonhosted.org/packages/8c/d6/97bdc8d714fb21762f2092511f380f18cdb2d985d516071fa925bb433a90/SQLAlchemy-2.0.35-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:627dee0c280eea91aed87b20a1f849e9ae2fe719d52cbf847c0e0ea34464b3f7", size = 3200080, upload-time = "2024-09-16T21:18:19.033Z" },
- { url = "https://files.pythonhosted.org/packages/87/d2/8c2adaf2ade4f6f1b725acd0b0be9210bb6a2df41024729a8eec6a86fe5a/SQLAlchemy-2.0.35-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:4fdcd72a789c1c31ed242fd8c1bcd9ea186a98ee8e5408a50e610edfef980d71", size = 3137108, upload-time = "2024-09-16T22:45:19.167Z" },
- { url = "https://files.pythonhosted.org/packages/7e/ae/ea05d0bfa8f2b25ae34591895147152854fc950f491c4ce362ae06035db8/SQLAlchemy-2.0.35-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:89b64cd8898a3a6f642db4eb7b26d1b28a497d4022eccd7717ca066823e9fb01", size = 3157437, upload-time = "2024-09-16T21:18:21.988Z" },
- { url = "https://files.pythonhosted.org/packages/fe/5d/8ad6df01398388a766163d27960b3365f1bbd8bb7b05b5cad321a8b69b25/SQLAlchemy-2.0.35-cp311-cp311-win32.whl", hash = "sha256:6a93c5a0dfe8d34951e8a6f499a9479ffb9258123551fa007fc708ae2ac2bc5e", size = 2061935, upload-time = "2024-09-16T20:54:10.564Z" },
- { url = "https://files.pythonhosted.org/packages/ff/68/8557efc0c32c8e2c147cb6512237448b8ed594a57cd015fda67f8e56bb3f/SQLAlchemy-2.0.35-cp311-cp311-win_amd64.whl", hash = "sha256:c68fe3fcde03920c46697585620135b4ecfdfc1ed23e75cc2c2ae9f8502c10b8", size = 2087281, upload-time = "2024-09-16T20:54:13.429Z" },
- { url = "https://files.pythonhosted.org/packages/2f/2b/fff87e6db0da31212c98bbc445f83fb608ea92b96bda3f3f10e373bac76c/SQLAlchemy-2.0.35-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:eb60b026d8ad0c97917cb81d3662d0b39b8ff1335e3fabb24984c6acd0c900a2", size = 2089790, upload-time = "2024-09-16T21:07:16.161Z" },
- { url = "https://files.pythonhosted.org/packages/68/92/4bb761bd82764d5827bf6b6095168c40fb5dbbd23670203aef2f96ba6bc6/SQLAlchemy-2.0.35-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6921ee01caf375363be5e9ae70d08ce7ca9d7e0e8983183080211a062d299468", size = 2080266, upload-time = "2024-09-16T21:07:18.277Z" },
- { url = "https://files.pythonhosted.org/packages/22/46/068a65db6dc253c6f25a7598d99e0a1d60b14f661f9d09ef6c73c718fa4e/SQLAlchemy-2.0.35-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8cdf1a0dbe5ced887a9b127da4ffd7354e9c1a3b9bb330dce84df6b70ccb3a8d", size = 3229760, upload-time = "2024-09-16T22:45:20.863Z" },
- { url = "https://files.pythonhosted.org/packages/6e/36/59830dafe40dda592304debd4cd86e583f63472f3a62c9e2695a5795e786/SQLAlchemy-2.0.35-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:93a71c8601e823236ac0e5d087e4f397874a421017b3318fd92c0b14acf2b6db", size = 3240649, upload-time = "2024-09-16T21:18:23.996Z" },
- { url = "https://files.pythonhosted.org/packages/00/50/844c50c6996f9c7f000c959dd1a7436a6c94e449ee113046a1d19e470089/SQLAlchemy-2.0.35-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e04b622bb8a88f10e439084486f2f6349bf4d50605ac3e445869c7ea5cf0fa8c", size = 3176138, upload-time = "2024-09-16T22:45:22.518Z" },
- { url = "https://files.pythonhosted.org/packages/df/d2/336b18cac68eecb67de474fc15c85f13be4e615c6f5bae87ea38c6734ce0/SQLAlchemy-2.0.35-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:1b56961e2d31389aaadf4906d453859f35302b4eb818d34a26fab72596076bb8", size = 3202753, upload-time = "2024-09-16T21:18:25.966Z" },
- { url = "https://files.pythonhosted.org/packages/f0/f3/ee1e62fabdc10910b5ef720ae08e59bc785f26652876af3a50b89b97b412/SQLAlchemy-2.0.35-cp312-cp312-win32.whl", hash = "sha256:0f9f3f9a3763b9c4deb8c5d09c4cc52ffe49f9876af41cc1b2ad0138878453cf", size = 2060113, upload-time = "2024-09-16T20:54:15.16Z" },
- { url = "https://files.pythonhosted.org/packages/60/63/a3cef44a52979169d884f3583d0640e64b3c28122c096474a1d7cfcaf1f3/SQLAlchemy-2.0.35-cp312-cp312-win_amd64.whl", hash = "sha256:25b0f63e7fcc2a6290cb5f7f5b4fc4047843504983a28856ce9b35d8f7de03cc", size = 2085839, upload-time = "2024-09-16T20:54:17.11Z" },
- { url = "https://files.pythonhosted.org/packages/0e/c6/33c706449cdd92b1b6d756b247761e27d32230fd6b2de5f44c4c3e5632b2/SQLAlchemy-2.0.35-py3-none-any.whl", hash = "sha256:2ab3f0336c0387662ce6221ad30ab3a5e6499aab01b9790879b6578fd9b8faa1", size = 1881276, upload-time = "2024-09-16T23:14:28.324Z" },
-]
-
-[[package]]
-name = "sqlglot"
-version = "26.24.0"
+sdist = { url = "https://files.pythonhosted.org/packages/63/66/45b165c595ec89aa7dcc2c1cd222ab269bc753f1fc7a1e68f8481bd957bf/sqlalchemy-2.0.41.tar.gz", hash = "sha256:edba70118c4be3c2b1f90754d308d0b79c6fe2c0fdc52d8ddf603916f83f4db9", size = 9689424, upload-time = "2025-05-14T17:10:32.339Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/37/4e/b00e3ffae32b74b5180e15d2ab4040531ee1bef4c19755fe7926622dc958/sqlalchemy-2.0.41-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6375cd674fe82d7aa9816d1cb96ec592bac1726c11e0cafbf40eeee9a4516b5f", size = 2121232, upload-time = "2025-05-14T17:48:20.444Z" },
+ { url = "https://files.pythonhosted.org/packages/ef/30/6547ebb10875302074a37e1970a5dce7985240665778cfdee2323709f749/sqlalchemy-2.0.41-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9f8c9fdd15a55d9465e590a402f42082705d66b05afc3ffd2d2eb3c6ba919560", size = 2110897, upload-time = "2025-05-14T17:48:21.634Z" },
+ { url = "https://files.pythonhosted.org/packages/9e/21/59df2b41b0f6c62da55cd64798232d7349a9378befa7f1bb18cf1dfd510a/sqlalchemy-2.0.41-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:32f9dc8c44acdee06c8fc6440db9eae8b4af8b01e4b1aee7bdd7241c22edff4f", size = 3273313, upload-time = "2025-05-14T17:51:56.205Z" },
+ { url = "https://files.pythonhosted.org/packages/62/e4/b9a7a0e5c6f79d49bcd6efb6e90d7536dc604dab64582a9dec220dab54b6/sqlalchemy-2.0.41-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90c11ceb9a1f482c752a71f203a81858625d8df5746d787a4786bca4ffdf71c6", size = 3273807, upload-time = "2025-05-14T17:55:26.928Z" },
+ { url = "https://files.pythonhosted.org/packages/39/d8/79f2427251b44ddee18676c04eab038d043cff0e764d2d8bb08261d6135d/sqlalchemy-2.0.41-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:911cc493ebd60de5f285bcae0491a60b4f2a9f0f5c270edd1c4dbaef7a38fc04", size = 3209632, upload-time = "2025-05-14T17:51:59.384Z" },
+ { url = "https://files.pythonhosted.org/packages/d4/16/730a82dda30765f63e0454918c982fb7193f6b398b31d63c7c3bd3652ae5/sqlalchemy-2.0.41-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:03968a349db483936c249f4d9cd14ff2c296adfa1290b660ba6516f973139582", size = 3233642, upload-time = "2025-05-14T17:55:29.901Z" },
+ { url = "https://files.pythonhosted.org/packages/04/61/c0d4607f7799efa8b8ea3c49b4621e861c8f5c41fd4b5b636c534fcb7d73/sqlalchemy-2.0.41-cp311-cp311-win32.whl", hash = "sha256:293cd444d82b18da48c9f71cd7005844dbbd06ca19be1ccf6779154439eec0b8", size = 2086475, upload-time = "2025-05-14T17:56:02.095Z" },
+ { url = "https://files.pythonhosted.org/packages/9d/8e/8344f8ae1cb6a479d0741c02cd4f666925b2bf02e2468ddaf5ce44111f30/sqlalchemy-2.0.41-cp311-cp311-win_amd64.whl", hash = "sha256:3d3549fc3e40667ec7199033a4e40a2f669898a00a7b18a931d3efb4c7900504", size = 2110903, upload-time = "2025-05-14T17:56:03.499Z" },
+ { url = "https://files.pythonhosted.org/packages/3e/2a/f1f4e068b371154740dd10fb81afb5240d5af4aa0087b88d8b308b5429c2/sqlalchemy-2.0.41-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:81f413674d85cfd0dfcd6512e10e0f33c19c21860342a4890c3a2b59479929f9", size = 2119645, upload-time = "2025-05-14T17:55:24.854Z" },
+ { url = "https://files.pythonhosted.org/packages/9b/e8/c664a7e73d36fbfc4730f8cf2bf930444ea87270f2825efbe17bf808b998/sqlalchemy-2.0.41-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:598d9ebc1e796431bbd068e41e4de4dc34312b7aa3292571bb3674a0cb415dd1", size = 2107399, upload-time = "2025-05-14T17:55:28.097Z" },
+ { url = "https://files.pythonhosted.org/packages/5c/78/8a9cf6c5e7135540cb682128d091d6afa1b9e48bd049b0d691bf54114f70/sqlalchemy-2.0.41-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a104c5694dfd2d864a6f91b0956eb5d5883234119cb40010115fd45a16da5e70", size = 3293269, upload-time = "2025-05-14T17:50:38.227Z" },
+ { url = "https://files.pythonhosted.org/packages/3c/35/f74add3978c20de6323fb11cb5162702670cc7a9420033befb43d8d5b7a4/sqlalchemy-2.0.41-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6145afea51ff0af7f2564a05fa95eb46f542919e6523729663a5d285ecb3cf5e", size = 3303364, upload-time = "2025-05-14T17:51:49.829Z" },
+ { url = "https://files.pythonhosted.org/packages/6a/d4/c990f37f52c3f7748ebe98883e2a0f7d038108c2c5a82468d1ff3eec50b7/sqlalchemy-2.0.41-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:b46fa6eae1cd1c20e6e6f44e19984d438b6b2d8616d21d783d150df714f44078", size = 3229072, upload-time = "2025-05-14T17:50:39.774Z" },
+ { url = "https://files.pythonhosted.org/packages/15/69/cab11fecc7eb64bc561011be2bd03d065b762d87add52a4ca0aca2e12904/sqlalchemy-2.0.41-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:41836fe661cc98abfae476e14ba1906220f92c4e528771a8a3ae6a151242d2ae", size = 3268074, upload-time = "2025-05-14T17:51:51.736Z" },
+ { url = "https://files.pythonhosted.org/packages/5c/ca/0c19ec16858585d37767b167fc9602593f98998a68a798450558239fb04a/sqlalchemy-2.0.41-cp312-cp312-win32.whl", hash = "sha256:a8808d5cf866c781150d36a3c8eb3adccfa41a8105d031bf27e92c251e3969d6", size = 2084514, upload-time = "2025-05-14T17:55:49.915Z" },
+ { url = "https://files.pythonhosted.org/packages/7f/23/4c2833d78ff3010a4e17f984c734f52b531a8c9060a50429c9d4b0211be6/sqlalchemy-2.0.41-cp312-cp312-win_amd64.whl", hash = "sha256:5b14e97886199c1f52c14629c11d90c11fbb09e9334fa7bb5f6d068d9ced0ce0", size = 2111557, upload-time = "2025-05-14T17:55:51.349Z" },
+ { url = "https://files.pythonhosted.org/packages/1c/fc/9ba22f01b5cdacc8f5ed0d22304718d2c758fce3fd49a5372b886a86f37c/sqlalchemy-2.0.41-py3-none-any.whl", hash = "sha256:57df5dc6fdb5ed1a88a1ed2195fd31927e705cad62dedd86b46972752a80f576", size = 1911224, upload-time = "2025-05-14T17:39:42.154Z" },
+]
+
+[[package]]
+name = "sseclient-py"
+version = "1.8.0"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/4d/f7/0fa9f9f2477c4e3d8e28b0f5e066f0e72343c29c8a302ee6a77579e8986b/sqlglot-26.24.0.tar.gz", hash = "sha256:e778ca9cb685b4fc34b59d50432c20f463c63ec90d0448fa91afa7f320a88518", size = 5371208, upload-time = "2025-05-30T08:44:06.516Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/e8/ed/3df5ab8bb0c12f86c28d0cadb11ed1de44a92ed35ce7ff4fd5518a809325/sseclient-py-1.8.0.tar.gz", hash = "sha256:c547c5c1a7633230a38dc599a21a2dc638f9b5c297286b48b46b935c71fac3e8", size = 7791, upload-time = "2023-09-01T19:39:20.45Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/b2/11/6995759d913d714ff443478f5865b2616dbcd32b12764d02df9550d7a61e/sqlglot-26.24.0-py3-none-any.whl", hash = "sha256:81f7e47bb1b4b396c564359f47c7c1aee476575a0cadf84dc35f7189cab87f82", size = 464043, upload-time = "2025-05-30T08:44:00.801Z" },
+ { url = "https://files.pythonhosted.org/packages/49/58/97655efdfeb5b4eeab85b1fc5d3fa1023661246c2ab2a26ea8e47402d4f2/sseclient_py-1.8.0-py2.py3-none-any.whl", hash = "sha256:4ecca6dc0b9f963f8384e9d7fd529bf93dd7d708144c4fb5da0e0a1a926fee83", size = 8828, upload-time = "2023-09-01T19:39:17.627Z" },
]
[[package]]
@@ -5364,12 +5398,11 @@ wheels = [
[[package]]
name = "tablestore"
-version = "6.1.0"
+version = "6.2.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "certifi" },
{ name = "crc32c" },
- { name = "enum34" },
{ name = "flatbuffers" },
{ name = "future" },
{ name = "numpy" },
@@ -5377,7 +5410,10 @@ dependencies = [
{ name = "six" },
{ name = "urllib3" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/0f/ed/5bdd906ec9d2dbae3909525dbb7602558c377e0cbcdddb6405d2d0d3f1af/tablestore-6.1.0.tar.gz", hash = "sha256:bfe6a3e0fe88a230729723c357f4a46b8869a06a4b936db20692ed587a721c1c", size = 135690, upload-time = "2024-12-20T07:38:37.428Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/a1/58/48d65d181a69f7db19f7cdee01d252168fbfbad2d1bb25abed03e6df3b05/tablestore-6.2.0.tar.gz", hash = "sha256:0773e77c00542be1bfebbc3c7a85f72a881c63e4e7df7c5a9793a54144590e68", size = 85942, upload-time = "2025-04-15T12:11:20.655Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/9c/da/30451712a769bcf417add8e81163d478a4d668b0e8d489a9d667260d55df/tablestore-6.2.0-py3-none-any.whl", hash = "sha256:6af496d841ab1ff3f78b46abbd87b95a08d89605c51664d2b30933b1d1c5583a", size = 106297, upload-time = "2025-04-15T12:11:17.476Z" },
+]
[[package]]
name = "tabulate"
@@ -5470,27 +5506,27 @@ wheels = [
[[package]]
name = "tokenizers"
-version = "0.21.1"
+version = "0.21.2"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "huggingface-hub" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/92/76/5ac0c97f1117b91b7eb7323dcd61af80d72f790b4df71249a7850c195f30/tokenizers-0.21.1.tar.gz", hash = "sha256:a1bb04dc5b448985f86ecd4b05407f5a8d97cb2c0532199b2a302a604a0165ab", size = 343256, upload-time = "2025-03-13T10:51:18.189Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ab/2d/b0fce2b8201635f60e8c95990080f58461cc9ca3d5026de2e900f38a7f21/tokenizers-0.21.2.tar.gz", hash = "sha256:fdc7cffde3e2113ba0e6cc7318c40e3438a4d74bbc62bf04bcc63bdfb082ac77", size = 351545, upload-time = "2025-06-24T10:24:52.449Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/a5/1f/328aee25f9115bf04262e8b4e5a2050b7b7cf44b59c74e982db7270c7f30/tokenizers-0.21.1-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:e78e413e9e668ad790a29456e677d9d3aa50a9ad311a40905d6861ba7692cf41", size = 2780767, upload-time = "2025-03-13T10:51:09.459Z" },
- { url = "https://files.pythonhosted.org/packages/ae/1a/4526797f3719b0287853f12c5ad563a9be09d446c44ac784cdd7c50f76ab/tokenizers-0.21.1-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:cd51cd0a91ecc801633829fcd1fda9cf8682ed3477c6243b9a095539de4aecf3", size = 2650555, upload-time = "2025-03-13T10:51:07.692Z" },
- { url = "https://files.pythonhosted.org/packages/4d/7a/a209b29f971a9fdc1da86f917fe4524564924db50d13f0724feed37b2a4d/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28da6b72d4fb14ee200a1bd386ff74ade8992d7f725f2bde2c495a9a98cf4d9f", size = 2937541, upload-time = "2025-03-13T10:50:56.679Z" },
- { url = "https://files.pythonhosted.org/packages/3c/1e/b788b50ffc6191e0b1fc2b0d49df8cff16fe415302e5ceb89f619d12c5bc/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:34d8cfde551c9916cb92014e040806122295a6800914bab5865deb85623931cf", size = 2819058, upload-time = "2025-03-13T10:50:59.525Z" },
- { url = "https://files.pythonhosted.org/packages/36/aa/3626dfa09a0ecc5b57a8c58eeaeb7dd7ca9a37ad9dd681edab5acd55764c/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aaa852d23e125b73d283c98f007e06d4595732104b65402f46e8ef24b588d9f8", size = 3133278, upload-time = "2025-03-13T10:51:04.678Z" },
- { url = "https://files.pythonhosted.org/packages/a4/4d/8fbc203838b3d26269f944a89459d94c858f5b3f9a9b6ee9728cdcf69161/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a21a15d5c8e603331b8a59548bbe113564136dc0f5ad8306dd5033459a226da0", size = 3144253, upload-time = "2025-03-13T10:51:01.261Z" },
- { url = "https://files.pythonhosted.org/packages/d8/1b/2bd062adeb7c7511b847b32e356024980c0ffcf35f28947792c2d8ad2288/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2fdbd4c067c60a0ac7eca14b6bd18a5bebace54eb757c706b47ea93204f7a37c", size = 3398225, upload-time = "2025-03-13T10:51:03.243Z" },
- { url = "https://files.pythonhosted.org/packages/8a/63/38be071b0c8e06840bc6046991636bcb30c27f6bb1e670f4f4bc87cf49cc/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2dd9a0061e403546f7377df940e866c3e678d7d4e9643d0461ea442b4f89e61a", size = 3038874, upload-time = "2025-03-13T10:51:06.235Z" },
- { url = "https://files.pythonhosted.org/packages/ec/83/afa94193c09246417c23a3c75a8a0a96bf44ab5630a3015538d0c316dd4b/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:db9484aeb2e200c43b915a1a0150ea885e35f357a5a8fabf7373af333dcc8dbf", size = 9014448, upload-time = "2025-03-13T10:51:10.927Z" },
- { url = "https://files.pythonhosted.org/packages/ae/b3/0e1a37d4f84c0f014d43701c11eb8072704f6efe8d8fc2dcdb79c47d76de/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:ed248ab5279e601a30a4d67bdb897ecbe955a50f1e7bb62bd99f07dd11c2f5b6", size = 8937877, upload-time = "2025-03-13T10:51:12.688Z" },
- { url = "https://files.pythonhosted.org/packages/ac/33/ff08f50e6d615eb180a4a328c65907feb6ded0b8f990ec923969759dc379/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:9ac78b12e541d4ce67b4dfd970e44c060a2147b9b2a21f509566d556a509c67d", size = 9186645, upload-time = "2025-03-13T10:51:14.723Z" },
- { url = "https://files.pythonhosted.org/packages/5f/aa/8ae85f69a9f6012c6f8011c6f4aa1c96154c816e9eea2e1b758601157833/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:e5a69c1a4496b81a5ee5d2c1f3f7fbdf95e90a0196101b0ee89ed9956b8a168f", size = 9384380, upload-time = "2025-03-13T10:51:16.526Z" },
- { url = "https://files.pythonhosted.org/packages/e8/5b/a5d98c89f747455e8b7a9504910c865d5e51da55e825a7ae641fb5ff0a58/tokenizers-0.21.1-cp39-abi3-win32.whl", hash = "sha256:1039a3a5734944e09de1d48761ade94e00d0fa760c0e0551151d4dd851ba63e3", size = 2239506, upload-time = "2025-03-13T10:51:20.643Z" },
- { url = "https://files.pythonhosted.org/packages/e6/b6/072a8e053ae600dcc2ac0da81a23548e3b523301a442a6ca900e92ac35be/tokenizers-0.21.1-cp39-abi3-win_amd64.whl", hash = "sha256:0f0dcbcc9f6e13e675a66d7a5f2f225a736745ce484c1a4e07476a89ccdad382", size = 2435481, upload-time = "2025-03-13T10:51:19.243Z" },
+ { url = "https://files.pythonhosted.org/packages/1d/cc/2936e2d45ceb130a21d929743f1e9897514691bec123203e10837972296f/tokenizers-0.21.2-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:342b5dfb75009f2255ab8dec0041287260fed5ce00c323eb6bab639066fef8ec", size = 2875206, upload-time = "2025-06-24T10:24:42.755Z" },
+ { url = "https://files.pythonhosted.org/packages/6c/e6/33f41f2cc7861faeba8988e7a77601407bf1d9d28fc79c5903f8f77df587/tokenizers-0.21.2-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:126df3205d6f3a93fea80c7a8a266a78c1bd8dd2fe043386bafdd7736a23e45f", size = 2732655, upload-time = "2025-06-24T10:24:41.56Z" },
+ { url = "https://files.pythonhosted.org/packages/33/2b/1791eb329c07122a75b01035b1a3aa22ad139f3ce0ece1b059b506d9d9de/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a32cd81be21168bd0d6a0f0962d60177c447a1aa1b1e48fa6ec9fc728ee0b12", size = 3019202, upload-time = "2025-06-24T10:24:31.791Z" },
+ { url = "https://files.pythonhosted.org/packages/05/15/fd2d8104faa9f86ac68748e6f7ece0b5eb7983c7efc3a2c197cb98c99030/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8bd8999538c405133c2ab999b83b17c08b7fc1b48c1ada2469964605a709ef91", size = 2934539, upload-time = "2025-06-24T10:24:34.567Z" },
+ { url = "https://files.pythonhosted.org/packages/a5/2e/53e8fd053e1f3ffbe579ca5f9546f35ac67cf0039ed357ad7ec57f5f5af0/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5e9944e61239b083a41cf8fc42802f855e1dca0f499196df37a8ce219abac6eb", size = 3248665, upload-time = "2025-06-24T10:24:39.024Z" },
+ { url = "https://files.pythonhosted.org/packages/00/15/79713359f4037aa8f4d1f06ffca35312ac83629da062670e8830917e2153/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:514cd43045c5d546f01142ff9c79a96ea69e4b5cda09e3027708cb2e6d5762ab", size = 3451305, upload-time = "2025-06-24T10:24:36.133Z" },
+ { url = "https://files.pythonhosted.org/packages/38/5f/959f3a8756fc9396aeb704292777b84f02a5c6f25c3fc3ba7530db5feb2c/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b1b9405822527ec1e0f7d8d2fdb287a5730c3a6518189c968254a8441b21faae", size = 3214757, upload-time = "2025-06-24T10:24:37.784Z" },
+ { url = "https://files.pythonhosted.org/packages/c5/74/f41a432a0733f61f3d21b288de6dfa78f7acff309c6f0f323b2833e9189f/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fed9a4d51c395103ad24f8e7eb976811c57fbec2af9f133df471afcd922e5020", size = 3121887, upload-time = "2025-06-24T10:24:40.293Z" },
+ { url = "https://files.pythonhosted.org/packages/3c/6a/bc220a11a17e5d07b0dfb3b5c628621d4dcc084bccd27cfaead659963016/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:2c41862df3d873665ec78b6be36fcc30a26e3d4902e9dd8608ed61d49a48bc19", size = 9091965, upload-time = "2025-06-24T10:24:44.431Z" },
+ { url = "https://files.pythonhosted.org/packages/6c/bd/ac386d79c4ef20dc6f39c4706640c24823dca7ebb6f703bfe6b5f0292d88/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:ed21dc7e624e4220e21758b2e62893be7101453525e3d23264081c9ef9a6d00d", size = 9053372, upload-time = "2025-06-24T10:24:46.455Z" },
+ { url = "https://files.pythonhosted.org/packages/63/7b/5440bf203b2a5358f074408f7f9c42884849cd9972879e10ee6b7a8c3b3d/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:0e73770507e65a0e0e2a1affd6b03c36e3bc4377bd10c9ccf51a82c77c0fe365", size = 9298632, upload-time = "2025-06-24T10:24:48.446Z" },
+ { url = "https://files.pythonhosted.org/packages/a4/d2/faa1acac3f96a7427866e94ed4289949b2524f0c1878512516567d80563c/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:106746e8aa9014a12109e58d540ad5465b4c183768ea96c03cbc24c44d329958", size = 9470074, upload-time = "2025-06-24T10:24:50.378Z" },
+ { url = "https://files.pythonhosted.org/packages/d8/a5/896e1ef0707212745ae9f37e84c7d50269411aef2e9ccd0de63623feecdf/tokenizers-0.21.2-cp39-abi3-win32.whl", hash = "sha256:cabda5a6d15d620b6dfe711e1af52205266d05b379ea85a8a301b3593c60e962", size = 2330115, upload-time = "2025-06-24T10:24:55.069Z" },
+ { url = "https://files.pythonhosted.org/packages/13/c3/cc2755ee10be859c4338c962a35b9a663788c0c0b50c0bdd8078fb6870cf/tokenizers-0.21.2-cp39-abi3-win_amd64.whl", hash = "sha256:58747bb898acdb1007f37a7bbe614346e98dc28708ffb66a3fd50ce169ac6c98", size = 2509918, upload-time = "2025-06-24T10:24:53.71Z" },
]
[[package]]
@@ -5594,20 +5630,20 @@ wheels = [
[[package]]
name = "types-aiofiles"
-version = "24.1.0.20250516"
+version = "24.1.0.20250708"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/b3/13/41faafda1d85fc8afa744ee67a2d788b3ba63e5f1c7303e5d10c2d784d2d/types_aiofiles-24.1.0.20250516.tar.gz", hash = "sha256:7fd2a7f793bbe180b7b22cd4f59300fe61fdc9940b3bbc9899ffe32849b95188", size = 14304, upload-time = "2025-05-16T03:08:29.55Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/4a/d6/5c44761bc11cb5c7505013a39f397a9016bfb3a5c932032b2db16c38b87b/types_aiofiles-24.1.0.20250708.tar.gz", hash = "sha256:c8207ed7385491ce5ba94da02658164ebd66b69a44e892288c9f20cbbf5284ff", size = 14322, upload-time = "2025-07-08T03:14:44.814Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/70/e7/828287ba5d1107db1093a123fe8e481eb5aab55c911f1100f28d0df80d5a/types_aiofiles-24.1.0.20250516-py3-none-any.whl", hash = "sha256:ec265994629146804b656a971c46f393ce860305834b3cacb4b8b6fb7dba7e33", size = 14253, upload-time = "2025-05-16T03:08:28.67Z" },
+ { url = "https://files.pythonhosted.org/packages/44/e9/4e0cc79c630040aae0634ac9393341dc2aff1a5be454be9741cc6cc8989f/types_aiofiles-24.1.0.20250708-py3-none-any.whl", hash = "sha256:07f8f06465fd415d9293467d1c66cd074b2c3b62b679e26e353e560a8cf63720", size = 14320, upload-time = "2025-07-08T03:14:44.009Z" },
]
[[package]]
name = "types-awscrt"
-version = "0.27.2"
+version = "0.27.4"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/36/6c/583522cfb3c330e92e726af517a91c13247e555e021791a60f1b03c6ff16/types_awscrt-0.27.2.tar.gz", hash = "sha256:acd04f57119eb15626ab0ba9157fc24672421de56e7bd7b9f61681fedee44e91", size = 16304, upload-time = "2025-05-16T03:10:08.712Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/94/95/02564024f8668feab6733a2c491005b5281b048b3d0573510622cbcd9fd4/types_awscrt-0.27.4.tar.gz", hash = "sha256:c019ba91a097e8a31d6948f6176ede1312963f41cdcacf82482ac877cbbcf390", size = 16941, upload-time = "2025-06-29T22:58:04.756Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/4c/82/1ee2e5c9d28deac086ab3a6ff07c8bc393ef013a083f546c623699881715/types_awscrt-0.27.2-py3-none-any.whl", hash = "sha256:49a045f25bbd5ad2865f314512afced933aed35ddbafc252e2268efa8a787e4e", size = 37761, upload-time = "2025-05-16T03:10:07.466Z" },
+ { url = "https://files.pythonhosted.org/packages/d4/40/cb4d04df4ac3520858f5b397a4ab89f34be2601000002a26edd8ddc0cac5/types_awscrt-0.27.4-py3-none-any.whl", hash = "sha256:a8c4b9d9ae66d616755c322aba75ab9bd793c6fef448917e6de2e8b8cdf66fb4", size = 39626, upload-time = "2025-06-29T22:58:03.157Z" },
]
[[package]]
@@ -5654,11 +5690,11 @@ wheels = [
[[package]]
name = "types-defusedxml"
-version = "0.7.0.20250516"
+version = "0.7.0.20250708"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/55/9d/3ba8b80536402f1a125bc5a44d82ab686aafa55a85f56160e076b2ac30de/types_defusedxml-0.7.0.20250516.tar.gz", hash = "sha256:164c2945077fa450f24ed09633f8b3a80694687fefbbc1cba5f24e4ba570666b", size = 10298, upload-time = "2025-05-16T03:08:18.951Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/b9/4b/79d046a7211e110afd885be04bb9423546df2a662ed28251512d60e51fb6/types_defusedxml-0.7.0.20250708.tar.gz", hash = "sha256:7b785780cc11c18a1af086308bf94bf53a0907943a1d145dbe00189bef323cb8", size = 10541, upload-time = "2025-07-08T03:14:33.325Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/2e/7b/567b0978150edccf7fa3aa8f2566ea9c3ffc9481ce7d64428166934d6d7f/types_defusedxml-0.7.0.20250516-py3-none-any.whl", hash = "sha256:00e793e5c385c3e142d7c2acc3b4ccea2fe0828cee11e35501f0ba40386630a0", size = 12576, upload-time = "2025-05-16T03:08:17.892Z" },
+ { url = "https://files.pythonhosted.org/packages/24/f8/870de7fbd5fee5643f05061db948df6bd574a05a42aee91e37ad47c999ef/types_defusedxml-0.7.0.20250708-py3-none-any.whl", hash = "sha256:cc426cbc31c61a0f1b1c2ad9b9ef9ef846645f28fd708cd7727a6353b5c52e54", size = 13478, upload-time = "2025-07-08T03:14:32.633Z" },
]
[[package]]
@@ -5672,11 +5708,11 @@ wheels = [
[[package]]
name = "types-docutils"
-version = "0.21.0.20250526"
+version = "0.21.0.20250708"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/34/bf/bb5695f7a9660f79a9cd999ea13ff7331b8f2d03aec3d2fd7c38be4bc8aa/types_docutils-0.21.0.20250526.tar.gz", hash = "sha256:6c7ba387716315df0d86a796baec9d5a71825ed2746cb7763193aafbb70ac86c", size = 38140, upload-time = "2025-05-26T03:10:49.242Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/39/86/24394a71a04f416ca03df51863a3d3e2cd0542fdc40989188dca30ffb5bf/types_docutils-0.21.0.20250708.tar.gz", hash = "sha256:5625a82a9a2f26d8384545607c157e023a48ed60d940dfc738db125282864172", size = 42011, upload-time = "2025-07-08T03:14:24.214Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/35/84/73bca8d1364f6685bd6e00eaa15e653ef96163231fbd7a612f3a845497fb/types_docutils-0.21.0.20250526-py3-none-any.whl", hash = "sha256:44d9f9ed19bb75071deb6804947c123f30bbc617a656420f044e09b9f16b72d1", size = 62000, upload-time = "2025-05-26T03:10:48.101Z" },
+ { url = "https://files.pythonhosted.org/packages/bd/17/8c1153fc1576a0dcffdd157c69a12863c3f9485054256f6791ea17d95aed/types_docutils-0.21.0.20250708-py3-none-any.whl", hash = "sha256:166630d1aec18b9ca02547873210e04bf7674ba8f8da9cd9e6a5e77dc99372c2", size = 67953, upload-time = "2025-07-08T03:14:23.057Z" },
]
[[package]]
@@ -5728,11 +5764,11 @@ wheels = [
[[package]]
name = "types-html5lib"
-version = "1.1.11.20250516"
+version = "1.1.11.20250708"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/d0/ed/9f092ff479e2b5598941855f314a22953bb04b5fb38bcba3f880feb833ba/types_html5lib-1.1.11.20250516.tar.gz", hash = "sha256:65043a6718c97f7d52567cc0cdf41efbfc33b1f92c6c0c5e19f60a7ec69ae720", size = 16136, upload-time = "2025-05-16T03:07:12.231Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/d4/3b/1f5ba4358cfc1421cced5cdb9d2b08b4b99e4f9a41da88ce079f6d1a7bf1/types_html5lib-1.1.11.20250708.tar.gz", hash = "sha256:24321720fdbac71cee50d5a4bec9b7448495b7217974cffe3fcf1ede4eef7afe", size = 16799, upload-time = "2025-07-08T03:13:53.14Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/cc/3b/cb5b23c7b51bf48b8c9f175abb9dce2f1ecd2d2c25f92ea9f4e3720e9398/types_html5lib-1.1.11.20250516-py3-none-any.whl", hash = "sha256:5e407b14b1bd2b9b1107cbd1e2e19d4a0c46d60febd231c7ab7313d7405663c1", size = 21770, upload-time = "2025-05-16T03:07:11.102Z" },
+ { url = "https://files.pythonhosted.org/packages/a8/50/5fc23cf647eee23acdd337c8150861d39980cf11f33dd87f78e87d2a4bad/types_html5lib-1.1.11.20250708-py3-none-any.whl", hash = "sha256:bb898066b155de7081cb182179e2ded31b9e0e234605e2cb46536894e68a6954", size = 22913, upload-time = "2025-07-08T03:13:52.098Z" },
]
[[package]]
@@ -5851,11 +5887,11 @@ wheels = [
[[package]]
name = "types-pymysql"
-version = "1.1.0.20250516"
+version = "1.1.0.20250708"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/db/11/cdaa90b82cb25c5e04e75f0b0616872aa5775b001096779375084f8dbbcf/types_pymysql-1.1.0.20250516.tar.gz", hash = "sha256:fea4a9776101cf893dfc868f42ce10d2e46dcc498c792cc7c9c0fe00cb744234", size = 19640, upload-time = "2025-05-16T03:06:54.568Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/65/a3/db349a06c64b8c041c165fc470b81d37404ec342014625c7a6b7f7a4f680/types_pymysql-1.1.0.20250708.tar.gz", hash = "sha256:2cbd7cfcf9313eda784910578c4f1d06f8cc03a15cd30ce588aa92dd6255011d", size = 21715, upload-time = "2025-07-08T03:13:56.463Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/ab/64/129656e04ddda35d69faae914ce67cf60d83407ddd7afdef1e7c50bbb74a/types_pymysql-1.1.0.20250516-py3-none-any.whl", hash = "sha256:41c87a832e3ff503d5120cc6cebd64f6dcb3c407d9580a98b2cb3e3bcd109aa6", size = 20328, upload-time = "2025-05-16T03:06:53.681Z" },
+ { url = "https://files.pythonhosted.org/packages/88/e5/7f72c520f527175b6455e955426fd4f971128b4fa2f8ab2f505f254a1ddc/types_pymysql-1.1.0.20250708-py3-none-any.whl", hash = "sha256:9252966d2795945b2a7a53d5cdc49fe8e4e2f3dde4c104ed7fc782a83114e365", size = 22860, upload-time = "2025-07-08T03:13:55.367Z" },
]
[[package]]
@@ -5873,11 +5909,20 @@ wheels = [
[[package]]
name = "types-python-dateutil"
-version = "2.9.0.20250516"
+version = "2.9.0.20250708"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/c9/95/6bdde7607da2e1e99ec1c1672a759d42f26644bbacf939916e086db34870/types_python_dateutil-2.9.0.20250708.tar.gz", hash = "sha256:ccdbd75dab2d6c9696c350579f34cffe2c281e4c5f27a585b2a2438dd1d5c8ab", size = 15834, upload-time = "2025-07-08T03:14:03.382Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/72/52/43e70a8e57fefb172c22a21000b03ebcc15e47e97f5cb8495b9c2832efb4/types_python_dateutil-2.9.0.20250708-py3-none-any.whl", hash = "sha256:4d6d0cc1cc4d24a2dc3816024e502564094497b713f7befda4d5bc7a8e3fd21f", size = 17724, upload-time = "2025-07-08T03:14:02.593Z" },
+]
+
+[[package]]
+name = "types-python-http-client"
+version = "3.3.7.20250708"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/ef/88/d65ed807393285204ab6e2801e5d11fbbea811adcaa979a2ed3b67a5ef41/types_python_dateutil-2.9.0.20250516.tar.gz", hash = "sha256:13e80d6c9c47df23ad773d54b2826bd52dbbb41be87c3f339381c1700ad21ee5", size = 13943, upload-time = "2025-05-16T03:06:58.385Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/55/a0/0ad93698a3ebc6846ca23aca20ff6f6f8ebe7b4f0c1de7f19e87c03dbe8f/types_python_http_client-3.3.7.20250708.tar.gz", hash = "sha256:5f85b32dc64671a4e5e016142169aa187c5abed0b196680944e4efd3d5ce3322", size = 7707, upload-time = "2025-07-08T03:14:36.197Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/c5/3f/b0e8db149896005adc938a1e7f371d6d7e9eca4053a29b108978ed15e0c2/types_python_dateutil-2.9.0.20250516-py3-none-any.whl", hash = "sha256:2b2b3f57f9c6a61fba26a9c0ffb9ea5681c9b83e69cd897c6b5f668d9c0cab93", size = 14356, upload-time = "2025-05-16T03:06:57.249Z" },
+ { url = "https://files.pythonhosted.org/packages/85/4f/b88274658cf489e35175be8571c970e9a1219713bafd8fc9e166d7351ecb/types_python_http_client-3.3.7.20250708-py3-none-any.whl", hash = "sha256:e2fc253859decab36713d82fc7f205868c3ddeaee79dbb55956ad9ca77abe12b", size = 8890, upload-time = "2025-07-08T03:14:35.506Z" },
]
[[package]]
@@ -5918,14 +5963,14 @@ wheels = [
[[package]]
name = "types-requests"
-version = "2.32.0.20250602"
+version = "2.32.4.20250611"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "urllib3" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/48/b0/5321e6eeba5d59e4347fcf9bf06a5052f085c3aa0f4876230566d6a4dc97/types_requests-2.32.0.20250602.tar.gz", hash = "sha256:ee603aeefec42051195ae62ca7667cd909a2f8128fdf8aad9e8a5219ecfab3bf", size = 23042, upload-time = "2025-06-02T03:15:02.958Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/6d/7f/73b3a04a53b0fd2a911d4ec517940ecd6600630b559e4505cc7b68beb5a0/types_requests-2.32.4.20250611.tar.gz", hash = "sha256:741c8777ed6425830bf51e54d6abe245f79b4dcb9019f1622b773463946bf826", size = 23118, upload-time = "2025-06-11T03:11:41.272Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/da/18/9b782980e575c6581d5c0c1c99f4c6f89a1d7173dad072ee96b2756c02e6/types_requests-2.32.0.20250602-py3-none-any.whl", hash = "sha256:f4f335f87779b47ce10b8b8597b409130299f6971ead27fead4fe7ba6ea3e726", size = 20638, upload-time = "2025-06-02T03:15:01.959Z" },
+ { url = "https://files.pythonhosted.org/packages/3d/ea/0be9258c5a4fa1ba2300111aa5a0767ee6d18eb3fd20e91616c12082284d/types_requests-2.32.4.20250611-py3-none-any.whl", hash = "sha256:ad2fe5d3b0cb3c2c902c8815a70e7fb2302c4b8c1f77bdcd738192cdb3878072", size = 20643, upload-time = "2025-06-11T03:11:40.186Z" },
]
[[package]]
@@ -6026,11 +6071,11 @@ wheels = [
[[package]]
name = "typing-extensions"
-version = "4.14.0"
+version = "4.14.1"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/d1/bc/51647cd02527e87d05cb083ccc402f93e441606ff1f01739a62c8ad09ba5/typing_extensions-4.14.0.tar.gz", hash = "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4", size = 107423, upload-time = "2025-06-02T14:52:11.399Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/98/5a/da40306b885cc8c09109dc2e1abd358d5684b1425678151cdaed4731c822/typing_extensions-4.14.1.tar.gz", hash = "sha256:38b39f4aeeab64884ce9f74c94263ef78f3c22467c8724005483154c26648d36", size = 107673, upload-time = "2025-07-04T13:28:34.16Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/69/e0/552843e0d356fbb5256d21449fa957fa4eff3bbc135a74a691ee70c7c5da/typing_extensions-4.14.0-py3-none-any.whl", hash = "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af", size = 43839, upload-time = "2025-06-02T14:52:10.026Z" },
+ { url = "https://files.pythonhosted.org/packages/b5/00/d631e67a838026495268c2f6884f3711a15a9a2a96cd244fdaea53b823fb/typing_extensions-4.14.1-py3-none-any.whl", hash = "sha256:d1e1e3b58374dc93031d6eda2420a48ea44a36c2b4766a4fdeb3710755731d76", size = 43906, upload-time = "2025-07-04T13:28:32.743Z" },
]
[[package]]
@@ -6158,7 +6203,7 @@ pptx = [
[[package]]
name = "unstructured-client"
-version = "0.36.0"
+version = "0.38.1"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "aiofiles" },
@@ -6169,9 +6214,9 @@ dependencies = [
{ name = "pypdf" },
{ name = "requests-toolbelt" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/9d/4d/d829dbef1138251de771cd52b277d93fb1c4e79d56be3e44e6d2ce76bd62/unstructured_client-0.36.0.tar.gz", hash = "sha256:ab293498100275c0e1d74c926c82dae2b3ba3fbb88945c0ba03b4b7a29197e4a", size = 86010, upload-time = "2025-05-29T00:11:11.429Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/85/60/412092671bfc4952640739f2c0c9b2f4c8af26a3c921738fd12621b4ddd8/unstructured_client-0.38.1.tar.gz", hash = "sha256:43ab0670dd8ff53d71e74f9b6dfe490a84a5303dab80a4873e118a840c6d46ca", size = 91781, upload-time = "2025-07-03T15:46:35.054Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/b9/4a/ae162e583bbdd0996f92ad18871a737d710260d8c0cfd78f1be6aa0ac150/unstructured_client-0.36.0-py3-none-any.whl", hash = "sha256:d0ecf3ac4d481437d858147904ff6e41205032cf8353af5cdd3ebaa190481d6a", size = 195765, upload-time = "2025-05-29T00:11:09.677Z" },
+ { url = "https://files.pythonhosted.org/packages/26/e0/8c249f00ba85fb4aba5c541463312befbfbf491105ff5c06e508089467be/unstructured_client-0.38.1-py3-none-any.whl", hash = "sha256:71e5467870d0a0119c788c29ec8baf5c0f7123f424affc9d6682eeeb7b8d45fa", size = 212626, upload-time = "2025-07-03T15:46:33.929Z" },
]
[[package]]
@@ -6197,54 +6242,33 @@ wheels = [
[[package]]
name = "urllib3"
-version = "2.4.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/8a/78/16493d9c386d8e60e442a35feac5e00f0913c0f4b7c217c11e8ec2ff53e0/urllib3-2.4.0.tar.gz", hash = "sha256:414bc6535b787febd7567804cc015fee39daab8ad86268f1310a9250697de466", size = 390672, upload-time = "2025-04-10T15:23:39.232Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/6b/11/cc635220681e93a0183390e26485430ca2c7b5f9d33b15c74c2861cb8091/urllib3-2.4.0-py3-none-any.whl", hash = "sha256:4e16665048960a0900c702d4a66415956a584919c03361cac9f1df5c5dd7e813", size = 128680, upload-time = "2025-04-10T15:23:37.377Z" },
-]
-
-[[package]]
-name = "uuid-utils"
-version = "0.11.0"
+version = "2.5.0"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/24/7f/7d83b937889d65682d95b40c94ba226b353d3f532290ee3acb17c8746e49/uuid_utils-0.11.0.tar.gz", hash = "sha256:18cf2b7083da7f3cca0517647213129eb16d20d7ed0dd74b3f4f8bff2aa334ea", size = 18854, upload-time = "2025-05-22T11:23:15.596Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/15/22/9ee70a2574a4f4599c47dd506532914ce044817c7752a79b6a51286319bc/urllib3-2.5.0.tar.gz", hash = "sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760", size = 393185, upload-time = "2025-06-18T14:07:41.644Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/d2/20/4a34f2a6e77b1f0f3334b111e4d2411fc8646ab2987892a36507e2d6a498/uuid_utils-0.11.0-cp39-abi3-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:094445ccd323bc5507e28e9d6d86b983513efcf19ab59c2dd75239cef765631a", size = 593779, upload-time = "2025-05-22T11:22:41.36Z" },
- { url = "https://files.pythonhosted.org/packages/a1/a1/1897cd3d37144f698392ec8aae89da2c00c6d34acd77f75312477f4510ab/uuid_utils-0.11.0-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:6430b53d343215f85269ffd74e1d1f4b25ae1031acf0ac24ff3d5721f6a06f48", size = 300848, upload-time = "2025-05-22T11:22:43.221Z" },
- { url = "https://files.pythonhosted.org/packages/d4/36/3ae8896de8a5320a9e7529452ed29af0082daf8c3787f17c5cbf9defc651/uuid_utils-0.11.0-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:be2e6e4318d23195887fa74fa1d64565a34f7127fdcf22918954981d79765f68", size = 336053, upload-time = "2025-05-22T11:22:44.741Z" },
- { url = "https://files.pythonhosted.org/packages/fe/b6/751e84cd056074a40ca9ac21db6ca4802e31d78207309c0d9c8ff69cd43b/uuid_utils-0.11.0-cp39-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d37289ab72aa30b5550bfa64d91431c62c89e4969bdf989988aa97f918d5f803", size = 338529, upload-time = "2025-05-22T11:22:46.303Z" },
- { url = "https://files.pythonhosted.org/packages/3b/c2/f6a1c00a1b067a886fc57c24da46bb0bcb753c92afb898871c6df3ae606f/uuid_utils-0.11.0-cp39-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1012595220f945fe09641f1365a8a06915bf432cac1b31ebd262944934a9b787", size = 480378, upload-time = "2025-05-22T11:22:47.482Z" },
- { url = "https://files.pythonhosted.org/packages/60/ea/cefc0521e07a35e85416d145382ac4817957cdec037271d0c9e27cbc7d45/uuid_utils-0.11.0-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:35cd3fc718a673e4516e87afb9325558969eca513aa734515b9031d1b651bbb1", size = 332220, upload-time = "2025-05-22T11:22:48.55Z" },
- { url = "https://files.pythonhosted.org/packages/03/91/5929f209bd4660a7e3b4d47d26189d3cf33e14297312a5f51f5451805fec/uuid_utils-0.11.0-cp39-abi3-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ed325e0c40e0f59ae82b347f534df954b50cedf12bf60d025625538530e1965d", size = 359052, upload-time = "2025-05-22T11:22:49.617Z" },
- { url = "https://files.pythonhosted.org/packages/d8/0d/32034d5b13bc07dd95f23122cb743b4eeca8e6d88173ea3c7100c67b6269/uuid_utils-0.11.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:5c8b7cf201990ee3140956e541967bd556a7365ec738cb504b04187ad89c757a", size = 515186, upload-time = "2025-05-22T11:22:50.808Z" },
- { url = "https://files.pythonhosted.org/packages/e7/43/ccf2474f723d6de5e214c22999ffb34219acf83d1e3fff6a4734172e10c0/uuid_utils-0.11.0-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:9966df55bed5d538ba2e9cc40115796480f437f9007727116ef99dc2f42bd5fa", size = 535318, upload-time = "2025-05-22T11:22:52.304Z" },
- { url = "https://files.pythonhosted.org/packages/fb/05/f668b4ad2b3542cd021c4b27d1ff4e425f854f299bcf7ee36f304399a58c/uuid_utils-0.11.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:cb04b6c604968424b7e6398d54debbdd5b771b39fc1e648c6eabf3f1dc20582e", size = 502691, upload-time = "2025-05-22T11:22:53.483Z" },
- { url = "https://files.pythonhosted.org/packages/9e/0b/b906301638eef837c89b19206989dbe27794c591d794ecc06167d9a47c41/uuid_utils-0.11.0-cp39-abi3-win32.whl", hash = "sha256:18420eb3316bb514f09f2da15750ac135478c3a12a704e2c5fb59eab642bb255", size = 180147, upload-time = "2025-05-22T11:22:54.598Z" },
- { url = "https://files.pythonhosted.org/packages/56/99/ad24ee5ecfc5fbd4a4490bb59c0e72ce604d5eef08683d345546ff6a6f2d/uuid_utils-0.11.0-cp39-abi3-win_amd64.whl", hash = "sha256:37c4805af61a7cce899597d34e7c3dd5cb6a8b4b93a90fbca3826b071ba544df", size = 183574, upload-time = "2025-05-22T11:22:55.581Z" },
- { url = "https://files.pythonhosted.org/packages/0e/76/2301b1d34defc8c234596ffb6e6d456cd7ef061d108e10a14ceda5ec5d4b/uuid_utils-0.11.0-cp39-abi3-win_arm64.whl", hash = "sha256:4065cf17bbe97f6d8ccc7dc6a0bae7d28fd4797d7f32028a5abd979aeb7bf7c9", size = 181014, upload-time = "2025-05-22T11:22:56.575Z" },
+ { url = "https://files.pythonhosted.org/packages/a7/c2/fe1e52489ae3122415c51f387e221dd0773709bad6c6cdaa599e8a2c5185/urllib3-2.5.0-py3-none-any.whl", hash = "sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc", size = 129795, upload-time = "2025-06-18T14:07:40.39Z" },
]
[[package]]
name = "uuid6"
-version = "2024.7.10"
+version = "2025.0.1"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/2c/56/2560a9f1ccab9e12b1b3478a3c870796cf4d8ee5652bb19b61751cced14a/uuid6-2024.7.10.tar.gz", hash = "sha256:2d29d7f63f593caaeea0e0d0dd0ad8129c9c663b29e19bdf882e864bedf18fb0", size = 8705, upload-time = "2024-07-10T16:39:37.592Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ca/b7/4c0f736ca824b3a25b15e8213d1bcfc15f8ac2ae48d1b445b310892dc4da/uuid6-2025.0.1.tar.gz", hash = "sha256:cd0af94fa428675a44e32c5319ec5a3485225ba2179eefcf4c3f205ae30a81bd", size = 13932, upload-time = "2025-07-04T18:30:35.186Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/d3/3e/4ae6af487ce5781ed71d5fe10aca72e7cbc4d4f45afc31b120287082a8dd/uuid6-2024.7.10-py3-none-any.whl", hash = "sha256:93432c00ba403751f722829ad21759ff9db051dea140bf81493271e8e4dd18b7", size = 6376, upload-time = "2024-07-10T16:39:36.148Z" },
+ { url = "https://files.pythonhosted.org/packages/3d/b2/93faaab7962e2aa8d6e174afb6f76be2ca0ce89fde14d3af835acebcaa59/uuid6-2025.0.1-py3-none-any.whl", hash = "sha256:80530ce4d02a93cdf82e7122ca0da3ebbbc269790ec1cb902481fa3e9cc9ff99", size = 6979, upload-time = "2025-07-04T18:30:34.001Z" },
]
[[package]]
name = "uvicorn"
-version = "0.34.3"
+version = "0.35.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "click" },
{ name = "h11" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/de/ad/713be230bcda622eaa35c28f0d328c3675c371238470abdea52417f17a8e/uvicorn-0.34.3.tar.gz", hash = "sha256:35919a9a979d7a59334b6b10e05d77c1d0d574c50e0fc98b8b1a0f165708b55a", size = 76631, upload-time = "2025-06-01T07:48:17.531Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/5e/42/e0e305207bb88c6b8d3061399c6a961ffe5fbb7e2aa63c9234df7259e9cd/uvicorn-0.35.0.tar.gz", hash = "sha256:bc662f087f7cf2ce11a1d7fd70b90c9f98ef2e2831556dd078d131b96cc94a01", size = 78473, upload-time = "2025-06-28T16:15:46.058Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/6d/0d/8adfeaa62945f90d19ddc461c55f4a50c258af7662d34b6a3d5d1f8646f6/uvicorn-0.34.3-py3-none-any.whl", hash = "sha256:16246631db62bdfbf069b0645177d6e8a77ba950cfedbfd093acef9444e4d885", size = 62431, upload-time = "2025-06-01T07:48:15.664Z" },
+ { url = "https://files.pythonhosted.org/packages/d2/e2/dc81b1bd1dcfe91735810265e9d26bc8ec5da45b4c0f6237e286819194c3/uvicorn-0.35.0-py3-none-any.whl", hash = "sha256:197535216b25ff9b785e29a0b79199f55222193d47f820816e7da751e9bc8d4a", size = 66406, upload-time = "2025-06-28T16:15:44.816Z" },
]
[package.optional-dependencies]
@@ -6316,72 +6340,73 @@ wheels = [
[[package]]
name = "wandb"
-version = "0.19.11"
+version = "0.21.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "click" },
- { name = "docker-pycreds" },
{ name = "gitpython" },
+ { name = "packaging" },
{ name = "platformdirs" },
{ name = "protobuf" },
- { name = "psutil" },
{ name = "pydantic" },
{ name = "pyyaml" },
{ name = "requests" },
{ name = "sentry-sdk" },
- { name = "setproctitle" },
- { name = "setuptools" },
{ name = "typing-extensions" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/39/98/0ff2925a21b998d4b84731429f4554ca3d9b5cad42c09c075e7306c3aca0/wandb-0.19.11.tar.gz", hash = "sha256:3f50a27dfadbb25946a513ffe856c0e8e538b5626ef207aa50b00c3b0356bff8", size = 39511477, upload-time = "2025-05-07T20:50:01.341Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/73/09/c84264a219e20efd615e4d5d150cc7d359d57d51328d3fa94ee02d70ed9c/wandb-0.21.0.tar.gz", hash = "sha256:473e01ef200b59d780416062991effa7349a34e51425d4be5ff482af2dc39e02", size = 40085784, upload-time = "2025-07-02T00:24:15.516Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/4f/2c/f8bab58c73fdde4442f1baffd9ea5d1bb3113906a97a27e8d9ab72db7a69/wandb-0.19.11-py3-none-any.whl", hash = "sha256:ff3bf050ba25ebae7aedc9a775ffab90c28068832edfe5458423f488c2558f82", size = 6481327, upload-time = "2025-05-07T20:49:33.461Z" },
- { url = "https://files.pythonhosted.org/packages/45/4a/34b364280f690f4c6d7660f528fba9f13bdecabc4c869d266a4632cf836e/wandb-0.19.11-py3-none-macosx_10_14_x86_64.whl", hash = "sha256:0823fd9aa6343f40c04e01959997ca8c6d6adf1bd81c8d45261fa4915f1c6b67", size = 20555751, upload-time = "2025-05-07T20:49:36.392Z" },
- { url = "https://files.pythonhosted.org/packages/d8/e6/a27868fdb83a60df37b9d15e52c3353dd88d74442f27ae48cf765c6b9554/wandb-0.19.11-py3-none-macosx_11_0_arm64.whl", hash = "sha256:c758ef5439599d9023db5b3cf1698477055d82f9fae48af2779f63f1d289167c", size = 20377587, upload-time = "2025-05-07T20:49:39.126Z" },
- { url = "https://files.pythonhosted.org/packages/21/f7/d5cf5b58c2b3015364c7b2b6af6a440cbeda4103b67332e1e64b30f6252d/wandb-0.19.11-py3-none-macosx_11_0_x86_64.whl", hash = "sha256:de2dfd4911e7691735e271654c735e7b90cdee9d29a3796fbf06e9e92d48f3d7", size = 20985041, upload-time = "2025-05-07T20:49:41.571Z" },
- { url = "https://files.pythonhosted.org/packages/68/06/8b827f16a0b8f18002d2fffa7c5a7fd447946e0d0c68aeec0dd7eb18cdd3/wandb-0.19.11-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cfff738850770d26b13f8f3fe400a6456f1e39e87f3f29d5aa241b249476df95", size = 20017696, upload-time = "2025-05-07T20:49:44.04Z" },
- { url = "https://files.pythonhosted.org/packages/f9/31/eeb2878b26566c04c3e9b8b20b3ec3c54a2be50535088d36a37c008e07a3/wandb-0.19.11-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e8ff673007448df11cc69379ae0df28ead866800dc1ec7bc151b402db0bbcf40", size = 21425857, upload-time = "2025-05-07T20:49:46.347Z" },
- { url = "https://files.pythonhosted.org/packages/10/30/08988360678ae78334bb16625c28260fcaba49f500b89f8766807cb74d71/wandb-0.19.11-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:858bc5023fa1b3285d89d15f62be78afdb28301064daa49ea3f4ebde5dcedad2", size = 20023145, upload-time = "2025-05-07T20:49:48.965Z" },
- { url = "https://files.pythonhosted.org/packages/c8/e9/a639c42c8ca517c4d25e8970d64d0c5a9bd35b784faed5f47d9cca3dcd12/wandb-0.19.11-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:90e4b57649896acb16c3dd41b3093df1a169c2f1d94ff15d76af86b8a60dcdac", size = 21504842, upload-time = "2025-05-07T20:49:51.628Z" },
- { url = "https://files.pythonhosted.org/packages/44/74/dbe9277dd935b77dd16939cdf15357766fec0813a6e336cf5f1d07eb016e/wandb-0.19.11-py3-none-win32.whl", hash = "sha256:38dea43c7926d8800405a73b80b9adfe81eb315fc6f2ac6885c77eb966634421", size = 20767584, upload-time = "2025-05-07T20:49:56.629Z" },
- { url = "https://files.pythonhosted.org/packages/36/d5/215cac3edec5c5ac6e7231beb9d22466d5d4e4a132fa3a1d044f7d682c15/wandb-0.19.11-py3-none-win_amd64.whl", hash = "sha256:73402003c56ddc2198878492ab2bff55bb49bce5587eae5960e737d27c0c48f7", size = 20767588, upload-time = "2025-05-07T20:49:58.85Z" },
+ { url = "https://files.pythonhosted.org/packages/38/dd/65eac086e1bc337bb5f0eed65ba1fe4a6dbc62c97f094e8e9df1ef83ffed/wandb-0.21.0-py3-none-any.whl", hash = "sha256:316e8cd4329738f7562f7369e6eabeeb28ef9d473203f7ead0d03e5dba01c90d", size = 6504284, upload-time = "2025-07-02T00:23:46.671Z" },
+ { url = "https://files.pythonhosted.org/packages/17/a7/80556ce9097f59e10807aa68f4a9b29d736a90dca60852a9e2af1641baf8/wandb-0.21.0-py3-none-macosx_10_14_x86_64.whl", hash = "sha256:701d9cbdfcc8550a330c1b54a26f1585519180e0f19247867446593d34ace46b", size = 21717388, upload-time = "2025-07-02T00:23:49.348Z" },
+ { url = "https://files.pythonhosted.org/packages/23/ae/660bc75aa37bd23409822ea5ed616177d94873172d34271693c80405c820/wandb-0.21.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:01689faa6b691df23ba2367e0a1ecf6e4d0be44474905840098eedd1fbcb8bdf", size = 21141465, upload-time = "2025-07-02T00:23:52.602Z" },
+ { url = "https://files.pythonhosted.org/packages/23/ab/9861929530be56557c74002868c85d0d8ac57050cc21863afe909ae3d46f/wandb-0.21.0-py3-none-macosx_11_0_x86_64.whl", hash = "sha256:55d3f42ddb7971d1699752dff2b85bcb5906ad098d18ab62846c82e9ce5a238d", size = 21793511, upload-time = "2025-07-02T00:23:55.447Z" },
+ { url = "https://files.pythonhosted.org/packages/de/52/e5cad2eff6fbed1ac06f4a5b718457fa2fd437f84f5c8f0d31995a2ef046/wandb-0.21.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:893508f0c7da48917448daa5cd622c27ce7ce15119adaa861185034c2bd7b14c", size = 20704643, upload-time = "2025-07-02T00:23:58.255Z" },
+ { url = "https://files.pythonhosted.org/packages/83/8f/6bed9358cc33767c877b221d4f565e1ddf00caf4bbbe54d2e3bbc932c6a7/wandb-0.21.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a4e8245a8912247ddf7654f7b5330f583a6c56ab88fee65589158490d583c57d", size = 22243012, upload-time = "2025-07-02T00:24:01.423Z" },
+ { url = "https://files.pythonhosted.org/packages/be/61/9048015412ea5ca916844af55add4fed7c21fe1ad70bb137951e70b550c5/wandb-0.21.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:2e4c4f951e0d02755e315679bfdcb5bc38c1b02e2e5abc5432b91a91bb0cf246", size = 20716440, upload-time = "2025-07-02T00:24:04.198Z" },
+ { url = "https://files.pythonhosted.org/packages/02/d9/fcd2273d8ec3f79323e40a031aba5d32d6fa9065702010eb428b5ffbab62/wandb-0.21.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:873749966eeac0069e0e742e6210641b6227d454fb1dae2cf5c437c6ed42d3ca", size = 22320652, upload-time = "2025-07-02T00:24:07.175Z" },
+ { url = "https://files.pythonhosted.org/packages/80/68/b8308db6b9c3c96dcd03be17c019aee105e1d7dc1e74d70756cdfb9241c6/wandb-0.21.0-py3-none-win32.whl", hash = "sha256:9d3cccfba658fa011d6cab9045fa4f070a444885e8902ae863802549106a5dab", size = 21484296, upload-time = "2025-07-02T00:24:10.147Z" },
+ { url = "https://files.pythonhosted.org/packages/cf/96/71cc033e8abd00e54465e68764709ed945e2da2d66d764f72f4660262b22/wandb-0.21.0-py3-none-win_amd64.whl", hash = "sha256:28a0b2dad09d7c7344ac62b0276be18a2492a5578e4d7c84937a3e1991edaac7", size = 21484301, upload-time = "2025-07-02T00:24:12.658Z" },
]
[[package]]
name = "watchfiles"
-version = "1.0.5"
+version = "1.1.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "anyio" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/03/e2/8ed598c42057de7aa5d97c472254af4906ff0a59a66699d426fc9ef795d7/watchfiles-1.0.5.tar.gz", hash = "sha256:b7529b5dcc114679d43827d8c35a07c493ad6f083633d573d81c660abc5979e9", size = 94537, upload-time = "2025-04-08T10:36:26.722Z" }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/39/f4/41b591f59021786ef517e1cdc3b510383551846703e03f204827854a96f8/watchfiles-1.0.5-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:237f9be419e977a0f8f6b2e7b0475ababe78ff1ab06822df95d914a945eac827", size = 405336, upload-time = "2025-04-08T10:34:59.359Z" },
- { url = "https://files.pythonhosted.org/packages/ae/06/93789c135be4d6d0e4f63e96eea56dc54050b243eacc28439a26482b5235/watchfiles-1.0.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e0da39ff917af8b27a4bdc5a97ac577552a38aac0d260a859c1517ea3dc1a7c4", size = 395977, upload-time = "2025-04-08T10:35:00.522Z" },
- { url = "https://files.pythonhosted.org/packages/d2/db/1cd89bd83728ca37054512d4d35ab69b5f12b8aa2ac9be3b0276b3bf06cc/watchfiles-1.0.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2cfcb3952350e95603f232a7a15f6c5f86c5375e46f0bd4ae70d43e3e063c13d", size = 455232, upload-time = "2025-04-08T10:35:01.698Z" },
- { url = "https://files.pythonhosted.org/packages/40/90/d8a4d44ffe960517e487c9c04f77b06b8abf05eb680bed71c82b5f2cad62/watchfiles-1.0.5-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:68b2dddba7a4e6151384e252a5632efcaa9bc5d1c4b567f3cb621306b2ca9f63", size = 459151, upload-time = "2025-04-08T10:35:03.358Z" },
- { url = "https://files.pythonhosted.org/packages/6c/da/267a1546f26465dead1719caaba3ce660657f83c9d9c052ba98fb8856e13/watchfiles-1.0.5-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:95cf944fcfc394c5f9de794ce581914900f82ff1f855326f25ebcf24d5397418", size = 489054, upload-time = "2025-04-08T10:35:04.561Z" },
- { url = "https://files.pythonhosted.org/packages/b1/31/33850dfd5c6efb6f27d2465cc4c6b27c5a6f5ed53c6fa63b7263cf5f60f6/watchfiles-1.0.5-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ecf6cd9f83d7c023b1aba15d13f705ca7b7d38675c121f3cc4a6e25bd0857ee9", size = 523955, upload-time = "2025-04-08T10:35:05.786Z" },
- { url = "https://files.pythonhosted.org/packages/09/84/b7d7b67856efb183a421f1416b44ca975cb2ea6c4544827955dfb01f7dc2/watchfiles-1.0.5-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:852de68acd6212cd6d33edf21e6f9e56e5d98c6add46f48244bd479d97c967c6", size = 502234, upload-time = "2025-04-08T10:35:07.187Z" },
- { url = "https://files.pythonhosted.org/packages/71/87/6dc5ec6882a2254cfdd8b0718b684504e737273903b65d7338efaba08b52/watchfiles-1.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5730f3aa35e646103b53389d5bc77edfbf578ab6dab2e005142b5b80a35ef25", size = 454750, upload-time = "2025-04-08T10:35:08.859Z" },
- { url = "https://files.pythonhosted.org/packages/3d/6c/3786c50213451a0ad15170d091570d4a6554976cf0df19878002fc96075a/watchfiles-1.0.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:18b3bd29954bc4abeeb4e9d9cf0b30227f0f206c86657674f544cb032296acd5", size = 631591, upload-time = "2025-04-08T10:35:10.64Z" },
- { url = "https://files.pythonhosted.org/packages/1b/b3/1427425ade4e359a0deacce01a47a26024b2ccdb53098f9d64d497f6684c/watchfiles-1.0.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ba5552a1b07c8edbf197055bc9d518b8f0d98a1c6a73a293bc0726dce068ed01", size = 625370, upload-time = "2025-04-08T10:35:12.412Z" },
- { url = "https://files.pythonhosted.org/packages/15/ba/f60e053b0b5b8145d682672024aa91370a29c5c921a88977eb565de34086/watchfiles-1.0.5-cp311-cp311-win32.whl", hash = "sha256:2f1fefb2e90e89959447bc0420fddd1e76f625784340d64a2f7d5983ef9ad246", size = 277791, upload-time = "2025-04-08T10:35:13.719Z" },
- { url = "https://files.pythonhosted.org/packages/50/ed/7603c4e164225c12c0d4e8700b64bb00e01a6c4eeea372292a3856be33a4/watchfiles-1.0.5-cp311-cp311-win_amd64.whl", hash = "sha256:b6e76ceb1dd18c8e29c73f47d41866972e891fc4cc7ba014f487def72c1cf096", size = 291622, upload-time = "2025-04-08T10:35:15.071Z" },
- { url = "https://files.pythonhosted.org/packages/a2/c2/99bb7c96b4450e36877fde33690ded286ff555b5a5c1d925855d556968a1/watchfiles-1.0.5-cp311-cp311-win_arm64.whl", hash = "sha256:266710eb6fddc1f5e51843c70e3bebfb0f5e77cf4f27129278c70554104d19ed", size = 283699, upload-time = "2025-04-08T10:35:16.732Z" },
- { url = "https://files.pythonhosted.org/packages/2a/8c/4f0b9bdb75a1bfbd9c78fad7d8854369283f74fe7cf03eb16be77054536d/watchfiles-1.0.5-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:b5eb568c2aa6018e26da9e6c86f3ec3fd958cee7f0311b35c2630fa4217d17f2", size = 401511, upload-time = "2025-04-08T10:35:17.956Z" },
- { url = "https://files.pythonhosted.org/packages/dc/4e/7e15825def77f8bd359b6d3f379f0c9dac4eb09dd4ddd58fd7d14127179c/watchfiles-1.0.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0a04059f4923ce4e856b4b4e5e783a70f49d9663d22a4c3b3298165996d1377f", size = 392715, upload-time = "2025-04-08T10:35:19.202Z" },
- { url = "https://files.pythonhosted.org/packages/58/65/b72fb817518728e08de5840d5d38571466c1b4a3f724d190cec909ee6f3f/watchfiles-1.0.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3e380c89983ce6e6fe2dd1e1921b9952fb4e6da882931abd1824c092ed495dec", size = 454138, upload-time = "2025-04-08T10:35:20.586Z" },
- { url = "https://files.pythonhosted.org/packages/3e/a4/86833fd2ea2e50ae28989f5950b5c3f91022d67092bfec08f8300d8b347b/watchfiles-1.0.5-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fe43139b2c0fdc4a14d4f8d5b5d967f7a2777fd3d38ecf5b1ec669b0d7e43c21", size = 458592, upload-time = "2025-04-08T10:35:21.87Z" },
- { url = "https://files.pythonhosted.org/packages/38/7e/42cb8df8be9a37e50dd3a818816501cf7a20d635d76d6bd65aae3dbbff68/watchfiles-1.0.5-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ee0822ce1b8a14fe5a066f93edd20aada932acfe348bede8aa2149f1a4489512", size = 487532, upload-time = "2025-04-08T10:35:23.143Z" },
- { url = "https://files.pythonhosted.org/packages/fc/fd/13d26721c85d7f3df6169d8b495fcac8ab0dc8f0945ebea8845de4681dab/watchfiles-1.0.5-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a0dbcb1c2d8f2ab6e0a81c6699b236932bd264d4cef1ac475858d16c403de74d", size = 522865, upload-time = "2025-04-08T10:35:24.702Z" },
- { url = "https://files.pythonhosted.org/packages/a1/0d/7f9ae243c04e96c5455d111e21b09087d0eeaf9a1369e13a01c7d3d82478/watchfiles-1.0.5-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a2014a2b18ad3ca53b1f6c23f8cd94a18ce930c1837bd891262c182640eb40a6", size = 499887, upload-time = "2025-04-08T10:35:25.969Z" },
- { url = "https://files.pythonhosted.org/packages/8e/0f/a257766998e26aca4b3acf2ae97dff04b57071e991a510857d3799247c67/watchfiles-1.0.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10f6ae86d5cb647bf58f9f655fcf577f713915a5d69057a0371bc257e2553234", size = 454498, upload-time = "2025-04-08T10:35:27.353Z" },
- { url = "https://files.pythonhosted.org/packages/81/79/8bf142575a03e0af9c3d5f8bcae911ee6683ae93a625d349d4ecf4c8f7df/watchfiles-1.0.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:1a7bac2bde1d661fb31f4d4e8e539e178774b76db3c2c17c4bb3e960a5de07a2", size = 630663, upload-time = "2025-04-08T10:35:28.685Z" },
- { url = "https://files.pythonhosted.org/packages/f1/80/abe2e79f610e45c63a70d271caea90c49bbf93eb00fa947fa9b803a1d51f/watchfiles-1.0.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4ab626da2fc1ac277bbf752446470b367f84b50295264d2d313e28dc4405d663", size = 625410, upload-time = "2025-04-08T10:35:30.42Z" },
- { url = "https://files.pythonhosted.org/packages/91/6f/bc7fbecb84a41a9069c2c6eb6319f7f7df113adf113e358c57fc1aff7ff5/watchfiles-1.0.5-cp312-cp312-win32.whl", hash = "sha256:9f4571a783914feda92018ef3901dab8caf5b029325b5fe4558c074582815249", size = 277965, upload-time = "2025-04-08T10:35:32.023Z" },
- { url = "https://files.pythonhosted.org/packages/99/a5/bf1c297ea6649ec59e935ab311f63d8af5faa8f0b86993e3282b984263e3/watchfiles-1.0.5-cp312-cp312-win_amd64.whl", hash = "sha256:360a398c3a19672cf93527f7e8d8b60d8275119c5d900f2e184d32483117a705", size = 291693, upload-time = "2025-04-08T10:35:33.225Z" },
- { url = "https://files.pythonhosted.org/packages/7f/7b/fd01087cc21db5c47e5beae507b87965db341cce8a86f9eb12bf5219d4e0/watchfiles-1.0.5-cp312-cp312-win_arm64.whl", hash = "sha256:1a2902ede862969077b97523987c38db28abbe09fb19866e711485d9fbf0d417", size = 283287, upload-time = "2025-04-08T10:35:34.568Z" },
+sdist = { url = "https://files.pythonhosted.org/packages/2a/9a/d451fcc97d029f5812e898fd30a53fd8c15c7bbd058fd75cfc6beb9bd761/watchfiles-1.1.0.tar.gz", hash = "sha256:693ed7ec72cbfcee399e92c895362b6e66d63dac6b91e2c11ae03d10d503e575", size = 94406, upload-time = "2025-06-15T19:06:59.42Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/8b/78/7401154b78ab484ccaaeef970dc2af0cb88b5ba8a1b415383da444cdd8d3/watchfiles-1.1.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:c9649dfc57cc1f9835551deb17689e8d44666315f2e82d337b9f07bd76ae3aa2", size = 405751, upload-time = "2025-06-15T19:05:07.679Z" },
+ { url = "https://files.pythonhosted.org/packages/76/63/e6c3dbc1f78d001589b75e56a288c47723de28c580ad715eb116639152b5/watchfiles-1.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:406520216186b99374cdb58bc48e34bb74535adec160c8459894884c983a149c", size = 397313, upload-time = "2025-06-15T19:05:08.764Z" },
+ { url = "https://files.pythonhosted.org/packages/6c/a2/8afa359ff52e99af1632f90cbf359da46184207e893a5f179301b0c8d6df/watchfiles-1.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb45350fd1dc75cd68d3d72c47f5b513cb0578da716df5fba02fff31c69d5f2d", size = 450792, upload-time = "2025-06-15T19:05:09.869Z" },
+ { url = "https://files.pythonhosted.org/packages/1d/bf/7446b401667f5c64972a57a0233be1104157fc3abf72c4ef2666c1bd09b2/watchfiles-1.1.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:11ee4444250fcbeb47459a877e5e80ed994ce8e8d20283857fc128be1715dac7", size = 458196, upload-time = "2025-06-15T19:05:11.91Z" },
+ { url = "https://files.pythonhosted.org/packages/58/2f/501ddbdfa3fa874ea5597c77eeea3d413579c29af26c1091b08d0c792280/watchfiles-1.1.0-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bda8136e6a80bdea23e5e74e09df0362744d24ffb8cd59c4a95a6ce3d142f79c", size = 484788, upload-time = "2025-06-15T19:05:13.373Z" },
+ { url = "https://files.pythonhosted.org/packages/61/1e/9c18eb2eb5c953c96bc0e5f626f0e53cfef4bd19bd50d71d1a049c63a575/watchfiles-1.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b915daeb2d8c1f5cee4b970f2e2c988ce6514aace3c9296e58dd64dc9aa5d575", size = 597879, upload-time = "2025-06-15T19:05:14.725Z" },
+ { url = "https://files.pythonhosted.org/packages/8b/6c/1467402e5185d89388b4486745af1e0325007af0017c3384cc786fff0542/watchfiles-1.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ed8fc66786de8d0376f9f913c09e963c66e90ced9aa11997f93bdb30f7c872a8", size = 477447, upload-time = "2025-06-15T19:05:15.775Z" },
+ { url = "https://files.pythonhosted.org/packages/2b/a1/ec0a606bde4853d6c4a578f9391eeb3684a9aea736a8eb217e3e00aa89a1/watchfiles-1.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fe4371595edf78c41ef8ac8df20df3943e13defd0efcb732b2e393b5a8a7a71f", size = 453145, upload-time = "2025-06-15T19:05:17.17Z" },
+ { url = "https://files.pythonhosted.org/packages/90/b9/ef6f0c247a6a35d689fc970dc7f6734f9257451aefb30def5d100d6246a5/watchfiles-1.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:b7c5f6fe273291f4d414d55b2c80d33c457b8a42677ad14b4b47ff025d0893e4", size = 626539, upload-time = "2025-06-15T19:05:18.557Z" },
+ { url = "https://files.pythonhosted.org/packages/34/44/6ffda5537085106ff5aaa762b0d130ac6c75a08015dd1621376f708c94de/watchfiles-1.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:7738027989881e70e3723c75921f1efa45225084228788fc59ea8c6d732eb30d", size = 624472, upload-time = "2025-06-15T19:05:19.588Z" },
+ { url = "https://files.pythonhosted.org/packages/c3/e3/71170985c48028fa3f0a50946916a14055e741db11c2e7bc2f3b61f4d0e3/watchfiles-1.1.0-cp311-cp311-win32.whl", hash = "sha256:622d6b2c06be19f6e89b1d951485a232e3b59618def88dbeda575ed8f0d8dbf2", size = 279348, upload-time = "2025-06-15T19:05:20.856Z" },
+ { url = "https://files.pythonhosted.org/packages/89/1b/3e39c68b68a7a171070f81fc2561d23ce8d6859659406842a0e4bebf3bba/watchfiles-1.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:48aa25e5992b61debc908a61ab4d3f216b64f44fdaa71eb082d8b2de846b7d12", size = 292607, upload-time = "2025-06-15T19:05:21.937Z" },
+ { url = "https://files.pythonhosted.org/packages/61/9f/2973b7539f2bdb6ea86d2c87f70f615a71a1fc2dba2911795cea25968aea/watchfiles-1.1.0-cp311-cp311-win_arm64.whl", hash = "sha256:00645eb79a3faa70d9cb15c8d4187bb72970b2470e938670240c7998dad9f13a", size = 285056, upload-time = "2025-06-15T19:05:23.12Z" },
+ { url = "https://files.pythonhosted.org/packages/f6/b8/858957045a38a4079203a33aaa7d23ea9269ca7761c8a074af3524fbb240/watchfiles-1.1.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:9dc001c3e10de4725c749d4c2f2bdc6ae24de5a88a339c4bce32300a31ede179", size = 402339, upload-time = "2025-06-15T19:05:24.516Z" },
+ { url = "https://files.pythonhosted.org/packages/80/28/98b222cca751ba68e88521fabd79a4fab64005fc5976ea49b53fa205d1fa/watchfiles-1.1.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d9ba68ec283153dead62cbe81872d28e053745f12335d037de9cbd14bd1877f5", size = 394409, upload-time = "2025-06-15T19:05:25.469Z" },
+ { url = "https://files.pythonhosted.org/packages/86/50/dee79968566c03190677c26f7f47960aff738d32087087bdf63a5473e7df/watchfiles-1.1.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:130fc497b8ee68dce163e4254d9b0356411d1490e868bd8790028bc46c5cc297", size = 450939, upload-time = "2025-06-15T19:05:26.494Z" },
+ { url = "https://files.pythonhosted.org/packages/40/45/a7b56fb129700f3cfe2594a01aa38d033b92a33dddce86c8dfdfc1247b72/watchfiles-1.1.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:50a51a90610d0845a5931a780d8e51d7bd7f309ebc25132ba975aca016b576a0", size = 457270, upload-time = "2025-06-15T19:05:27.466Z" },
+ { url = "https://files.pythonhosted.org/packages/b5/c8/fa5ef9476b1d02dc6b5e258f515fcaaecf559037edf8b6feffcbc097c4b8/watchfiles-1.1.0-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dc44678a72ac0910bac46fa6a0de6af9ba1355669b3dfaf1ce5f05ca7a74364e", size = 483370, upload-time = "2025-06-15T19:05:28.548Z" },
+ { url = "https://files.pythonhosted.org/packages/98/68/42cfcdd6533ec94f0a7aab83f759ec11280f70b11bfba0b0f885e298f9bd/watchfiles-1.1.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a543492513a93b001975ae283a51f4b67973662a375a403ae82f420d2c7205ee", size = 598654, upload-time = "2025-06-15T19:05:29.997Z" },
+ { url = "https://files.pythonhosted.org/packages/d3/74/b2a1544224118cc28df7e59008a929e711f9c68ce7d554e171b2dc531352/watchfiles-1.1.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8ac164e20d17cc285f2b94dc31c384bc3aa3dd5e7490473b3db043dd70fbccfd", size = 478667, upload-time = "2025-06-15T19:05:31.172Z" },
+ { url = "https://files.pythonhosted.org/packages/8c/77/e3362fe308358dc9f8588102481e599c83e1b91c2ae843780a7ded939a35/watchfiles-1.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f7590d5a455321e53857892ab8879dce62d1f4b04748769f5adf2e707afb9d4f", size = 452213, upload-time = "2025-06-15T19:05:32.299Z" },
+ { url = "https://files.pythonhosted.org/packages/6e/17/c8f1a36540c9a1558d4faf08e909399e8133599fa359bf52ec8fcee5be6f/watchfiles-1.1.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:37d3d3f7defb13f62ece99e9be912afe9dd8a0077b7c45ee5a57c74811d581a4", size = 626718, upload-time = "2025-06-15T19:05:33.415Z" },
+ { url = "https://files.pythonhosted.org/packages/26/45/fb599be38b4bd38032643783d7496a26a6f9ae05dea1a42e58229a20ac13/watchfiles-1.1.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:7080c4bb3efd70a07b1cc2df99a7aa51d98685be56be6038c3169199d0a1c69f", size = 623098, upload-time = "2025-06-15T19:05:34.534Z" },
+ { url = "https://files.pythonhosted.org/packages/a1/e7/fdf40e038475498e160cd167333c946e45d8563ae4dd65caf757e9ffe6b4/watchfiles-1.1.0-cp312-cp312-win32.whl", hash = "sha256:cbcf8630ef4afb05dc30107bfa17f16c0896bb30ee48fc24bf64c1f970f3b1fd", size = 279209, upload-time = "2025-06-15T19:05:35.577Z" },
+ { url = "https://files.pythonhosted.org/packages/3f/d3/3ae9d5124ec75143bdf088d436cba39812122edc47709cd2caafeac3266f/watchfiles-1.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:cbd949bdd87567b0ad183d7676feb98136cde5bb9025403794a4c0db28ed3a47", size = 292786, upload-time = "2025-06-15T19:05:36.559Z" },
+ { url = "https://files.pythonhosted.org/packages/26/2f/7dd4fc8b5f2b34b545e19629b4a018bfb1de23b3a496766a2c1165ca890d/watchfiles-1.1.0-cp312-cp312-win_arm64.whl", hash = "sha256:0a7d40b77f07be87c6faa93d0951a0fcd8cbca1ddff60a1b65d741bac6f3a9f6", size = 284343, upload-time = "2025-06-15T19:05:37.5Z" },
+ { url = "https://files.pythonhosted.org/packages/8c/6b/686dcf5d3525ad17b384fd94708e95193529b460a1b7bf40851f1328ec6e/watchfiles-1.1.0-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:0ece16b563b17ab26eaa2d52230c9a7ae46cf01759621f4fbbca280e438267b3", size = 406910, upload-time = "2025-06-15T19:06:49.335Z" },
+ { url = "https://files.pythonhosted.org/packages/f3/d3/71c2dcf81dc1edcf8af9f4d8d63b1316fb0a2dd90cbfd427e8d9dd584a90/watchfiles-1.1.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:51b81e55d40c4b4aa8658427a3ee7ea847c591ae9e8b81ef94a90b668999353c", size = 398816, upload-time = "2025-06-15T19:06:50.433Z" },
+ { url = "https://files.pythonhosted.org/packages/b8/fa/12269467b2fc006f8fce4cd6c3acfa77491dd0777d2a747415f28ccc8c60/watchfiles-1.1.0-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f2bcdc54ea267fe72bfc7d83c041e4eb58d7d8dc6f578dfddb52f037ce62f432", size = 451584, upload-time = "2025-06-15T19:06:51.834Z" },
+ { url = "https://files.pythonhosted.org/packages/bd/d3/254cea30f918f489db09d6a8435a7de7047f8cb68584477a515f160541d6/watchfiles-1.1.0-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:923fec6e5461c42bd7e3fd5ec37492c6f3468be0499bc0707b4bbbc16ac21792", size = 454009, upload-time = "2025-06-15T19:06:52.896Z" },
]
[[package]]
@@ -6395,7 +6420,7 @@ wheels = [
[[package]]
name = "weave"
-version = "0.51.50"
+version = "0.51.54"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "click" },
@@ -6409,12 +6434,11 @@ dependencies = [
{ name = "pydantic" },
{ name = "rich" },
{ name = "tenacity" },
- { name = "uuid-utils" },
{ name = "wandb" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/fe/d1/47ab7923eb389ec7b1ca0138d9929dc50bfd0dfac324f42167f99fa02798/weave-0.51.50.tar.gz", hash = "sha256:773434765a3230bf8f4dfe9e04f9c7dfd90b03f18bb5e069186ce67d1f7c4dd8", size = 410739, upload-time = "2025-06-02T21:20:45.208Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/fb/2b/bdac08ae2fa7f660e3fb02e9f4acec5a5683509decd8fbd1ad5641160d3a/weave-0.51.54.tar.gz", hash = "sha256:41aaaa770c0ac2259325dd6035e1bf96f47fb92dbd4eec54d3ef4847587cc061", size = 425873, upload-time = "2025-06-16T21:57:47.582Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/e4/4a/72ed6f8435759f44090c8ae81d3a50716f0c3e527e733a78e77b9a834372/weave-0.51.50-py3-none-any.whl", hash = "sha256:23fb74ec95f57fe30f31019f32f6626f39993aa228024eb9cf8fe83e58b698de", size = 524057, upload-time = "2025-06-02T21:20:43.205Z" },
+ { url = "https://files.pythonhosted.org/packages/48/4d/7cee23e5bf5faab149aeb7cca367a434c4aec1fa0cb1f5a1d20149a2bf6f/weave-0.51.54-py3-none-any.whl", hash = "sha256:7de2c0da8061bc007de2f74fb3dd2496d24337dff3723f057be49fcf53e0a3a2", size = 542168, upload-time = "2025-06-16T21:57:44.929Z" },
]
[[package]]
@@ -6548,20 +6572,20 @@ wheels = [
[[package]]
name = "xlrd"
-version = "2.0.1"
+version = "2.0.2"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/a6/b3/19a2540d21dea5f908304375bd43f5ed7a4c28a370dc9122c565423e6b44/xlrd-2.0.1.tar.gz", hash = "sha256:f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88", size = 100259, upload-time = "2020-12-11T10:14:22.201Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/07/5a/377161c2d3538d1990d7af382c79f3b2372e880b65de21b01b1a2b78691e/xlrd-2.0.2.tar.gz", hash = "sha256:08b5e25de58f21ce71dc7db3b3b8106c1fa776f3024c54e45b45b374e89234c9", size = 100167, upload-time = "2025-06-14T08:46:39.039Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/a6/0c/c2a72d51fe56e08a08acc85d13013558a2d793028ae7385448a6ccdfae64/xlrd-2.0.1-py2.py3-none-any.whl", hash = "sha256:6a33ee89877bd9abc1158129f6e94be74e2679636b8a205b43b85206c3f0bbdd", size = 96531, upload-time = "2020-12-11T10:14:20.877Z" },
+ { url = "https://files.pythonhosted.org/packages/1a/62/c8d562e7766786ba6587d09c5a8ba9f718ed3fa8af7f4553e8f91c36f302/xlrd-2.0.2-py2.py3-none-any.whl", hash = "sha256:ea762c3d29f4cca48d82df517b6d89fbce4db3107f9d78713e48cd321d5c9aa9", size = 96555, upload-time = "2025-06-14T08:46:37.766Z" },
]
[[package]]
name = "xlsxwriter"
-version = "3.2.3"
+version = "3.2.5"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/a7/d1/e026d33dd5d552e5bf3a873dee54dad66b550230df8290d79394f09b2315/xlsxwriter-3.2.3.tar.gz", hash = "sha256:ad6fd41bdcf1b885876b1f6b7087560aecc9ae5a9cc2ba97dcac7ab2e210d3d5", size = 209135, upload-time = "2025-04-17T10:11:23.481Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/a7/47/7704bac42ac6fe1710ae099b70e6a1e68ed173ef14792b647808c357da43/xlsxwriter-3.2.5.tar.gz", hash = "sha256:7e88469d607cdc920151c0ab3ce9cf1a83992d4b7bc730c5ffdd1a12115a7dbe", size = 213306, upload-time = "2025-06-17T08:59:14.619Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/37/b1/a252d499f2760b314fcf264d2b36fcc4343a1ecdb25492b210cb0db70a68/XlsxWriter-3.2.3-py3-none-any.whl", hash = "sha256:593f8296e8a91790c6d0378ab08b064f34a642b3feb787cf6738236bd0a4860d", size = 169433, upload-time = "2025-04-17T10:11:21.329Z" },
+ { url = "https://files.pythonhosted.org/packages/fa/34/a22e6664211f0c8879521328000bdcae9bf6dbafa94a923e531f6d5b3f73/xlsxwriter-3.2.5-py3-none-any.whl", hash = "sha256:4f4824234e1eaf9d95df9a8fe974585ff91d0f5e3d3f12ace5b71e443c1c6abd", size = 172347, upload-time = "2025-06-17T08:59:13.453Z" },
]
[[package]]
@@ -6621,23 +6645,23 @@ wheels = [
[[package]]
name = "zipp"
-version = "3.22.0"
+version = "3.23.0"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/12/b6/7b3d16792fdf94f146bed92be90b4eb4563569eca91513c8609aebf0c167/zipp-3.22.0.tar.gz", hash = "sha256:dd2f28c3ce4bc67507bfd3781d21b7bb2be31103b51a4553ad7d90b84e57ace5", size = 25257, upload-time = "2025-05-26T14:46:32.217Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/e3/02/0f2892c661036d50ede074e376733dca2ae7c6eb617489437771209d4180/zipp-3.23.0.tar.gz", hash = "sha256:a07157588a12518c9d4034df3fbbee09c814741a33ff63c05fa29d26a2404166", size = 25547, upload-time = "2025-06-08T17:06:39.4Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/ad/da/f64669af4cae46f17b90798a827519ce3737d31dbafad65d391e49643dc4/zipp-3.22.0-py3-none-any.whl", hash = "sha256:fe208f65f2aca48b81f9e6fd8cf7b8b32c26375266b009b413d45306b6148343", size = 9796, upload-time = "2025-05-26T14:46:30.775Z" },
+ { url = "https://files.pythonhosted.org/packages/2e/54/647ade08bf0db230bfea292f893923872fd20be6ac6f53b2b936ba839d75/zipp-3.23.0-py3-none-any.whl", hash = "sha256:071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e", size = 10276, upload-time = "2025-06-08T17:06:38.034Z" },
]
[[package]]
name = "zope-event"
-version = "5.0"
+version = "5.1"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "setuptools" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/46/c2/427f1867bb96555d1d34342f1dd97f8c420966ab564d58d18469a1db8736/zope.event-5.0.tar.gz", hash = "sha256:bac440d8d9891b4068e2b5a2c5e2c9765a9df762944bda6955f96bb9b91e67cd", size = 17350, upload-time = "2023-06-23T06:28:35.709Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/8b/c7/31e6f40282a2c548602c177826df281177caf79efaa101dd14314fb4ee73/zope_event-5.1.tar.gz", hash = "sha256:a153660e0c228124655748e990396b9d8295d6e4f546fa1b34f3319e1c666e7f", size = 18632, upload-time = "2025-06-26T07:14:22.72Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/fe/42/f8dbc2b9ad59e927940325a22d6d3931d630c3644dae7e2369ef5d9ba230/zope.event-5.0-py3-none-any.whl", hash = "sha256:2832e95014f4db26c47a13fdaef84cef2f4df37e66b59d8f1f4a8f319a632c26", size = 6824, upload-time = "2023-06-23T06:28:32.652Z" },
+ { url = "https://files.pythonhosted.org/packages/00/ed/d8c3f56c1edb0ee9b51461dd08580382e9589850f769b69f0dedccff5215/zope_event-5.1-py3-none-any.whl", hash = "sha256:53de8f0e9f61dc0598141ac591f49b042b6d74784dab49971b9cc91d0f73a7df", size = 6905, upload-time = "2025-06-26T07:14:21.779Z" },
]
[[package]]
diff --git a/dev/mypy-check b/dev/mypy-check
index b1c2c969a8..8a2342730c 100755
--- a/dev/mypy-check
+++ b/dev/mypy-check
@@ -7,4 +7,4 @@ cd "$SCRIPT_DIR/.."
# run mypy checks
uv run --directory api --dev --with pip \
- python -m mypy --install-types --non-interactive ./
+ python -m mypy --install-types --non-interactive --exclude venv ./
diff --git a/docker/.env.example b/docker/.env.example
index d4d59936eb..6149f63165 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -47,6 +47,11 @@ APP_WEB_URL=
# ensuring port 5001 is externally accessible (see docker-compose.yaml).
FILES_URL=
+# INTERNAL_FILES_URL is used for plugin daemon communication within Docker network.
+# Set this to the internal Docker service URL for proper plugin file access.
+# Example: INTERNAL_FILES_URL=http://api:5001
+INTERNAL_FILES_URL=
+
# ------------------------------
# Server Configuration
# ------------------------------
@@ -209,6 +214,10 @@ SQLALCHEMY_POOL_SIZE=30
SQLALCHEMY_POOL_RECYCLE=3600
# Whether to print SQL, default is false.
SQLALCHEMY_ECHO=false
+# If True, will test connections for liveness upon each checkout
+SQLALCHEMY_POOL_PRE_PING=false
+# Whether to enable the Last in first out option or use default FIFO queue if is false
+SQLALCHEMY_POOL_USE_LIFO=false
# Maximum number of connections to the database
# Default is 100
@@ -274,17 +283,20 @@ REDIS_CLUSTERS_PASSWORD=
# Celery Configuration
# ------------------------------
-# Use redis as the broker, and redis db 1 for celery broker.
-# Format as follows: `redis://:@:/`
+# Use standalone redis as the broker, and redis db 1 for celery broker. (redis_username is usually set by defualt as empty)
+# Format as follows: `redis://:@:/`.
# Example: redis://:difyai123456@redis:6379/1
-# If use Redis Sentinel, format as follows: `sentinel://:@:/`
-# Example: sentinel://localhost:26379/1;sentinel://localhost:26380/1;sentinel://localhost:26381/1
+# If use Redis Sentinel, format as follows: `sentinel://:@:/`
+# For high availability, you can configure multiple Sentinel nodes (if provided) separated by semicolons like below example:
+# Example: sentinel://:difyai123456@localhost:26379/1;sentinel://:difyai12345@localhost:26379/1;sentinel://:difyai12345@localhost:26379/1
CELERY_BROKER_URL=redis://:difyai123456@redis:6379/1
+CELERY_BACKEND=redis
BROKER_USE_SSL=false
# If you are using Redis Sentinel for high availability, configure the following settings.
CELERY_USE_SENTINEL=false
CELERY_SENTINEL_MASTER_NAME=
+CELERY_SENTINEL_PASSWORD=
CELERY_SENTINEL_SOCKET_TIMEOUT=0.1
# ------------------------------
@@ -399,8 +411,10 @@ SUPABASE_URL=your-server-url
# ------------------------------
# The type of vector store to use.
-# Supported values are `weaviate`, `qdrant`, `milvus`, `myscale`, `relyt`, `pgvector`, `pgvecto-rs`, `chroma`, `opensearch`, `oracle`, `tencent`, `elasticsearch`, `elasticsearch-ja`, `analyticdb`, `couchbase`, `vikingdb`, `oceanbase`, `opengauss`, `tablestore`,`vastbase`,`tidb`,`tidb_on_qdrant`,`baidu`,`lindorm`,`huawei_cloud`,`upstash`.
+# Supported values are `weaviate`, `qdrant`, `milvus`, `myscale`, `relyt`, `pgvector`, `pgvecto-rs`, `chroma`, `opensearch`, `oracle`, `tencent`, `elasticsearch`, `elasticsearch-ja`, `analyticdb`, `couchbase`, `vikingdb`, `oceanbase`, `opengauss`, `tablestore`,`vastbase`,`tidb`,`tidb_on_qdrant`,`baidu`,`lindorm`,`huawei_cloud`,`upstash`, `matrixone`.
VECTOR_STORE=weaviate
+# Prefix used to create collection name in vector database
+VECTOR_INDEX_NAME_PREFIX=Vector_index
# The Weaviate endpoint URL. Only available when VECTOR_STORE is `weaviate`.
WEAVIATE_ENDPOINT=http://weaviate:8080
@@ -490,6 +504,13 @@ TIDB_VECTOR_USER=
TIDB_VECTOR_PASSWORD=
TIDB_VECTOR_DATABASE=dify
+# Matrixone vector configurations.
+MATRIXONE_HOST=matrixone
+MATRIXONE_PORT=6001
+MATRIXONE_USER=dump
+MATRIXONE_PASSWORD=111
+MATRIXONE_DATABASE=dify
+
# Tidb on qdrant configuration, only available when VECTOR_STORE is `tidb_on_qdrant`
TIDB_ON_QDRANT_URL=http://127.0.0.1
TIDB_ON_QDRANT_API_KEY=dify
@@ -719,10 +740,11 @@ NOTION_INTERNAL_SECRET=
# Mail related configuration
# ------------------------------
-# Mail type, support: resend, smtp
+# Mail type, support: resend, smtp, sendgrid
MAIL_TYPE=resend
# Default send from email address, if not specified
+# If using SendGrid, use the 'from' field for authentication if necessary.
MAIL_DEFAULT_SEND_FROM=
# API-Key for the Resend email provider, used when MAIL_TYPE is `resend`.
@@ -738,6 +760,9 @@ SMTP_PASSWORD=
SMTP_USE_TLS=true
SMTP_OPPORTUNISTIC_TLS=false
+# Sendgid configuration
+SENDGRID_API_KEY=
+
# ------------------------------
# Others Configuration
# ------------------------------
@@ -751,6 +776,8 @@ INVITE_EXPIRY_HOURS=72
# Reset password token valid time (minutes),
RESET_PASSWORD_TOKEN_EXPIRY_MINUTES=5
+CHANGE_EMAIL_TOKEN_EXPIRY_MINUTES=5
+OWNER_TRANSFER_TOKEN_EXPIRY_MINUTES=5
# The sandbox service endpoint.
CODE_EXECUTION_ENDPOINT=http://sandbox:8194
@@ -782,11 +809,27 @@ WORKFLOW_FILE_UPLOAD_LIMIT=10
# hybrid: Save new data to object storage, read from both object storage and RDBMS
WORKFLOW_NODE_EXECUTION_STORAGE=rdbms
+# Repository configuration
+# Core workflow execution repository implementation
+CORE_WORKFLOW_EXECUTION_REPOSITORY=core.repositories.sqlalchemy_workflow_execution_repository.SQLAlchemyWorkflowExecutionRepository
+
+# Core workflow node execution repository implementation
+CORE_WORKFLOW_NODE_EXECUTION_REPOSITORY=core.repositories.sqlalchemy_workflow_node_execution_repository.SQLAlchemyWorkflowNodeExecutionRepository
+
+# API workflow node execution repository implementation
+API_WORKFLOW_NODE_EXECUTION_REPOSITORY=repositories.sqlalchemy_api_workflow_node_execution_repository.DifyAPISQLAlchemyWorkflowNodeExecutionRepository
+
+# API workflow run repository implementation
+API_WORKFLOW_RUN_REPOSITORY=repositories.sqlalchemy_api_workflow_run_repository.DifyAPISQLAlchemyWorkflowRunRepository
+
# HTTP request node in workflow configuration
HTTP_REQUEST_NODE_MAX_BINARY_SIZE=10485760
HTTP_REQUEST_NODE_MAX_TEXT_SIZE=1048576
HTTP_REQUEST_NODE_SSL_VERIFY=True
+# Respect X-* headers to redirect clients
+RESPECT_XFORWARD_HEADERS_ENABLED=false
+
# SSRF Proxy server HTTP URL
SSRF_PROXY_HTTP_URL=http://ssrf_proxy:3128
# SSRF Proxy server HTTPS URL
@@ -811,11 +854,15 @@ MAX_ITERATIONS_NUM=99
# The timeout for the text generation in millisecond
TEXT_GENERATION_TIMEOUT_MS=60000
+# Allow rendering unsafe URLs which have "data:" scheme.
+ALLOW_UNSAFE_DATA_SCHEME=false
+
# ------------------------------
# Environment Variables for db Service
# ------------------------------
-PGUSER=${DB_USERNAME}
+# The name of the default postgres user.
+POSTGRES_USER=${DB_USERNAME}
# The password for the default postgres user.
POSTGRES_PASSWORD=${DB_PASSWORD}
# The name of the default postgres database.
@@ -942,7 +989,7 @@ NGINX_SSL_PROTOCOLS=TLSv1.1 TLSv1.2 TLSv1.3
# Nginx performance tuning
NGINX_WORKER_PROCESSES=auto
-NGINX_CLIENT_MAX_BODY_SIZE=15M
+NGINX_CLIENT_MAX_BODY_SIZE=100M
NGINX_KEEPALIVE_TIMEOUT=65
# Proxy settings
@@ -1067,7 +1114,7 @@ PLUGIN_MEDIA_CACHE_PATH=assets
# Plugin oss bucket
PLUGIN_STORAGE_OSS_BUCKET=
# Plugin oss s3 credentials
-PLUGIN_S3_USE_AWS=
+PLUGIN_S3_USE_AWS=false
PLUGIN_S3_USE_AWS_MANAGED_IAM=false
PLUGIN_S3_ENDPOINT=
PLUGIN_S3_USE_PATH_STYLE=false
@@ -1098,6 +1145,8 @@ PLUGIN_VOLCENGINE_TOS_REGION=
# OTLP Collector Configuration
# ------------------------------
ENABLE_OTEL=false
+OTLP_TRACE_ENDPOINT=
+OTLP_METRIC_ENDPOINT=
OTLP_BASE_ENDPOINT=http://localhost:4318
OTLP_API_KEY=
OTEL_EXPORTER_OTLP_PROTOCOL=
diff --git a/docker/docker-compose-template.yaml b/docker/docker-compose-template.yaml
index 55e1b55599..7c1544acb9 100644
--- a/docker/docker-compose-template.yaml
+++ b/docker/docker-compose-template.yaml
@@ -2,7 +2,7 @@ x-shared-env: &shared-api-worker-env
services:
# API service
api:
- image: langgenius/dify-api:1.4.3
+ image: langgenius/dify-api:1.6.0
restart: always
environment:
# Use the shared environment variables.
@@ -31,7 +31,7 @@ services:
# worker service
# The Celery worker for processing the queue.
worker:
- image: langgenius/dify-api:1.4.3
+ image: langgenius/dify-api:1.6.0
restart: always
environment:
# Use the shared environment variables.
@@ -57,7 +57,7 @@ services:
# Frontend web application.
web:
- image: langgenius/dify-web:1.4.3
+ image: langgenius/dify-web:1.6.0
restart: always
environment:
CONSOLE_API_URL: ${CONSOLE_API_URL:-}
@@ -67,6 +67,7 @@ services:
TEXT_GENERATION_TIMEOUT_MS: ${TEXT_GENERATION_TIMEOUT_MS:-60000}
CSP_WHITELIST: ${CSP_WHITELIST:-}
ALLOW_EMBED: ${ALLOW_EMBED:-false}
+ ALLOW_UNSAFE_DATA_SCHEME: ${ALLOW_UNSAFE_DATA_SCHEME:-false}
MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
MARKETPLACE_URL: ${MARKETPLACE_URL:-https://marketplace.dify.ai}
TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-}
@@ -84,7 +85,7 @@ services:
image: postgres:15-alpine
restart: always
environment:
- PGUSER: ${PGUSER:-postgres}
+ POSTGRES_USER: ${POSTGRES_USER:-postgres}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-difyai123456}
POSTGRES_DB: ${POSTGRES_DB:-dify}
PGDATA: ${PGDATA:-/var/lib/postgresql/data/pgdata}
@@ -142,7 +143,7 @@ services:
# plugin daemon
plugin_daemon:
- image: langgenius/dify-plugin-daemon:0.1.2-local
+ image: langgenius/dify-plugin-daemon:0.1.3-local
restart: always
environment:
# Use the shared environment variables.
@@ -168,7 +169,7 @@ services:
PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false}
- S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-}
+ S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-false}
S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false}
AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-}
@@ -265,7 +266,7 @@ services:
NGINX_SSL_CERT_KEY_FILENAME: ${NGINX_SSL_CERT_KEY_FILENAME:-dify.key}
NGINX_SSL_PROTOCOLS: ${NGINX_SSL_PROTOCOLS:-TLSv1.1 TLSv1.2 TLSv1.3}
NGINX_WORKER_PROCESSES: ${NGINX_WORKER_PROCESSES:-auto}
- NGINX_CLIENT_MAX_BODY_SIZE: ${NGINX_CLIENT_MAX_BODY_SIZE:-15M}
+ NGINX_CLIENT_MAX_BODY_SIZE: ${NGINX_CLIENT_MAX_BODY_SIZE:-100M}
NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-65}
NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600s}
NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600s}
@@ -451,6 +452,14 @@ services:
OB_CLUSTER_NAME: ${OCEANBASE_CLUSTER_NAME:-difyai}
OB_SERVER_IP: 127.0.0.1
MODE: mini
+ ports:
+ - "${OCEANBASE_VECTOR_PORT:-2881}:2881"
+ healthcheck:
+ test: [ 'CMD-SHELL', 'obclient -h127.0.0.1 -P2881 -uroot@test -p$${OB_TENANT_PASSWORD} -e "SELECT 1;"' ]
+ interval: 10s
+ retries: 30
+ start_period: 30s
+ timeout: 10s
# Oracle vector database
oracle:
@@ -609,6 +618,18 @@ services:
ports:
- ${MYSCALE_PORT:-8123}:${MYSCALE_PORT:-8123}
+ # Matrixone vector store.
+ matrixone:
+ hostname: matrixone
+ image: matrixorigin/matrixone:2.1.1
+ profiles:
+ - matrixone
+ restart: always
+ volumes:
+ - ./volumes/matrixone/data:/mo-data
+ ports:
+ - ${MATRIXONE_PORT:-6001}:${MATRIXONE_PORT:-6001}
+
# https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html
# https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#docker-prod-prerequisites
elasticsearch:
diff --git a/docker/docker-compose.middleware.yaml b/docker/docker-compose.middleware.yaml
index 4081bfd818..0b1885755b 100644
--- a/docker/docker-compose.middleware.yaml
+++ b/docker/docker-compose.middleware.yaml
@@ -71,7 +71,7 @@ services:
# plugin daemon
plugin_daemon:
- image: langgenius/dify-plugin-daemon:0.1.2-local
+ image: langgenius/dify-plugin-daemon:0.1.3-local
restart: always
env_file:
- ./middleware.env
@@ -104,7 +104,7 @@ services:
PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages}
PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
- S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-}
+ S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-false}
S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false}
S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false}
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index dddce106b9..1271d6d464 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -11,6 +11,7 @@ x-shared-env: &shared-api-worker-env
APP_API_URL: ${APP_API_URL:-}
APP_WEB_URL: ${APP_WEB_URL:-}
FILES_URL: ${FILES_URL:-}
+ INTERNAL_FILES_URL: ${INTERNAL_FILES_URL:-}
LOG_LEVEL: ${LOG_LEVEL:-INFO}
LOG_FILE: ${LOG_FILE:-/app/logs/server.log}
LOG_FILE_MAX_SIZE: ${LOG_FILE_MAX_SIZE:-20}
@@ -55,6 +56,8 @@ x-shared-env: &shared-api-worker-env
SQLALCHEMY_POOL_SIZE: ${SQLALCHEMY_POOL_SIZE:-30}
SQLALCHEMY_POOL_RECYCLE: ${SQLALCHEMY_POOL_RECYCLE:-3600}
SQLALCHEMY_ECHO: ${SQLALCHEMY_ECHO:-false}
+ SQLALCHEMY_POOL_PRE_PING: ${SQLALCHEMY_POOL_PRE_PING:-false}
+ SQLALCHEMY_POOL_USE_LIFO: ${SQLALCHEMY_POOL_USE_LIFO:-false}
POSTGRES_MAX_CONNECTIONS: ${POSTGRES_MAX_CONNECTIONS:-100}
POSTGRES_SHARED_BUFFERS: ${POSTGRES_SHARED_BUFFERS:-128MB}
POSTGRES_WORK_MEM: ${POSTGRES_WORK_MEM:-4MB}
@@ -76,9 +79,11 @@ x-shared-env: &shared-api-worker-env
REDIS_CLUSTERS: ${REDIS_CLUSTERS:-}
REDIS_CLUSTERS_PASSWORD: ${REDIS_CLUSTERS_PASSWORD:-}
CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://:difyai123456@redis:6379/1}
+ CELERY_BACKEND: ${CELERY_BACKEND:-redis}
BROKER_USE_SSL: ${BROKER_USE_SSL:-false}
CELERY_USE_SENTINEL: ${CELERY_USE_SENTINEL:-false}
CELERY_SENTINEL_MASTER_NAME: ${CELERY_SENTINEL_MASTER_NAME:-}
+ CELERY_SENTINEL_PASSWORD: ${CELERY_SENTINEL_PASSWORD:-}
CELERY_SENTINEL_SOCKET_TIMEOUT: ${CELERY_SENTINEL_SOCKET_TIMEOUT:-0.1}
WEB_API_CORS_ALLOW_ORIGINS: ${WEB_API_CORS_ALLOW_ORIGINS:-*}
CONSOLE_CORS_ALLOW_ORIGINS: ${CONSOLE_CORS_ALLOW_ORIGINS:-*}
@@ -131,6 +136,7 @@ x-shared-env: &shared-api-worker-env
SUPABASE_API_KEY: ${SUPABASE_API_KEY:-your-access-key}
SUPABASE_URL: ${SUPABASE_URL:-your-server-url}
VECTOR_STORE: ${VECTOR_STORE:-weaviate}
+ VECTOR_INDEX_NAME_PREFIX: ${VECTOR_INDEX_NAME_PREFIX:-Vector_index}
WEAVIATE_ENDPOINT: ${WEAVIATE_ENDPOINT:-http://weaviate:8080}
WEAVIATE_API_KEY: ${WEAVIATE_API_KEY:-WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih}
QDRANT_URL: ${QDRANT_URL:-http://qdrant:6333}
@@ -195,6 +201,11 @@ x-shared-env: &shared-api-worker-env
TIDB_VECTOR_USER: ${TIDB_VECTOR_USER:-}
TIDB_VECTOR_PASSWORD: ${TIDB_VECTOR_PASSWORD:-}
TIDB_VECTOR_DATABASE: ${TIDB_VECTOR_DATABASE:-dify}
+ MATRIXONE_HOST: ${MATRIXONE_HOST:-matrixone}
+ MATRIXONE_PORT: ${MATRIXONE_PORT:-6001}
+ MATRIXONE_USER: ${MATRIXONE_USER:-dump}
+ MATRIXONE_PASSWORD: ${MATRIXONE_PASSWORD:-111}
+ MATRIXONE_DATABASE: ${MATRIXONE_DATABASE:-dify}
TIDB_ON_QDRANT_URL: ${TIDB_ON_QDRANT_URL:-http://127.0.0.1}
TIDB_ON_QDRANT_API_KEY: ${TIDB_ON_QDRANT_API_KEY:-dify}
TIDB_ON_QDRANT_CLIENT_TIMEOUT: ${TIDB_ON_QDRANT_CLIENT_TIMEOUT:-20}
@@ -322,9 +333,12 @@ x-shared-env: &shared-api-worker-env
SMTP_PASSWORD: ${SMTP_PASSWORD:-}
SMTP_USE_TLS: ${SMTP_USE_TLS:-true}
SMTP_OPPORTUNISTIC_TLS: ${SMTP_OPPORTUNISTIC_TLS:-false}
+ SENDGRID_API_KEY: ${SENDGRID_API_KEY:-}
INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH: ${INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH:-4000}
INVITE_EXPIRY_HOURS: ${INVITE_EXPIRY_HOURS:-72}
RESET_PASSWORD_TOKEN_EXPIRY_MINUTES: ${RESET_PASSWORD_TOKEN_EXPIRY_MINUTES:-5}
+ CHANGE_EMAIL_TOKEN_EXPIRY_MINUTES: ${CHANGE_EMAIL_TOKEN_EXPIRY_MINUTES:-5}
+ OWNER_TRANSFER_TOKEN_EXPIRY_MINUTES: ${OWNER_TRANSFER_TOKEN_EXPIRY_MINUTES:-5}
CODE_EXECUTION_ENDPOINT: ${CODE_EXECUTION_ENDPOINT:-http://sandbox:8194}
CODE_EXECUTION_API_KEY: ${CODE_EXECUTION_API_KEY:-dify-sandbox}
CODE_MAX_NUMBER: ${CODE_MAX_NUMBER:-9223372036854775807}
@@ -346,9 +360,14 @@ x-shared-env: &shared-api-worker-env
WORKFLOW_PARALLEL_DEPTH_LIMIT: ${WORKFLOW_PARALLEL_DEPTH_LIMIT:-3}
WORKFLOW_FILE_UPLOAD_LIMIT: ${WORKFLOW_FILE_UPLOAD_LIMIT:-10}
WORKFLOW_NODE_EXECUTION_STORAGE: ${WORKFLOW_NODE_EXECUTION_STORAGE:-rdbms}
+ CORE_WORKFLOW_EXECUTION_REPOSITORY: ${CORE_WORKFLOW_EXECUTION_REPOSITORY:-core.repositories.sqlalchemy_workflow_execution_repository.SQLAlchemyWorkflowExecutionRepository}
+ CORE_WORKFLOW_NODE_EXECUTION_REPOSITORY: ${CORE_WORKFLOW_NODE_EXECUTION_REPOSITORY:-core.repositories.sqlalchemy_workflow_node_execution_repository.SQLAlchemyWorkflowNodeExecutionRepository}
+ API_WORKFLOW_NODE_EXECUTION_REPOSITORY: ${API_WORKFLOW_NODE_EXECUTION_REPOSITORY:-repositories.sqlalchemy_api_workflow_node_execution_repository.DifyAPISQLAlchemyWorkflowNodeExecutionRepository}
+ API_WORKFLOW_RUN_REPOSITORY: ${API_WORKFLOW_RUN_REPOSITORY:-repositories.sqlalchemy_api_workflow_run_repository.DifyAPISQLAlchemyWorkflowRunRepository}
HTTP_REQUEST_NODE_MAX_BINARY_SIZE: ${HTTP_REQUEST_NODE_MAX_BINARY_SIZE:-10485760}
HTTP_REQUEST_NODE_MAX_TEXT_SIZE: ${HTTP_REQUEST_NODE_MAX_TEXT_SIZE:-1048576}
HTTP_REQUEST_NODE_SSL_VERIFY: ${HTTP_REQUEST_NODE_SSL_VERIFY:-True}
+ RESPECT_XFORWARD_HEADERS_ENABLED: ${RESPECT_XFORWARD_HEADERS_ENABLED:-false}
SSRF_PROXY_HTTP_URL: ${SSRF_PROXY_HTTP_URL:-http://ssrf_proxy:3128}
SSRF_PROXY_HTTPS_URL: ${SSRF_PROXY_HTTPS_URL:-http://ssrf_proxy:3128}
LOOP_NODE_MAX_COUNT: ${LOOP_NODE_MAX_COUNT:-100}
@@ -356,7 +375,8 @@ x-shared-env: &shared-api-worker-env
MAX_PARALLEL_LIMIT: ${MAX_PARALLEL_LIMIT:-10}
MAX_ITERATIONS_NUM: ${MAX_ITERATIONS_NUM:-99}
TEXT_GENERATION_TIMEOUT_MS: ${TEXT_GENERATION_TIMEOUT_MS:-60000}
- PGUSER: ${PGUSER:-${DB_USERNAME}}
+ ALLOW_UNSAFE_DATA_SCHEME: ${ALLOW_UNSAFE_DATA_SCHEME:-false}
+ POSTGRES_USER: ${POSTGRES_USER:-${DB_USERNAME}}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-${DB_PASSWORD}}
POSTGRES_DB: ${POSTGRES_DB:-${DB_DATABASE}}
PGDATA: ${PGDATA:-/var/lib/postgresql/data/pgdata}
@@ -412,7 +432,7 @@ x-shared-env: &shared-api-worker-env
NGINX_SSL_CERT_KEY_FILENAME: ${NGINX_SSL_CERT_KEY_FILENAME:-dify.key}
NGINX_SSL_PROTOCOLS: ${NGINX_SSL_PROTOCOLS:-TLSv1.1 TLSv1.2 TLSv1.3}
NGINX_WORKER_PROCESSES: ${NGINX_WORKER_PROCESSES:-auto}
- NGINX_CLIENT_MAX_BODY_SIZE: ${NGINX_CLIENT_MAX_BODY_SIZE:-15M}
+ NGINX_CLIENT_MAX_BODY_SIZE: ${NGINX_CLIENT_MAX_BODY_SIZE:-100M}
NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-65}
NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600s}
NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600s}
@@ -467,7 +487,7 @@ x-shared-env: &shared-api-worker-env
PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages}
PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
- PLUGIN_S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-}
+ PLUGIN_S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-false}
PLUGIN_S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false}
PLUGIN_S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
PLUGIN_S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false}
@@ -490,6 +510,8 @@ x-shared-env: &shared-api-worker-env
PLUGIN_VOLCENGINE_TOS_SECRET_KEY: ${PLUGIN_VOLCENGINE_TOS_SECRET_KEY:-}
PLUGIN_VOLCENGINE_TOS_REGION: ${PLUGIN_VOLCENGINE_TOS_REGION:-}
ENABLE_OTEL: ${ENABLE_OTEL:-false}
+ OTLP_TRACE_ENDPOINT: ${OTLP_TRACE_ENDPOINT:-}
+ OTLP_METRIC_ENDPOINT: ${OTLP_METRIC_ENDPOINT:-}
OTLP_BASE_ENDPOINT: ${OTLP_BASE_ENDPOINT:-http://localhost:4318}
OTLP_API_KEY: ${OTLP_API_KEY:-}
OTEL_EXPORTER_OTLP_PROTOCOL: ${OTEL_EXPORTER_OTLP_PROTOCOL:-}
@@ -509,7 +531,7 @@ x-shared-env: &shared-api-worker-env
services:
# API service
api:
- image: langgenius/dify-api:1.4.3
+ image: langgenius/dify-api:1.6.0
restart: always
environment:
# Use the shared environment variables.
@@ -538,7 +560,7 @@ services:
# worker service
# The Celery worker for processing the queue.
worker:
- image: langgenius/dify-api:1.4.3
+ image: langgenius/dify-api:1.6.0
restart: always
environment:
# Use the shared environment variables.
@@ -564,7 +586,7 @@ services:
# Frontend web application.
web:
- image: langgenius/dify-web:1.4.3
+ image: langgenius/dify-web:1.6.0
restart: always
environment:
CONSOLE_API_URL: ${CONSOLE_API_URL:-}
@@ -574,6 +596,7 @@ services:
TEXT_GENERATION_TIMEOUT_MS: ${TEXT_GENERATION_TIMEOUT_MS:-60000}
CSP_WHITELIST: ${CSP_WHITELIST:-}
ALLOW_EMBED: ${ALLOW_EMBED:-false}
+ ALLOW_UNSAFE_DATA_SCHEME: ${ALLOW_UNSAFE_DATA_SCHEME:-false}
MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
MARKETPLACE_URL: ${MARKETPLACE_URL:-https://marketplace.dify.ai}
TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-}
@@ -591,7 +614,7 @@ services:
image: postgres:15-alpine
restart: always
environment:
- PGUSER: ${PGUSER:-postgres}
+ POSTGRES_USER: ${POSTGRES_USER:-postgres}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-difyai123456}
POSTGRES_DB: ${POSTGRES_DB:-dify}
PGDATA: ${PGDATA:-/var/lib/postgresql/data/pgdata}
@@ -649,7 +672,7 @@ services:
# plugin daemon
plugin_daemon:
- image: langgenius/dify-plugin-daemon:0.1.2-local
+ image: langgenius/dify-plugin-daemon:0.1.3-local
restart: always
environment:
# Use the shared environment variables.
@@ -675,7 +698,7 @@ services:
PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false}
- S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-}
+ S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-false}
S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false}
AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-}
@@ -772,7 +795,7 @@ services:
NGINX_SSL_CERT_KEY_FILENAME: ${NGINX_SSL_CERT_KEY_FILENAME:-dify.key}
NGINX_SSL_PROTOCOLS: ${NGINX_SSL_PROTOCOLS:-TLSv1.1 TLSv1.2 TLSv1.3}
NGINX_WORKER_PROCESSES: ${NGINX_WORKER_PROCESSES:-auto}
- NGINX_CLIENT_MAX_BODY_SIZE: ${NGINX_CLIENT_MAX_BODY_SIZE:-15M}
+ NGINX_CLIENT_MAX_BODY_SIZE: ${NGINX_CLIENT_MAX_BODY_SIZE:-100M}
NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-65}
NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600s}
NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600s}
@@ -958,6 +981,14 @@ services:
OB_CLUSTER_NAME: ${OCEANBASE_CLUSTER_NAME:-difyai}
OB_SERVER_IP: 127.0.0.1
MODE: mini
+ ports:
+ - "${OCEANBASE_VECTOR_PORT:-2881}:2881"
+ healthcheck:
+ test: [ 'CMD-SHELL', 'obclient -h127.0.0.1 -P2881 -uroot@test -p$${OB_TENANT_PASSWORD} -e "SELECT 1;"' ]
+ interval: 10s
+ retries: 30
+ start_period: 30s
+ timeout: 10s
# Oracle vector database
oracle:
@@ -1116,6 +1147,18 @@ services:
ports:
- ${MYSCALE_PORT:-8123}:${MYSCALE_PORT:-8123}
+ # Matrixone vector store.
+ matrixone:
+ hostname: matrixone
+ image: matrixorigin/matrixone:2.1.1
+ profiles:
+ - matrixone
+ restart: always
+ volumes:
+ - ./volumes/matrixone/data:/mo-data
+ ports:
+ - ${MATRIXONE_PORT:-6001}:${MATRIXONE_PORT:-6001}
+
# https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html
# https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#docker-prod-prerequisites
elasticsearch:
diff --git a/docker/middleware.env.example b/docker/middleware.env.example
index 338b057ae8..2eba62f594 100644
--- a/docker/middleware.env.example
+++ b/docker/middleware.env.example
@@ -1,7 +1,7 @@
# ------------------------------
# Environment Variables for db Service
# ------------------------------
-PGUSER=postgres
+POSTGRES_USER=postgres
# The password for the default postgres user.
POSTGRES_PASSWORD=difyai123456
# The name of the default postgres database.
@@ -133,7 +133,7 @@ PLUGIN_MEDIA_CACHE_PATH=assets
PLUGIN_STORAGE_OSS_BUCKET=
# Plugin oss s3 credentials
PLUGIN_S3_USE_AWS_MANAGED_IAM=false
-PLUGIN_S3_USE_AWS=
+PLUGIN_S3_USE_AWS=false
PLUGIN_S3_ENDPOINT=
PLUGIN_S3_USE_PATH_STYLE=false
PLUGIN_AWS_ACCESS_KEY=
diff --git a/docker/nginx/conf.d/default.conf.template b/docker/nginx/conf.d/default.conf.template
index a458412d1e..48d7da8cf5 100644
--- a/docker/nginx/conf.d/default.conf.template
+++ b/docker/nginx/conf.d/default.conf.template
@@ -39,7 +39,10 @@ server {
proxy_pass http://web:3000;
include proxy.conf;
}
-
+ location /mcp {
+ proxy_pass http://api:5001;
+ include proxy.conf;
+ }
# placeholder for acme challenge location
${ACME_CHALLENGE_LOCATION}
diff --git a/images/GitHub_README_if.png b/images/GitHub_README_if.png
index 2a4e67264e..10c9d87b08 100644
Binary files a/images/GitHub_README_if.png and b/images/GitHub_README_if.png differ
diff --git a/sdks/python-client/README.md b/sdks/python-client/README.md
index 8949ef08fa..7401fd2fd4 100644
--- a/sdks/python-client/README.md
+++ b/sdks/python-client/README.md
@@ -183,3 +183,42 @@ rename_conversation_response.raise_for_status()
print('[rename result]')
print(rename_conversation_response.json())
```
+
+* Using the Workflow Client
+```python
+import json
+import requests
+from dify_client import WorkflowClient
+
+api_key = "your_api_key"
+
+# Initialize Workflow Client
+client = WorkflowClient(api_key)
+
+# Prepare parameters for Workflow Client
+user_id = "your_user_id"
+context = "previous user interaction / metadata"
+user_prompt = "What is the capital of France?"
+
+inputs = {
+ "context": context,
+ "user_prompt": user_prompt,
+ # Add other input fields expected by your workflow (e.g., additional context, task parameters)
+
+}
+
+# Set response mode (default: streaming)
+response_mode = "blocking"
+
+# Run the workflow
+response = client.run(inputs=inputs, response_mode=response_mode, user=user_id)
+response.raise_for_status()
+
+# Parse result
+result = json.loads(response.text)
+
+answer = result.get("data").get("outputs")
+
+print(answer["answer"])
+
+```
diff --git a/sdks/python-client/dify_client/__init__.py b/sdks/python-client/dify_client/__init__.py
index 6fa9d190e5..d00c207afa 100644
--- a/sdks/python-client/dify_client/__init__.py
+++ b/sdks/python-client/dify_client/__init__.py
@@ -1 +1,7 @@
-from dify_client.client import ChatClient, CompletionClient, DifyClient
+from dify_client.client import (
+ ChatClient,
+ CompletionClient,
+ WorkflowClient,
+ KnowledgeBaseClient,
+ DifyClient,
+)
diff --git a/tests/unit_tests/events/test_provider_update_deadlock_prevention.py b/tests/unit_tests/events/test_provider_update_deadlock_prevention.py
new file mode 100644
index 0000000000..47c175acd7
--- /dev/null
+++ b/tests/unit_tests/events/test_provider_update_deadlock_prevention.py
@@ -0,0 +1,248 @@
+import threading
+from unittest.mock import Mock, patch
+
+from core.app.entities.app_invoke_entities import ChatAppGenerateEntity
+from core.entities.provider_entities import QuotaUnit
+from events.event_handlers.update_provider_when_message_created import (
+ handle,
+ get_update_stats,
+)
+from models.provider import ProviderType
+from sqlalchemy.exc import OperationalError
+
+
+class TestProviderUpdateDeadlockPrevention:
+ """Test suite for deadlock prevention in Provider updates."""
+
+ def setup_method(self):
+ """Setup test fixtures."""
+ self.mock_message = Mock()
+ self.mock_message.answer_tokens = 100
+
+ self.mock_app_config = Mock()
+ self.mock_app_config.tenant_id = "test-tenant-123"
+
+ self.mock_model_conf = Mock()
+ self.mock_model_conf.provider = "openai"
+
+ self.mock_system_config = Mock()
+ self.mock_system_config.current_quota_type = QuotaUnit.TOKENS
+
+ self.mock_provider_config = Mock()
+ self.mock_provider_config.using_provider_type = ProviderType.SYSTEM
+ self.mock_provider_config.system_configuration = self.mock_system_config
+
+ self.mock_provider_bundle = Mock()
+ self.mock_provider_bundle.configuration = self.mock_provider_config
+
+ self.mock_model_conf.provider_model_bundle = self.mock_provider_bundle
+
+ self.mock_generate_entity = Mock(spec=ChatAppGenerateEntity)
+ self.mock_generate_entity.app_config = self.mock_app_config
+ self.mock_generate_entity.model_conf = self.mock_model_conf
+
+ @patch("events.event_handlers.update_provider_when_message_created.db")
+ def test_consolidated_handler_basic_functionality(self, mock_db):
+ """Test that the consolidated handler performs both updates correctly."""
+ # Setup mock query chain
+ mock_query = Mock()
+ mock_db.session.query.return_value = mock_query
+ mock_query.filter.return_value = mock_query
+ mock_query.order_by.return_value = mock_query
+ mock_query.update.return_value = 1 # 1 row affected
+
+ # Call the handler
+ handle(self.mock_message, application_generate_entity=self.mock_generate_entity)
+
+ # Verify db.session.query was called
+ assert mock_db.session.query.called
+
+ # Verify commit was called
+ mock_db.session.commit.assert_called_once()
+
+ # Verify no rollback was called
+ assert not mock_db.session.rollback.called
+
+ @patch("events.event_handlers.update_provider_when_message_created.db")
+ def test_deadlock_retry_mechanism(self, mock_db):
+ """Test that deadlock errors trigger retry logic."""
+ # Setup mock to raise deadlock error on first attempt, succeed on second
+ mock_query = Mock()
+ mock_db.session.query.return_value = mock_query
+ mock_query.filter.return_value = mock_query
+ mock_query.order_by.return_value = mock_query
+ mock_query.update.return_value = 1
+
+ # First call raises deadlock, second succeeds
+ mock_db.session.commit.side_effect = [
+ OperationalError("deadlock detected", None, None),
+ None, # Success on retry
+ ]
+
+ # Call the handler
+ handle(self.mock_message, application_generate_entity=self.mock_generate_entity)
+
+ # Verify commit was called twice (original + retry)
+ assert mock_db.session.commit.call_count == 2
+
+ # Verify rollback was called once (after first failure)
+ mock_db.session.rollback.assert_called_once()
+
+ @patch("events.event_handlers.update_provider_when_message_created.db")
+ @patch("events.event_handlers.update_provider_when_message_created.time.sleep")
+ def test_exponential_backoff_timing(self, mock_sleep, mock_db):
+ """Test that retry delays follow exponential backoff pattern."""
+ # Setup mock to fail twice, succeed on third attempt
+ mock_query = Mock()
+ mock_db.session.query.return_value = mock_query
+ mock_query.filter.return_value = mock_query
+ mock_query.order_by.return_value = mock_query
+ mock_query.update.return_value = 1
+
+ mock_db.session.commit.side_effect = [
+ OperationalError("deadlock detected", None, None),
+ OperationalError("deadlock detected", None, None),
+ None, # Success on third attempt
+ ]
+
+ # Call the handler
+ handle(self.mock_message, application_generate_entity=self.mock_generate_entity)
+
+ # Verify sleep was called twice with increasing delays
+ assert mock_sleep.call_count == 2
+
+ # First delay should be around 0.1s + jitter
+ first_delay = mock_sleep.call_args_list[0][0][0]
+ assert 0.1 <= first_delay <= 0.3
+
+ # Second delay should be around 0.2s + jitter
+ second_delay = mock_sleep.call_args_list[1][0][0]
+ assert 0.2 <= second_delay <= 0.4
+
+ def test_concurrent_handler_execution(self):
+ """Test that multiple handlers can run concurrently without deadlock."""
+ results = []
+ errors = []
+
+ def run_handler():
+ try:
+ with patch(
+ "events.event_handlers.update_provider_when_message_created.db"
+ ) as mock_db:
+ mock_query = Mock()
+ mock_db.session.query.return_value = mock_query
+ mock_query.filter.return_value = mock_query
+ mock_query.order_by.return_value = mock_query
+ mock_query.update.return_value = 1
+
+ handle(
+ self.mock_message,
+ application_generate_entity=self.mock_generate_entity,
+ )
+ results.append("success")
+ except Exception as e:
+ errors.append(str(e))
+
+ # Run multiple handlers concurrently
+ threads = []
+ for _ in range(5):
+ thread = threading.Thread(target=run_handler)
+ threads.append(thread)
+ thread.start()
+
+ # Wait for all threads to complete
+ for thread in threads:
+ thread.join(timeout=5)
+
+ # Verify all handlers completed successfully
+ assert len(results) == 5
+ assert len(errors) == 0
+
+ def test_performance_stats_tracking(self):
+ """Test that performance statistics are tracked correctly."""
+ # Reset stats
+ stats = get_update_stats()
+ initial_total = stats["total_updates"]
+
+ with patch(
+ "events.event_handlers.update_provider_when_message_created.db"
+ ) as mock_db:
+ mock_query = Mock()
+ mock_db.session.query.return_value = mock_query
+ mock_query.filter.return_value = mock_query
+ mock_query.order_by.return_value = mock_query
+ mock_query.update.return_value = 1
+
+ # Call handler
+ handle(
+ self.mock_message, application_generate_entity=self.mock_generate_entity
+ )
+
+ # Check that stats were updated
+ updated_stats = get_update_stats()
+ assert updated_stats["total_updates"] == initial_total + 1
+ assert updated_stats["successful_updates"] >= initial_total + 1
+
+ def test_non_chat_entity_ignored(self):
+ """Test that non-chat entities are ignored by the handler."""
+ # Create a non-chat entity
+ mock_non_chat_entity = Mock()
+ mock_non_chat_entity.__class__.__name__ = "NonChatEntity"
+
+ with patch(
+ "events.event_handlers.update_provider_when_message_created.db"
+ ) as mock_db:
+ # Call handler with non-chat entity
+ handle(self.mock_message, application_generate_entity=mock_non_chat_entity)
+
+ # Verify no database operations were performed
+ assert not mock_db.session.query.called
+ assert not mock_db.session.commit.called
+
+ @patch("events.event_handlers.update_provider_when_message_created.db")
+ def test_quota_calculation_tokens(self, mock_db):
+ """Test quota calculation for token-based quotas."""
+ # Setup token-based quota
+ self.mock_system_config.current_quota_type = QuotaUnit.TOKENS
+ self.mock_message.answer_tokens = 150
+
+ mock_query = Mock()
+ mock_db.session.query.return_value = mock_query
+ mock_query.filter.return_value = mock_query
+ mock_query.order_by.return_value = mock_query
+ mock_query.update.return_value = 1
+
+ # Call handler
+ handle(self.mock_message, application_generate_entity=self.mock_generate_entity)
+
+ # Verify update was called with token count
+ update_calls = mock_query.update.call_args_list
+
+ # Should have at least one call with quota_used update
+ quota_update_found = False
+ for call in update_calls:
+ values = call[0][0] # First argument to update()
+ if "quota_used" in values:
+ quota_update_found = True
+ break
+
+ assert quota_update_found
+
+ @patch("events.event_handlers.update_provider_when_message_created.db")
+ def test_quota_calculation_times(self, mock_db):
+ """Test quota calculation for times-based quotas."""
+ # Setup times-based quota
+ self.mock_system_config.current_quota_type = QuotaUnit.TIMES
+
+ mock_query = Mock()
+ mock_db.session.query.return_value = mock_query
+ mock_query.filter.return_value = mock_query
+ mock_query.order_by.return_value = mock_query
+ mock_query.update.return_value = 1
+
+ # Call handler
+ handle(self.mock_message, application_generate_entity=self.mock_generate_entity)
+
+ # Verify update was called
+ assert mock_query.update.called
+ assert mock_db.session.commit.called
diff --git a/web/.env.example b/web/.env.example
index 78b4f33e8c..37bfc939eb 100644
--- a/web/.env.example
+++ b/web/.env.example
@@ -32,6 +32,9 @@ NEXT_PUBLIC_CSP_WHITELIST=
# Default is not allow to embed into iframe to prevent Clickjacking: https://owasp.org/www-community/attacks/Clickjacking
NEXT_PUBLIC_ALLOW_EMBED=
+# Allow rendering unsafe URLs which have "data:" scheme.
+NEXT_PUBLIC_ALLOW_UNSAFE_DATA_SCHEME=false
+
# Github Access Token, used for invoking Github API
NEXT_PUBLIC_GITHUB_ACCESS_TOKEN=
# The maximum number of top-k value for RAG.
@@ -56,3 +59,5 @@ NEXT_PUBLIC_ENABLE_WEBSITE_JINAREADER=true
NEXT_PUBLIC_ENABLE_WEBSITE_FIRECRAWL=true
NEXT_PUBLIC_ENABLE_WEBSITE_WATERCRAWL=true
+# The maximum number of tree node depth for workflow
+NEXT_PUBLIC_MAX_TREE_DEPTH=50
diff --git a/web/Dockerfile b/web/Dockerfile
index 4555130236..d59039528c 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -6,7 +6,7 @@ LABEL maintainer="takatost@gmail.com"
# RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
RUN apk add --no-cache tzdata
-RUN npm install -g pnpm@10.12.1
+RUN npm install -g pnpm@10.13.1
ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/cardView.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/cardView.tsx
index 084adceef2..3d572b926a 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/cardView.tsx
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/cardView.tsx
@@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next'
import { useContext } from 'use-context-selector'
import AppCard from '@/app/components/app/overview/appCard'
import Loading from '@/app/components/base/loading'
+import MCPServiceCard from '@/app/components/tools/mcp/mcp-service-card'
import { ToastContext } from '@/app/components/base/toast'
import {
fetchAppDetail,
@@ -31,6 +32,8 @@ const CardView: FC = ({ appId, isInPanel, className }) => {
const appDetail = useAppStore(state => state.appDetail)
const setAppDetail = useAppStore(state => state.setAppDetail)
+ const showMCPCard = isInPanel
+
const updateAppDetail = async () => {
try {
const res = await fetchAppDetail({ url: '/apps', id: appId })
@@ -117,6 +120,11 @@ const CardView: FC = ({ appId, isInPanel, className }) => {
isInPanel={isInPanel}
onChangeStatus={onChangeApiStatus}
/>
+ {showMCPCard && (
+
)
}
diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config-popup.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config-popup.tsx
index 0efc5082a4..2afe451fe1 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config-popup.tsx
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config-popup.tsx
@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'
import { useBoolean } from 'ahooks'
import TracingIcon from './tracing-icon'
import ProviderPanel from './provider-panel'
-import type { LangFuseConfig, LangSmithConfig, OpikConfig, WeaveConfig } from './type'
+import type { AliyunConfig, ArizeConfig, LangFuseConfig, LangSmithConfig, OpikConfig, PhoenixConfig, WeaveConfig } from './type'
import { TracingProvider } from './type'
import ProviderConfigModal from './provider-config-modal'
import Indicator from '@/app/components/header/indicator'
@@ -23,11 +23,14 @@ export type PopupProps = {
onStatusChange: (enabled: boolean) => void
chosenProvider: TracingProvider | null
onChooseProvider: (provider: TracingProvider) => void
+ arizeConfig: ArizeConfig | null
+ phoenixConfig: PhoenixConfig | null
langSmithConfig: LangSmithConfig | null
langFuseConfig: LangFuseConfig | null
opikConfig: OpikConfig | null
weaveConfig: WeaveConfig | null
- onConfigUpdated: (provider: TracingProvider, payload: LangSmithConfig | LangFuseConfig | OpikConfig | WeaveConfig) => void
+ aliyunConfig: AliyunConfig | null
+ onConfigUpdated: (provider: TracingProvider, payload: ArizeConfig | PhoenixConfig | LangSmithConfig | LangFuseConfig | OpikConfig | WeaveConfig | AliyunConfig) => void
onConfigRemoved: (provider: TracingProvider) => void
}
@@ -38,10 +41,13 @@ const ConfigPopup: FC
= ({
onStatusChange,
chosenProvider,
onChooseProvider,
+ arizeConfig,
+ phoenixConfig,
langSmithConfig,
langFuseConfig,
opikConfig,
weaveConfig,
+ aliyunConfig,
onConfigUpdated,
onConfigRemoved,
}) => {
@@ -65,7 +71,7 @@ const ConfigPopup: FC = ({
}
}, [onChooseProvider])
- const handleConfigUpdated = useCallback((payload: LangSmithConfig | LangFuseConfig | OpikConfig | WeaveConfig) => {
+ const handleConfigUpdated = useCallback((payload: ArizeConfig | PhoenixConfig | LangSmithConfig | LangFuseConfig | OpikConfig | WeaveConfig | AliyunConfig) => {
onConfigUpdated(currentProvider!, payload)
hideConfigModal()
}, [currentProvider, hideConfigModal, onConfigUpdated])
@@ -75,8 +81,8 @@ const ConfigPopup: FC = ({
hideConfigModal()
}, [currentProvider, hideConfigModal, onConfigRemoved])
- const providerAllConfigured = langSmithConfig && langFuseConfig && opikConfig && weaveConfig
- const providerAllNotConfigured = !langSmithConfig && !langFuseConfig && !opikConfig && !weaveConfig
+ const providerAllConfigured = arizeConfig && phoenixConfig && langSmithConfig && langFuseConfig && opikConfig && weaveConfig && aliyunConfig
+ const providerAllNotConfigured = !arizeConfig && !phoenixConfig && !langSmithConfig && !langFuseConfig && !opikConfig && !weaveConfig && !aliyunConfig
const switchContent = (
= ({
disabled={providerAllNotConfigured}
/>
)
+ const arizePanel = (
+ = ({
key="weave-provider-panel"
/>
)
+
+ const aliyunPanel = (
+ = ({
if (weaveConfig)
configuredPanels.push(weavePanel)
+ if (arizeConfig)
+ configuredPanels.push(arizePanel)
+
+ if (phoenixConfig)
+ configuredPanels.push(phoenixPanel)
+
+ if (aliyunConfig)
+ configuredPanels.push(aliyunPanel)
+
return configuredPanels
}
const moreProviderPanel = () => {
const notConfiguredPanels: JSX.Element[] = []
+ if (!arizeConfig)
+ notConfiguredPanels.push(arizePanel)
+
+ if (!phoenixConfig)
+ notConfiguredPanels.push(phoenixPanel)
+
if (!langFuseConfig)
notConfiguredPanels.push(langfusePanel)
@@ -170,16 +230,25 @@ const ConfigPopup: FC = ({
if (!weaveConfig)
notConfiguredPanels.push(weavePanel)
+ if (!aliyunConfig)
+ notConfiguredPanels.push(aliyunPanel)
+
return notConfiguredPanels
}
const configuredProviderConfig = () => {
+ if (currentProvider === TracingProvider.arize)
+ return arizeConfig
+ if (currentProvider === TracingProvider.phoenix)
+ return phoenixConfig
if (currentProvider === TracingProvider.langSmith)
return langSmithConfig
if (currentProvider === TracingProvider.langfuse)
return langFuseConfig
if (currentProvider === TracingProvider.opik)
return opikConfig
+ if (currentProvider === TracingProvider.aliyun)
+ return aliyunConfig
return weaveConfig
}
@@ -220,22 +289,25 @@ const ConfigPopup: FC = ({
? (
<>
{t(`${I18N_PREFIX}.configProviderTitle.${providerAllConfigured ? 'configured' : 'notConfigured'}`)}
-
+
{langfusePanel}
{langSmithPanel}
{opikPanel}
{weavePanel}
+ {arizePanel}
+ {phoenixPanel}
+ {aliyunPanel}
)
: (
<>
{t(`${I18N_PREFIX}.configProviderTitle.configured`)}
-
+
{configuredProviderPanel()}
{t(`${I18N_PREFIX}.configProviderTitle.moreProvider`)}
-
+
{moreProviderPanel()}
diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config.ts b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config.ts
index 5d3c4076bd..4c81b63ea2 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config.ts
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config.ts
@@ -1,8 +1,11 @@
import { TracingProvider } from './type'
export const docURL = {
+ [TracingProvider.arize]: 'https://docs.arize.com/arize',
+ [TracingProvider.phoenix]: 'https://docs.arize.com/phoenix',
[TracingProvider.langSmith]: 'https://docs.smith.langchain.com/',
[TracingProvider.langfuse]: 'https://docs.langfuse.com',
[TracingProvider.opik]: 'https://www.comet.com/docs/opik/tracing/integrations/dify#setup-instructions',
[TracingProvider.weave]: 'https://weave-docs.wandb.ai/',
+ [TracingProvider.aliyun]: 'https://help.aliyun.com/zh/arms/tracing-analysis/untitled-document-1750672984680',
}
diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/panel.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/panel.tsx
index 76e90ecf19..d4cd4374c6 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/panel.tsx
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/panel.tsx
@@ -7,12 +7,12 @@ import {
import { useTranslation } from 'react-i18next'
import { usePathname } from 'next/navigation'
import { useBoolean } from 'ahooks'
-import type { LangFuseConfig, LangSmithConfig, OpikConfig, WeaveConfig } from './type'
+import type { AliyunConfig, ArizeConfig, LangFuseConfig, LangSmithConfig, OpikConfig, PhoenixConfig, WeaveConfig } from './type'
import { TracingProvider } from './type'
import TracingIcon from './tracing-icon'
import ConfigButton from './config-button'
import cn from '@/utils/classnames'
-import { LangfuseIcon, LangsmithIcon, OpikIcon, WeaveIcon } from '@/app/components/base/icons/src/public/tracing'
+import { AliyunIcon, ArizeIcon, LangfuseIcon, LangsmithIcon, OpikIcon, PhoenixIcon, WeaveIcon } from '@/app/components/base/icons/src/public/tracing'
import Indicator from '@/app/components/header/indicator'
import { fetchTracingConfig as doFetchTracingConfig, fetchTracingStatus, updateTracingStatus } from '@/service/apps'
import type { TracingStatus } from '@/models/app'
@@ -62,24 +62,33 @@ const Panel: FC = () => {
}
const inUseTracingProvider: TracingProvider | null = tracingStatus?.tracing_provider || null
- const InUseProviderIcon
- = inUseTracingProvider === TracingProvider.langSmith
- ? LangsmithIcon
- : inUseTracingProvider === TracingProvider.langfuse
- ? LangfuseIcon
- : inUseTracingProvider === TracingProvider.opik
- ? OpikIcon
- : inUseTracingProvider === TracingProvider.weave
- ? WeaveIcon
- : LangsmithIcon
+ const providerIconMap: Record
> = {
+ [TracingProvider.arize]: ArizeIcon,
+ [TracingProvider.phoenix]: PhoenixIcon,
+ [TracingProvider.langSmith]: LangsmithIcon,
+ [TracingProvider.langfuse]: LangfuseIcon,
+ [TracingProvider.opik]: OpikIcon,
+ [TracingProvider.weave]: WeaveIcon,
+ [TracingProvider.aliyun]: AliyunIcon,
+ }
+ const InUseProviderIcon = inUseTracingProvider ? providerIconMap[inUseTracingProvider] : undefined
+ const [arizeConfig, setArizeConfig] = useState(null)
+ const [phoenixConfig, setPhoenixConfig] = useState(null)
const [langSmithConfig, setLangSmithConfig] = useState(null)
const [langFuseConfig, setLangFuseConfig] = useState(null)
const [opikConfig, setOpikConfig] = useState(null)
const [weaveConfig, setWeaveConfig] = useState(null)
- const hasConfiguredTracing = !!(langSmithConfig || langFuseConfig || opikConfig || weaveConfig)
+ const [aliyunConfig, setAliyunConfig] = useState(null)
+ const hasConfiguredTracing = !!(langSmithConfig || langFuseConfig || opikConfig || weaveConfig || arizeConfig || phoenixConfig || aliyunConfig)
const fetchTracingConfig = async () => {
+ const { tracing_config: arizeConfig, has_not_configured: arizeHasNotConfig } = await doFetchTracingConfig({ appId, provider: TracingProvider.arize })
+ if (!arizeHasNotConfig)
+ setArizeConfig(arizeConfig as ArizeConfig)
+ const { tracing_config: phoenixConfig, has_not_configured: phoenixHasNotConfig } = await doFetchTracingConfig({ appId, provider: TracingProvider.phoenix })
+ if (!phoenixHasNotConfig)
+ setPhoenixConfig(phoenixConfig as PhoenixConfig)
const { tracing_config: langSmithConfig, has_not_configured: langSmithHasNotConfig } = await doFetchTracingConfig({ appId, provider: TracingProvider.langSmith })
if (!langSmithHasNotConfig)
setLangSmithConfig(langSmithConfig as LangSmithConfig)
@@ -92,12 +101,19 @@ const Panel: FC = () => {
const { tracing_config: weaveConfig, has_not_configured: weaveHasNotConfig } = await doFetchTracingConfig({ appId, provider: TracingProvider.weave })
if (!weaveHasNotConfig)
setWeaveConfig(weaveConfig as WeaveConfig)
+ const { tracing_config: aliyunConfig, has_not_configured: aliyunHasNotConfig } = await doFetchTracingConfig({ appId, provider: TracingProvider.aliyun })
+ if (!aliyunHasNotConfig)
+ setAliyunConfig(aliyunConfig as AliyunConfig)
}
const handleTracingConfigUpdated = async (provider: TracingProvider) => {
// call api to hide secret key value
const { tracing_config } = await doFetchTracingConfig({ appId, provider })
- if (provider === TracingProvider.langSmith)
+ if (provider === TracingProvider.arize)
+ setArizeConfig(tracing_config as ArizeConfig)
+ else if (provider === TracingProvider.phoenix)
+ setPhoenixConfig(tracing_config as PhoenixConfig)
+ else if (provider === TracingProvider.langSmith)
setLangSmithConfig(tracing_config as LangSmithConfig)
else if (provider === TracingProvider.langfuse)
setLangFuseConfig(tracing_config as LangFuseConfig)
@@ -105,10 +121,16 @@ const Panel: FC = () => {
setOpikConfig(tracing_config as OpikConfig)
else if (provider === TracingProvider.weave)
setWeaveConfig(tracing_config as WeaveConfig)
+ else if (provider === TracingProvider.aliyun)
+ setAliyunConfig(tracing_config as AliyunConfig)
}
const handleTracingConfigRemoved = (provider: TracingProvider) => {
- if (provider === TracingProvider.langSmith)
+ if (provider === TracingProvider.arize)
+ setArizeConfig(null)
+ else if (provider === TracingProvider.phoenix)
+ setPhoenixConfig(null)
+ else if (provider === TracingProvider.langSmith)
setLangSmithConfig(null)
else if (provider === TracingProvider.langfuse)
setLangFuseConfig(null)
@@ -116,6 +138,8 @@ const Panel: FC = () => {
setOpikConfig(null)
else if (provider === TracingProvider.weave)
setWeaveConfig(null)
+ else if (provider === TracingProvider.aliyun)
+ setAliyunConfig(null)
if (provider === inUseTracingProvider) {
handleTracingStatusChange({
enabled: false,
@@ -131,7 +155,6 @@ const Panel: FC = () => {
await fetchTracingConfig()
setLoaded()
})()
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [])
const [controlShowPopup, setControlShowPopup] = useState(0)
@@ -170,10 +193,13 @@ const Panel: FC = () => {
onStatusChange={handleTracingEnabledChange}
chosenProvider={inUseTracingProvider}
onChooseProvider={handleChooseProvider}
+ arizeConfig={arizeConfig}
+ phoenixConfig={phoenixConfig}
langSmithConfig={langSmithConfig}
langFuseConfig={langFuseConfig}
opikConfig={opikConfig}
weaveConfig={weaveConfig}
+ aliyunConfig={aliyunConfig}
onConfigUpdated={handleTracingConfigUpdated}
onConfigRemoved={handleTracingConfigRemoved}
controlShowPopup={controlShowPopup}
@@ -205,10 +231,13 @@ const Panel: FC = () => {
onStatusChange={handleTracingEnabledChange}
chosenProvider={inUseTracingProvider}
onChooseProvider={handleChooseProvider}
+ arizeConfig={arizeConfig}
+ phoenixConfig={phoenixConfig}
langSmithConfig={langSmithConfig}
langFuseConfig={langFuseConfig}
opikConfig={opikConfig}
weaveConfig={weaveConfig}
+ aliyunConfig={aliyunConfig}
onConfigUpdated={handleTracingConfigUpdated}
onConfigRemoved={handleTracingConfigRemoved}
controlShowPopup={controlShowPopup}
diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-config-modal.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-config-modal.tsx
index b6c97add48..318f1f61d6 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-config-modal.tsx
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-config-modal.tsx
@@ -4,7 +4,7 @@ import React, { useCallback, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useBoolean } from 'ahooks'
import Field from './field'
-import type { LangFuseConfig, LangSmithConfig, OpikConfig, WeaveConfig } from './type'
+import type { AliyunConfig, ArizeConfig, LangFuseConfig, LangSmithConfig, OpikConfig, PhoenixConfig, WeaveConfig } from './type'
import { TracingProvider } from './type'
import { docURL } from './config'
import {
@@ -22,15 +22,28 @@ import Divider from '@/app/components/base/divider'
type Props = {
appId: string
type: TracingProvider
- payload?: LangSmithConfig | LangFuseConfig | OpikConfig | WeaveConfig | null
+ payload?: ArizeConfig | PhoenixConfig | LangSmithConfig | LangFuseConfig | OpikConfig | WeaveConfig | AliyunConfig | null
onRemoved: () => void
onCancel: () => void
- onSaved: (payload: LangSmithConfig | LangFuseConfig | OpikConfig | WeaveConfig) => void
+ onSaved: (payload: ArizeConfig | PhoenixConfig | LangSmithConfig | LangFuseConfig | OpikConfig | WeaveConfig | AliyunConfig) => void
onChosen: (provider: TracingProvider) => void
}
const I18N_PREFIX = 'app.tracing.configProvider'
+const arizeConfigTemplate = {
+ api_key: '',
+ space_id: '',
+ project: '',
+ endpoint: '',
+}
+
+const phoenixConfigTemplate = {
+ api_key: '',
+ project: '',
+ endpoint: '',
+}
+
const langSmithConfigTemplate = {
api_key: '',
project: '',
@@ -58,6 +71,12 @@ const weaveConfigTemplate = {
host: '',
}
+const aliyunConfigTemplate = {
+ app_name: '',
+ license_key: '',
+ endpoint: '',
+}
+
const ProviderConfigModal: FC = ({
appId,
type,
@@ -71,11 +90,17 @@ const ProviderConfigModal: FC = ({
const isEdit = !!payload
const isAdd = !isEdit
const [isSaving, setIsSaving] = useState(false)
- const [config, setConfig] = useState((() => {
+ const [config, setConfig] = useState((() => {
if (isEdit)
return payload
- if (type === TracingProvider.langSmith)
+ if (type === TracingProvider.arize)
+ return arizeConfigTemplate
+
+ else if (type === TracingProvider.phoenix)
+ return phoenixConfigTemplate
+
+ else if (type === TracingProvider.langSmith)
return langSmithConfigTemplate
else if (type === TracingProvider.langfuse)
@@ -84,6 +109,9 @@ const ProviderConfigModal: FC = ({
else if (type === TracingProvider.opik)
return opikConfigTemplate
+ else if (type === TracingProvider.aliyun)
+ return aliyunConfigTemplate
+
return weaveConfigTemplate
})())
const [isShowRemoveConfirm, {
@@ -115,6 +143,24 @@ const ProviderConfigModal: FC = ({
const checkValid = useCallback(() => {
let errorMessage = ''
+ if (type === TracingProvider.arize) {
+ const postData = config as ArizeConfig
+ if (!postData.api_key)
+ errorMessage = t('common.errorMsg.fieldRequired', { field: 'API Key' })
+ if (!postData.space_id)
+ errorMessage = t('common.errorMsg.fieldRequired', { field: 'Space ID' })
+ if (!errorMessage && !postData.project)
+ errorMessage = t('common.errorMsg.fieldRequired', { field: t(`${I18N_PREFIX}.project`) })
+ }
+
+ if (type === TracingProvider.phoenix) {
+ const postData = config as PhoenixConfig
+ if (!postData.api_key)
+ errorMessage = t('common.errorMsg.fieldRequired', { field: 'API Key' })
+ if (!errorMessage && !postData.project)
+ errorMessage = t('common.errorMsg.fieldRequired', { field: t(`${I18N_PREFIX}.project`) })
+ }
+
if (type === TracingProvider.langSmith) {
const postData = config as LangSmithConfig
if (!postData.api_key)
@@ -146,6 +192,16 @@ const ProviderConfigModal: FC = ({
errorMessage = t('common.errorMsg.fieldRequired', { field: t(`${I18N_PREFIX}.project`) })
}
+ if (type === TracingProvider.aliyun) {
+ const postData = config as AliyunConfig
+ if (!errorMessage && !postData.app_name)
+ errorMessage = t('common.errorMsg.fieldRequired', { field: 'App Name' })
+ if (!errorMessage && !postData.license_key)
+ errorMessage = t('common.errorMsg.fieldRequired', { field: 'License Key' })
+ if (!errorMessage && !postData.endpoint)
+ errorMessage = t('common.errorMsg.fieldRequired', { field: 'Endpoint' })
+ }
+
return errorMessage
}, [config, t, type])
const handleSave = useCallback(async () => {
@@ -195,6 +251,93 @@ const ProviderConfigModal: FC = ({
+ {type === TracingProvider.arize && (
+ <>
+
+
+
+
+
+ )}
+ {type === TracingProvider.phoenix && (
+ <>
+
+
+
+
+ )}
+ {type === TracingProvider.aliyun && (
+ <>
+
+
+
+
+ )}
{type === TracingProvider.weave && (
<>
{
return ({
+ [TracingProvider.arize]: ArizeIconBig,
+ [TracingProvider.phoenix]: PhoenixIconBig,
[TracingProvider.langSmith]: LangsmithIconBig,
[TracingProvider.langfuse]: LangfuseIconBig,
[TracingProvider.opik]: OpikIconBig,
[TracingProvider.weave]: WeaveIconBig,
+ [TracingProvider.aliyun]: AliyunIconBig,
})[type]
}
diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/type.ts b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/type.ts
index ed468caf65..78bca41ad2 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/type.ts
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/type.ts
@@ -1,8 +1,24 @@
export enum TracingProvider {
+ arize = 'arize',
+ phoenix = 'phoenix',
langSmith = 'langsmith',
langfuse = 'langfuse',
opik = 'opik',
weave = 'weave',
+ aliyun = 'aliyun',
+}
+
+export type ArizeConfig = {
+ api_key: string
+ space_id: string
+ project: string
+ endpoint: string
+}
+
+export type PhoenixConfig = {
+ api_key: string
+ project: string
+ endpoint: string
}
export type LangSmithConfig = {
@@ -31,3 +47,9 @@ export type WeaveConfig = {
endpoint: string
host: string
}
+
+export type AliyunConfig = {
+ app_name: string
+ license_key: string
+ endpoint: string
+}
diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/workflow/page.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/workflow/page.tsx
index d5df70f004..15da0bbed2 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/workflow/page.tsx
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/workflow/page.tsx
@@ -1,5 +1,3 @@
-'use client'
-
import WorkflowApp from '@/app/components/workflow-app'
const Page = () => {
diff --git a/web/app/(commonLayout)/apps/assets/add.svg b/web/app/(commonLayout)/apps/assets/add.svg
deleted file mode 100644
index 9958e855aa..0000000000
--- a/web/app/(commonLayout)/apps/assets/add.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
diff --git a/web/app/(commonLayout)/apps/assets/chat-solid.svg b/web/app/(commonLayout)/apps/assets/chat-solid.svg
deleted file mode 100644
index a793e982c0..0000000000
--- a/web/app/(commonLayout)/apps/assets/chat-solid.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
diff --git a/web/app/(commonLayout)/apps/assets/chat.svg b/web/app/(commonLayout)/apps/assets/chat.svg
deleted file mode 100644
index 0971349a53..0000000000
--- a/web/app/(commonLayout)/apps/assets/chat.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
diff --git a/web/app/(commonLayout)/apps/assets/completion-solid.svg b/web/app/(commonLayout)/apps/assets/completion-solid.svg
deleted file mode 100644
index a9dc7e3dc1..0000000000
--- a/web/app/(commonLayout)/apps/assets/completion-solid.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
diff --git a/web/app/(commonLayout)/apps/assets/completion.svg b/web/app/(commonLayout)/apps/assets/completion.svg
deleted file mode 100644
index 34af4417fe..0000000000
--- a/web/app/(commonLayout)/apps/assets/completion.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
diff --git a/web/app/(commonLayout)/apps/assets/discord.svg b/web/app/(commonLayout)/apps/assets/discord.svg
deleted file mode 100644
index 9f22a1ab59..0000000000
--- a/web/app/(commonLayout)/apps/assets/discord.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
diff --git a/web/app/(commonLayout)/apps/assets/github.svg b/web/app/(commonLayout)/apps/assets/github.svg
deleted file mode 100644
index f03798b5e1..0000000000
--- a/web/app/(commonLayout)/apps/assets/github.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/web/app/(commonLayout)/apps/assets/link-gray.svg b/web/app/(commonLayout)/apps/assets/link-gray.svg
deleted file mode 100644
index a293cfcf53..0000000000
--- a/web/app/(commonLayout)/apps/assets/link-gray.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
diff --git a/web/app/(commonLayout)/apps/assets/link.svg b/web/app/(commonLayout)/apps/assets/link.svg
deleted file mode 100644
index 2926c28b16..0000000000
--- a/web/app/(commonLayout)/apps/assets/link.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
diff --git a/web/app/(commonLayout)/apps/assets/right-arrow.svg b/web/app/(commonLayout)/apps/assets/right-arrow.svg
deleted file mode 100644
index a2c1cedf95..0000000000
--- a/web/app/(commonLayout)/apps/assets/right-arrow.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
diff --git a/web/app/(commonLayout)/apps/layout.tsx b/web/app/(commonLayout)/apps/layout.tsx
deleted file mode 100644
index 10d04a4188..0000000000
--- a/web/app/(commonLayout)/apps/layout.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-'use client'
-
-import useDocumentTitle from '@/hooks/use-document-title'
-import { useTranslation } from 'react-i18next'
-
-export default function DatasetsLayout({ children }: { children: React.ReactNode }) {
- const { t } = useTranslation()
- useDocumentTitle(t('common.menus.apps'))
- return (<>
- {children}
- )
-}
diff --git a/web/app/(commonLayout)/apps/page.tsx b/web/app/(commonLayout)/apps/page.tsx
index 3f617d41c9..25b6d55d11 100644
--- a/web/app/(commonLayout)/apps/page.tsx
+++ b/web/app/(commonLayout)/apps/page.tsx
@@ -1,32 +1,8 @@
-'use client'
-import { useTranslation } from 'react-i18next'
-import { RiDiscordFill, RiGithubFill } from '@remixicon/react'
-import Link from 'next/link'
-import style from '../list.module.css'
-import Apps from './Apps'
-import { useEducationInit } from '@/app/education-apply/hooks'
-import { useGlobalPublicStore } from '@/context/global-public-context'
+import Apps from '@/app/components/apps'
const AppList = () => {
- const { t } = useTranslation()
- useEducationInit()
- const { systemFeatures } = useGlobalPublicStore()
return (
-
-
- {!systemFeatures.branding.enabled &&
}
-
{
)}
- {isMobile &&
+ {isMobile &&
{relatedAppsTotal || '--'}
}
@@ -87,7 +86,6 @@ const ExtraInfo = ({ isMobile, relatedApps, expand }: IExtraInfoProps) => {
diff --git a/web/app/(commonLayout)/datasets/Datasets.tsx b/web/app/(commonLayout)/datasets/Datasets.tsx
index 28461e8617..2d4848e92e 100644
--- a/web/app/(commonLayout)/datasets/Datasets.tsx
+++ b/web/app/(commonLayout)/datasets/Datasets.tsx
@@ -81,7 +81,7 @@ const Datasets = ({
currentContainer?.removeEventListener('scroll', onScroll)
onScroll.cancel()
}
- }, [onScroll])
+ }, [containerRef, onScroll])
return (
diff --git a/web/app/(commonLayout)/datasets/NewDatasetCard.tsx b/web/app/(commonLayout)/datasets/NewDatasetCard.tsx
index 792d9904da..62f6a34be0 100644
--- a/web/app/(commonLayout)/datasets/NewDatasetCard.tsx
+++ b/web/app/(commonLayout)/datasets/NewDatasetCard.tsx
@@ -1,38 +1,37 @@
'use client'
import { useTranslation } from 'react-i18next'
-import { basePath } from '@/utils/var'
import {
RiAddLine,
RiArrowRightLine,
} from '@remixicon/react'
+import Link from 'next/link'
-const CreateAppCard = (
- {
- ref,
- ..._
- },
-) => {
+type CreateAppCardProps = {
+ ref?: React.Ref
+}
+
+const CreateAppCard = ({ ref }: CreateAppCardProps) => {
const { t } = useTranslation()
return (
)
}
diff --git a/web/app/(commonLayout)/datasets/layout.tsx b/web/app/(commonLayout)/datasets/layout.tsx
index b3fc5147b5..5f97d853ef 100644
--- a/web/app/(commonLayout)/datasets/layout.tsx
+++ b/web/app/(commonLayout)/datasets/layout.tsx
@@ -8,15 +8,17 @@ import { useRouter } from 'next/navigation'
import { useEffect } from 'react'
export default function DatasetsLayout({ children }: { children: React.ReactNode }) {
- const { isCurrentWorkspaceEditor, isCurrentWorkspaceDatasetOperator } = useAppContext()
+ const { isCurrentWorkspaceEditor, isCurrentWorkspaceDatasetOperator, currentWorkspace, isLoadingCurrentWorkspace } = useAppContext()
const router = useRouter()
useEffect(() => {
- if (!isCurrentWorkspaceEditor && !isCurrentWorkspaceDatasetOperator)
+ if (isLoadingCurrentWorkspace || !currentWorkspace.id)
+ return
+ if (!(isCurrentWorkspaceEditor || isCurrentWorkspaceDatasetOperator))
router.replace('/apps')
- }, [isCurrentWorkspaceEditor, isCurrentWorkspaceDatasetOperator, router])
+ }, [isCurrentWorkspaceEditor, isCurrentWorkspaceDatasetOperator, isLoadingCurrentWorkspace, currentWorkspace, router])
- if (!isCurrentWorkspaceEditor && !isCurrentWorkspaceDatasetOperator)
+ if (isLoadingCurrentWorkspace || !(isCurrentWorkspaceEditor || isCurrentWorkspaceDatasetOperator))
return
diff --git a/web/app/(commonLayout)/datasets/template/template.en.mdx b/web/app/(commonLayout)/datasets/template/template.en.mdx
index e1ff827c96..ebb2e6a806 100644
--- a/web/app/(commonLayout)/datasets/template/template.en.mdx
+++ b/web/app/(commonLayout)/datasets/template/template.en.mdx
@@ -1124,6 +1124,186 @@ import { Row, Col, Properties, Property, Heading, SubProperty, PropertyInstructi
+
+ ```bash {{ title: 'cURL' }}
+ curl -X GET '${props.apiBaseUrl}/datasets/{dataset_id}/documents/{document_id}' \
+ -H 'Authorization: Bearer {api_key}'
+ ```
+
+
+ ### Response Example
+
+ ```json {{ title: 'Response' }}
+ {
+ "id": "f46ae30c-5c11-471b-96d0-464f5f32a7b2",
+ "position": 1,
+ "data_source_type": "upload_file",
+ "data_source_info": {
+ "upload_file": {
+ ...
+ }
+ },
+ "dataset_process_rule_id": "24b99906-845e-499f-9e3c-d5565dd6962c",
+ "dataset_process_rule": {
+ "mode": "hierarchical",
+ "rules": {
+ "pre_processing_rules": [
+ {
+ "id": "remove_extra_spaces",
+ "enabled": true
+ },
+ {
+ "id": "remove_urls_emails",
+ "enabled": false
+ }
+ ],
+ "segmentation": {
+ "separator": "**********page_ending**********",
+ "max_tokens": 1024,
+ "chunk_overlap": 0
+ },
+ "parent_mode": "paragraph",
+ "subchunk_segmentation": {
+ "separator": "\n",
+ "max_tokens": 512,
+ "chunk_overlap": 0
+ }
+ }
+ },
+ "document_process_rule": {
+ "id": "24b99906-845e-499f-9e3c-d5565dd6962c",
+ "dataset_id": "48a0db76-d1a9-46c1-ae35-2baaa919a8a9",
+ "mode": "hierarchical",
+ "rules": {
+ "pre_processing_rules": [
+ {
+ "id": "remove_extra_spaces",
+ "enabled": true
+ },
+ {
+ "id": "remove_urls_emails",
+ "enabled": false
+ }
+ ],
+ "segmentation": {
+ "separator": "**********page_ending**********",
+ "max_tokens": 1024,
+ "chunk_overlap": 0
+ },
+ "parent_mode": "paragraph",
+ "subchunk_segmentation": {
+ "separator": "\n",
+ "max_tokens": 512,
+ "chunk_overlap": 0
+ }
+ }
+ },
+ "name": "xxxx",
+ "created_from": "web",
+ "created_by": "17f71940-a7b5-4c77-b60f-2bd645c1ffa0",
+ "created_at": 1750464191,
+ "tokens": null,
+ "indexing_status": "waiting",
+ "completed_at": null,
+ "updated_at": 1750464191,
+ "indexing_latency": null,
+ "error": null,
+ "enabled": true,
+ "disabled_at": null,
+ "disabled_by": null,
+ "archived": false,
+ "segment_count": 0,
+ "average_segment_length": 0,
+ "hit_count": null,
+ "display_status": "queuing",
+ "doc_form": "hierarchical_model",
+ "doc_language": "Chinese Simplified"
+ }
+ ```
+
+
+
+___
+
+
+
+ Knowledge ID
+
+
+ - `enable` - Enable document
+ - `disable` - Disable document
+ - `archive` - Archive document
+ - `un_archive` - Unarchive document
+
+
+
+ ### Request Body
+
+
+ List of document IDs
+
+
+
+
+ ```bash {{ title: 'cURL' }}
+ curl --location --request PATCH '${props.apiBaseUrl}/datasets/{dataset_id}/documents/status/{action}' \
+ --header 'Authorization: Bearer {api_key}' \
+ --header 'Content-Type: application/json' \
+ --data-raw '{
+ "document_ids": ["doc-id-1", "doc-id-2"]
+ }'
+ ```
+
+
+
+ ```json {{ title: 'Response' }}
+ {
+ "result": "success"
+ }
+ ```
+
+
+
+
+subchunk_segmentation (object) 子チャンクルール
- separator セグメンテーション識別子。現在は 1 つの区切り文字のみ許可。デフォルトは ***
- max_tokens 最大長 (トークン) は親チャンクの長さより短いことを検証する必要があります
- - chunk_overlap 隣接するチャンク間の重複を定義 (オプション)
+ - chunk_overlap 隣接するチャンク間の重なりを定義 (オプション)
ナレッジベースにパラメータが設定されていない場合、最初のアップロードには以下のパラメータを提供する必要があります。提供されない場合、デフォルトパラメータが使用されます。
@@ -218,7 +218,7 @@ import { Row, Col, Properties, Property, Heading, SubProperty, PropertyInstructi
- subchunk_segmentation (object) 子チャンクルール
- separator セグメンテーション識別子。現在は 1 つの区切り文字のみ許可。デフォルトは ***
- max_tokens 最大長 (トークン) は親チャンクの長さより短いことを検証する必要があります
- - chunk_overlap 隣接するチャンク間の重複を定義 (オプション)
+ - chunk_overlap 隣接するチャンク間の重なりを定義 (オプション)
アップロードする必要があるファイル。
@@ -555,7 +555,7 @@ import { Row, Col, Properties, Property, Heading, SubProperty, PropertyInstructi
- subchunk_segmentation (object) 子チャンクルール
- separator セグメンテーション識別子。現在は 1 つの区切り文字のみ許可。デフォルトは ***
- max_tokens 最大長 (トークン) は親チャンクの長さより短いことを検証する必要があります
- - chunk_overlap 隣接するチャンク間の重複を定義 (オプション)
+ - chunk_overlap 隣接するチャンク間の重なりを定義 (オプション)
@@ -657,7 +657,7 @@ import { Row, Col, Properties, Property, Heading, SubProperty, PropertyInstructi
- subchunk_segmentation (object) 子チャンクルール
- separator セグメンテーション識別子。現在は 1 つの区切り文字のみ許可。デフォルトは ***
- max_tokens 最大長 (トークン) は親チャンクの長さより短いことを検証する必要があります
- - chunk_overlap 隣接するチャンク間の重複を定義 (オプション)
+ - chunk_overlap 隣接するチャンク間の重なりを定義 (オプション)
@@ -881,6 +881,187 @@ import { Row, Col, Properties, Property, Heading, SubProperty, PropertyInstructi
+
+ ```bash {{ title: 'cURL' }}
+ curl -X GET '${props.apiBaseUrl}/datasets/{dataset_id}/documents/{document_id}' \
+ -H 'Authorization: Bearer {api_key}'
+ ```
+
+
+ ### Response Example
+
+ ```json {{ title: 'Response' }}
+ {
+ "id": "f46ae30c-5c11-471b-96d0-464f5f32a7b2",
+ "position": 1,
+ "data_source_type": "upload_file",
+ "data_source_info": {
+ "upload_file": {
+ ...
+ }
+ },
+ "dataset_process_rule_id": "24b99906-845e-499f-9e3c-d5565dd6962c",
+ "dataset_process_rule": {
+ "mode": "hierarchical",
+ "rules": {
+ "pre_processing_rules": [
+ {
+ "id": "remove_extra_spaces",
+ "enabled": true
+ },
+ {
+ "id": "remove_urls_emails",
+ "enabled": false
+ }
+ ],
+ "segmentation": {
+ "separator": "**********page_ending**********",
+ "max_tokens": 1024,
+ "chunk_overlap": 0
+ },
+ "parent_mode": "paragraph",
+ "subchunk_segmentation": {
+ "separator": "\n",
+ "max_tokens": 512,
+ "chunk_overlap": 0
+ }
+ }
+ },
+ "document_process_rule": {
+ "id": "24b99906-845e-499f-9e3c-d5565dd6962c",
+ "dataset_id": "48a0db76-d1a9-46c1-ae35-2baaa919a8a9",
+ "mode": "hierarchical",
+ "rules": {
+ "pre_processing_rules": [
+ {
+ "id": "remove_extra_spaces",
+ "enabled": true
+ },
+ {
+ "id": "remove_urls_emails",
+ "enabled": false
+ }
+ ],
+ "segmentation": {
+ "separator": "**********page_ending**********",
+ "max_tokens": 1024,
+ "chunk_overlap": 0
+ },
+ "parent_mode": "paragraph",
+ "subchunk_segmentation": {
+ "separator": "\n",
+ "max_tokens": 512,
+ "chunk_overlap": 0
+ }
+ }
+ },
+ "name": "xxxx",
+ "created_from": "web",
+ "created_by": "17f71940-a7b5-4c77-b60f-2bd645c1ffa0",
+ "created_at": 1750464191,
+ "tokens": null,
+ "indexing_status": "waiting",
+ "completed_at": null,
+ "updated_at": 1750464191,
+ "indexing_latency": null,
+ "error": null,
+ "enabled": true,
+ "disabled_at": null,
+ "disabled_by": null,
+ "archived": false,
+ "segment_count": 0,
+ "average_segment_length": 0,
+ "hit_count": null,
+ "display_status": "queuing",
+ "doc_form": "hierarchical_model",
+ "doc_language": "Chinese Simplified"
+ }
+ ```
+
+
+
+___
+
+
+
+ ナレッジ ID
+
+
+ - `enable` - ドキュメントを有効化
+ - `disable` - ドキュメントを無効化
+ - `archive` - ドキュメントをアーカイブ
+ - `un_archive` - ドキュメントのアーカイブを解除
+
+
+
+ ### リクエストボディ
+
+
+ ドキュメントIDのリスト
+
+
+
+
+ ```bash {{ title: 'cURL' }}
+ curl --location --request PATCH '${props.apiBaseUrl}/datasets/{dataset_id}/documents/status/{action}' \
+ --header 'Authorization: Bearer {api_key}' \
+ --header 'Content-Type: application/json' \
+ --data-raw '{
+ "document_ids": ["doc-id-1", "doc-id-2"]
+ }'
+ ```
+
+
+
+ ```json {{ title: 'Response' }}
+ {
+ "result": "success"
+ }
+ ```
+
+
+
+
+
+
diff --git a/web/app/(commonLayout)/datasets/template/template.zh.mdx b/web/app/(commonLayout)/datasets/template/template.zh.mdx
index 3994356b51..c21ce3bf5f 100644
--- a/web/app/(commonLayout)/datasets/template/template.zh.mdx
+++ b/web/app/(commonLayout)/datasets/template/template.zh.mdx
@@ -1131,6 +1131,187 @@ import { Row, Col, Properties, Property, Heading, SubProperty, PropertyInstructi
+
+ ```bash {{ title: 'cURL' }}
+ curl -X GET '${props.apiBaseUrl}/datasets/{dataset_id}/documents/{document_id}' \
+ -H 'Authorization: Bearer {api_key}'
+ ```
+
+
+ ### Response Example
+
+ ```json {{ title: 'Response' }}
+ {
+ "id": "f46ae30c-5c11-471b-96d0-464f5f32a7b2",
+ "position": 1,
+ "data_source_type": "upload_file",
+ "data_source_info": {
+ "upload_file": {
+ ...
+ }
+ },
+ "dataset_process_rule_id": "24b99906-845e-499f-9e3c-d5565dd6962c",
+ "dataset_process_rule": {
+ "mode": "hierarchical",
+ "rules": {
+ "pre_processing_rules": [
+ {
+ "id": "remove_extra_spaces",
+ "enabled": true
+ },
+ {
+ "id": "remove_urls_emails",
+ "enabled": false
+ }
+ ],
+ "segmentation": {
+ "separator": "**********page_ending**********",
+ "max_tokens": 1024,
+ "chunk_overlap": 0
+ },
+ "parent_mode": "paragraph",
+ "subchunk_segmentation": {
+ "separator": "\n",
+ "max_tokens": 512,
+ "chunk_overlap": 0
+ }
+ }
+ },
+ "document_process_rule": {
+ "id": "24b99906-845e-499f-9e3c-d5565dd6962c",
+ "dataset_id": "48a0db76-d1a9-46c1-ae35-2baaa919a8a9",
+ "mode": "hierarchical",
+ "rules": {
+ "pre_processing_rules": [
+ {
+ "id": "remove_extra_spaces",
+ "enabled": true
+ },
+ {
+ "id": "remove_urls_emails",
+ "enabled": false
+ }
+ ],
+ "segmentation": {
+ "separator": "**********page_ending**********",
+ "max_tokens": 1024,
+ "chunk_overlap": 0
+ },
+ "parent_mode": "paragraph",
+ "subchunk_segmentation": {
+ "separator": "\n",
+ "max_tokens": 512,
+ "chunk_overlap": 0
+ }
+ }
+ },
+ "name": "xxxx",
+ "created_from": "web",
+ "created_by": "17f71940-a7b5-4c77-b60f-2bd645c1ffa0",
+ "created_at": 1750464191,
+ "tokens": null,
+ "indexing_status": "waiting",
+ "completed_at": null,
+ "updated_at": 1750464191,
+ "indexing_latency": null,
+ "error": null,
+ "enabled": true,
+ "disabled_at": null,
+ "disabled_by": null,
+ "archived": false,
+ "segment_count": 0,
+ "average_segment_length": 0,
+ "hit_count": null,
+ "display_status": "queuing",
+ "doc_form": "hierarchical_model",
+ "doc_language": "Chinese Simplified"
+ }
+ ```
+
+
+
+___
+
+
+
+ 知识库 ID
+
+
+ - `enable` - 启用文档
+ - `disable` - 禁用文档
+ - `archive` - 归档文档
+ - `un_archive` - 取消归档文档
+
+
+
+ ### Request Body
+
+
+ 文档ID列表
+
+
+
+
+ ```bash {{ title: 'cURL' }}
+ curl --location --request PATCH '${props.apiBaseUrl}/datasets/{dataset_id}/documents/status/{action}' \
+ --header 'Authorization: Bearer {api_key}' \
+ --header 'Content-Type: application/json' \
+ --data-raw '{
+ "document_ids": ["doc-id-1", "doc-id-2"]
+ }'
+ ```
+
+
+
+ ```json {{ title: 'Response' }}
+ {
+ "result": "success"
+ }
+ ```
+
+
+
+
+
+ }
}
-const InstalledApp: FC = async ({ params }) => {
+// Using Next.js page convention for async server components
+async function InstalledApp({ params }: IInstalledAppProps) {
+ const appId = (await params).appId
return (
-
+
@@ -26,7 +26,7 @@ const Layout = ({ children }: { children: ReactNode }) => {
-
+
)
}
diff --git a/web/app/(commonLayout)/list.module.css b/web/app/(commonLayout)/list.module.css
deleted file mode 100644
index cefa9ccee7..0000000000
--- a/web/app/(commonLayout)/list.module.css
+++ /dev/null
@@ -1,217 +0,0 @@
-.listItem {
- @apply col-span-1 bg-white border-2 border-solid border-transparent rounded-xl shadow-xs min-h-[160px] flex flex-col transition-all duration-200 ease-in-out cursor-pointer hover:shadow-lg;
-}
-
-.listItem.newItemCard {
- @apply outline outline-1 outline-gray-200 -outline-offset-1 hover:shadow-sm hover:bg-white;
- background-color: rgba(229, 231, 235, 0.5);
-}
-
-.listItem.selectable {
- @apply relative bg-gray-50 outline outline-1 outline-gray-200 -outline-offset-1 shadow-none hover:bg-none hover:shadow-none hover:outline-primary-200 transition-colors;
-}
-
-.listItem.selectable * {
- @apply relative;
-}
-
-.listItem.selectable::before {
- content: "";
- @apply absolute top-0 left-0 block w-full h-full rounded-lg pointer-events-none opacity-0 transition-opacity duration-200 ease-in-out hover:opacity-100;
- background: linear-gradient(0deg,
- rgba(235, 245, 255, 0.5),
- rgba(235, 245, 255, 0.5)),
- #ffffff;
-}
-
-.listItem.selectable:hover::before {
- @apply opacity-100;
-}
-
-.listItem.selected {
- @apply border-primary-600 hover:border-primary-600 border-2;
-}
-
-.listItem.selected::before {
- @apply opacity-100;
-}
-
-.appIcon {
- @apply flex items-center justify-center w-8 h-8 bg-pink-100 rounded-lg grow-0 shrink-0;
-}
-
-.appIcon.medium {
- @apply w-9 h-9;
-}
-
-.appIcon.large {
- @apply w-10 h-10;
-}
-
-.newItemIcon {
- @apply flex items-center justify-center w-8 h-8 transition-colors duration-200 ease-in-out border border-gray-200 rounded-lg hover:bg-white grow-0 shrink-0;
-}
-
-.listItem:hover .newItemIcon {
- @apply bg-gray-50 border-primary-100;
-}
-
-.newItemCard .newItemIcon {
- @apply bg-gray-100;
-}
-
-.newItemCard:hover .newItemIcon {
- @apply bg-white;
-}
-
-.selectable .newItemIcon {
- @apply bg-gray-50;
-}
-
-.selectable:hover .newItemIcon {
- @apply bg-primary-50;
-}
-
-.newItemIconImage {
- @apply grow-0 shrink-0 block w-4 h-4 bg-center bg-contain transition-colors duration-200 ease-in-out;
- color: #1f2a37;
-}
-
-.listItem:hover .newIconImage {
- @apply text-primary-600;
-}
-
-.newItemIconAdd {
- background-image: url("./apps/assets/add.svg");
-}
-
-/* .newItemIconChat {
- background-image: url("@/app/components/base/icons/assets/public/header-nav/studio/Robot.svg");
-}
-
-.selected .newItemIconChat {
- background-image: url("@/app/components/base/icons/assets/public/header-nav/studio/Robot-Active.svg");
-} */
-
-.newItemIconComplete {
- background-image: url("./apps/assets/completion.svg");
-}
-
-.listItemTitle {
- @apply flex pt-[14px] px-[14px] pb-3 h-[66px] items-center gap-3 grow-0 shrink-0;
-}
-
-.listItemHeading {
- @apply relative h-8 text-sm font-medium leading-8 grow;
-}
-
-.listItemHeadingContent {
- @apply absolute top-0 left-0 w-full h-full overflow-hidden text-ellipsis whitespace-nowrap;
-}
-
-.actionIconWrapper {
- @apply hidden h-8 w-8 p-2 rounded-md border-none hover:bg-gray-100 !important;
-}
-
-.listItem:hover .actionIconWrapper {
- @apply !inline-flex;
-}
-
-.deleteDatasetIcon {
- @apply hidden grow-0 shrink-0 basis-8 w-8 h-8 rounded-lg transition-colors duration-200 ease-in-out bg-white border border-gray-200 hover:bg-gray-100 bg-center bg-no-repeat;
- background-size: 16px;
- background-image: url('/assets/delete.svg');
-}
-
-.listItem:hover .deleteDatasetIcon {
- @apply block;
-}
-
-.listItemDescription {
- @apply mb-3 px-[14px] h-9 text-xs leading-normal text-gray-500 line-clamp-2;
-}
-
-.listItemDescription.noClip {
- @apply line-clamp-none;
-}
-
-.listItemFooter {
- @apply flex items-center flex-wrap min-h-[42px] px-[14px] pt-2 pb-[10px];
-}
-
-.listItemFooter.datasetCardFooter {
- @apply flex items-center gap-4 text-xs text-gray-500;
-}
-
-.listItemStats {
- @apply flex items-center gap-1;
-}
-
-.listItemFooterIcon {
- @apply block w-3 h-3 bg-center bg-contain;
-}
-
-.solidChatIcon {
- background-image: url("./apps/assets/chat-solid.svg");
-}
-
-.solidCompletionIcon {
- background-image: url("./apps/assets/completion-solid.svg");
-}
-
-.newItemCardHeading {
- @apply transition-colors duration-200 ease-in-out;
-}
-
-.listItem:hover .newItemCardHeading {
- @apply text-primary-600;
-}
-
-.listItemLink {
- @apply inline-flex items-center gap-1 text-xs text-gray-400 transition-colors duration-200 ease-in-out;
-}
-
-.listItem:hover .listItemLink {
- @apply text-primary-600;
-}
-
-.linkIcon {
- @apply block w-[13px] h-[13px] bg-center bg-contain;
- background-image: url("./apps/assets/link.svg");
-}
-
-.linkIcon.grayLinkIcon {
- background-image: url("./apps/assets/link-gray.svg");
-}
-
-.listItem:hover .grayLinkIcon {
- background-image: url("./apps/assets/link.svg");
-}
-
-.rightIcon {
- @apply block w-[13px] h-[13px] bg-center bg-contain;
- background-image: url("./apps/assets/right-arrow.svg");
-}
-
-.socialMediaLink {
- @apply flex items-center justify-center w-8 h-8 cursor-pointer hover:opacity-80 transition-opacity duration-200 ease-in-out;
-}
-
-.socialMediaIcon {
- @apply block w-6 h-6 bg-center bg-contain;
-}
-
-/* #region new app dialog */
-.newItemCaption {
- @apply inline-flex items-center mb-2 text-sm font-medium;
-}
-
-/* #endregion new app dialog */
-
-.unavailable {
- @apply opacity-50;
-}
-
-.listItem:hover .unavailable {
- @apply opacity-100;
-}
diff --git a/web/app/(shareLayout)/chat/[token]/page.tsx b/web/app/(shareLayout)/chat/[token]/page.tsx
index 640c40378f..8ce67585f0 100644
--- a/web/app/(shareLayout)/chat/[token]/page.tsx
+++ b/web/app/(shareLayout)/chat/[token]/page.tsx
@@ -1,10 +1,13 @@
'use client'
import React from 'react'
import ChatWithHistoryWrap from '@/app/components/base/chat/chat-with-history'
+import AuthenticatedLayout from '../../components/authenticated-layout'
const Chat = () => {
return (
-
+
)
}
diff --git a/web/app/(shareLayout)/chatbot/[token]/page.tsx b/web/app/(shareLayout)/chatbot/[token]/page.tsx
index 6196afecc4..5323d0dacc 100644
--- a/web/app/(shareLayout)/chatbot/[token]/page.tsx
+++ b/web/app/(shareLayout)/chatbot/[token]/page.tsx
@@ -1,10 +1,13 @@
'use client'
import React from 'react'
import EmbeddedChatbot from '@/app/components/base/chat/embedded-chatbot'
+import AuthenticatedLayout from '../../components/authenticated-layout'
const Chatbot = () => {
return (
-
+
)
}
diff --git a/web/app/(shareLayout)/completion/[token]/page.tsx b/web/app/(shareLayout)/completion/[token]/page.tsx
index e8bc9d79f5..ae91338b9a 100644
--- a/web/app/(shareLayout)/completion/[token]/page.tsx
+++ b/web/app/(shareLayout)/completion/[token]/page.tsx
@@ -1,9 +1,12 @@
import React from 'react'
import Main from '@/app/components/share/text-generation'
+import AuthenticatedLayout from '../../components/authenticated-layout'
const Completion = () => {
return (
-
+
)
}
diff --git a/web/app/(shareLayout)/components/authenticated-layout.tsx b/web/app/(shareLayout)/components/authenticated-layout.tsx
new file mode 100644
index 0000000000..e3cfc8e6a8
--- /dev/null
+++ b/web/app/(shareLayout)/components/authenticated-layout.tsx
@@ -0,0 +1,84 @@
+'use client'
+
+import AppUnavailable from '@/app/components/base/app-unavailable'
+import Loading from '@/app/components/base/loading'
+import { removeAccessToken } from '@/app/components/share/utils'
+import { useWebAppStore } from '@/context/web-app-context'
+import { useGetUserCanAccessApp } from '@/service/access-control'
+import { useGetWebAppInfo, useGetWebAppMeta, useGetWebAppParams } from '@/service/use-share'
+import { usePathname, useRouter, useSearchParams } from 'next/navigation'
+import React, { useCallback, useEffect } from 'react'
+import { useTranslation } from 'react-i18next'
+
+const AuthenticatedLayout = ({ children }: { children: React.ReactNode }) => {
+ const { t } = useTranslation()
+ const updateAppInfo = useWebAppStore(s => s.updateAppInfo)
+ const updateAppParams = useWebAppStore(s => s.updateAppParams)
+ const updateWebAppMeta = useWebAppStore(s => s.updateWebAppMeta)
+ const updateUserCanAccessApp = useWebAppStore(s => s.updateUserCanAccessApp)
+ const { isFetching: isFetchingAppParams, data: appParams, error: appParamsError } = useGetWebAppParams()
+ const { isFetching: isFetchingAppInfo, data: appInfo, error: appInfoError } = useGetWebAppInfo()
+ const { isFetching: isFetchingAppMeta, data: appMeta, error: appMetaError } = useGetWebAppMeta()
+ const { data: userCanAccessApp, error: useCanAccessAppError } = useGetUserCanAccessApp({ appId: appInfo?.app_id, isInstalledApp: false })
+
+ useEffect(() => {
+ if (appInfo)
+ updateAppInfo(appInfo)
+ if (appParams)
+ updateAppParams(appParams)
+ if (appMeta)
+ updateWebAppMeta(appMeta)
+ updateUserCanAccessApp(Boolean(userCanAccessApp && userCanAccessApp?.result))
+ }, [appInfo, appMeta, appParams, updateAppInfo, updateAppParams, updateUserCanAccessApp, updateWebAppMeta, userCanAccessApp])
+
+ const router = useRouter()
+ const pathname = usePathname()
+ const searchParams = useSearchParams()
+ const getSigninUrl = useCallback(() => {
+ const params = new URLSearchParams(searchParams)
+ params.delete('message')
+ params.set('redirect_url', pathname)
+ return `/webapp-signin?${params.toString()}`
+ }, [searchParams, pathname])
+
+ const backToHome = useCallback(() => {
+ removeAccessToken()
+ const url = getSigninUrl()
+ router.replace(url)
+ }, [getSigninUrl, router])
+
+ if (appInfoError) {
+ return
+ }
+ if (appParamsError) {
+ return
+ }
+ if (appMetaError) {
+ return
+ }
+ if (useCanAccessAppError) {
+ return
+ }
+ if (userCanAccessApp && !userCanAccessApp.result) {
+ return
+
+
{t('common.userProfile.logout')}
+
+
+ }
+ return <>{children}
+}
+
+export default React.memo(AuthenticatedLayout)
diff --git a/web/app/(shareLayout)/components/splash.tsx b/web/app/(shareLayout)/components/splash.tsx
new file mode 100644
index 0000000000..4fe9efe4dd
--- /dev/null
+++ b/web/app/(shareLayout)/components/splash.tsx
@@ -0,0 +1,80 @@
+'use client'
+import type { FC, PropsWithChildren } from 'react'
+import { useEffect } from 'react'
+import { useCallback } from 'react'
+import { useWebAppStore } from '@/context/web-app-context'
+import { useRouter, useSearchParams } from 'next/navigation'
+import AppUnavailable from '@/app/components/base/app-unavailable'
+import { checkOrSetAccessToken, removeAccessToken, setAccessToken } from '@/app/components/share/utils'
+import { useTranslation } from 'react-i18next'
+import { fetchAccessToken } from '@/service/share'
+import Loading from '@/app/components/base/loading'
+import { AccessMode } from '@/models/access-control'
+
+const Splash: FC = ({ children }) => {
+ const { t } = useTranslation()
+ const shareCode = useWebAppStore(s => s.shareCode)
+ const webAppAccessMode = useWebAppStore(s => s.webAppAccessMode)
+ const searchParams = useSearchParams()
+ const router = useRouter()
+ const redirectUrl = searchParams.get('redirect_url')
+ const tokenFromUrl = searchParams.get('web_sso_token')
+ const message = searchParams.get('message')
+ const code = searchParams.get('code')
+ const getSigninUrl = useCallback(() => {
+ const params = new URLSearchParams(searchParams)
+ params.delete('message')
+ params.delete('code')
+ return `/webapp-signin?${params.toString()}`
+ }, [searchParams])
+
+ const backToHome = useCallback(() => {
+ removeAccessToken()
+ const url = getSigninUrl()
+ router.replace(url)
+ }, [getSigninUrl, router])
+
+ useEffect(() => {
+ (async () => {
+ if (message)
+ return
+ if (shareCode && tokenFromUrl && redirectUrl) {
+ localStorage.setItem('webapp_access_token', tokenFromUrl)
+ const tokenResp = await fetchAccessToken({ appCode: shareCode, webAppAccessToken: tokenFromUrl })
+ await setAccessToken(shareCode, tokenResp.access_token)
+ router.replace(decodeURIComponent(redirectUrl))
+ return
+ }
+ if (shareCode && redirectUrl && localStorage.getItem('webapp_access_token')) {
+ const tokenResp = await fetchAccessToken({ appCode: shareCode, webAppAccessToken: localStorage.getItem('webapp_access_token') })
+ await setAccessToken(shareCode, tokenResp.access_token)
+ router.replace(decodeURIComponent(redirectUrl))
+ return
+ }
+ if (webAppAccessMode === AccessMode.PUBLIC && redirectUrl) {
+ await checkOrSetAccessToken(shareCode)
+ router.replace(decodeURIComponent(redirectUrl))
+ }
+ })()
+ }, [shareCode, redirectUrl, router, tokenFromUrl, message, webAppAccessMode])
+
+ if (message) {
+ return
+
+
{code === '403' ? t('common.userProfile.logout') : t('share.login.backToHome')}
+
+
+ }
+ if (webAppAccessMode === AccessMode.PUBLIC && redirectUrl) {
+ return
+
+ }
+ return <>{children}
+}
+
+export default Splash
diff --git a/web/app/(shareLayout)/layout.tsx b/web/app/(shareLayout)/layout.tsx
index 78b8835009..5af913cac9 100644
--- a/web/app/(shareLayout)/layout.tsx
+++ b/web/app/(shareLayout)/layout.tsx
@@ -1,51 +1,15 @@
-'use client'
-import React, { useEffect, useState } from 'react'
-import type { FC } from 'react'
-import { usePathname, useSearchParams } from 'next/navigation'
-import Loading from '../components/base/loading'
-import { useGlobalPublicStore } from '@/context/global-public-context'
-import { AccessMode } from '@/models/access-control'
-import { getAppAccessModeByAppCode } from '@/service/share'
+import type { FC, PropsWithChildren } from 'react'
+import WebAppStoreProvider from '@/context/web-app-context'
+import Splash from './components/splash'
-const Layout: FC<{
- children: React.ReactNode
-}> = ({ children }) => {
- const isGlobalPending = useGlobalPublicStore(s => s.isGlobalPending)
- const setWebAppAccessMode = useGlobalPublicStore(s => s.setWebAppAccessMode)
- const systemFeatures = useGlobalPublicStore(s => s.systemFeatures)
- const pathname = usePathname()
- const searchParams = useSearchParams()
- const redirectUrl = searchParams.get('redirect_url')
- const [isLoading, setIsLoading] = useState(true)
- useEffect(() => {
- (async () => {
- if (!isGlobalPending && !systemFeatures.webapp_auth.enabled) {
- setIsLoading(false)
- return
- }
-
- let appCode: string | null = null
- if (redirectUrl)
- appCode = redirectUrl?.split('/').pop() || null
- else
- appCode = pathname.split('/').pop() || null
-
- if (!appCode)
- return
- setIsLoading(true)
- const ret = await getAppAccessModeByAppCode(appCode)
- setWebAppAccessMode(ret?.accessMode || AccessMode.PUBLIC)
- setIsLoading(false)
- })()
- }, [pathname, redirectUrl, setWebAppAccessMode, isGlobalPending, systemFeatures.webapp_auth.enabled])
- if (isLoading || isGlobalPending) {
- return
-
- }
+const Layout: FC = ({ children }) => {
return (
- {children}
+
+
+ {children}
+
+
)
}
diff --git a/web/app/(shareLayout)/webapp-reset-password/set-password/page.tsx b/web/app/(shareLayout)/webapp-reset-password/set-password/page.tsx
index 9f9a8ad4e3..5e3f6fff1d 100644
--- a/web/app/(shareLayout)/webapp-reset-password/set-password/page.tsx
+++ b/web/app/(shareLayout)/webapp-reset-password/set-password/page.tsx
@@ -9,8 +9,7 @@ import Button from '@/app/components/base/button'
import { changeWebAppPasswordWithToken } from '@/service/common'
import Toast from '@/app/components/base/toast'
import Input from '@/app/components/base/input'
-
-const validPassword = /^(?=.*[a-zA-Z])(?=.*\d).{8,}$/
+import { validPassword } from '@/config'
const ChangePasswordForm = () => {
const { t } = useTranslation()
diff --git a/web/app/(shareLayout)/webapp-signin/check-code/page.tsx b/web/app/(shareLayout)/webapp-signin/check-code/page.tsx
index 1b8f18c98f..a2ba620ace 100644
--- a/web/app/(shareLayout)/webapp-signin/check-code/page.tsx
+++ b/web/app/(shareLayout)/webapp-signin/check-code/page.tsx
@@ -25,7 +25,10 @@ export default function CheckCode() {
const redirectUrl = searchParams.get('redirect_url')
const getAppCodeFromRedirectUrl = useCallback(() => {
- const appCode = redirectUrl?.split('/').pop()
+ if (!redirectUrl)
+ return null
+ const url = new URL(`${window.location.origin}${decodeURIComponent(redirectUrl)}`)
+ const appCode = url.pathname.split('/').pop()
if (!appCode)
return null
@@ -62,7 +65,7 @@ export default function CheckCode() {
localStorage.setItem('webapp_access_token', ret.data.access_token)
const tokenResp = await fetchAccessToken({ appCode, webAppAccessToken: ret.data.access_token })
await setAccessToken(appCode, tokenResp.access_token)
- router.replace(redirectUrl)
+ router.replace(decodeURIComponent(redirectUrl))
}
}
catch (error) { console.error(error) }
diff --git a/web/app/(shareLayout)/webapp-signin/components/external-member-sso-auth.tsx b/web/app/(shareLayout)/webapp-signin/components/external-member-sso-auth.tsx
index e9b15ae331..612a9677a6 100644
--- a/web/app/(shareLayout)/webapp-signin/components/external-member-sso-auth.tsx
+++ b/web/app/(shareLayout)/webapp-signin/components/external-member-sso-auth.tsx
@@ -23,7 +23,10 @@ const ExternalMemberSSOAuth = () => {
}
const getAppCodeFromRedirectUrl = useCallback(() => {
- const appCode = redirectUrl?.split('/').pop()
+ if (!redirectUrl)
+ return null
+ const url = new URL(`${window.location.origin}${decodeURIComponent(redirectUrl)}`)
+ const appCode = url.pathname.split('/').pop()
if (!appCode)
return null
diff --git a/web/app/(shareLayout)/webapp-signin/components/mail-and-password-auth.tsx b/web/app/(shareLayout)/webapp-signin/components/mail-and-password-auth.tsx
index d9e56af1b8..2201b28a2f 100644
--- a/web/app/(shareLayout)/webapp-signin/components/mail-and-password-auth.tsx
+++ b/web/app/(shareLayout)/webapp-signin/components/mail-and-password-auth.tsx
@@ -1,3 +1,4 @@
+'use client'
import Link from 'next/link'
import { useCallback, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -33,7 +34,10 @@ export default function MailAndPasswordAuth({ isEmailSetup }: MailAndPasswordAut
const redirectUrl = searchParams.get('redirect_url')
const getAppCodeFromRedirectUrl = useCallback(() => {
- const appCode = redirectUrl?.split('/').pop()
+ if (!redirectUrl)
+ return null
+ const url = new URL(`${window.location.origin}${decodeURIComponent(redirectUrl)}`)
+ const appCode = url.pathname.split('/').pop()
if (!appCode)
return null
@@ -87,7 +91,7 @@ export default function MailAndPasswordAuth({ isEmailSetup }: MailAndPasswordAut
localStorage.setItem('webapp_access_token', res.data.access_token)
const tokenResp = await fetchAccessToken({ appCode, webAppAccessToken: res.data.access_token })
await setAccessToken(appCode, tokenResp.access_token)
- router.replace(redirectUrl)
+ router.replace(decodeURIComponent(redirectUrl))
}
else {
Toast.notify({
diff --git a/web/app/(shareLayout)/webapp-signin/components/sso-auth.tsx b/web/app/(shareLayout)/webapp-signin/components/sso-auth.tsx
index 5d649322ba..bcba572644 100644
--- a/web/app/(shareLayout)/webapp-signin/components/sso-auth.tsx
+++ b/web/app/(shareLayout)/webapp-signin/components/sso-auth.tsx
@@ -23,7 +23,10 @@ const SSOAuth: FC = ({
const redirectUrl = searchParams.get('redirect_url')
const getAppCodeFromRedirectUrl = useCallback(() => {
- const appCode = redirectUrl?.split('/').pop()
+ if (!redirectUrl)
+ return null
+ const url = new URL(`${window.location.origin}${decodeURIComponent(redirectUrl)}`)
+ const appCode = url.pathname.split('/').pop()
if (!appCode)
return null
diff --git a/web/app/(shareLayout)/webapp-signin/layout.tsx b/web/app/(shareLayout)/webapp-signin/layout.tsx
index a03364d326..7649982072 100644
--- a/web/app/(shareLayout)/webapp-signin/layout.tsx
+++ b/web/app/(shareLayout)/webapp-signin/layout.tsx
@@ -3,10 +3,13 @@
import cn from '@/utils/classnames'
import { useGlobalPublicStore } from '@/context/global-public-context'
import useDocumentTitle from '@/hooks/use-document-title'
+import type { PropsWithChildren } from 'react'
+import { useTranslation } from 'react-i18next'
-export default function SignInLayout({ children }: any) {
- const { systemFeatures } = useGlobalPublicStore()
- useDocumentTitle('')
+export default function SignInLayout({ children }: PropsWithChildren) {
+ const { t } = useTranslation()
+ const systemFeatures = useGlobalPublicStore(s => s.systemFeatures)
+ useDocumentTitle(t('login.webapp.login'))
return <>
diff --git a/web/app/(shareLayout)/webapp-signin/normalForm.tsx b/web/app/(shareLayout)/webapp-signin/normalForm.tsx
index d6bdf607ba..44006a9f1e 100644
--- a/web/app/(shareLayout)/webapp-signin/normalForm.tsx
+++ b/web/app/(shareLayout)/webapp-signin/normalForm.tsx
@@ -1,3 +1,4 @@
+'use client'
import React, { useCallback, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import Link from 'next/link'
diff --git a/web/app/(shareLayout)/webapp-signin/page.tsx b/web/app/(shareLayout)/webapp-signin/page.tsx
index 07b7c88430..1c6209b902 100644
--- a/web/app/(shareLayout)/webapp-signin/page.tsx
+++ b/web/app/(shareLayout)/webapp-signin/page.tsx
@@ -1,36 +1,30 @@
'use client'
import { useRouter, useSearchParams } from 'next/navigation'
import type { FC } from 'react'
-import React, { useCallback, useEffect } from 'react'
+import React, { useCallback } from 'react'
import { useTranslation } from 'react-i18next'
-import Toast from '@/app/components/base/toast'
-import { removeAccessToken, setAccessToken } from '@/app/components/share/utils'
+import { removeAccessToken } from '@/app/components/share/utils'
import { useGlobalPublicStore } from '@/context/global-public-context'
-import Loading from '@/app/components/base/loading'
import AppUnavailable from '@/app/components/base/app-unavailable'
import NormalForm from './normalForm'
import { AccessMode } from '@/models/access-control'
import ExternalMemberSsoAuth from './components/external-member-sso-auth'
-import { fetchAccessToken } from '@/service/share'
+import { useWebAppStore } from '@/context/web-app-context'
const WebSSOForm: FC = () => {
const { t } = useTranslation()
const systemFeatures = useGlobalPublicStore(s => s.systemFeatures)
- const webAppAccessMode = useGlobalPublicStore(s => s.webAppAccessMode)
+ const webAppAccessMode = useWebAppStore(s => s.webAppAccessMode)
const searchParams = useSearchParams()
const router = useRouter()
const redirectUrl = searchParams.get('redirect_url')
- const tokenFromUrl = searchParams.get('web_sso_token')
- const message = searchParams.get('message')
- const code = searchParams.get('code')
const getSigninUrl = useCallback(() => {
- const params = new URLSearchParams(searchParams)
- params.delete('message')
- params.delete('code')
+ const params = new URLSearchParams()
+ params.append('redirect_url', redirectUrl || '')
return `/webapp-signin?${params.toString()}`
- }, [searchParams])
+ }, [redirectUrl])
const backToHome = useCallback(() => {
removeAccessToken()
@@ -38,70 +32,12 @@ const WebSSOForm: FC = () => {
router.replace(url)
}, [getSigninUrl, router])
- const showErrorToast = (msg: string) => {
- Toast.notify({
- type: 'error',
- message: msg,
- })
- }
-
- const getAppCodeFromRedirectUrl = useCallback(() => {
- const appCode = redirectUrl?.split('/').pop()
- if (!appCode)
- return null
-
- return appCode
- }, [redirectUrl])
-
- useEffect(() => {
- (async () => {
- if (message)
- return
-
- const appCode = getAppCodeFromRedirectUrl()
- if (appCode && tokenFromUrl && redirectUrl) {
- localStorage.setItem('webapp_access_token', tokenFromUrl)
- const tokenResp = await fetchAccessToken({ appCode, webAppAccessToken: tokenFromUrl })
- await setAccessToken(appCode, tokenResp.access_token)
- router.replace(redirectUrl)
- return
- }
- if (appCode && redirectUrl && localStorage.getItem('webapp_access_token')) {
- const tokenResp = await fetchAccessToken({ appCode, webAppAccessToken: localStorage.getItem('webapp_access_token') })
- await setAccessToken(appCode, tokenResp.access_token)
- router.replace(redirectUrl)
- }
- })()
- }, [getAppCodeFromRedirectUrl, redirectUrl, router, tokenFromUrl, message])
-
- useEffect(() => {
- if (webAppAccessMode && webAppAccessMode === AccessMode.PUBLIC && redirectUrl)
- router.replace(redirectUrl)
- }, [webAppAccessMode, router, redirectUrl])
-
- if (tokenFromUrl) {
- return
-
- }
-
- if (message) {
- return
-
-
{code === '403' ? t('common.userProfile.logout') : t('share.login.backToHome')}
-
- }
if (!redirectUrl) {
- showErrorToast('redirect url is invalid.')
return
}
- if (webAppAccessMode && webAppAccessMode === AccessMode.PUBLIC) {
- return
-
- }
+
if (!systemFeatures.webapp_auth.enabled) {
return
{t('login.webapp.disabled')}
diff --git a/web/app/(shareLayout)/workflow/[token]/page.tsx b/web/app/(shareLayout)/workflow/[token]/page.tsx
index e93bc8c1af..4f5923e91f 100644
--- a/web/app/(shareLayout)/workflow/[token]/page.tsx
+++ b/web/app/(shareLayout)/workflow/[token]/page.tsx
@@ -1,10 +1,13 @@
import React from 'react'
import Main from '@/app/components/share/text-generation'
+import AuthenticatedLayout from '../../components/authenticated-layout'
const Workflow = () => {
return (
-
+
+
)
}
diff --git a/web/app/account/account-page/email-change-modal.tsx b/web/app/account/account-page/email-change-modal.tsx
new file mode 100644
index 0000000000..c3efad104a
--- /dev/null
+++ b/web/app/account/account-page/email-change-modal.tsx
@@ -0,0 +1,371 @@
+import React, { useState } from 'react'
+import { Trans, useTranslation } from 'react-i18next'
+import { useRouter } from 'next/navigation'
+import { useContext } from 'use-context-selector'
+import { ToastContext } from '@/app/components/base/toast'
+import { RiCloseLine } from '@remixicon/react'
+import Modal from '@/app/components/base/modal'
+import Button from '@/app/components/base/button'
+import Input from '@/app/components/base/input'
+import {
+ checkEmailExisted,
+ logout,
+ resetEmail,
+ sendVerifyCode,
+ verifyEmail,
+} from '@/service/common'
+import { noop } from 'lodash-es'
+
+type Props = {
+ show: boolean
+ onClose: () => void
+ email: string
+}
+
+enum STEP {
+ start = 'start',
+ verifyOrigin = 'verifyOrigin',
+ newEmail = 'newEmail',
+ verifyNew = 'verifyNew',
+}
+
+const EmailChangeModal = ({ onClose, email, show }: Props) => {
+ const { t } = useTranslation()
+ const { notify } = useContext(ToastContext)
+ const router = useRouter()
+ const [step, setStep] = useState
(STEP.start)
+ const [code, setCode] = useState('')
+ const [mail, setMail] = useState('')
+ const [time, setTime] = useState(0)
+ const [stepToken, setStepToken] = useState('')
+ const [newEmailExited, setNewEmailExited] = useState(false)
+ const [isCheckingEmail, setIsCheckingEmail] = useState(false)
+
+ const startCount = () => {
+ setTime(60)
+ const timer = setInterval(() => {
+ setTime((prev) => {
+ if (prev <= 0) {
+ clearInterval(timer)
+ return 0
+ }
+ return prev - 1
+ })
+ }, 1000)
+ }
+
+ const sendEmail = async (email: string, isOrigin: boolean, token?: string) => {
+ try {
+ const res = await sendVerifyCode({
+ email,
+ phase: isOrigin ? 'old_email' : 'new_email',
+ token,
+ })
+ startCount()
+ if (res.data)
+ setStepToken(res.data)
+ }
+ catch (error) {
+ notify({
+ type: 'error',
+ message: `Error sending verification code: ${error ? (error as any).message : ''}`,
+ })
+ }
+ }
+
+ const verifyEmailAddress = async (email: string, code: string, token: string, callback?: (data?: any) => void) => {
+ try {
+ const res = await verifyEmail({
+ email,
+ code,
+ token,
+ })
+ if (res.is_valid) {
+ setStepToken(res.token)
+ callback?.(res.token)
+ }
+ else {
+ notify({
+ type: 'error',
+ message: 'Verifying email failed',
+ })
+ }
+ }
+ catch (error) {
+ notify({
+ type: 'error',
+ message: `Error verifying email: ${error ? (error as any).message : ''}`,
+ })
+ }
+ }
+
+ const sendCodeToOriginEmail = async () => {
+ await sendEmail(
+ email,
+ true,
+ )
+ setStep(STEP.verifyOrigin)
+ }
+
+ const handleVerifyOriginEmail = async () => {
+ await verifyEmailAddress(email, code, stepToken, () => setStep(STEP.newEmail))
+ setCode('')
+ }
+
+ const isValidEmail = (email: string): boolean => {
+ const rfc5322emailRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
+ return rfc5322emailRegex.test(email) && email.length <= 254
+ }
+
+ const checkNewEmailExisted = async (email: string) => {
+ setIsCheckingEmail(true)
+ try {
+ await checkEmailExisted({
+ email,
+ })
+ setNewEmailExited(false)
+ }
+ catch {
+ setNewEmailExited(true)
+ }
+ finally {
+ setIsCheckingEmail(false)
+ }
+ }
+
+ const handleNewEmailValueChange = (mailAddress: string) => {
+ setMail(mailAddress)
+ setNewEmailExited(false)
+ if (isValidEmail(mailAddress))
+ checkNewEmailExisted(mailAddress)
+ }
+
+ const sendCodeToNewEmail = async () => {
+ if (!isValidEmail(mail)) {
+ notify({
+ type: 'error',
+ message: 'Invalid email format',
+ })
+ return
+ }
+ await sendEmail(
+ mail,
+ false,
+ stepToken,
+ )
+ setStep(STEP.verifyNew)
+ }
+
+ const handleLogout = async () => {
+ await logout({
+ url: '/logout',
+ params: {},
+ })
+
+ localStorage.removeItem('setup_status')
+ localStorage.removeItem('console_token')
+ localStorage.removeItem('refresh_token')
+
+ router.push('/signin')
+ }
+
+ const updateEmail = async (lastToken: string) => {
+ try {
+ await resetEmail({
+ new_email: mail,
+ token: lastToken,
+ })
+ handleLogout()
+ }
+ catch (error) {
+ notify({
+ type: 'error',
+ message: `Error changing email: ${error ? (error as any).message : ''}`,
+ })
+ }
+ }
+
+ const submitNewEmail = async () => {
+ await verifyEmailAddress(mail, code, stepToken, updateEmail)
+ }
+
+ return (
+
+
+
+ {step === STEP.start && (
+ <>
+ {t('common.account.changeEmail.title')}
+
+
{t('common.account.changeEmail.authTip')}
+
+ }}
+ values={{ email }}
+ />
+
+
+
+
+ {t('common.account.changeEmail.sendVerifyCode')}
+
+
+ {t('common.operation.cancel')}
+
+
+
+ )}
+ {step === STEP.verifyOrigin && (
+ <>
+ {t('common.account.changeEmail.verifyEmail')}
+
+
+ }}
+ values={{ email }}
+ />
+
+
+
{t('common.account.changeEmail.codeLabel')}
+
setCode(e.target.value)}
+ maxLength={6}
+ />
+
+
+ {t('common.account.changeEmail.continue')}
+
+
+ {t('common.operation.cancel')}
+
+
+
+ {t('common.account.changeEmail.resendTip')}
+ {time > 0 && (
+ {t('common.account.changeEmail.resendCount', { count: time })}
+ )}
+ {!time && (
+ {t('common.account.changeEmail.resend')}
+ )}
+
+
+ )}
+ {step === STEP.newEmail && (
+ <>
+ {t('common.account.changeEmail.newEmail')}
+
+
{t('common.account.changeEmail.content3')}
+
+
{t('common.account.changeEmail.emailLabel')}
+
handleNewEmailValueChange(e.target.value)}
+ destructive={newEmailExited}
+ />
+ {newEmailExited && (
+
{t('common.account.changeEmail.existingEmail')}
+ )}
+
+
+ {t('common.account.changeEmail.sendVerifyCode')}
+
+
+ {t('common.operation.cancel')}
+
+
+
+ )}
+ {step === STEP.verifyNew && (
+ <>
+ {t('common.account.changeEmail.verifyNew')}
+
+
+ }}
+ values={{ email: mail }}
+ />
+
+
+
{t('common.account.changeEmail.codeLabel')}
+
setCode(e.target.value)}
+ maxLength={6}
+ />
+
+
+ {t('common.account.changeEmail.changeTo', { email: mail })}
+
+
+ {t('common.operation.cancel')}
+
+
+
+ {t('common.account.changeEmail.resendTip')}
+ {time > 0 && (
+ {t('common.account.changeEmail.resendCount', { count: time })}
+ )}
+ {!time && (
+ {t('common.account.changeEmail.resend')}
+ )}
+
+
+ )}
+
+ )
+}
+
+export default EmailChangeModal
diff --git a/web/app/account/account-page/index.module.css b/web/app/account/account-page/index.module.css
deleted file mode 100644
index 949d1257e9..0000000000
--- a/web/app/account/account-page/index.module.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.modal {
- padding: 24px 32px !important;
- width: 400px !important;
-}
-
-.bg {
- background: linear-gradient(180deg, rgba(217, 45, 32, 0.05) 0%, rgba(217, 45, 32, 0.00) 24.02%), #F9FAFB;
-}
-
diff --git a/web/app/account/account-page/index.tsx b/web/app/account/account-page/index.tsx
index 19c1e44236..47b8f045d2 100644
--- a/web/app/account/account-page/index.tsx
+++ b/web/app/account/account-page/index.tsx
@@ -1,12 +1,12 @@
'use client'
import { useState } from 'react'
+import useSWR from 'swr'
import { useTranslation } from 'react-i18next'
import {
RiGraduationCapFill,
} from '@remixicon/react'
import { useContext } from 'use-context-selector'
import DeleteAccount from '../delete-account'
-import s from './index.module.css'
import AvatarWithEdit from './AvatarWithEdit'
import Collapse from '@/app/components/header/account-setting/collapse'
import type { IItem } from '@/app/components/header/account-setting/collapse'
@@ -21,6 +21,10 @@ import { IS_CE_EDITION } from '@/config'
import Input from '@/app/components/base/input'
import PremiumBadge from '@/app/components/base/premium-badge'
import { useGlobalPublicStore } from '@/context/global-public-context'
+import EmailChangeModal from './email-change-modal'
+import { validPassword } from '@/config'
+import { fetchAppList } from '@/service/apps'
+import type { App } from '@/types/app'
const titleClassName = `
system-sm-semibold text-text-secondary
@@ -29,12 +33,12 @@ const descriptionClassName = `
mt-1 body-xs-regular text-text-tertiary
`
-const validPassword = /^(?=.*[a-zA-Z])(?=.*\d).{8,}$/
-
export default function AccountPage() {
const { t } = useTranslation()
const { systemFeatures } = useGlobalPublicStore()
- const { mutateUserProfile, userProfile, apps } = useAppContext()
+ const { data: appList } = useSWR({ url: '/apps', params: { page: 1, limit: 100, name: '' } }, fetchAppList)
+ const apps = appList?.data || []
+ const { mutateUserProfile, userProfile } = useAppContext()
const { isEducationAccount } = useProviderContext()
const { notify } = useContext(ToastContext)
const [editNameModalVisible, setEditNameModalVisible] = useState(false)
@@ -48,6 +52,7 @@ export default function AccountPage() {
const [showCurrentPassword, setShowCurrentPassword] = useState(false)
const [showPassword, setShowPassword] = useState(false)
const [showConfirmPassword, setShowConfirmPassword] = useState(false)
+ const [showUpdateEmail, setShowUpdateEmail] = useState(false)
const handleEditName = () => {
setEditNameModalVisible(true)
@@ -123,10 +128,17 @@ export default function AccountPage() {
}
const renderAppItem = (item: IItem) => {
+ const { icon, icon_background, icon_type, icon_url } = item as any
return (
@@ -170,6 +182,11 @@ export default function AccountPage() {
{userProfile.email}
+ {systemFeatures.enable_change_email && (
+ setShowUpdateEmail(true)}>
+ {t('common.operation.change')}
+
+ )}
{
@@ -190,7 +207,7 @@ export default function AccountPage() {
{!!apps.length && (
({ key: app.id, name: app.name }))}
+ items={apps.map((app: App) => ({ ...app, key: app.id, name: app.name }))}
renderItem={renderAppItem}
wrapperClassName='mt-2'
/>
@@ -202,7 +219,7 @@ export default function AccountPage() {
setEditNameModalVisible(false)}
- className={s.modal}
+ className='!w-[420px] !p-6'
>
{t('common.account.editName')}
{t('common.account.name')}
@@ -231,7 +248,7 @@ export default function AccountPage() {
setEditPasswordModalVisible(false)
resetPasswordForm()
}}
- className={s.modal}
+ className='!w-[420px] !p-6'
>
{userProfile.is_password_set ? t('common.account.resetPassword') : t('common.account.setPassword')}
{userProfile.is_password_set && (
@@ -316,6 +333,13 @@ export default function AccountPage() {
/>
)
}
+ {showUpdateEmail && (
+ setShowUpdateEmail(false)}
+ email={userProfile.email}
+ />
+ )}
)
}
diff --git a/web/app/account/layout.tsx b/web/app/account/layout.tsx
index e74716fb3b..b3225b5341 100644
--- a/web/app/account/layout.tsx
+++ b/web/app/account/layout.tsx
@@ -1,7 +1,7 @@
import React from 'react'
import type { ReactNode } from 'react'
import Header from './header'
-import SwrInitor from '@/app/components/swr-initor'
+import SwrInitor from '@/app/components/swr-initializer'
import { AppContextProvider } from '@/context/app-context'
import GA, { GaType } from '@/app/components/base/ga'
import HeaderWrapper from '@/app/components/header/header-wrapper'
diff --git a/web/app/components/app-sidebar/app-info.tsx b/web/app/components/app-sidebar/app-info.tsx
index 7b6e66f7e7..c35047bbc5 100644
--- a/web/app/components/app-sidebar/app-info.tsx
+++ b/web/app/components/app-sidebar/app-info.tsx
@@ -1,6 +1,6 @@
import { useTranslation } from 'react-i18next'
import { useRouter } from 'next/navigation'
-import { useContext, useContextSelector } from 'use-context-selector'
+import { useContext } from 'use-context-selector'
import React, { useCallback, useState } from 'react'
import {
RiDeleteBinLine,
@@ -10,45 +10,62 @@ import {
RiFileCopy2Line,
RiFileDownloadLine,
RiFileUploadLine,
- RiMoreLine,
} from '@remixicon/react'
import AppIcon from '../base/app-icon'
-import SwitchAppModal from '../app/switch-app-modal'
import cn from '@/utils/classnames'
-import Confirm from '@/app/components/base/confirm'
import { useStore as useAppStore } from '@/app/components/app/store'
import { ToastContext } from '@/app/components/base/toast'
-import AppsContext, { useAppContext } from '@/context/app-context'
+import { useAppContext } from '@/context/app-context'
import { useProviderContext } from '@/context/provider-context'
import { copyApp, deleteApp, exportAppConfig, updateAppInfo } from '@/service/apps'
-import DuplicateAppModal from '@/app/components/app/duplicate-modal'
import type { DuplicateAppModalProps } from '@/app/components/app/duplicate-modal'
-import CreateAppModal from '@/app/components/explore/create-app-modal'
import type { CreateAppModalProps } from '@/app/components/explore/create-app-modal'
import { NEED_REFRESH_APP_LIST_KEY } from '@/config'
import { getRedirection } from '@/utils/app-redirection'
-import UpdateDSLModal from '@/app/components/workflow/update-dsl-modal'
import type { EnvironmentVariable } from '@/app/components/workflow/types'
-import DSLExportConfirmModal from '@/app/components/workflow/dsl-export-confirm-modal'
import { fetchWorkflowDraft } from '@/service/workflow'
import ContentDialog from '@/app/components/base/content-dialog'
import Button from '@/app/components/base/button'
import CardView from '@/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/cardView'
import Divider from '../base/divider'
-import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '../base/portal-to-follow-elem'
+import type { Operation } from './app-operations'
+import AppOperations from './app-operations'
+import dynamic from 'next/dynamic'
+
+const SwitchAppModal = dynamic(() => import('@/app/components/app/switch-app-modal'), {
+ ssr: false,
+})
+const CreateAppModal = dynamic(() => import('@/app/components/explore/create-app-modal'), {
+ ssr: false,
+})
+const DuplicateAppModal = dynamic(() => import('@/app/components/app/duplicate-modal'), {
+ ssr: false,
+})
+const Confirm = dynamic(() => import('@/app/components/base/confirm'), {
+ ssr: false,
+})
+const UpdateDSLModal = dynamic(() => import('@/app/components/workflow/update-dsl-modal'), {
+ ssr: false,
+})
+const DSLExportConfirmModal = dynamic(() => import('@/app/components/workflow/dsl-export-confirm-modal'), {
+ ssr: false,
+})
export type IAppInfoProps = {
expand: boolean
+ onlyShowDetail?: boolean
+ openState?: boolean
+ onDetailExpand?: (expand: boolean) => void
}
-const AppInfo = ({ expand }: IAppInfoProps) => {
+const AppInfo = ({ expand, onlyShowDetail = false, openState = false, onDetailExpand }: IAppInfoProps) => {
const { t } = useTranslation()
const { notify } = useContext(ToastContext)
const { replace } = useRouter()
const { onPlanInfoChanged } = useProviderContext()
const appDetail = useAppStore(state => state.appDetail)
const setAppDetail = useAppStore(state => state.setAppDetail)
- const [open, setOpen] = useState(false)
+ const [open, setOpen] = useState(openState)
const [showEditModal, setShowEditModal] = useState(false)
const [showDuplicateModal, setShowDuplicateModal] = useState(false)
const [showConfirmDelete, setShowConfirmDelete] = useState(false)
@@ -56,11 +73,6 @@ const AppInfo = ({ expand }: IAppInfoProps) => {
const [showImportDSLModal, setShowImportDSLModal] = useState(false)
const [secretEnvList, setSecretEnvList] = useState([])
- const mutateApps = useContextSelector(
- AppsContext,
- state => state.mutateApps,
- )
-
const onEdit: CreateAppModalProps['onConfirm'] = useCallback(async ({
name,
icon_type,
@@ -68,6 +80,7 @@ const AppInfo = ({ expand }: IAppInfoProps) => {
icon_background,
description,
use_icon_as_answer_icon,
+ max_active_requests,
}) => {
if (!appDetail)
return
@@ -80,6 +93,7 @@ const AppInfo = ({ expand }: IAppInfoProps) => {
icon_background,
description,
use_icon_as_answer_icon,
+ max_active_requests,
})
setShowEditModal(false)
notify({
@@ -87,12 +101,11 @@ const AppInfo = ({ expand }: IAppInfoProps) => {
message: t('app.editDone'),
})
setAppDetail(app)
- mutateApps()
}
catch {
notify({ type: 'error', message: t('app.editFailed') })
}
- }, [appDetail, mutateApps, notify, setAppDetail, t])
+ }, [appDetail, notify, setAppDetail, t])
const onCopy: DuplicateAppModalProps['onConfirm'] = async ({ name, icon_type, icon, icon_background }) => {
if (!appDetail)
@@ -112,7 +125,6 @@ const AppInfo = ({ expand }: IAppInfoProps) => {
message: t('app.newApp.appCreated'),
})
localStorage.setItem(NEED_REFRESH_APP_LIST_KEY, '1')
- mutateApps()
onPlanInfoChanged()
getRedirection(true, newApp, replace)
}
@@ -167,7 +179,6 @@ const AppInfo = ({ expand }: IAppInfoProps) => {
try {
await deleteApp(appDetail.id)
notify({ type: 'success', message: t('app.appDeleted') })
- mutateApps()
onPlanInfoChanged()
setAppDetail()
replace('/apps')
@@ -179,57 +190,106 @@ const AppInfo = ({ expand }: IAppInfoProps) => {
})
}
setShowConfirmDelete(false)
- }, [appDetail, mutateApps, notify, onPlanInfoChanged, replace, setAppDetail, t])
+ }, [appDetail, notify, onPlanInfoChanged, replace, setAppDetail, t])
const { isCurrentWorkspaceEditor } = useAppContext()
- const [showMore, setShowMore] = useState(false)
- const handleTriggerMore = useCallback(() => {
- setShowMore(true)
- }, [setShowMore])
-
if (!appDetail)
return null
+ const operations = [
+ {
+ id: 'edit',
+ title: t('app.editApp'),
+ icon:
-
{
- if (isCurrentWorkspaceEditor)
- setOpen(v => !v)
- }}
- className='block w-full'
- >
-
-
-
-
-
-
+ {!onlyShowDetail && (
+
{
+ if (isCurrentWorkspaceEditor)
+ setOpen(v => !v)
+ }}
+ className='block w-full'
+ >
+
- {
- expand && (
-
-
-
{appDetail.name}
+ {
+ expand && (
+
+
+
{appDetail.mode === 'advanced-chat' ? t('app.types.advanced') : appDetail.mode === 'agent-chat' ? t('app.types.agent') : appDetail.mode === 'chat' ? t('app.types.chatbot') : appDetail.mode === 'completion' ? t('app.types.completion') : t('app.types.workflow')}
-
{appDetail.mode === 'advanced-chat' ? t('app.types.advanced') : appDetail.mode === 'agent-chat' ? t('app.types.agent') : appDetail.mode === 'chat' ? t('app.types.chatbot') : appDetail.mode === 'completion' ? t('app.types.completion') : t('app.types.workflow')}
-
- )
- }
-
+ )
+ }
+
+
+ )}
setOpen(false)}
+ show={onlyShowDetail ? openState : open}
+ onClose={() => {
+ setOpen(false)
+ onDetailExpand?.(false)
+ }}
className='absolute bottom-2 left-2 top-2 flex w-[420px] flex-col rounded-2xl !p-0'
>
@@ -248,95 +308,19 @@ const AppInfo = ({ expand }: IAppInfoProps) => {
{/* description */}
{appDetail.description && (
- {appDetail.description}
+ {appDetail.description}
)}
{/* operations */}
-
-
{
- setOpen(false)
- setShowEditModal(true)
- }}
- >
- {t('app.editApp')}
-
-
{
- setOpen(false)
- setShowDuplicateModal(true)
- }}>
- {t('app.duplicate')}
-
-
- {t('app.export')}
-
- {appDetail.mode !== 'agent-chat' &&
-
-
- {t('common.operation.more')}
-
-
-
-
- {
- (appDetail.mode === 'advanced-chat' || appDetail.mode === 'workflow')
- &&
{
- setOpen(false)
- setShowImportDSLModal(true)
- }}>
- {t('workflow.common.importDSL')}
-
- }
- {
- (appDetail.mode === 'completion' || appDetail.mode === 'chat')
- &&
{
- setOpen(false)
- setShowSwitchModal(true)
- }}>
- {t('app.switch')}
-
- }
-
- }
-
-
+
{
className='gap-0.5'
onClick={() => {
setOpen(false)
+ onDetailExpand?.(false)
setShowConfirmDelete(true)
}}
>
@@ -373,6 +358,7 @@ const AppInfo = ({ expand }: IAppInfoProps) => {
appDescription={appDetail.description}
appMode={appDetail.mode}
appUseIconAsAnswerIcon={appDetail.use_icon_as_answer_icon}
+ max_active_requests={appDetail.max_active_requests ?? null}
show={showEditModal}
onConfirm={onEdit}
onHide={() => setShowEditModal(false)}
diff --git a/web/app/components/app-sidebar/app-operations.tsx b/web/app/components/app-sidebar/app-operations.tsx
new file mode 100644
index 0000000000..49cad71573
--- /dev/null
+++ b/web/app/components/app-sidebar/app-operations.tsx
@@ -0,0 +1,145 @@
+import type { ReactElement } from 'react'
+import { cloneElement, useCallback } from 'react'
+import { useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import Button from '@/app/components/base/button'
+import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '../base/portal-to-follow-elem'
+import { RiMoreLine } from '@remixicon/react'
+
+export type Operation = {
+ id: string; title: string; icon: ReactElement; onClick: () => void
+}
+
+const AppOperations = ({ operations, gap }: {
+ operations: Operation[]
+ gap: number
+}) => {
+ const { t } = useTranslation()
+ const [visibleOpreations, setVisibleOperations] = useState([])
+ const [moreOperations, setMoreOperations] = useState([])
+ const [showMore, setShowMore] = useState(false)
+ const navRef = useRef(null)
+ const handleTriggerMore = useCallback(() => {
+ setShowMore(true)
+ }, [setShowMore])
+
+ useEffect(() => {
+ const moreElement = document.getElementById('more')
+ const navElement = document.getElementById('nav')
+ let width = 0
+ const containerWidth = navElement?.clientWidth ?? 0
+ const moreWidth = moreElement?.clientWidth ?? 0
+
+ if (containerWidth === 0 || moreWidth === 0) return
+
+ const updatedEntries: Record = operations.reduce((pre, cur) => {
+ pre[cur.id] = false
+ return pre
+ }, {} as Record)
+ const childrens = Array.from(navRef.current!.children).slice(0, -1)
+ for (let i = 0; i < childrens.length; i++) {
+ const child: any = childrens[i]
+ const id = child.dataset.targetid
+ if (!id) break
+ const childWidth = child.clientWidth
+
+ if (width + gap + childWidth + moreWidth <= containerWidth) {
+ updatedEntries[id] = true
+ width += gap + childWidth
+ }
+ else {
+ if (i === childrens.length - 1 && width + childWidth <= containerWidth)
+ updatedEntries[id] = true
+ else
+ updatedEntries[id] = false
+ break
+ }
+ }
+ setVisibleOperations(operations.filter(item => updatedEntries[item.id]))
+ setMoreOperations(operations.filter(item => !updatedEntries[item.id]))
+ }, [operations, gap])
+
+ return (
+ <>
+ {!visibleOpreations.length &&
+ {operations.map((operation, index) =>
+
+ {cloneElement(operation.icon, { className: 'h-3.5 w-3.5 text-components-button-secondary-text' })}
+
+ {operation.title}
+
+ ,
+ )}
+
+
+ {t('common.operation.more')}
+
+
+
}
+
+ {visibleOpreations.map(operation =>
+
+ {cloneElement(operation.icon, { className: 'h-3.5 w-3.5 text-components-button-secondary-text' })}
+
+ {operation.title}
+
+ ,
+ )}
+ {visibleOpreations.length < operations.length &&
+
+
+ {t('common.operation.more')}
+
+
+
+
+ {moreOperations.map(item =>
+ {cloneElement(item.icon, { className: 'h-4 w-4 text-text-tertiary' })}
+ {item.title}
+
)}
+
+ }
+
+
+
+
+
+
+
+
+
{
+ setDetailExpand(true)
+ setOpen(false)
+ }}
+ >
+
+
+
+
{appDetail.mode === 'advanced-chat' ? t('app.types.advanced') : appDetail.mode === 'agent-chat' ? t('app.types.agent') : appDetail.mode === 'chat' ? t('app.types.chatbot') : appDetail.mode === 'completion' ? t('app.types.completion') : t('app.types.workflow')}
+
+
+
+
+
+ {navigation.map((item, index) => {
+ return (
+
+
+
+
-
-
const DatasetSvg =
-const WebappSvg =
-
-
const NotionSvg =
+
,
dataset:
+
,
notion:
- {isExtraInLine ? (
+ {!hideType && isExtraInLine && (
{type}
- ) : (
+ )}
+ {!hideType && !isExtraInLine && (
{isExternal ? t('dataset.externalTag') : type}
)}
}
diff --git a/web/app/components/app-sidebar/index.tsx b/web/app/components/app-sidebar/index.tsx
index f58985ed96..b6bfc0e9ac 100644
--- a/web/app/components/app-sidebar/index.tsx
+++ b/web/app/components/app-sidebar/index.tsx
@@ -1,4 +1,5 @@
-import React, { useEffect } from 'react'
+import React, { useEffect, useState } from 'react'
+import { usePathname } from 'next/navigation'
import { useShallow } from 'zustand/react/shallow'
import { RiLayoutLeft2Line, RiLayoutRight2Line } from '@remixicon/react'
import NavLink from './navLink'
@@ -6,8 +7,10 @@ import type { NavIcon } from './navLink'
import AppBasic from './basic'
import AppInfo from './app-info'
import DatasetInfo from './dataset-info'
+import AppSidebarDropdown from './app-sidebar-dropdown'
import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
import { useStore as useAppStore } from '@/app/components/app/store'
+import { useEventEmitterContextContext } from '@/context/event-emitter'
import cn from '@/utils/classnames'
export type IAppDetailNavProps = {
@@ -39,6 +42,18 @@ const AppDetailNav = ({ title, desc, isExternal, icon, icon_background, navigati
setAppSiderbarExpand(state === 'expand' ? 'collapse' : 'expand')
}
+ // // Check if the current path is a workflow canvas & fullscreen
+ const pathname = usePathname()
+ const inWorkflowCanvas = pathname.endsWith('/workflow')
+ const workflowCanvasMaximize = localStorage.getItem('workflow-canvas-maximize') === 'true'
+ const [hideHeader, setHideHeader] = useState(workflowCanvasMaximize)
+ const { eventEmitter } = useEventEmitterContextContext()
+
+ eventEmitter?.useSubscription((v: any) => {
+ if (v?.type === 'workflow-canvas-maximize')
+ setHideHeader(v.payload)
+ })
+
useEffect(() => {
if (appSidebarExpand) {
localStorage.setItem('app-detail-collapse-or-expand', appSidebarExpand)
@@ -46,6 +61,14 @@ const AppDetailNav = ({ title, desc, isExternal, icon, icon_background, navigati
}
}, [appSidebarExpand, setAppSiderbarExpand])
+ if (inWorkflowCanvas && hideHeader) {
+ return (
+
+ )
+}
+
return (
close()} className="absolute right-5 top-5 z-10 flex h-8 w-8 cursor-pointer items-center justify-center">
-
{children}
diff --git a/web/app/components/app/app-access-control/index.tsx b/web/app/components/app/app-access-control/index.tsx
index 13faaea957..e8e2358e0e 100644
--- a/web/app/components/app/app-access-control/index.tsx
+++ b/web/app/components/app/app-access-control/index.tsx
@@ -72,7 +72,7 @@ export default function AccessControl(props: AccessControlProps) {
-
{t('app.accessControlDialog.accessLabel')}
+
{t('app.accessControlDialog.accessLabel')}
diff --git a/web/app/components/app/app-publisher/index.tsx b/web/app/components/app/app-publisher/index.tsx
index 1485964198..cb98aa4950 100644
--- a/web/app/components/app/app-publisher/index.tsx
+++ b/web/app/components/app/app-publisher/index.tsx
@@ -6,6 +6,7 @@ import {
} from 'react'
import { useTranslation } from 'react-i18next'
import dayjs from 'dayjs'
+import relativeTime from 'dayjs/plugin/relativeTime'
import {
RiArrowDownSLine,
RiArrowRightSLine,
@@ -48,6 +49,7 @@ import { useAppWhiteListSubjects, useGetUserCanAccessApp } from '@/service/acces
import { AccessMode } from '@/models/access-control'
import { fetchAppDetail } from '@/service/apps'
import { useGlobalPublicStore } from '@/context/global-public-context'
+dayjs.extend(relativeTime)
export type AppPublisherProps = {
disabled?: boolean
@@ -116,6 +118,7 @@ const AppPublisher = ({
}
}, [appAccessSubjects, appDetail])
const language = useGetLanguage()
+
const formatTimeFromNow = useCallback((time: number) => {
return dayjs(time).locale(language === 'zh_Hans' ? 'zh-cn' : language.replace('_', '-')).fromNow()
}, [language])
@@ -180,8 +183,7 @@ const AppPublisher = ({
if (publishDisabled || published)
return
handlePublish()
- },
- { exactMatch: true, useCapture: true })
+ }, { exactMatch: true, useCapture: true })
return (
<>
@@ -314,10 +316,10 @@ const AppPublisher = ({
{!isAppAccessSet &&
{t('app.publishApp.notSetDesc')}
}
-
+
{appDetail?.mode === 'workflow' || appDetail?.mode === 'completion'
? (
-
+
= ({
)}
{!isCopied
? (
- {
+ {
copy(value)
setIsCopied(true)
}} />
)
: (
-
@@ -227,7 +227,7 @@ const AdvancedPromptInput: FC
= ({
}}
variableBlock={{
show: true,
- variables: modelConfig.configs.prompt_variables.filter(item => item.type !== 'api').map(item => ({
+ variables: modelConfig.configs.prompt_variables.filter(item => item.type !== 'api' && item.key && item.key.trim() && item.name && item.name.trim()).map(item => ({
name: item.name,
value: item.key,
})),
diff --git a/web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx b/web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx
index 3268c1dc76..eb0f524386 100644
--- a/web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx
+++ b/web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx
@@ -10,7 +10,6 @@ import PromptEditorHeightResizeWrap from './prompt-editor-height-resize-wrap'
import cn from '@/utils/classnames'
import type { PromptVariable } from '@/models/debug'
import Tooltip from '@/app/components/base/tooltip'
-import type { CompletionParams } from '@/types/app'
import { AppType } from '@/types/app'
import { getNewVar, getVars } from '@/utils/var'
import AutomaticBtn from '@/app/components/app/configuration/config/automatic/automatic-btn'
@@ -63,7 +62,6 @@ const Prompt: FC = ({
const { eventEmitter } = useEventEmitterContextContext()
const {
modelConfig,
- completionParams,
dataSets,
setModelConfig,
setPrevPromptConfig,
@@ -99,20 +97,31 @@ const Prompt: FC = ({
},
})
}
- const promptVariablesObj = (() => {
- const obj: Record = {}
- promptVariables.forEach((item) => {
- obj[item.key] = true
- })
- return obj
- })()
const [newPromptVariables, setNewPromptVariables] = React.useState(promptVariables)
const [newTemplates, setNewTemplates] = React.useState('')
const [isShowConfirmAddVar, { setTrue: showConfirmAddVar, setFalse: hideConfirmAddVar }] = useBoolean(false)
const handleChange = (newTemplates: string, keys: string[]) => {
- const newPromptVariables = keys.filter(key => !(key in promptVariablesObj) && !externalDataToolsConfig.find(item => item.variable === key)).map(key => getNewVar(key, ''))
+ // Filter out keys that are not properly defined (either not exist or exist but without valid name)
+ const newPromptVariables = keys.filter((key) => {
+ // Check if key exists in external data tools
+ if (externalDataToolsConfig.find((item: ExternalDataTool) => item.variable === key))
+ return false
+
+ // Check if key exists in prompt variables
+ const existingVar = promptVariables.find((item: PromptVariable) => item.key === key)
+ if (!existingVar) {
+ // Variable doesn't exist at all
+ return true
+ }
+
+ // Variable exists but check if it has valid name and key
+ return !existingVar.name || !existingVar.name.trim() || !existingVar.key || !existingVar.key.trim()
+
+ return false
+ }).map(key => getNewVar(key, ''))
+
if (newPromptVariables.length > 0) {
setNewPromptVariables(newPromptVariables)
setNewTemplates(newTemplates)
@@ -212,14 +221,14 @@ const Prompt: FC = ({
}}
variableBlock={{
show: true,
- variables: modelConfig.configs.prompt_variables.filter(item => item.type !== 'api').map(item => ({
+ variables: modelConfig.configs.prompt_variables.filter((item: PromptVariable) => item.type !== 'api' && item.key && item.key.trim() && item.name && item.name.trim()).map((item: PromptVariable) => ({
name: item.name,
value: item.key,
})),
}}
externalToolBlock={{
show: true,
- externalTools: modelConfig.configs.prompt_variables.filter(item => item.type === 'api').map(item => ({
+ externalTools: modelConfig.configs.prompt_variables.filter((item: PromptVariable) => item.type === 'api').map((item: PromptVariable) => ({
name: item.name,
variableName: item.key,
icon: item.icon,
@@ -264,14 +273,6 @@ const Prompt: FC = ({
{showAutomatic && (
= ({
})
}, [checkVariableName, tempPayload.label])
+ const handleVarNameChange = useCallback((e: ChangeEvent) => {
+ replaceSpaceWithUnderscreInVarNameInput(e.target)
+ const value = e.target.value
+ const { isValid, errorKey, errorMessageKey } = checkKeys([value], true)
+ if (!isValid) {
+ Toast.notify({
+ type: 'error',
+ message: t(`appDebug.varKeyError.${errorMessageKey}`, { key: errorKey }),
+ })
+ return
+ }
+ handlePayloadChange('variable')(e.target.value)
+ }, [handlePayloadChange, t])
+
const handleConfirm = () => {
const moreInfo = tempPayload.variable === payload?.variable
? undefined
@@ -200,7 +214,7 @@ const ConfigModal: FC = ({
= ({ text, type, value, Icon, onClick }) => {
return (
onClick(value)}
>
- {Icon ?
:
}
-
{text}
+ {Icon ?
:
}
+
{text}
= ({
}}
>
setOpen(v => !v)}>
-
-
+
-
+
diff --git a/web/app/components/app/configuration/config/agent/agent-tools/index.tsx b/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
index a3149447d4..b4711ea39a 100644
--- a/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
+++ b/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
@@ -18,7 +18,6 @@ import AppIcon from '@/app/components/base/app-icon'
import Button from '@/app/components/base/button'
import Indicator from '@/app/components/header/indicator'
import Switch from '@/app/components/base/switch'
-import Toast from '@/app/components/base/toast'
import ConfigContext from '@/context/debug-configuration'
import type { AgentTool } from '@/types/app'
import { type Collection, CollectionType } from '@/app/components/tools/types'
@@ -26,28 +25,36 @@ import { MAX_TOOLS_NUM } from '@/config'
import { AlertTriangle } from '@/app/components/base/icons/src/vender/solid/alertsAndFeedback'
import Tooltip from '@/app/components/base/tooltip'
import { DefaultToolIcon } from '@/app/components/base/icons/src/public/other'
-import ConfigCredential from '@/app/components/tools/setting/build-in/config-credentials'
-import { updateBuiltInToolCredential } from '@/service/tools'
import cn from '@/utils/classnames'
import ToolPicker from '@/app/components/workflow/block-selector/tool-picker'
-import type { ToolDefaultValue } from '@/app/components/workflow/block-selector/types'
+import type { ToolDefaultValue, ToolValue } from '@/app/components/workflow/block-selector/types'
import { canFindTool } from '@/utils'
+import { useAllBuiltInTools, useAllCustomTools, useAllMCPTools, useAllWorkflowTools } from '@/service/use-tools'
+import type { ToolWithProvider } from '@/app/components/workflow/types'
import { useMittContextSelector } from '@/context/mitt-context'
type AgentToolWithMoreInfo = AgentTool & { icon: any; collection?: Collection } | null
const AgentTools: FC = () => {
const { t } = useTranslation()
const [isShowChooseTool, setIsShowChooseTool] = useState(false)
- const { modelConfig, setModelConfig, collectionList } = useContext(ConfigContext)
+ const { modelConfig, setModelConfig } = useContext(ConfigContext)
+ const { data: buildInTools } = useAllBuiltInTools()
+ const { data: customTools } = useAllCustomTools()
+ const { data: workflowTools } = useAllWorkflowTools()
+ const { data: mcpTools } = useAllMCPTools()
+ const collectionList = useMemo(() => {
+ const allTools = [
+ ...(buildInTools || []),
+ ...(customTools || []),
+ ...(workflowTools || []),
+ ...(mcpTools || []),
+ ]
+ return allTools
+ }, [buildInTools, customTools, workflowTools, mcpTools])
+
const formattingChangedDispatcher = useFormattingChangedDispatcher()
const [currentTool, setCurrentTool] = useState
(null)
- const currentCollection = useMemo(() => {
- if (!currentTool) return null
- const collection = collectionList.find(collection => canFindTool(collection.id, currentTool?.provider_id) && collection.type === currentTool?.provider_type)
- return collection
- }, [currentTool, collectionList])
const [isShowSettingTool, setIsShowSettingTool] = useState(false)
- const [isShowSettingAuth, setShowSettingAuth] = useState(false)
const tools = (modelConfig?.agentConfig?.tools as AgentTool[] || []).map((item) => {
const collection = collectionList.find(
collection =>
@@ -84,34 +91,52 @@ const AgentTools: FC = () => {
formattingChangedDispatcher()
}
- const handleToolAuthSetting = (value: AgentToolWithMoreInfo) => {
+ const [isDeleting, setIsDeleting] = useState(-1)
+ const getToolValue = (tool: ToolDefaultValue) => {
+ return {
+ provider_id: tool.provider_id,
+ provider_type: tool.provider_type as CollectionType,
+ provider_name: tool.provider_name,
+ tool_name: tool.tool_name,
+ tool_label: tool.tool_label,
+ tool_parameters: tool.params,
+ notAuthor: !tool.is_team_authorization,
+ enabled: true,
+ }
+ }
+ const handleSelectTool = (tool: ToolDefaultValue) => {
const newModelConfig = produce(modelConfig, (draft) => {
- const tool = (draft.agentConfig.tools).find((item: any) => item.provider_id === value?.collection?.id && item.tool_name === value?.tool_name)
- if (tool)
- (tool as AgentTool).notAuthor = false
+ draft.agentConfig.tools.push(getToolValue(tool))
})
setModelConfig(newModelConfig)
- setIsShowSettingTool(false)
- formattingChangedDispatcher()
}
- const [isDeleting, setIsDeleting] = useState(-1)
-
- const handleSelectTool = (tool: ToolDefaultValue) => {
+ const handleSelectMultipleTool = (tool: ToolDefaultValue[]) => {
const newModelConfig = produce(modelConfig, (draft) => {
- draft.agentConfig.tools.push({
- provider_id: tool.provider_id,
- provider_type: tool.provider_type as CollectionType,
- provider_name: tool.provider_name,
- tool_name: tool.tool_name,
- tool_label: tool.tool_label,
- tool_parameters: tool.params,
- notAuthor: !tool.is_team_authorization,
- enabled: true,
- })
+ draft.agentConfig.tools.push(...tool.map(getToolValue))
})
setModelConfig(newModelConfig)
}
+ const getProviderShowName = (item: AgentTool) => {
+ const type = item.provider_type
+ if(type === CollectionType.builtIn)
+ return item.provider_name.split('/').pop()
+ return item.provider_name
+ }
+
+ const handleAuthorizationItemClick = useCallback((credentialId: string) => {
+ const newModelConfig = produce(modelConfig, (draft) => {
+ const tool = (draft.agentConfig.tools).find((item: any) => item.provider_id === currentTool?.provider_id)
+ if (tool)
+ (tool as AgentTool).credential_id = credentialId
+ })
+ setCurrentTool({
+ ...currentTool,
+ credential_id: credentialId,
+ } as any)
+ setModelConfig(newModelConfig)
+ formattingChangedDispatcher()
+ }, [currentTool, modelConfig, setModelConfig, formattingChangedDispatcher])
return (
<>
@@ -143,7 +168,9 @@ const AgentTools: FC = () => {
disabled={false}
supportAddCustomTool
onSelect={handleSelectTool}
- selectedTools={tools as any}
+ onSelectMultiple={handleSelectMultipleTool}
+ selectedTools={tools as unknown as ToolValue[]}
+ canChooseMCPTool
/>
)}
@@ -161,7 +188,7 @@ const AgentTools: FC = () => {
{item.isDeleted &&
}
{!item.isDeleted && (
-
+
{typeof item.icon === 'string' &&
}
{typeof item.icon !== 'string' &&
}
@@ -172,11 +199,10 @@ const AgentTools: FC = () => {
(item.isDeleted || item.notAuthor || !item.enabled) ? 'opacity-50' : '',
)}
>
-
{item.provider_type === CollectionType.builtIn ? item.provider_name.split('/').pop() : item.tool_label}
+
{getProviderShowName(item)}
{item.tool_label}
{!item.isDeleted && (
{item.tool_name}
@@ -199,7 +225,6 @@ const AgentTools: FC = () => {
@@ -226,7 +251,6 @@ const AgentTools: FC = () => {
{!item.notAuthor && (
{
setCurrentTool(item)
@@ -269,7 +293,7 @@ const AgentTools: FC = () => {
{item.notAuthor && (
{
setCurrentTool(item)
- setShowSettingAuth(true)
+ setIsShowSettingTool(true)
}}>
{t('tools.notAuthorized')}
setIsShowSettingTool(false)}
- />
- )}
- {isShowSettingAuth && (
- setShowSettingAuth(false)}
- onSaved={async (value) => {
- await updateBuiltInToolCredential((currentCollection as any).name, value)
- Toast.notify({
- type: 'success',
- message: t('common.api.actionSuccess'),
- })
- handleToolAuthSetting(currentTool)
- setShowSettingAuth(false)
- }}
+ credentialId={currentTool?.credential_id}
+ onAuthorizationItemClick={handleAuthorizationItemClick}
/>
)}
diff --git a/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx b/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx
index 952ad66fc4..92f1525bd5 100644
--- a/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx
+++ b/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx
@@ -14,7 +14,6 @@ import Icon from '@/app/components/plugins/card/base/card-icon'
import OrgInfo from '@/app/components/plugins/card/base/org-info'
import Description from '@/app/components/plugins/card/base/description'
import TabSlider from '@/app/components/base/tab-slider-plain'
-
import Button from '@/app/components/base/button'
import Form from '@/app/components/header/account-setting/model-provider-page/model-modal/Form'
import { addDefaultValue, toolParametersToFormSchemas } from '@/app/components/tools/utils/to-form-schema'
@@ -24,10 +23,15 @@ import { fetchBuiltInToolList, fetchCustomToolList, fetchModelToolList, fetchWor
import I18n from '@/context/i18n'
import { getLanguage } from '@/i18n/language'
import cn from '@/utils/classnames'
+import type { ToolWithProvider } from '@/app/components/workflow/types'
+import {
+ AuthCategory,
+ PluginAuthInAgent,
+} from '@/app/components/plugins/plugin-auth'
type Props = {
showBackButton?: boolean
- collection: Collection
+ collection: Collection | ToolWithProvider
isBuiltIn?: boolean
isModel?: boolean
toolName: string
@@ -35,6 +39,8 @@ type Props = {
readonly?: boolean
onHide: () => void
onSave?: (value: Record) => void
+ credentialId?: string
+ onAuthorizationItemClick?: (id: string) => void
}
const SettingBuiltInTool: FC = ({
@@ -47,13 +53,16 @@ const SettingBuiltInTool: FC = ({
readonly,
onHide,
onSave,
+ credentialId,
+ onAuthorizationItemClick,
}) => {
const { locale } = useContext(I18n)
const language = getLanguage(locale)
const { t } = useTranslation()
-
- const [isLoading, setIsLoading] = useState(true)
- const [tools, setTools] = useState([])
+ const passedTools = (collection as ToolWithProvider).tools
+ const hasPassedTools = passedTools?.length > 0
+ const [isLoading, setIsLoading] = useState(!hasPassedTools)
+ const [tools, setTools] = useState(hasPassedTools ? passedTools : [])
const currTool = tools.find(tool => tool.name === toolName)
const formSchemas = currTool ? toolParametersToFormSchemas(currTool.parameters) : []
const infoSchemas = formSchemas.filter(item => item.form === 'llm')
@@ -63,7 +72,7 @@ const SettingBuiltInTool: FC = ({
const [currType, setCurrType] = useState('info')
const isInfoActive = currType === 'info'
useEffect(() => {
- if (!collection)
+ if (!collection || hasPassedTools)
return
(async () => {
@@ -195,8 +204,20 @@ const SettingBuiltInTool: FC = ({
{currTool?.label[language]}
{!!currTool?.description[language] && (
-
{/* form */}
diff --git a/web/app/components/app/configuration/config/agent/prompt-editor.tsx b/web/app/components/app/configuration/config/agent/prompt-editor.tsx
index 7f7f140eda..98b23e5379 100644
--- a/web/app/components/app/configuration/config/agent/prompt-editor.tsx
+++ b/web/app/components/app/configuration/config/agent/prompt-editor.tsx
@@ -6,8 +6,8 @@ import { useContext } from 'use-context-selector'
import { useTranslation } from 'react-i18next'
import cn from '@/utils/classnames'
import {
- Clipboard,
- ClipboardCheck,
+ Copy,
+ CopyCheck,
} from '@/app/components/base/icons/src/vender/line/files'
import PromptEditor from '@/app/components/base/prompt-editor'
import type { ExternalDataTool } from '@/models/common'
@@ -81,13 +81,13 @@ const Editor: FC
= ({
{!isCopied
? (
- {
+ {
copy(value)
setIsCopied(true)
}} />
)
: (
-
= ({
}}
variableBlock={{
show: true,
- variables: modelConfig.configs.prompt_variables.map(item => ({
+ variables: modelConfig.configs.prompt_variables.filter(item => item.key && item.key.trim() && item.name && item.name.trim()).map(item => ({
name: item.name,
value: item.key,
})),
diff --git a/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx b/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx
index e4b333d998..aacaa81ac2 100644
--- a/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx
+++ b/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx
@@ -1,6 +1,6 @@
'use client'
import type { FC } from 'react'
-import React, { useCallback } from 'react'
+import React, { useCallback, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useBoolean } from 'ahooks'
import {
@@ -22,7 +22,7 @@ import Textarea from '@/app/components/base/textarea'
import Toast from '@/app/components/base/toast'
import { generateRule } from '@/service/debug'
import ConfigPrompt from '@/app/components/app/configuration/config-prompt'
-import type { Model } from '@/types/app'
+import type { CompletionParams, Model } from '@/types/app'
import { AppType } from '@/types/app'
import ConfigVar from '@/app/components/app/configuration/config-var'
import GroupName from '@/app/components/app/configuration/base/group-name'
@@ -33,14 +33,15 @@ import { LoveMessage } from '@/app/components/base/icons/src/vender/features'
// type
import type { AutomaticRes } from '@/service/debug'
import { Generator } from '@/app/components/base/icons/src/vender/other'
-import ModelIcon from '@/app/components/header/account-setting/model-provider-page/model-icon'
-import ModelName from '@/app/components/header/account-setting/model-provider-page/model-name'
+import ModelParameterModal from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal'
+
import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
import { useModelListAndDefaultModelAndCurrentProviderAndModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
+import type { ModelModeType } from '@/types/app'
+import type { FormValue } from '@/app/components/header/account-setting/model-provider-page/declarations'
export type IGetAutomaticResProps = {
mode: AppType
- model: Model
isShow: boolean
onClose: () => void
onFinished: (res: AutomaticRes) => void
@@ -65,16 +66,23 @@ const TryLabel: FC<{
const GetAutomaticRes: FC = ({
mode,
- model,
isShow,
onClose,
isInLLMNode,
onFinished,
}) => {
const { t } = useTranslation()
+ const localModel = localStorage.getItem('auto-gen-model')
+ ? JSON.parse(localStorage.getItem('auto-gen-model') as string) as Model
+ : null
+ const [model, setModel] = React.useState(localModel || {
+ name: '',
+ provider: '',
+ mode: mode as unknown as ModelModeType.chat,
+ completion_params: {} as CompletionParams,
+ })
const {
- currentProvider,
- currentModel,
+ defaultModel,
} = useModelListAndDefaultModelAndCurrentProviderAndModel(ModelTypeEnum.textGeneration)
const tryList = [
{
@@ -115,7 +123,7 @@ const GetAutomaticRes: FC = ({
},
]
- const [instruction, setInstruction] = React.useState('')
+ const [instruction, setInstruction] = useState('')
const handleChooseTemplate = useCallback((key: string) => {
return () => {
const template = t(`appDebug.generate.template.${key}.instruction`)
@@ -135,7 +143,25 @@ const GetAutomaticRes: FC = ({
return true
}
const [isLoading, { setTrue: setLoadingTrue, setFalse: setLoadingFalse }] = useBoolean(false)
- const [res, setRes] = React.useState(null)
+ const [res, setRes] = useState(null)
+
+ useEffect(() => {
+ if (defaultModel) {
+ const localModel = localStorage.getItem('auto-gen-model')
+ ? JSON.parse(localStorage.getItem('auto-gen-model') || '')
+ : null
+ if (localModel) {
+ setModel(localModel)
+ }
+ else {
+ setModel(prev => ({
+ ...prev,
+ name: defaultModel.model,
+ provider: defaultModel.provider.provider,
+ }))
+ }
+ }
+ }, [defaultModel])
const renderLoading = (
@@ -154,6 +180,26 @@ const GetAutomaticRes: FC = ({
)
+ const handleModelChange = useCallback((newValue: { modelId: string; provider: string; mode?: string; features?: string[] }) => {
+ const newModel = {
+ ...model,
+ provider: newValue.provider,
+ name: newValue.modelId,
+ mode: newValue.mode as ModelModeType,
+ }
+ setModel(newModel)
+ localStorage.setItem('auto-gen-model', JSON.stringify(newModel))
+ }, [model, setModel])
+
+ const handleCompletionParamsChange = useCallback((newParams: FormValue) => {
+ const newModel = {
+ ...model,
+ completion_params: newParams as CompletionParams,
+ }
+ setModel(newModel)
+ localStorage.setItem('auto-gen-model', JSON.stringify(newModel))
+ }, [model, setModel])
+
const onGenerate = async () => {
if (!isValid())
return
@@ -198,17 +244,18 @@ const GetAutomaticRes: FC = ({
{t('appDebug.generate.title')}
{t('appDebug.generate.description')}
-
diff --git a/web/app/components/app/configuration/config/code-generator/get-code-generator-res.tsx b/web/app/components/app/configuration/config/code-generator/get-code-generator-res.tsx
index ddae2f5b26..c0db0d7213 100644
--- a/web/app/components/app/configuration/config/code-generator/get-code-generator-res.tsx
+++ b/web/app/components/app/configuration/config/code-generator/get-code-generator-res.tsx
@@ -1,5 +1,5 @@
import type { FC } from 'react'
-import React from 'react'
+import React, { useCallback, useEffect } from 'react'
import cn from 'classnames'
import useBoolean from 'ahooks/lib/useBoolean'
import { useTranslation } from 'react-i18next'
@@ -7,8 +7,10 @@ import ConfigPrompt from '../../config-prompt'
import { languageMap } from '../../../../workflow/nodes/_base/components/editor/code-editor/index'
import { generateRuleCode } from '@/service/debug'
import type { CodeGenRes } from '@/service/debug'
-import { type AppType, type Model, ModelModeType } from '@/types/app'
+import type { ModelModeType } from '@/types/app'
+import type { AppType, CompletionParams, Model } from '@/types/app'
import Modal from '@/app/components/base/modal'
+import Textarea from '@/app/components/base/textarea'
import Button from '@/app/components/base/button'
import { Generator } from '@/app/components/base/icons/src/vender/other'
import Toast from '@/app/components/base/toast'
@@ -17,8 +19,9 @@ import Confirm from '@/app/components/base/confirm'
import type { CodeLanguage } from '@/app/components/workflow/nodes/code/types'
import { useModelListAndDefaultModelAndCurrentProviderAndModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
-import ModelIcon from '@/app/components/header/account-setting/model-provider-page/model-icon'
-import ModelName from '@/app/components/header/account-setting/model-provider-page/model-name'
+import ModelParameterModal from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal'
+import type { FormValue } from '@/app/components/header/account-setting/model-provider-page/declarations'
+
export type IGetCodeGeneratorResProps = {
mode: AppType
isShow: boolean
@@ -36,11 +39,28 @@ export const GetCodeGeneratorResModal: FC
= (
onFinished,
},
) => {
+ const { t } = useTranslation()
+ const defaultCompletionParams = {
+ temperature: 0.7,
+ max_tokens: 0,
+ top_p: 0,
+ echo: false,
+ stop: [],
+ presence_penalty: 0,
+ frequency_penalty: 0,
+ }
+ const localModel = localStorage.getItem('auto-gen-model')
+ ? JSON.parse(localStorage.getItem('auto-gen-model') as string) as Model
+ : null
+ const [model, setModel] = React.useState(localModel || {
+ name: '',
+ provider: '',
+ mode: mode as unknown as ModelModeType.chat,
+ completion_params: defaultCompletionParams,
+ })
const {
- currentProvider,
- currentModel,
+ defaultModel,
} = useModelListAndDefaultModelAndCurrentProviderAndModel(ModelTypeEnum.textGeneration)
- const { t } = useTranslation()
const [instruction, setInstruction] = React.useState('')
const [isLoading, { setTrue: setLoadingTrue, setFalse: setLoadingFalse }] = useBoolean(false)
const [res, setRes] = React.useState(null)
@@ -56,21 +76,27 @@ export const GetCodeGeneratorResModal: FC = (
}
return true
}
- const model: Model = {
- provider: currentProvider?.provider || '',
- name: currentModel?.model || '',
- mode: ModelModeType.chat,
- // This is a fixed parameter
- completion_params: {
- temperature: 0.7,
- max_tokens: 0,
- top_p: 0,
- echo: false,
- stop: [],
- presence_penalty: 0,
- frequency_penalty: 0,
- },
- }
+
+ const handleModelChange = useCallback((newValue: { modelId: string; provider: string; mode?: string; features?: string[] }) => {
+ const newModel = {
+ ...model,
+ provider: newValue.provider,
+ name: newValue.modelId,
+ mode: newValue.mode as ModelModeType,
+ }
+ setModel(newModel)
+ localStorage.setItem('auto-gen-model', JSON.stringify(newModel))
+ }, [model, setModel])
+
+ const handleCompletionParamsChange = useCallback((newParams: FormValue) => {
+ const newModel = {
+ ...model,
+ completion_params: newParams as CompletionParams,
+ }
+ setModel(newModel)
+ localStorage.setItem('auto-gen-model', JSON.stringify(newModel))
+ }, [model, setModel])
+
const isInLLMNode = true
const onGenerate = async () => {
if (!isValid())
@@ -99,16 +125,40 @@ export const GetCodeGeneratorResModal: FC = (
}
const [showConfirmOverwrite, setShowConfirmOverwrite] = React.useState(false)
+ useEffect(() => {
+ if (defaultModel) {
+ const localModel = localStorage.getItem('auto-gen-model')
+ ? JSON.parse(localStorage.getItem('auto-gen-model') || '')
+ : null
+ if (localModel) {
+ setModel({
+ ...localModel,
+ completion_params: {
+ ...defaultCompletionParams,
+ ...localModel.completion_params,
+ },
+ })
+ }
+ else {
+ setModel(prev => ({
+ ...prev,
+ name: defaultModel.model,
+ provider: defaultModel.provider.provider,
+ }))
+ }
+ }
+ }, [defaultModel])
+
const renderLoading = (
-
{t('appDebug.codegen.loading')}
+
{t('appDebug.codegen.loading')}
)
const renderNoData = (
-
-
+
+
{t('appDebug.codegen.noDataLine1')}
{t('appDebug.codegen.noDataLine2')}
@@ -123,29 +173,30 @@ export const GetCodeGeneratorResModal: FC
= (
closable
>
-
+
-
{t('appDebug.codegen.title')}
-
{t('appDebug.codegen.description')}
+
{t('appDebug.codegen.title')}
+
{t('appDebug.codegen.description')}
-
-
+
-
{t('appDebug.codegen.instruction')}
-
+
+ {latestParams.length > 0 && (
+
+
+
{t('tools.mcp.server.modal.parameters')}
+
+
+
{t('tools.mcp.server.modal.parametersTip')}
+
+ {latestParams.map(paramItem => (
+ handleParamChange(paramItem.variable, value)}
+ />
+ ))}
+
+
+ )}
+
+
+ {data ? t('tools.mcp.modal.save') : t('tools.mcp.server.modal.confirm')}
+ {t('tools.mcp.modal.cancel')}
+
+
+ )
+}
+
+export default MCPServerModal
diff --git a/web/app/components/tools/mcp/mcp-server-param-item.tsx b/web/app/components/tools/mcp/mcp-server-param-item.tsx
new file mode 100644
index 0000000000..a48d1b92b0
--- /dev/null
+++ b/web/app/components/tools/mcp/mcp-server-param-item.tsx
@@ -0,0 +1,37 @@
+'use client'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import Textarea from '@/app/components/base/textarea'
+
+type Props = {
+ data?: any
+ value: string
+ onChange: (value: string) => void
+}
+
+const MCPServerParamItem = ({
+ data,
+ value,
+ onChange,
+}: Props) => {
+ const { t } = useTranslation()
+
+ return (
+
+
+
{data.label}
+
·
+
{data.variable}
+
{data.type}
+
+
+
+ )
+}
+
+export default MCPServerParamItem
diff --git a/web/app/components/tools/mcp/mcp-service-card.tsx b/web/app/components/tools/mcp/mcp-service-card.tsx
new file mode 100644
index 0000000000..301bb66897
--- /dev/null
+++ b/web/app/components/tools/mcp/mcp-service-card.tsx
@@ -0,0 +1,247 @@
+'use client'
+import React, { useEffect, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { RiEditLine, RiLoopLeftLine } from '@remixicon/react'
+import {
+ Mcp,
+} from '@/app/components/base/icons/src/vender/other'
+import Button from '@/app/components/base/button'
+import Tooltip from '@/app/components/base/tooltip'
+import Switch from '@/app/components/base/switch'
+import Divider from '@/app/components/base/divider'
+import CopyFeedback from '@/app/components/base/copy-feedback'
+import Confirm from '@/app/components/base/confirm'
+import type { AppDetailResponse } from '@/models/app'
+import { useAppContext } from '@/context/app-context'
+import type { AppSSO } from '@/types/app'
+import Indicator from '@/app/components/header/indicator'
+import MCPServerModal from '@/app/components/tools/mcp/mcp-server-modal'
+import { useAppWorkflow } from '@/service/use-workflow'
+import {
+ useInvalidateMCPServerDetail,
+ useMCPServerDetail,
+ useRefreshMCPServerCode,
+ useUpdateMCPServer,
+} from '@/service/use-tools'
+import { BlockEnum } from '@/app/components/workflow/types'
+import cn from '@/utils/classnames'
+import { fetchAppDetail } from '@/service/apps'
+
+export type IAppCardProps = {
+ appInfo: AppDetailResponse & Partial
+}
+
+function MCPServiceCard({
+ appInfo,
+}: IAppCardProps) {
+ const { t } = useTranslation()
+ const appId = appInfo.id
+ const { mutateAsync: updateMCPServer } = useUpdateMCPServer()
+ const { mutateAsync: refreshMCPServerCode, isPending: genLoading } = useRefreshMCPServerCode()
+ const invalidateMCPServerDetail = useInvalidateMCPServerDetail()
+ const { isCurrentWorkspaceManager, isCurrentWorkspaceEditor } = useAppContext()
+ const [showConfirmDelete, setShowConfirmDelete] = useState(false)
+ const [showMCPServerModal, setShowMCPServerModal] = useState(false)
+
+ const isAdvancedApp = appInfo?.mode === 'advanced-chat' || appInfo?.mode === 'workflow'
+ const isBasicApp = !isAdvancedApp
+ const { data: currentWorkflow } = useAppWorkflow(isAdvancedApp ? appId : '')
+ const [basicAppConfig, setBasicAppConfig] = useState({})
+ const basicAppInputForm = useMemo(() => {
+ if(!isBasicApp || !basicAppConfig?.user_input_form)
+ return []
+ return basicAppConfig.user_input_form.map((item: any) => {
+ const type = Object.keys(item)[0]
+ return {
+ ...item[type],
+ type: type || 'text-input',
+ }
+ })
+ }, [basicAppConfig.user_input_form, isBasicApp])
+ useEffect(() => {
+ if(isBasicApp && appId) {
+ (async () => {
+ const res = await fetchAppDetail({ url: '/apps', id: appId })
+ setBasicAppConfig(res?.model_config || {})
+ })()
+ }
+ }, [appId, isBasicApp])
+ const { data: detail } = useMCPServerDetail(appId)
+ const { id, status, server_code } = detail ?? {}
+
+ const appUnpublished = isAdvancedApp ? !currentWorkflow?.graph : !basicAppConfig.updated_at
+ const serverPublished = !!id
+ const serverActivated = status === 'active'
+ const serverURL = serverPublished ? `${appInfo.api_base_url.replace('/v1', '')}/mcp/server/${server_code}/mcp` : '***********'
+ const toggleDisabled = !isCurrentWorkspaceEditor || appUnpublished
+
+ const [activated, setActivated] = useState(serverActivated)
+
+ const latestParams = useMemo(() => {
+ if(isAdvancedApp) {
+ if (!currentWorkflow?.graph)
+ return []
+ const startNode = currentWorkflow?.graph.nodes.find(node => node.data.type === BlockEnum.Start) as any
+ return startNode?.data.variables as any[] || []
+ }
+ return basicAppInputForm
+ }, [currentWorkflow, basicAppInputForm, isAdvancedApp])
+
+ const onGenCode = async () => {
+ await refreshMCPServerCode(detail?.id || '')
+ invalidateMCPServerDetail(appId)
+ }
+
+ const onChangeStatus = async (state: boolean) => {
+ setActivated(state)
+ if (state) {
+ if (!serverPublished) {
+ setShowMCPServerModal(true)
+ return
+ }
+
+ await updateMCPServer({
+ appID: appId,
+ id: id || '',
+ description: detail?.description || '',
+ parameters: detail?.parameters || {},
+ status: 'active',
+ })
+ invalidateMCPServerDetail(appId)
+ }
+ else {
+ await updateMCPServer({
+ appID: appId,
+ id: id || '',
+ description: detail?.description || '',
+ parameters: detail?.parameters || {},
+ status: 'inactive',
+ })
+ invalidateMCPServerDetail(appId)
+ }
+ }
+
+ const handleServerModalHide = () => {
+ setShowMCPServerModal(false)
+ if (!serverActivated)
+ setActivated(false)
+ }
+
+ useEffect(() => {
+ setActivated(serverActivated)
+ }, [serverActivated])
+
+ if (!currentWorkflow && isAdvancedApp)
+ return null
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+ {t('tools.mcp.server.title')}
+
+
+
+
+
+
+ {serverActivated
+ ? t('appOverview.overview.status.running')
+ : t('appOverview.overview.status.disable')}
+
+
+
+
+
+
+
+
+
+ {t('tools.mcp.server.url')}
+
+
+
+ {serverPublished && (
+ <>
+
+
+ {isCurrentWorkspaceManager && (
+
+ setShowConfirmDelete(true)}
+ >
+
+
+ )}
+
+ )}
+
+
+
+
+
setShowMCPServerModal(true)}
+ >
+
+
+
+
{serverPublished ? t('tools.mcp.server.edit') : t('tools.mcp.server.addDescription')}
+
+
+
+
{
+ onGenCode()
+ setShowConfirmDelete(false)
+ }}
+ onCancel={() => setShowConfirmDelete(false)}
+ />
+ )}
+
+ )
+}
+
+export default MCPServiceCard
diff --git a/web/app/components/tools/mcp/mock.ts b/web/app/components/tools/mcp/mock.ts
new file mode 100644
index 0000000000..f271f67ed3
--- /dev/null
+++ b/web/app/components/tools/mcp/mock.ts
@@ -0,0 +1,154 @@
+const tools = [
+ {
+ author: 'Novice',
+ name: 'NOTION_ADD_PAGE_CONTENT',
+ label: {
+ en_US: 'NOTION_ADD_PAGE_CONTENT',
+ zh_Hans: 'NOTION_ADD_PAGE_CONTENT',
+ pt_BR: 'NOTION_ADD_PAGE_CONTENT',
+ ja_JP: 'NOTION_ADD_PAGE_CONTENT',
+ },
+ description: {
+ en_US: 'Adds a single content block to a notion page. multiple calls needed for multiple blocks. note: only supports adding to notion pages. blocks that can contain children: - page (any block type) - toggle (any nested content) - to-do (nested to-dos/blocks) - bulleted list (nested lists/blocks) - numbered list (nested lists/blocks) - callout (child blocks) - quote (nested blocks)',
+ zh_Hans: 'Adds a single content block to a notion page. multiple calls needed for multiple blocks. note: only supports adding to notion pages. blocks that can contain children: - page (any block type) - toggle (any nested content) - to-do (nested to-dos/blocks) - bulleted list (nested lists/blocks) - numbered list (nested lists/blocks) - callout (child blocks) - quote (nested blocks)',
+ pt_BR: 'Adds a single content block to a notion page. multiple calls needed for multiple blocks. note: only supports adding to notion pages. blocks that can contain children: - page (any block type) - toggle (any nested content) - to-do (nested to-dos/blocks) - bulleted list (nested lists/blocks) - numbered list (nested lists/blocks) - callout (child blocks) - quote (nested blocks)',
+ ja_JP: 'Adds a single content block to a notion page. multiple calls needed for multiple blocks. note: only supports adding to notion pages. blocks that can contain children: - page (any block type) - toggle (any nested content) - to-do (nested to-dos/blocks) - bulleted list (nested lists/blocks) - numbered list (nested lists/blocks) - callout (child blocks) - quote (nested blocks)',
+ },
+ parameters: [
+ {
+ name: 'after',
+ label: {
+ en_US: 'after',
+ zh_Hans: 'after',
+ pt_BR: 'after',
+ ja_JP: 'after',
+ },
+ placeholder: null,
+ scope: null,
+ auto_generate: null,
+ template: null,
+ required: false,
+ default: null,
+ min: null,
+ max: null,
+ precision: null,
+ options: [],
+ type: 'string',
+ human_description: {
+ en_US: 'The ID of the existing block that the new block should be appended after. If not provided, content will be appended at the end of the page.',
+ zh_Hans: 'The ID of the existing block that the new block should be appended after. If not provided, content will be appended at the end of the page.',
+ pt_BR: 'The ID of the existing block that the new block should be appended after. If not provided, content will be appended at the end of the page.',
+ ja_JP: 'The ID of the existing block that the new block should be appended after. If not provided, content will be appended at the end of the page.',
+ },
+ form: 'llm',
+ llm_description: 'The ID of the existing block that the new block should be appended after. If not provided, content will be appended at the end of the page.',
+ },
+ {
+ name: 'content_block',
+ label: {
+ en_US: 'content_block',
+ zh_Hans: 'content_block',
+ pt_BR: 'content_block',
+ ja_JP: 'content_block',
+ },
+ placeholder: null,
+ scope: null,
+ auto_generate: null,
+ template: null,
+ required: false,
+ default: null,
+ min: null,
+ max: null,
+ precision: null,
+ options: [],
+ type: 'string',
+ human_description: {
+ en_US: 'Child content to append to a page.',
+ zh_Hans: 'Child content to append to a page.',
+ pt_BR: 'Child content to append to a page.',
+ ja_JP: 'Child content to append to a page.',
+ },
+ form: 'llm',
+ llm_description: 'Child content to append to a page.',
+ },
+ {
+ name: 'parent_block_id',
+ label: {
+ en_US: 'parent_block_id',
+ zh_Hans: 'parent_block_id',
+ pt_BR: 'parent_block_id',
+ ja_JP: 'parent_block_id',
+ },
+ placeholder: null,
+ scope: null,
+ auto_generate: null,
+ template: null,
+ required: false,
+ default: null,
+ min: null,
+ max: null,
+ precision: null,
+ options: [],
+ type: 'string',
+ human_description: {
+ en_US: 'The ID of the page which the children will be added.',
+ zh_Hans: 'The ID of the page which the children will be added.',
+ pt_BR: 'The ID of the page which the children will be added.',
+ ja_JP: 'The ID of the page which the children will be added.',
+ },
+ form: 'llm',
+ llm_description: 'The ID of the page which the children will be added.',
+ },
+ ],
+ labels: [],
+ output_schema: null,
+ },
+]
+
+export const listData = [
+ {
+ id: 'fdjklajfkljadslf111',
+ author: 'KVOJJJin',
+ name: 'GOGOGO',
+ icon: 'https://cloud.dify.dev/console/api/workspaces/694cc430-fa36-4458-86a0-4a98c09c4684/model-providers/langgenius/openai/openai/icon_small/en_US',
+ server_url: 'https://mcp.composio.dev/notion/****/abc',
+ type: 'mcp',
+ is_team_authorization: true,
+ tools,
+ update_elapsed_time: 1744793369,
+ label: {
+ en_US: 'GOGOGO',
+ zh_Hans: 'GOGOGO',
+ },
+ },
+ {
+ id: 'fdjklajfkljadslf222',
+ author: 'KVOJJJin',
+ name: 'GOGOGO2',
+ icon: 'https://cloud.dify.dev/console/api/workspaces/694cc430-fa36-4458-86a0-4a98c09c4684/model-providers/langgenius/openai/openai/icon_small/en_US',
+ server_url: 'https://mcp.composio.dev/notion/****/abc',
+ type: 'mcp',
+ is_team_authorization: false,
+ tools: [],
+ update_elapsed_time: 1744793369,
+ label: {
+ en_US: 'GOGOGO2',
+ zh_Hans: 'GOGOGO2',
+ },
+ },
+ {
+ id: 'fdjklajfkljadslf333',
+ author: 'KVOJJJin',
+ name: 'GOGOGO3',
+ icon: 'https://cloud.dify.dev/console/api/workspaces/694cc430-fa36-4458-86a0-4a98c09c4684/model-providers/langgenius/openai/openai/icon_small/en_US',
+ server_url: 'https://mcp.composio.dev/notion/****/abc',
+ type: 'mcp',
+ is_team_authorization: true,
+ tools,
+ update_elapsed_time: 1744793369,
+ label: {
+ en_US: 'GOGOGO3',
+ zh_Hans: 'GOGOGO3',
+ },
+ },
+]
diff --git a/web/app/components/tools/mcp/modal.tsx b/web/app/components/tools/mcp/modal.tsx
new file mode 100644
index 0000000000..88e831bc3a
--- /dev/null
+++ b/web/app/components/tools/mcp/modal.tsx
@@ -0,0 +1,221 @@
+'use client'
+import React, { useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { getDomain } from 'tldts'
+import { RiCloseLine, RiEditLine } from '@remixicon/react'
+import AppIconPicker from '@/app/components/base/app-icon-picker'
+import type { AppIconSelection } from '@/app/components/base/app-icon-picker'
+import AppIcon from '@/app/components/base/app-icon'
+import Modal from '@/app/components/base/modal'
+import Button from '@/app/components/base/button'
+import Input from '@/app/components/base/input'
+import type { AppIconType } from '@/types/app'
+import type { ToolWithProvider } from '@/app/components/workflow/types'
+import { noop } from 'lodash-es'
+import Toast from '@/app/components/base/toast'
+import { uploadRemoteFileInfo } from '@/service/common'
+import cn from '@/utils/classnames'
+import { useHover } from 'ahooks'
+
+export type DuplicateAppModalProps = {
+ data?: ToolWithProvider
+ show: boolean
+ onConfirm: (info: {
+ name: string
+ server_url: string
+ icon_type: AppIconType
+ icon: string
+ icon_background?: string | null
+ server_identifier: string
+ }) => void
+ onHide: () => void
+}
+
+const DEFAULT_ICON = { type: 'emoji', icon: '🧿', background: '#EFF1F5' }
+const extractFileId = (url: string) => {
+ const match = url.match(/files\/(.+?)\/file-preview/)
+ return match ? match[1] : null
+}
+const getIcon = (data?: ToolWithProvider) => {
+ if (!data)
+ return DEFAULT_ICON as AppIconSelection
+ if (typeof data.icon === 'string')
+ return { type: 'image', url: data.icon, fileId: extractFileId(data.icon) } as AppIconSelection
+ return {
+ ...data.icon,
+ icon: data.icon.content,
+ type: 'emoji',
+ } as unknown as AppIconSelection
+}
+
+const MCPModal = ({
+ data,
+ show,
+ onConfirm,
+ onHide,
+}: DuplicateAppModalProps) => {
+ const { t } = useTranslation()
+ const isCreate = !data
+
+ const originalServerUrl = data?.server_url
+ const originalServerID = data?.server_identifier
+ const [url, setUrl] = React.useState(data?.server_url || '')
+ const [name, setName] = React.useState(data?.name || '')
+ const [appIcon, setAppIcon] = useState(getIcon(data))
+ const [showAppIconPicker, setShowAppIconPicker] = useState(false)
+ const [serverIdentifier, setServerIdentifier] = React.useState(data?.server_identifier || '')
+ const [isFetchingIcon, setIsFetchingIcon] = useState(false)
+ const appIconRef = useRef(null)
+ const isHovering = useHover(appIconRef)
+
+ const isValidUrl = (string: string) => {
+ try {
+ const urlPattern = /^(https?:\/\/)((([a-z\d]([a-z\d-]*[a-z\d])*)\.)+[a-z]{2,}|((\d{1,3}\.){3}\d{1,3})|localhost)(\:\d+)?(\/[-a-z\d%_.~+]*)*(\?[;&a-z\d%_.~+=-]*)?/i
+ return urlPattern.test(string)
+ }
+ catch (e) {
+ return false
+ }
+ }
+
+ const isValidServerID = (str: string) => {
+ return /^[a-z0-9_-]{1,24}$/.test(str)
+ }
+
+ const handleBlur = async (url: string) => {
+ if (data)
+ return
+ if (!isValidUrl(url))
+ return
+ const domain = getDomain(url)
+ const remoteIcon = `https://www.google.com/s2/favicons?domain=${domain}&sz=128`
+ setIsFetchingIcon(true)
+ try {
+ const res = await uploadRemoteFileInfo(remoteIcon, undefined, true)
+ setAppIcon({ type: 'image', url: res.url, fileId: extractFileId(res.url) || '' })
+ }
+ catch (e) {
+ console.error('Failed to fetch remote icon:', e)
+ Toast.notify({ type: 'warning', message: 'Failed to fetch remote icon' })
+ }
+ finally {
+ setIsFetchingIcon(false)
+ }
+ }
+
+ const submit = async () => {
+ if (!isValidUrl(url)) {
+ Toast.notify({ type: 'error', message: 'invalid server url' })
+ return
+ }
+ if (!isValidServerID(serverIdentifier.trim())) {
+ Toast.notify({ type: 'error', message: 'invalid server identifier' })
+ return
+ }
+ await onConfirm({
+ server_url: originalServerUrl === url ? '[__HIDDEN__]' : url.trim(),
+ name,
+ icon_type: appIcon.type,
+ icon: appIcon.type === 'emoji' ? appIcon.icon : appIcon.fileId,
+ icon_background: appIcon.type === 'emoji' ? appIcon.background : undefined,
+ server_identifier: serverIdentifier.trim(),
+ })
+ if(isCreate)
+ onHide()
+ }
+
+ return (
+ <>
+
+
+
+ {!isCreate ? t('tools.mcp.modal.editTitle') : t('tools.mcp.modal.title')}
+
+
+
+ {t('tools.mcp.modal.serverUrl')}
+
+
setUrl(e.target.value)}
+ onBlur={e => handleBlur(e.target.value.trim())}
+ placeholder={t('tools.mcp.modal.serverUrlPlaceholder')}
+ />
+ {originalServerUrl && originalServerUrl !== url && (
+
+ {t('tools.mcp.modal.serverUrlWarning')}
+
+ )}
+
+
+
+
+ {t('tools.mcp.modal.name')}
+
+
setName(e.target.value)}
+ placeholder={t('tools.mcp.modal.namePlaceholder')}
+ />
+
+
) : null
+ }
+ onClick={() => { setShowAppIconPicker(true) }}
+ />
+
+
+
+ {t('tools.mcp.modal.serverIdentifier')}
+
+
{t('tools.mcp.modal.serverIdentifierTip')}
+
setServerIdentifier(e.target.value)}
+ placeholder={t('tools.mcp.modal.serverIdentifierPlaceholder')}
+ />
+ {originalServerID && originalServerID !== serverIdentifier && (
+
+ {t('tools.mcp.modal.serverIdentifierWarning')}
+
+ )}
+
+
+ {data ? t('tools.mcp.modal.save') : t('tools.mcp.modal.confirm')}
+ {t('tools.mcp.modal.cancel')}
+
+
+ {showAppIconPicker &&
{
+ setAppIcon(payload)
+ setShowAppIconPicker(false)
+ }}
+ onClose={() => {
+ setAppIcon(getIcon(data))
+ setShowAppIconPicker(false)
+ }}
+ />}
+
+
+ )
+}
+
+export default MCPModal
diff --git a/web/app/components/tools/mcp/provider-card.tsx b/web/app/components/tools/mcp/provider-card.tsx
new file mode 100644
index 0000000000..677e25c533
--- /dev/null
+++ b/web/app/components/tools/mcp/provider-card.tsx
@@ -0,0 +1,152 @@
+'use client'
+import { useCallback, useState } from 'react'
+import { useBoolean } from 'ahooks'
+import { useTranslation } from 'react-i18next'
+import { useAppContext } from '@/context/app-context'
+import { RiHammerFill } from '@remixicon/react'
+import Indicator from '@/app/components/header/indicator'
+import Icon from '@/app/components/plugins/card/base/card-icon'
+import { useFormatTimeFromNow } from './hooks'
+import type { ToolWithProvider } from '../../workflow/types'
+import Confirm from '@/app/components/base/confirm'
+import MCPModal from './modal'
+import OperationDropdown from './detail/operation-dropdown'
+import { useDeleteMCP, useUpdateMCP } from '@/service/use-tools'
+import cn from '@/utils/classnames'
+
+type Props = {
+ currentProvider?: ToolWithProvider
+ data: ToolWithProvider
+ handleSelect: (providerID: string) => void
+ onUpdate: (providerID: string) => void
+ onDeleted: () => void
+}
+
+const MCPCard = ({
+ currentProvider,
+ data,
+ onUpdate,
+ handleSelect,
+ onDeleted,
+}: Props) => {
+ const { t } = useTranslation()
+ const { formatTimeFromNow } = useFormatTimeFromNow()
+ const { isCurrentWorkspaceManager } = useAppContext()
+
+ const { mutateAsync: updateMCP } = useUpdateMCP({})
+ const { mutateAsync: deleteMCP } = useDeleteMCP({})
+
+ const [isOperationShow, setIsOperationShow] = useState(false)
+
+ const [isShowUpdateModal, {
+ setTrue: showUpdateModal,
+ setFalse: hideUpdateModal,
+ }] = useBoolean(false)
+
+ const [isShowDeleteConfirm, {
+ setTrue: showDeleteConfirm,
+ setFalse: hideDeleteConfirm,
+ }] = useBoolean(false)
+
+ const [deleting, {
+ setTrue: showDeleting,
+ setFalse: hideDeleting,
+ }] = useBoolean(false)
+
+ const handleUpdate = useCallback(async (form: any) => {
+ const res = await updateMCP({
+ ...form,
+ provider_id: data.id,
+ })
+ if ((res as any)?.result === 'success') {
+ hideUpdateModal()
+ onUpdate(data.id)
+ }
+ }, [data, updateMCP, hideUpdateModal, onUpdate])
+
+ const handleDelete = useCallback(async () => {
+ showDeleting()
+ const res = await deleteMCP(data.id)
+ hideDeleting()
+ if ((res as any)?.result === 'success') {
+ hideDeleteConfirm()
+ onDeleted()
+ }
+ }, [showDeleting, deleteMCP, data.id, hideDeleting, hideDeleteConfirm, onDeleted])
+
+ return (
+ handleSelect(data.id)}
+ className={cn(
+ 'group relative flex cursor-pointer flex-col rounded-xl border-[1.5px] border-transparent bg-components-card-bg shadow-xs hover:bg-components-card-bg-alt hover:shadow-md',
+ currentProvider?.id === data.id && 'border-components-option-card-option-selected-border bg-components-card-bg-alt',
+ )}
+ >
+
+
+
+
+
{data.name}
+
{data.server_identifier}
+
+
+
+
+
+
+ {data.tools.length > 0 && (
+
{t('tools.mcp.toolsCount', { count: data.tools.length })}
+ )}
+ {!data.tools.length && (
+
{t('tools.mcp.noTools')}
+ )}
+
+
/
+
{`${t('tools.mcp.updateTime')} ${formatTimeFromNow(data.updated_at! * 1000)}`}
+
+ {data.is_team_authorization && data.tools.length > 0 &&
}
+ {(!data.is_team_authorization || !data.tools.length) && (
+
+ {t('tools.mcp.noConfigured')}
+
+ )}
+
+ {isCurrentWorkspaceManager && (
+
e.stopPropagation()}>
+
+ )}
+ {isShowUpdateModal && (
+
+ )}
+ {isShowDeleteConfirm && (
+
+ {t('tools.mcp.deleteConfirmTitle', { mcp: data.name })}
+
+ )
+}
+export default MCPCard
diff --git a/web/app/components/tools/provider-list.tsx b/web/app/components/tools/provider-list.tsx
index 0970daab9c..ecfa5f6ea2 100644
--- a/web/app/components/tools/provider-list.tsx
+++ b/web/app/components/tools/provider-list.tsx
@@ -15,11 +15,29 @@ import WorkflowToolEmpty from '@/app/components/tools/add-tool-modal/empty'
import Card from '@/app/components/plugins/card'
import CardMoreInfo from '@/app/components/plugins/card/card-more-info'
import PluginDetailPanel from '@/app/components/plugins/plugin-detail-panel'
+import MCPList from './mcp'
import { useAllToolProviders } from '@/service/use-tools'
import { useInstalledPluginList, useInvalidateInstalledPluginList } from '@/service/use-plugins'
import { useGlobalPublicStore } from '@/context/global-public-context'
+import { ToolTypeEnum } from '../workflow/block-selector/types'
+const getToolType = (type: string) => {
+ switch (type) {
+ case 'builtin':
+ return ToolTypeEnum.BuiltIn
+ case 'api':
+ return ToolTypeEnum.Custom
+ case 'workflow':
+ return ToolTypeEnum.Workflow
+ case 'mcp':
+ return ToolTypeEnum.MCP
+ default:
+ return ToolTypeEnum.BuiltIn
+ }
+}
const ProviderList = () => {
+ // const searchParams = useSearchParams()
+ // searchParams.get('category') === 'workflow'
const { t } = useTranslation()
const { enable_marketplace } = useGlobalPublicStore(s => s.systemFeatures)
const containerRef = useRef
(null)
@@ -31,6 +49,7 @@ const ProviderList = () => {
{ value: 'builtin', text: t('tools.type.builtIn') },
{ value: 'api', text: t('tools.type.custom') },
{ value: 'workflow', text: t('tools.type.workflow') },
+ { value: 'mcp', text: 'MCP' },
]
const [tagFilterValue, setTagFilterValue] = useState([])
const handleTagsChange = (value: string[]) => {
@@ -72,7 +91,7 @@ const ProviderList = () => {
className='relative flex grow flex-col overflow-y-auto bg-background-body'
>
- {(filteredCollectionList.length > 0 || activeTab !== 'builtin') && (
+ {activeTab !== 'mcp' && (
{
/>
))}
- {!filteredCollectionList.length && activeTab === 'workflow' &&
}
+ {!filteredCollectionList.length && activeTab === 'workflow' &&
}
)}
{!filteredCollectionList.length && activeTab === 'builtin' && (
)}
- {
- enable_marketplace && activeTab === 'builtin' && (
-
{
- containerRef.current?.scrollTo({ top: containerRef.current.scrollHeight, behavior: 'smooth' })
- }}
- searchPluginText={keywords}
- filterPluginTags={tagFilterValue}
- />
- )
- }
-
+ {enable_marketplace && activeTab === 'builtin' && (
+
{
+ containerRef.current?.scrollTo({ top: containerRef.current.scrollHeight, behavior: 'smooth' })
+ }}
+ searchPluginText={keywords}
+ filterPluginTags={tagFilterValue}
+ />
+ )}
+ {activeTab === 'mcp' && (
+ {
return (
<>
{isCurrentWorkspaceManager && (
-
-
setIsShowEditCustomCollectionModal(true)}>
+
+
setIsShowEditCustomCollectionModal(true)}>
-
-
+
+
-
{t('tools.createCustomTool')}
+
{t('tools.createCustomTool')}
-
diff --git a/web/app/components/tools/provider/tool-item.tsx b/web/app/components/tools/provider/tool-item.tsx
index 161b62963b..d79d20cb9c 100644
--- a/web/app/components/tools/provider/tool-item.tsx
+++ b/web/app/components/tools/provider/tool-item.tsx
@@ -29,7 +29,7 @@ const ToolItem = ({
return (
<>
!disabled && setShowDetail(true)}
>
{tool.label[language]}
diff --git a/web/app/components/tools/types.ts b/web/app/components/tools/types.ts
index 32c468cde8..b83919ad18 100644
--- a/web/app/components/tools/types.ts
+++ b/web/app/components/tools/types.ts
@@ -7,7 +7,8 @@ export enum LOC {
export enum AuthType {
none = 'none',
- apiKey = 'api_key',
+ apiKeyHeader = 'api_key_header',
+ apiKeyQuery = 'api_key_query',
}
export enum AuthHeaderPrefix {
@@ -21,6 +22,7 @@ export type Credential = {
api_key_header?: string
api_key_value?: string
api_key_header_prefix?: AuthHeaderPrefix
+ api_key_query_param?: string
}
export enum CollectionType {
@@ -29,6 +31,7 @@ export enum CollectionType {
custom = 'api',
model = 'model',
workflow = 'workflow',
+ mcp = 'mcp',
}
export type Emoji = {
@@ -50,6 +53,10 @@ export type Collection = {
labels: string[]
plugin_id?: string
letter?: string
+ // MCP Server
+ server_url?: string
+ updated_at?: number
+ server_identifier?: string
}
export type ToolParameter = {
@@ -168,3 +175,11 @@ export type WorkflowToolProviderResponse = {
}
privacy_policy: string
}
+
+export type MCPServerDetail = {
+ id: string
+ server_code: string
+ description: string
+ status: string
+ parameters?: Record
+}
diff --git a/web/app/components/tools/utils/to-form-schema.ts b/web/app/components/tools/utils/to-form-schema.ts
index 179f59021e..ee7f3379ad 100644
--- a/web/app/components/tools/utils/to-form-schema.ts
+++ b/web/app/components/tools/utils/to-form-schema.ts
@@ -1,4 +1,7 @@
import type { ToolCredential, ToolParameter } from '../types'
+import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import { VarType as VarKindType } from '@/app/components/workflow/nodes/tool/types'
+
export const toType = (type: string) => {
switch (type) {
case 'string':
@@ -54,7 +57,7 @@ export const toolCredentialToFormSchemas = (parameters: ToolCredential[]) => {
return formSchemas
}
-export const addDefaultValue = (value: Record, formSchemas: { variable: string; default?: any }[]) => {
+export const addDefaultValue = (value: Record, formSchemas: { variable: string; type: string; default?: any }[]) => {
const newValues = { ...value }
formSchemas.forEach((formSchema) => {
const itemValue = value[formSchema.variable]
@@ -64,14 +67,47 @@ export const addDefaultValue = (value: Record, formSchemas: { varia
return newValues
}
-export const generateFormValue = (value: Record, formSchemas: { variable: string; default?: any }[], isReasoning = false) => {
+const correctInitialData = (type: string, target: any, defaultValue: any) => {
+ if (type === 'text-input' || type === 'secret-input')
+ target.type = 'mixed'
+
+ if (type === 'boolean') {
+ if (typeof defaultValue === 'string')
+ target.value = defaultValue === 'true' || defaultValue === '1'
+
+ if (typeof defaultValue === 'boolean')
+ target.value = defaultValue
+
+ if (typeof defaultValue === 'number')
+ target.value = defaultValue === 1
+ }
+
+ if (type === 'number-input') {
+ if (typeof defaultValue === 'string' && defaultValue !== '')
+ target.value = Number.parseFloat(defaultValue)
+ }
+
+ if (type === 'app-selector' || type === 'model-selector')
+ target.value = defaultValue
+
+ return target
+}
+
+export const generateFormValue = (value: Record, formSchemas: { variable: string; default?: any; type: string }[], isReasoning = false) => {
const newValues = {} as any
formSchemas.forEach((formSchema) => {
const itemValue = value[formSchema.variable]
if ((formSchema.default !== undefined) && (value === undefined || itemValue === null || itemValue === '' || itemValue === undefined)) {
+ const value = formSchema.default
newValues[formSchema.variable] = {
- ...(isReasoning ? { value: null, auto: 1 } : { value: formSchema.default }),
+ value: {
+ type: 'constant',
+ value: formSchema.default,
+ },
+ ...(isReasoning ? { auto: 1, value: null } : {}),
}
+ if (!isReasoning)
+ newValues[formSchema.variable].value = correctInitialData(formSchema.type, newValues[formSchema.variable].value, value)
}
})
return newValues
@@ -80,7 +116,9 @@ export const generateFormValue = (value: Record, formSchemas: { var
export const getPlainValue = (value: Record) => {
const plainValue = { ...value }
Object.keys(plainValue).forEach((key) => {
- plainValue[key] = value[key].value
+ plainValue[key] = {
+ ...value[key].value,
+ }
})
return plainValue
}
@@ -94,3 +132,65 @@ export const getStructureValue = (value: Record) => {
})
return newValue
}
+
+export const getConfiguredValue = (value: Record, formSchemas: { variable: string; type: string; default?: any }[]) => {
+ const newValues = { ...value }
+ formSchemas.forEach((formSchema) => {
+ const itemValue = value[formSchema.variable]
+ if ((formSchema.default !== undefined) && (value === undefined || itemValue === null || itemValue === '' || itemValue === undefined)) {
+ const value = formSchema.default
+ newValues[formSchema.variable] = {
+ type: 'constant',
+ value: formSchema.default,
+ }
+ newValues[formSchema.variable] = correctInitialData(formSchema.type, newValues[formSchema.variable], value)
+ }
+ })
+ return newValues
+}
+
+const getVarKindType = (type: FormTypeEnum) => {
+ if (type === FormTypeEnum.file || type === FormTypeEnum.files)
+ return VarKindType.variable
+ if (type === FormTypeEnum.select || type === FormTypeEnum.boolean || type === FormTypeEnum.textNumber)
+ return VarKindType.constant
+ if (type === FormTypeEnum.textInput || type === FormTypeEnum.secretInput)
+ return VarKindType.mixed
+ }
+
+export const generateAgentToolValue = (value: Record, formSchemas: { variable: string; default?: any; type: string }[], isReasoning = false) => {
+ const newValues = {} as any
+ if (!isReasoning) {
+ formSchemas.forEach((formSchema) => {
+ const itemValue = value[formSchema.variable]
+ newValues[formSchema.variable] = {
+ value: {
+ type: 'constant',
+ value: itemValue.value,
+ },
+ }
+ newValues[formSchema.variable].value = correctInitialData(formSchema.type, newValues[formSchema.variable].value, itemValue.value)
+ })
+ }
+ else {
+ formSchemas.forEach((formSchema) => {
+ const itemValue = value[formSchema.variable]
+ if (itemValue.auto === 1) {
+ newValues[formSchema.variable] = {
+ auto: 1,
+ value: null,
+ }
+ }
+ else {
+ newValues[formSchema.variable] = {
+ auto: 0,
+ value: itemValue.value || {
+ type: getVarKindType(formSchema.type as FormTypeEnum),
+ value: null,
+ },
+ }
+ }
+ })
+ }
+ return newValues
+}
diff --git a/web/app/components/workflow-app/components/workflow-children.tsx b/web/app/components/workflow-app/components/workflow-children.tsx
index 6a6bbcd61a..670630e574 100644
--- a/web/app/components/workflow-app/components/workflow-children.tsx
+++ b/web/app/components/workflow-app/components/workflow-children.tsx
@@ -5,10 +5,7 @@ import {
import type { EnvironmentVariable } from '@/app/components/workflow/types'
import { DSL_EXPORT_CHECK } from '@/app/components/workflow/constants'
import { useStore } from '@/app/components/workflow/store'
-import Features from '@/app/components/workflow/features'
import PluginDependency from '@/app/components/workflow/plugin-dependency'
-import UpdateDSLModal from '@/app/components/workflow/update-dsl-modal'
-import DSLExportConfirmModal from '@/app/components/workflow/dsl-export-confirm-modal'
import {
useDSL,
usePanelInteractions,
@@ -16,6 +13,17 @@ import {
import { useEventEmitterContextContext } from '@/context/event-emitter'
import WorkflowHeader from './workflow-header'
import WorkflowPanel from './workflow-panel'
+import dynamic from 'next/dynamic'
+
+const Features = dynamic(() => import('@/app/components/workflow/features'), {
+ ssr: false,
+})
+const UpdateDSLModal = dynamic(() => import('@/app/components/workflow/update-dsl-modal'), {
+ ssr: false,
+})
+const DSLExportConfirmModal = dynamic(() => import('@/app/components/workflow/dsl-export-confirm-modal'), {
+ ssr: false,
+})
const WorkflowChildren = () => {
const { eventEmitter } = useEventEmitterContextContext()
diff --git a/web/app/components/workflow-app/components/workflow-header/features-trigger.tsx b/web/app/components/workflow-app/components/workflow-header/features-trigger.tsx
index f183dd9545..fd48935147 100644
--- a/web/app/components/workflow-app/components/workflow-header/features-trigger.tsx
+++ b/web/app/components/workflow-app/components/workflow-header/features-trigger.tsx
@@ -3,7 +3,7 @@ import {
useCallback,
useMemo,
} from 'react'
-import { useNodes } from 'reactflow'
+import { useStore as useReactflowStore } from 'reactflow'
import { RiApps2AddLine } from '@remixicon/react'
import { useTranslation } from 'react-i18next'
import {
@@ -22,9 +22,8 @@ import {
BlockEnum,
InputVarType,
} from '@/app/components/workflow/types'
-import type { StartNodeType } from '@/app/components/workflow/nodes/start/types'
import { useToastContext } from '@/app/components/base/toast'
-import { usePublishWorkflow, useResetWorkflowVersionHistory } from '@/service/use-workflow'
+import { useInvalidateAppWorkflow, usePublishWorkflow, useResetWorkflowVersionHistory } from '@/service/use-workflow'
import type { PublishWorkflowParams } from '@/types/workflow'
import { fetchAppDetail } from '@/service/apps'
import { useStore as useAppStore } from '@/app/components/app/store'
@@ -42,9 +41,9 @@ const FeaturesTrigger = () => {
const publishedAt = useStore(s => s.publishedAt)
const draftUpdatedAt = useStore(s => s.draftUpdatedAt)
const toolPublished = useStore(s => s.toolPublished)
- const nodes = useNodes()
- const startNode = nodes.find(node => node.data.type === BlockEnum.Start)
- const startVariables = startNode?.data.variables
+ const startVariables = useReactflowStore(
+ s => s.getNodes().find(node => node.data.type === BlockEnum.Start)?.data.variables,
+ )
const fileSettings = useFeatures(s => s.features.file)
const variables = useMemo(() => {
const data = startVariables || []
@@ -90,6 +89,7 @@ const FeaturesTrigger = () => {
}
}, [appID, setAppDetail])
const { mutateAsync: publishWorkflow } = usePublishWorkflow(appID!)
+ const updatePublishedWorkflow = useInvalidateAppWorkflow()
const onPublish = useCallback(async (params?: PublishWorkflowParams) => {
if (await handleCheckBeforePublish()) {
const res = await publishWorkflow({
@@ -99,6 +99,7 @@ const FeaturesTrigger = () => {
if (res) {
notify({ type: 'success', message: t('common.api.actionSuccess') })
+ updatePublishedWorkflow(appID!)
updateAppDetail()
workflowStore.getState().setPublishedAt(res.created_at)
resetWorkflowVersionHistory()
@@ -107,7 +108,7 @@ const FeaturesTrigger = () => {
else {
throw new Error('Checklist failed')
}
- }, [handleCheckBeforePublish, notify, t, workflowStore, publishWorkflow, resetWorkflowVersionHistory, updateAppDetail])
+ }, [handleCheckBeforePublish, publishWorkflow, notify, t, updatePublishedWorkflow, appID, updateAppDetail, workflowStore, resetWorkflowVersionHistory])
const onPublisherToggle = useCallback((state: boolean) => {
if (state)
diff --git a/web/app/components/workflow-app/components/workflow-main.tsx b/web/app/components/workflow-app/components/workflow-main.tsx
index 2f2295cb59..d425e6f595 100644
--- a/web/app/components/workflow-app/components/workflow-main.tsx
+++ b/web/app/components/workflow-app/components/workflow-main.tsx
@@ -7,11 +7,15 @@ import { WorkflowWithInnerContext } from '@/app/components/workflow'
import type { WorkflowProps } from '@/app/components/workflow'
import WorkflowChildren from './workflow-children'
import {
+ useConfigsMap,
+ useInspectVarsCrud,
useNodesSyncDraft,
+ useSetWorkflowVarsWithValue,
useWorkflowRefreshDraft,
useWorkflowRun,
useWorkflowStartRun,
} from '../hooks'
+import { useStore, useWorkflowStore } from '@/app/components/workflow/store'
type WorkflowMainProps = Pick
const WorkflowMain = ({
@@ -20,14 +24,28 @@ const WorkflowMain = ({
viewport,
}: WorkflowMainProps) => {
const featuresStore = useFeaturesStore()
+ const workflowStore = useWorkflowStore()
const handleWorkflowDataUpdate = useCallback((payload: any) => {
- if (payload.features && featuresStore) {
+ const {
+ features,
+ conversation_variables,
+ environment_variables,
+ } = payload
+ if (features && featuresStore) {
const { setFeatures } = featuresStore.getState()
- setFeatures(payload.features)
+ setFeatures(features)
}
- }, [featuresStore])
+ if (conversation_variables) {
+ const { setConversationVariables } = workflowStore.getState()
+ setConversationVariables(conversation_variables)
+ }
+ if (environment_variables) {
+ const { setEnvironmentVariables } = workflowStore.getState()
+ setEnvironmentVariables(environment_variables)
+ }
+ }, [featuresStore, workflowStore])
const {
doSyncWorkflowDraft,
@@ -46,6 +64,28 @@ const WorkflowMain = ({
handleWorkflowStartRunInChatflow,
handleWorkflowStartRunInWorkflow,
} = useWorkflowStartRun()
+ const appId = useStore(s => s.appId)
+ const { fetchInspectVars } = useSetWorkflowVarsWithValue({
+ flowId: appId,
+ ...useConfigsMap(),
+ })
+ const {
+ hasNodeInspectVars,
+ hasSetInspectVar,
+ fetchInspectVarValue,
+ editInspectVarValue,
+ renameInspectVarName,
+ appendNodeInspectVars,
+ deleteInspectVar,
+ deleteNodeInspectorVars,
+ deleteAllInspectorVars,
+ isInspectVarEdited,
+ resetToLastRunVar,
+ invalidateSysVarValues,
+ resetConversationVar,
+ invalidateConversationVarValues,
+ } = useInspectVarsCrud()
+ const configsMap = useConfigsMap()
const hooksStore = useMemo(() => {
return {
@@ -60,6 +100,22 @@ const WorkflowMain = ({
handleStartWorkflowRun,
handleWorkflowStartRunInChatflow,
handleWorkflowStartRunInWorkflow,
+ fetchInspectVars,
+ hasNodeInspectVars,
+ hasSetInspectVar,
+ fetchInspectVarValue,
+ editInspectVarValue,
+ renameInspectVarName,
+ appendNodeInspectVars,
+ deleteInspectVar,
+ deleteNodeInspectorVars,
+ deleteAllInspectorVars,
+ isInspectVarEdited,
+ resetToLastRunVar,
+ invalidateSysVarValues,
+ resetConversationVar,
+ invalidateConversationVarValues,
+ configsMap,
}
}, [
syncWorkflowDraftWhenPageClose,
@@ -73,6 +129,22 @@ const WorkflowMain = ({
handleStartWorkflowRun,
handleWorkflowStartRunInChatflow,
handleWorkflowStartRunInWorkflow,
+ fetchInspectVars,
+ hasNodeInspectVars,
+ hasSetInspectVar,
+ fetchInspectVarValue,
+ editInspectVarValue,
+ renameInspectVarName,
+ appendNodeInspectVars,
+ deleteInspectVar,
+ deleteNodeInspectorVars,
+ deleteAllInspectorVars,
+ isInspectVarEdited,
+ resetToLastRunVar,
+ invalidateSysVarValues,
+ resetConversationVar,
+ invalidateConversationVarValues,
+ configsMap,
])
return (
diff --git a/web/app/components/workflow-app/components/workflow-panel.tsx b/web/app/components/workflow-app/components/workflow-panel.tsx
index dd368660ce..013f2834ef 100644
--- a/web/app/components/workflow-app/components/workflow-panel.tsx
+++ b/web/app/components/workflow-app/components/workflow-panel.tsx
@@ -4,17 +4,35 @@ import { useStore } from '@/app/components/workflow/store'
import {
useIsChatMode,
} from '../hooks'
-import DebugAndPreview from '@/app/components/workflow/panel/debug-and-preview'
-import Record from '@/app/components/workflow/panel/record'
-import WorkflowPreview from '@/app/components/workflow/panel/workflow-preview'
-import ChatRecord from '@/app/components/workflow/panel/chat-record'
-import ChatVariablePanel from '@/app/components/workflow/panel/chat-variable-panel'
-import GlobalVariablePanel from '@/app/components/workflow/panel/global-variable-panel'
-import VersionHistoryPanel from '@/app/components/workflow/panel/version-history-panel'
import { useStore as useAppStore } from '@/app/components/app/store'
-import MessageLogModal from '@/app/components/base/message-log-modal'
import type { PanelProps } from '@/app/components/workflow/panel'
import Panel from '@/app/components/workflow/panel'
+import dynamic from 'next/dynamic'
+
+const MessageLogModal = dynamic(() => import('@/app/components/base/message-log-modal'), {
+ ssr: false,
+})
+const Record = dynamic(() => import('@/app/components/workflow/panel/record'), {
+ ssr: false,
+})
+const ChatRecord = dynamic(() => import('@/app/components/workflow/panel/chat-record'), {
+ ssr: false,
+})
+const DebugAndPreview = dynamic(() => import('@/app/components/workflow/panel/debug-and-preview'), {
+ ssr: false,
+})
+const WorkflowPreview = dynamic(() => import('@/app/components/workflow/panel/workflow-preview'), {
+ ssr: false,
+})
+const ChatVariablePanel = dynamic(() => import('@/app/components/workflow/panel/chat-variable-panel'), {
+ ssr: false,
+})
+const GlobalVariablePanel = dynamic(() => import('@/app/components/workflow/panel/global-variable-panel'), {
+ ssr: false,
+})
+const VersionHistoryPanel = dynamic(() => import('@/app/components/workflow/panel/version-history-panel'), {
+ ssr: false,
+})
const WorkflowPanelOnLeft = () => {
const { currentLogItem, setCurrentLogItem, showMessageLogModal, setShowMessageLogModal, currentLogModalActiveTab } = useAppStore(useShallow(state => ({
diff --git a/web/app/components/workflow-app/hooks/index.ts b/web/app/components/workflow-app/hooks/index.ts
index 6373a8591c..9e4f94965b 100644
--- a/web/app/components/workflow-app/hooks/index.ts
+++ b/web/app/components/workflow-app/hooks/index.ts
@@ -5,3 +5,6 @@ export * from './use-workflow-run'
export * from './use-workflow-start-run'
export * from './use-is-chat-mode'
export * from './use-workflow-refresh-draft'
+export * from '../../workflow/hooks/use-fetch-workflow-inspect-vars'
+export * from './use-inspect-vars-crud'
+export * from './use-configs-map'
diff --git a/web/app/components/workflow-app/hooks/use-configs-map.ts b/web/app/components/workflow-app/hooks/use-configs-map.ts
new file mode 100644
index 0000000000..0db4f77856
--- /dev/null
+++ b/web/app/components/workflow-app/hooks/use-configs-map.ts
@@ -0,0 +1,12 @@
+import { useMemo } from 'react'
+import { useStore } from '@/app/components/workflow/store'
+
+export const useConfigsMap = () => {
+ const appId = useStore(s => s.appId)
+ return useMemo(() => {
+ return {
+ conversationVarsUrl: `apps/${appId}/workflows/draft/conversation-variables`,
+ systemVarsUrl: `apps/${appId}/workflows/draft/system-variables`,
+ }
+ }, [appId])
+}
diff --git a/web/app/components/workflow-app/hooks/use-inspect-vars-crud.ts b/web/app/components/workflow-app/hooks/use-inspect-vars-crud.ts
new file mode 100644
index 0000000000..109ee85f96
--- /dev/null
+++ b/web/app/components/workflow-app/hooks/use-inspect-vars-crud.ts
@@ -0,0 +1,16 @@
+import { useStore } from '@/app/components/workflow/store'
+import { useInspectVarsCrudCommon } from '../../workflow/hooks/use-inspect-vars-crud-common'
+import { useConfigsMap } from './use-configs-map'
+
+export const useInspectVarsCrud = () => {
+ const appId = useStore(s => s.appId)
+ const configsMap = useConfigsMap()
+ const apis = useInspectVarsCrudCommon({
+ flowId: appId,
+ ...configsMap,
+ })
+
+ return {
+ ...apis,
+ }
+}
diff --git a/web/app/components/workflow-app/hooks/use-workflow-init.ts b/web/app/components/workflow-app/hooks/use-workflow-init.ts
index e1c4c25a4e..d63c5ca7b9 100644
--- a/web/app/components/workflow-app/hooks/use-workflow-init.ts
+++ b/web/app/components/workflow-app/hooks/use-workflow-init.ts
@@ -17,7 +17,6 @@ import {
} from '@/service/workflow'
import type { FetchWorkflowDraftResponse } from '@/types/workflow'
import { useWorkflowConfig } from '@/service/use-workflow'
-
export const useWorkflowInit = () => {
const workflowStore = useWorkflowStore()
const {
@@ -84,7 +83,6 @@ export const useWorkflowInit = () => {
useEffect(() => {
handleGetInitialWorkflowData()
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [])
const handleFetchPreloadData = useCallback(async () => {
diff --git a/web/app/components/workflow-app/hooks/use-workflow-run.ts b/web/app/components/workflow-app/hooks/use-workflow-run.ts
index 1e484d0760..c303211715 100644
--- a/web/app/components/workflow-app/hooks/use-workflow-run.ts
+++ b/web/app/components/workflow-app/hooks/use-workflow-run.ts
@@ -19,6 +19,9 @@ import { AudioPlayerManager } from '@/app/components/base/audio-btn/audio.player
import type { VersionHistory } from '@/types/workflow'
import { noop } from 'lodash-es'
import { useNodesSyncDraft } from './use-nodes-sync-draft'
+import { useInvalidAllLastRun } from '@/service/use-workflow'
+import { useSetWorkflowVarsWithValue } from '../../workflow/hooks/use-fetch-workflow-inspect-vars'
+import { useConfigsMap } from './use-configs-map'
export const useWorkflowRun = () => {
const store = useStoreApi()
@@ -28,6 +31,13 @@ export const useWorkflowRun = () => {
const { doSyncWorkflowDraft } = useNodesSyncDraft()
const { handleUpdateWorkflowCanvas } = useWorkflowUpdate()
const pathname = usePathname()
+ const appId = useAppStore.getState().appDetail?.id
+ const invalidAllLastRun = useInvalidAllLastRun(appId as string)
+ const configsMap = useConfigsMap()
+ const { fetchInspectVars } = useSetWorkflowVarsWithValue({
+ flowId: appId as string,
+ ...configsMap,
+ })
const {
handleWorkflowStarted,
@@ -140,11 +150,13 @@ export const useWorkflowRun = () => {
clientHeight,
} = workflowContainer!
+ const isInWorkflowDebug = appDetail?.mode === 'workflow'
+
let url = ''
if (appDetail?.mode === 'advanced-chat')
url = `/apps/${appDetail.id}/advanced-chat/workflows/draft/run`
- if (appDetail?.mode === 'workflow')
+ if (isInWorkflowDebug)
url = `/apps/${appDetail.id}/workflows/draft/run`
const {
@@ -189,6 +201,10 @@ export const useWorkflowRun = () => {
if (onWorkflowFinished)
onWorkflowFinished(params)
+ if (isInWorkflowDebug) {
+ fetchInspectVars()
+ invalidAllLastRun()
+ }
},
onError: (params) => {
handleWorkflowFailed()
@@ -292,26 +308,7 @@ export const useWorkflowRun = () => {
...restCallback,
},
)
- }, [
- store,
- workflowStore,
- doSyncWorkflowDraft,
- handleWorkflowStarted,
- handleWorkflowFinished,
- handleWorkflowFailed,
- handleWorkflowNodeStarted,
- handleWorkflowNodeFinished,
- handleWorkflowNodeIterationStarted,
- handleWorkflowNodeIterationNext,
- handleWorkflowNodeIterationFinished,
- handleWorkflowNodeLoopStarted,
- handleWorkflowNodeLoopNext,
- handleWorkflowNodeLoopFinished,
- handleWorkflowNodeRetry,
- handleWorkflowTextChunk,
- handleWorkflowTextReplace,
- handleWorkflowAgentLog,
- pathname],
+ }, [store, doSyncWorkflowDraft, workflowStore, pathname, handleWorkflowStarted, handleWorkflowFinished, fetchInspectVars, invalidAllLastRun, handleWorkflowFailed, handleWorkflowNodeStarted, handleWorkflowNodeFinished, handleWorkflowNodeIterationStarted, handleWorkflowNodeIterationNext, handleWorkflowNodeIterationFinished, handleWorkflowNodeLoopStarted, handleWorkflowNodeLoopNext, handleWorkflowNodeLoopFinished, handleWorkflowNodeRetry, handleWorkflowAgentLog, handleWorkflowTextChunk, handleWorkflowTextReplace],
)
const handleStopRun = useCallback((taskId: string) => {
diff --git a/web/app/components/workflow-app/hooks/use-workflow-template.ts b/web/app/components/workflow-app/hooks/use-workflow-template.ts
index 9f47b981dc..2bab08f205 100644
--- a/web/app/components/workflow-app/hooks/use-workflow-template.ts
+++ b/web/app/components/workflow-app/hooks/use-workflow-template.ts
@@ -22,7 +22,7 @@ export const useWorkflowTemplate = () => {
...nodesInitialData.llm,
memory: {
window: { enabled: false, size: 10 },
- query_prompt_template: '{{#sys.query#}}',
+ query_prompt_template: '{{#sys.query#}}\n\n{{#sys.files#}}',
},
selected: true,
},
diff --git a/web/app/components/workflow-app/index.tsx b/web/app/components/workflow-app/index.tsx
index 761a7f29c4..471d4de0d8 100644
--- a/web/app/components/workflow-app/index.tsx
+++ b/web/app/components/workflow-app/index.tsx
@@ -1,3 +1,5 @@
+'use client'
+
import {
useMemo,
} from 'react'
diff --git a/web/app/components/workflow/block-selector/all-tools.tsx b/web/app/components/workflow/block-selector/all-tools.tsx
index 36831aee3c..f155b644a1 100644
--- a/web/app/components/workflow/block-selector/all-tools.tsx
+++ b/web/app/components/workflow/block-selector/all-tools.tsx
@@ -5,10 +5,11 @@ import {
useState,
} from 'react'
import type {
+ BlockEnum,
OnSelectBlock,
ToolWithProvider,
} from '../types'
-import type { ToolValue } from './types'
+import type { ToolDefaultValue, ToolValue } from './types'
import { ToolTypeEnum } from './types'
import Tools from './tools'
import { useToolTabs } from './hooks'
@@ -17,8 +18,6 @@ import cn from '@/utils/classnames'
import { useGetLanguage } from '@/context/i18n'
import type { ListRef } from '@/app/components/workflow/block-selector/market-place-plugin/list'
import PluginList, { type ListProps } from '@/app/components/workflow/block-selector/market-place-plugin/list'
-import ActionButton from '../../base/action-button'
-import { RiAddLine } from '@remixicon/react'
import { PluginType } from '../../plugins/types'
import { useMarketplacePlugins } from '../../plugins/marketplace/hooks'
import { useGlobalPublicStore } from '@/context/global-public-context'
@@ -31,11 +30,12 @@ type AllToolsProps = {
buildInTools: ToolWithProvider[]
customTools: ToolWithProvider[]
workflowTools: ToolWithProvider[]
+ mcpTools: ToolWithProvider[]
onSelect: OnSelectBlock
- supportAddCustomTool?: boolean
- onAddedCustomTool?: () => void
- onShowAddCustomCollectionModal?: () => void
+ canNotSelectMultiple?: boolean
+ onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void
selectedTools?: ToolValue[]
+ canChooseMCPTool?: boolean
}
const DEFAULT_TAGS: AllToolsProps['tags'] = []
@@ -46,12 +46,14 @@ const AllTools = ({
searchText,
tags = DEFAULT_TAGS,
onSelect,
+ canNotSelectMultiple,
+ onSelectMultiple,
buildInTools,
workflowTools,
customTools,
- supportAddCustomTool,
- onShowAddCustomCollectionModal,
+ mcpTools = [],
selectedTools,
+ canChooseMCPTool,
}: AllToolsProps) => {
const language = useGetLanguage()
const tabs = useToolTabs()
@@ -64,13 +66,15 @@ const AllTools = ({
const tools = useMemo(() => {
let mergedTools: ToolWithProvider[] = []
if (activeTab === ToolTypeEnum.All)
- mergedTools = [...buildInTools, ...customTools, ...workflowTools]
+ mergedTools = [...buildInTools, ...customTools, ...workflowTools, ...mcpTools]
if (activeTab === ToolTypeEnum.BuiltIn)
mergedTools = buildInTools
if (activeTab === ToolTypeEnum.Custom)
mergedTools = customTools
if (activeTab === ToolTypeEnum.Workflow)
mergedTools = workflowTools
+ if (activeTab === ToolTypeEnum.MCP)
+ mergedTools = mcpTools
if (!hasFilter)
return mergedTools.filter(toolWithProvider => toolWithProvider.tools.length > 0)
@@ -80,7 +84,7 @@ const AllTools = ({
return tool.label[language].toLowerCase().includes(searchText.toLowerCase()) || tool.name.toLowerCase().includes(searchText.toLowerCase())
})
})
- }, [activeTab, buildInTools, customTools, workflowTools, searchText, language, hasFilter])
+ }, [activeTab, buildInTools, customTools, workflowTools, mcpTools, searchText, language, hasFilter])
const {
queryPluginsWithDebounced: fetchPlugins,
@@ -88,9 +92,8 @@ const AllTools = ({
} = useMarketplacePlugins()
const { enable_marketplace } = useGlobalPublicStore(s => s.systemFeatures)
-
useEffect(() => {
- if (enable_marketplace) return
+ if (!enable_marketplace) return
if (searchText || tags.length > 0) {
fetchPlugins({
query: searchText,
@@ -98,15 +101,15 @@ const AllTools = ({
category: PluginType.tool,
})
}
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [searchText, tags, enable_marketplace])
const pluginRef = useRef(null)
const wrapElemRef = useRef(null)
+ const isSupportGroupView = [ToolTypeEnum.All, ToolTypeEnum.BuiltIn].includes(activeTab)
return (
-
-
+
+
{
tabs.map(tab => (
@@ -124,17 +127,8 @@ const AllTools = ({
))
}
-
- {supportAddCustomTool && (
-
+ {isSupportGroupView && (
+
)}
{/* Plugins from marketplace */}
{enable_marketplace &&
{
]
}
-export const useToolTabs = () => {
+export const useToolTabs = (isHideMCPTools?: boolean) => {
const { t } = useTranslation()
-
- return [
+ const tabs = [
{
key: ToolTypeEnum.All,
name: t('workflow.tabs.allTool'),
@@ -52,4 +51,12 @@ export const useToolTabs = () => {
name: t('workflow.tabs.workflowTool'),
},
]
+ if(!isHideMCPTools) {
+ tabs.push({
+ key: ToolTypeEnum.MCP,
+ name: 'MCP',
+ })
+ }
+
+ return tabs
}
diff --git a/web/app/components/workflow/block-selector/index-bar.tsx b/web/app/components/workflow/block-selector/index-bar.tsx
index 4d8bedffbe..097a16eb94 100644
--- a/web/app/components/workflow/block-selector/index-bar.tsx
+++ b/web/app/components/workflow/block-selector/index-bar.tsx
@@ -83,8 +83,8 @@ const IndexBar: FC = ({ letters, itemRefs, className }) => {
element.scrollIntoView({ behavior: 'smooth' })
}
return (
-
-
+
+
{letters.map(letter => (
handleIndexClick(letter)}>
{letter}
diff --git a/web/app/components/workflow/block-selector/index.tsx b/web/app/components/workflow/block-selector/index.tsx
index 9e55a24d9e..0673ca0c0d 100644
--- a/web/app/components/workflow/block-selector/index.tsx
+++ b/web/app/components/workflow/block-selector/index.tsx
@@ -129,33 +129,35 @@ const NodeSelector: FC
= ({
+ }
onSelect={handleSelect}
searchText={searchText}
tags={tags}
diff --git a/web/app/components/workflow/block-selector/market-place-plugin/action.tsx b/web/app/components/workflow/block-selector/market-place-plugin/action.tsx
index 9c3c69d601..56ee420cff 100644
--- a/web/app/components/workflow/block-selector/market-place-plugin/action.tsx
+++ b/web/app/components/workflow/block-selector/market-place-plugin/action.tsx
@@ -12,9 +12,9 @@ import {
PortalToFollowElemTrigger,
} from '@/app/components/base/portal-to-follow-elem'
import cn from '@/utils/classnames'
-import { MARKETPLACE_URL_PREFIX } from '@/config'
import { useDownloadPlugin } from '@/service/use-plugins'
import { downloadFile } from '@/utils/format'
+import { getMarketplaceUrl } from '@/utils/var'
type Props = {
open: boolean
@@ -60,7 +60,6 @@ const OperationDropdown: FC = ({
downloadFile({ data: blob, fileName })
setNeedDownload(false)
}
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [blob])
return (
= ({
diff --git a/web/app/components/workflow/block-selector/market-place-plugin/list.tsx b/web/app/components/workflow/block-selector/market-place-plugin/list.tsx
index 27cd2ae3ea..98b799adf4 100644
--- a/web/app/components/workflow/block-selector/market-place-plugin/list.tsx
+++ b/web/app/components/workflow/block-selector/market-place-plugin/list.tsx
@@ -6,9 +6,9 @@ import Item from './item'
import type { Plugin } from '@/app/components/plugins/types.ts'
import cn from '@/utils/classnames'
import Link from 'next/link'
-import { marketplaceUrlPrefix } from '@/config'
import { RiArrowRightUpLine, RiSearchLine } from '@remixicon/react'
import { noop } from 'lodash-es'
+import { getMarketplaceUrl } from '@/utils/var'
export type ListProps = {
wrapElemRef: React.RefObject
@@ -32,7 +32,7 @@ const List = forwardRef(({
const { t } = useTranslation()
const hasFilter = !searchText
const hasRes = list.length > 0
- const urlWithSearchText = `${marketplaceUrlPrefix}/?q=${searchText}&tags=${tags.join(',')}`
+ const urlWithSearchText = getMarketplaceUrl('', { q: searchText, tags: tags.join(',') })
const nextToStickyELemRef = useRef(null)
const { handleScroll, scrollPosition } = useStickyScroll({
@@ -56,7 +56,6 @@ const List = forwardRef(({
useEffect(() => {
handleScroll()
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [list])
const handleHeadClick = () => {
@@ -71,7 +70,7 @@ const List = forwardRef(({
return (
{t('plugin.findMoreInMarketplace')}
@@ -80,7 +79,7 @@ const List = forwardRef(({
)
}
- const maxWidthClassName = toolContentClassName || 'max-w-[300px]'
+ const maxWidthClassName = toolContentClassName || 'max-w-[100%]'
return (
<>
@@ -109,18 +108,20 @@ const List = forwardRef(({
onAction={noop}
/>
))}
-
-
-
-
-
{t('plugin.searchInMarketplace')}
-
-
-
+
+
+
+
{t('plugin.searchInMarketplace')}
+
+
+
)
diff --git a/web/app/components/workflow/block-selector/tabs.tsx b/web/app/components/workflow/block-selector/tabs.tsx
index 67aaaba1a5..3f3fed2ca9 100644
--- a/web/app/components/workflow/block-selector/tabs.tsx
+++ b/web/app/components/workflow/block-selector/tabs.tsx
@@ -1,6 +1,6 @@
import type { FC } from 'react'
import { memo } from 'react'
-import { useAllBuiltInTools, useAllCustomTools, useAllWorkflowTools } from '@/service/use-tools'
+import { useAllBuiltInTools, useAllCustomTools, useAllMCPTools, useAllWorkflowTools } from '@/service/use-tools'
import type { BlockEnum } from '../types'
import { useTabs } from './hooks'
import type { ToolDefaultValue } from './types'
@@ -16,6 +16,7 @@ export type TabsProps = {
tags: string[]
onSelect: (type: BlockEnum, tool?: ToolDefaultValue) => void
availableBlocksTypes?: BlockEnum[]
+ filterElem: React.ReactNode
noBlocks?: boolean
}
const Tabs: FC
= ({
@@ -25,26 +26,28 @@ const Tabs: FC = ({
searchText,
onSelect,
availableBlocksTypes,
+ filterElem,
noBlocks,
}) => {
const tabs = useTabs()
const { data: buildInTools } = useAllBuiltInTools()
const { data: customTools } = useAllCustomTools()
const { data: workflowTools } = useAllWorkflowTools()
+ const { data: mcpTools } = useAllMCPTools()
return (
e.stopPropagation()}>
{
!noBlocks && (
-
+
{
tabs.map(tab => (
onActiveTabChange(tab.key)}
@@ -56,25 +59,30 @@ const Tabs: FC = ({
)
}
+ {filterElem}
{
activeTab === TabsEnum.Blocks && !noBlocks && (
-
+
+
)
}
{
activeTab === TabsEnum.Tools && (
)
}
diff --git a/web/app/components/workflow/block-selector/tool-picker.tsx b/web/app/components/workflow/block-selector/tool-picker.tsx
index dbb49fde75..d97a4f3a1b 100644
--- a/web/app/components/workflow/block-selector/tool-picker.tsx
+++ b/web/app/components/workflow/block-selector/tool-picker.tsx
@@ -23,7 +23,7 @@ import {
} from '@/service/tools'
import type { CustomCollectionBackend } from '@/app/components/tools/types'
import Toast from '@/app/components/base/toast'
-import { useAllBuiltInTools, useAllCustomTools, useAllWorkflowTools, useInvalidateAllCustomTools } from '@/service/use-tools'
+import { useAllBuiltInTools, useAllCustomTools, useAllMCPTools, useAllWorkflowTools, useInvalidateAllCustomTools } from '@/service/use-tools'
import cn from '@/utils/classnames'
type Props = {
@@ -35,9 +35,11 @@ type Props = {
isShow: boolean
onShowChange: (isShow: boolean) => void
onSelect: (tool: ToolDefaultValue) => void
+ onSelectMultiple: (tools: ToolDefaultValue[]) => void
supportAddCustomTool?: boolean
scope?: string
selectedTools?: ToolValue[]
+ canChooseMCPTool?: boolean
}
const ToolPicker: FC
= ({
@@ -48,10 +50,12 @@ const ToolPicker: FC = ({
isShow,
onShowChange,
onSelect,
+ onSelectMultiple,
supportAddCustomTool,
scope = 'all',
selectedTools,
panelClassName,
+ canChooseMCPTool,
}) => {
const { t } = useTranslation()
const [searchText, setSearchText] = useState('')
@@ -61,6 +65,7 @@ const ToolPicker: FC = ({
const { data: customTools } = useAllCustomTools()
const invalidateCustomTools = useInvalidateAllCustomTools()
const { data: workflowTools } = useAllWorkflowTools()
+ const { data: mcpTools } = useAllMCPTools()
const { builtinToolList, customToolList, workflowToolList } = useMemo(() => {
if (scope === 'plugins') {
@@ -102,6 +107,10 @@ const ToolPicker: FC = ({
onSelect(tool!)
}
+ const handleSelectMultiple = (_type: BlockEnum, tools: ToolDefaultValue[]) => {
+ onSelectMultiple(tools)
+ }
+
const [isShowEditCollectionToolModal, {
setFalse: hideEditCustomCollectionModal,
setTrue: showEditCustomCollectionModal,
@@ -142,7 +151,7 @@ const ToolPicker: FC = ({
-
+
= ({
onTagsChange={setTags}
size='small'
placeholder={t('plugin.searchTools')!}
+ supportAddCustomTool={supportAddCustomTool}
+ onAddedCustomTool={handleAddedCustomTool}
+ onShowAddCustomCollectionModal={showEditCustomCollectionModal}
+ inputClassName='grow'
+
/>
diff --git a/web/app/components/workflow/block-selector/tool/action-item.tsx b/web/app/components/workflow/block-selector/tool/action-item.tsx
index dc9b9b9114..e5e33614b0 100644
--- a/web/app/components/workflow/block-selector/tool/action-item.tsx
+++ b/web/app/components/workflow/block-selector/tool/action-item.tsx
@@ -10,13 +10,12 @@ import { useGetLanguage } from '@/context/i18n'
import BlockIcon from '../../block-icon'
import cn from '@/utils/classnames'
import { useTranslation } from 'react-i18next'
-import { RiCheckLine } from '@remixicon/react'
-import Badge from '@/app/components/base/badge'
type Props = {
provider: ToolWithProvider
payload: Tool
disabled?: boolean
+ isAdded?: boolean
onSelect: (type: BlockEnum, tool?: ToolDefaultValue) => void
}
@@ -25,6 +24,7 @@ const ToolItem: FC
= ({
payload,
onSelect,
disabled,
+ isAdded,
}) => {
const { t } = useTranslation()
@@ -71,18 +71,16 @@ const ToolItem: FC = ({
output_schema: payload.output_schema,
paramSchemas: payload.parameters,
params,
+ meta: provider.meta,
})
}}
>
- {payload.label[language]}
- {disabled &&
- {t('tools.addToolModal.added')}
-
- }
+
+ {payload.label[language]}
+
+ {isAdded && (
+ {t('tools.addToolModal.added')}
+ )}
= ({
letters,
payload,
isShowLetterIndex,
+ indexBar,
hasSearchText,
onSelect,
+ canNotSelectMultiple,
+ onSelectMultiple,
toolRefs,
selectedTools,
+ canChooseMCPTool,
}) => {
const firstLetterToolIds = useMemo(() => {
const res: Record = {}
@@ -37,26 +45,31 @@ const ToolViewFlatView: FC = ({
return res
}, [payload, letters])
return (
-
- {payload.map(tool => (
-
{
- const letter = firstLetterToolIds[tool.id]
- if (letter)
- toolRefs.current[letter] = el
- }}
- >
-
- ))}
+
+
+ {payload.map(tool => (
+
{
+ const letter = firstLetterToolIds[tool.id]
+ if (letter)
+ toolRefs.current[letter] = el
+ }}
+ >
+
+ ))}
+
+ {isShowLetterIndex && indexBar}
)
}
diff --git a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx
index d6c567f8e2..b3f7aab4df 100644
--- a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx
@@ -12,7 +12,10 @@ type Props = {
toolList: ToolWithProvider[]
hasSearchText: boolean
onSelect: (type: BlockEnum, tool?: ToolDefaultValue) => void
+ canNotSelectMultiple?: boolean
+ onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void
selectedTools?: ToolValue[]
+ canChooseMCPTool?: boolean
}
const Item: FC
= ({
@@ -20,7 +23,10 @@ const Item: FC = ({
toolList,
hasSearchText,
onSelect,
+ canNotSelectMultiple,
+ onSelectMultiple,
selectedTools,
+ canChooseMCPTool,
}) => {
return (
@@ -36,7 +42,10 @@ const Item: FC
= ({
isShowLetterIndex={false}
hasSearchText={hasSearchText}
onSelect={onSelect}
+ canNotSelectMultiple={canNotSelectMultiple}
+ onSelectMultiple={onSelectMultiple}
selectedTools={selectedTools}
+ canChooseMCPTool={canChooseMCPTool}
/>
))}
hasSearchText: boolean
onSelect: (type: BlockEnum, tool?: ToolDefaultValue) => void
+ canNotSelectMultiple?: boolean
+ onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void
selectedTools?: ToolValue[]
+ canChooseMCPTool?: boolean
}
const ToolListTreeView: FC = ({
payload,
hasSearchText,
onSelect,
+ canNotSelectMultiple,
+ onSelectMultiple,
selectedTools,
+ canChooseMCPTool,
}) => {
const { t } = useTranslation()
const getI18nGroupName = useCallback((name: string) => {
@@ -46,7 +52,10 @@ const ToolListTreeView: FC = ({
toolList={payload[groupName]}
hasSearchText={hasSearchText}
onSelect={onSelect}
+ canNotSelectMultiple={canNotSelectMultiple}
+ onSelectMultiple={onSelectMultiple}
selectedTools={selectedTools}
+ canChooseMCPTool={canChooseMCPTool}
/>
))}
= ({
className,
payload,
viewType,
- isShowLetterIndex,
hasSearchText,
onSelect,
+ canNotSelectMultiple,
+ onSelectMultiple,
selectedTools,
+ canChooseMCPTool,
}) => {
const { t } = useTranslation()
const language = useGetLanguage()
const isFlatView = viewType === ViewType.flat
+ const notShowProvider = payload.type === CollectionType.workflow
const actions = payload.tools
- const hasAction = true // Now always support actions
+ const hasAction = !notShowProvider
const [isFold, setFold] = React.useState(true)
- const getIsDisabled = (tool: ToolType) => {
+ const ref = useRef(null)
+ const isHovering = useHover(ref)
+ const isMCPTool = payload.type === CollectionType.mcp
+ const isShowCanNotChooseMCPTip = !canChooseMCPTool && isMCPTool
+ const getIsDisabled = useCallback((tool: ToolType) => {
if (!selectedTools || !selectedTools.length) return false
- return selectedTools.some(selectedTool => selectedTool.provider_name === payload.name && selectedTool.tool_name === tool.name)
- }
+ return selectedTools.some(selectedTool => (selectedTool.provider_name === payload.name || selectedTool.provider_name === payload.id) && selectedTool.tool_name === tool.name)
+ }, [payload.id, payload.name, selectedTools])
+
+ const totalToolsNum = actions.length
+ const selectedToolsNum = actions.filter(action => getIsDisabled(action)).length
+ const isAllSelected = selectedToolsNum === totalToolsNum
+
+ const notShowProviderSelectInfo = useMemo(() => {
+ if (isAllSelected) {
+ return (
+
+ {t('tools.addToolModal.added')}
+
+ )
+ }
+ }, [isAllSelected, t])
+ const selectedInfo = useMemo(() => {
+ if (isHovering && !isAllSelected) {
+ return (
+ {
+ onSelectMultiple?.(BlockEnum.Tool, actions.filter(action => !getIsDisabled(action)).map((tool) => {
+ const params: Record = {}
+ if (tool.parameters) {
+ tool.parameters.forEach((item) => {
+ params[item.name] = ''
+ })
+ }
+ return {
+ provider_id: payload.id,
+ provider_type: payload.type,
+ provider_name: payload.name,
+ tool_name: tool.name,
+ tool_label: tool.label[language],
+ tool_description: tool.description[language],
+ title: tool.label[language],
+ is_team_authorization: payload.is_team_authorization,
+ output_schema: tool.output_schema,
+ paramSchemas: tool.parameters,
+ params,
+ }
+ }))
+ }}
+ >
+ {t('workflow.tabs.addAll')}
+
+ )
+ }
+
+ if (selectedToolsNum === 0)
+ return <>
+
+ return (
+
+ {isAllSelected
+ ? t('workflow.tabs.allAdded')
+ : `${selectedToolsNum} / ${totalToolsNum}`
+ }
+
+ )
+ }, [actions, getIsDisabled, isAllSelected, isHovering, language, onSelectMultiple, payload.id, payload.is_team_authorization, payload.name, payload.type, selectedToolsNum, t, totalToolsNum])
+
useEffect(() => {
if (hasSearchText && isFold) {
setFold(false)
@@ -50,7 +122,6 @@ const Tool: FC = ({
}
if (!hasSearchText && !isFold)
setFold(true)
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [hasSearchText])
const FoldIcon = isFold ? RiArrowRightSLine : RiArrowDownSLine
@@ -71,59 +142,73 @@ const Tool: FC = ({
return (
{
- if (hasAction)
+ if (hasAction) {
setFold(!isFold)
+ return
+ }
- // Now always support actions
- // if (payload.parameters) {
- // payload.parameters.forEach((item) => {
- // params[item.name] = ''
- // })
- // }
- // onSelect(BlockEnum.Tool, {
- // provider_id: payload.id,
- // provider_type: payload.type,
- // provider_name: payload.name,
- // tool_name: payload.name,
- // tool_label: payload.label[language],
- // title: payload.label[language],
- // params: {},
- // })
+ const tool = actions[0]
+ const params: Record
= {}
+ if (tool.parameters) {
+ tool.parameters.forEach((item) => {
+ params[item.name] = ''
+ })
+ }
+ onSelect(BlockEnum.Tool, {
+ provider_id: payload.id,
+ provider_type: payload.type,
+ provider_name: payload.name,
+ tool_name: tool.name,
+ tool_label: tool.label[language],
+ tool_description: tool.description[language],
+ title: tool.label[language],
+ is_team_authorization: payload.is_team_authorization,
+ output_schema: tool.output_schema,
+ paramSchemas: tool.parameters,
+ params,
+ })
}}
>
-
+
-
{payload.label[language]}
+
+ {notShowProvider ? actions[0]?.label[language] : payload.label[language]}
+ {isFlatView && groupName && (
+ {groupName}
+ )}
+ {isMCPTool &&
-
- {isFlatView && (
-
{groupName}
- )}
+
+ {!isShowCanNotChooseMCPTip && !canNotSelectMultiple && (notShowProvider ? notShowProviderSelectInfo : selectedInfo)}
+ {isShowCanNotChooseMCPTip &&
- {hasAction && !isFold && (
+ {!notShowProvider && hasAction && !isFold && (
actions.map(action => (
-
))
)}
diff --git a/web/app/components/workflow/block-selector/tools.tsx b/web/app/components/workflow/block-selector/tools.tsx
index 2562501524..da47432b04 100644
--- a/web/app/components/workflow/block-selector/tools.tsx
+++ b/web/app/components/workflow/block-selector/tools.tsx
@@ -7,6 +7,7 @@ import { useTranslation } from 'react-i18next'
import type { BlockEnum, ToolWithProvider } from '../types'
import IndexBar, { groupItems } from './index-bar'
import type { ToolDefaultValue, ToolValue } from './types'
+import type { ToolTypeEnum } from './types'
import { ViewType } from './view-type-select'
import Empty from '@/app/components/tools/add-tool-modal/empty'
import { useGetLanguage } from '@/context/i18n'
@@ -15,25 +16,34 @@ import ToolListFlatView from './tool/tool-list-flat-view/list'
import classNames from '@/utils/classnames'
type ToolsProps = {
- showWorkflowEmpty: boolean
onSelect: (type: BlockEnum, tool?: ToolDefaultValue) => void
+ canNotSelectMultiple?: boolean
+ onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void
tools: ToolWithProvider[]
viewType: ViewType
hasSearchText: boolean
+ toolType?: ToolTypeEnum
+ isAgent?: boolean
className?: string
indexBarClassName?: string
selectedTools?: ToolValue[]
+ canChooseMCPTool?: boolean
}
const Blocks = ({
- showWorkflowEmpty,
onSelect,
+ canNotSelectMultiple,
+ onSelectMultiple,
tools,
viewType,
hasSearchText,
+ toolType,
+ isAgent,
className,
indexBarClassName,
selectedTools,
+ canChooseMCPTool,
}: ToolsProps) => {
+ // const tools: any = []
const { t } = useTranslation()
const language = useGetLanguage()
const isFlatView = viewType === ViewType.flat
@@ -87,15 +97,15 @@ const Blocks = ({
const toolRefs = useRef({})
return (
-
+
{
- !tools.length && !showWorkflowEmpty && (
-
{t('workflow.tabs.noResult')}
+ !tools.length && hasSearchText && (
+
{t('workflow.tabs.noResult')}
)
}
- {!tools.length && showWorkflowEmpty && (
+ {!tools.length && !hasSearchText && (
-
)}
{!!tools.length && (
@@ -107,19 +117,24 @@ const Blocks = ({
isShowLetterIndex={isShowLetterIndex}
hasSearchText={hasSearchText}
onSelect={onSelect}
+ canNotSelectMultiple={canNotSelectMultiple}
+ onSelectMultiple={onSelectMultiple}
selectedTools={selectedTools}
+ canChooseMCPTool={canChooseMCPTool}
+ indexBar={
}
/>
) : (
)
)}
-
- {isShowLetterIndex &&
}
)
}
diff --git a/web/app/components/workflow/block-selector/types.ts b/web/app/components/workflow/block-selector/types.ts
index 0abf7b9031..361d4ccc9d 100644
--- a/web/app/components/workflow/block-selector/types.ts
+++ b/web/app/components/workflow/block-selector/types.ts
@@ -1,3 +1,5 @@
+import type { PluginMeta } from '../../plugins/types'
+
export enum TabsEnum {
Blocks = 'blocks',
Tools = 'tools',
@@ -8,6 +10,7 @@ export enum ToolTypeEnum {
BuiltIn = 'built-in',
Custom = 'custom',
Workflow = 'workflow',
+ MCP = 'mcp',
}
export enum BlockClassificationEnum {
@@ -30,15 +33,19 @@ export type ToolDefaultValue = {
params: Record
paramSchemas: Record[]
output_schema: Record
+ credential_id?: string
+ meta?: PluginMeta
}
export type ToolValue = {
provider_name: string
+ provider_show_name?: string
tool_name: string
tool_label: string
- tool_description: string
+ tool_description?: string
settings?: Record
parameters?: Record
enabled?: boolean
extra?: Record
+ credential_id?: string
}
diff --git a/web/app/components/workflow/block-selector/use-check-vertical-scrollbar.ts b/web/app/components/workflow/block-selector/use-check-vertical-scrollbar.ts
new file mode 100644
index 0000000000..98986cf3b6
--- /dev/null
+++ b/web/app/components/workflow/block-selector/use-check-vertical-scrollbar.ts
@@ -0,0 +1,31 @@
+import { useEffect, useState } from 'react'
+
+const useCheckVerticalScrollbar = (ref: React.RefObject) => {
+ const [hasVerticalScrollbar, setHasVerticalScrollbar] = useState(false)
+
+ useEffect(() => {
+ const elem = ref.current
+ if (!elem) return
+
+ const checkScrollbar = () => {
+ setHasVerticalScrollbar(elem.scrollHeight > elem.clientHeight)
+ }
+
+ checkScrollbar()
+
+ const resizeObserver = new ResizeObserver(checkScrollbar)
+ resizeObserver.observe(elem)
+
+ const mutationObserver = new MutationObserver(checkScrollbar)
+ mutationObserver.observe(elem, { childList: true, subtree: true, characterData: true })
+
+ return () => {
+ resizeObserver.disconnect()
+ mutationObserver.disconnect()
+ }
+ }, [ref])
+
+ return hasVerticalScrollbar
+}
+
+export default useCheckVerticalScrollbar
diff --git a/web/app/components/workflow/constants.ts b/web/app/components/workflow/constants.ts
index cdfd963cfa..0ef4dc9dea 100644
--- a/web/app/components/workflow/constants.ts
+++ b/web/app/components/workflow/constants.ts
@@ -31,6 +31,7 @@ type NodesExtraData = {
getAvailablePrevNodes: (isChatMode: boolean) => BlockEnum[]
getAvailableNextNodes: (isChatMode: boolean) => BlockEnum[]
checkValid: any
+ defaultRunInputData?: Record
}
export const NODES_EXTRA_DATA: Record = {
[BlockEnum.Start]: {
@@ -68,6 +69,7 @@ export const NODES_EXTRA_DATA: Record = {
getAvailablePrevNodes: LLMDefault.getAvailablePrevNodes,
getAvailableNextNodes: LLMDefault.getAvailableNextNodes,
checkValid: LLMDefault.checkValid,
+ defaultRunInputData: LLMDefault.defaultRunInputData,
},
[BlockEnum.KnowledgeRetrieval]: {
author: 'Dify',
@@ -408,7 +410,6 @@ export const NODE_WIDTH = 240
export const X_OFFSET = 60
export const NODE_WIDTH_X_OFFSET = NODE_WIDTH + X_OFFSET
export const Y_OFFSET = 39
-export const MAX_TREE_DEPTH = 50
export const START_INITIAL_POSITION = { x: 80, y: 282 }
export const AUTO_LAYOUT_OFFSET = {
x: -42,
@@ -479,6 +480,10 @@ export const LLM_OUTPUT_STRUCT: Var[] = [
variable: 'text',
type: VarType.string,
},
+ {
+ variable: 'usage',
+ type: VarType.object,
+ },
]
export const KNOWLEDGE_RETRIEVAL_OUTPUT_STRUCT: Var[] = [
@@ -500,6 +505,10 @@ export const QUESTION_CLASSIFIER_OUTPUT_STRUCT = [
variable: 'class_name',
type: VarType.string,
},
+ {
+ variable: 'usage',
+ type: VarType.object,
+ },
]
export const HTTP_REQUEST_OUTPUT_STRUCT: Var[] = [
@@ -545,6 +554,10 @@ export const PARAMETER_EXTRACTOR_COMMON_STRUCT: Var[] = [
variable: '__reason',
type: VarType.string,
},
+ {
+ variable: '__usage',
+ type: VarType.object,
+ },
]
export const FILE_STRUCT: Var[] = [
diff --git a/web/app/components/workflow/header/header-in-normal.tsx b/web/app/components/workflow/header/header-in-normal.tsx
index ec016b1b65..79a6509a7a 100644
--- a/web/app/components/workflow/header/header-in-normal.tsx
+++ b/web/app/components/workflow/header/header-in-normal.tsx
@@ -33,6 +33,8 @@ const HeaderInNormal = ({
const setShowWorkflowVersionHistoryPanel = useStore(s => s.setShowWorkflowVersionHistoryPanel)
const setShowEnvPanel = useStore(s => s.setShowEnvPanel)
const setShowDebugAndPreviewPanel = useStore(s => s.setShowDebugAndPreviewPanel)
+ const setShowVariableInspectPanel = useStore(s => s.setShowVariableInspectPanel)
+ const setShowChatVariablePanel = useStore(s => s.setShowChatVariablePanel)
const nodes = useNodes()
const selectedNode = nodes.find(node => node.data.selected)
const { handleBackupDraft } = useWorkflowRun()
@@ -46,8 +48,9 @@ const HeaderInNormal = ({
setShowWorkflowVersionHistoryPanel(true)
setShowEnvPanel(false)
setShowDebugAndPreviewPanel(false)
- }, [handleBackupDraft, workflowStore, handleNodeSelect, selectedNode,
- setShowWorkflowVersionHistoryPanel, setShowEnvPanel, setShowDebugAndPreviewPanel])
+ setShowVariableInspectPanel(false)
+ setShowChatVariablePanel(false)
+ }, [workflowStore, handleBackupDraft, selectedNode, handleNodeSelect, setShowWorkflowVersionHistoryPanel, setShowEnvPanel, setShowDebugAndPreviewPanel, setShowVariableInspectPanel, setShowChatVariablePanel])
return (
<>
diff --git a/web/app/components/workflow/header/header-in-restoring.tsx b/web/app/components/workflow/header/header-in-restoring.tsx
index 4d1954587d..afa4e62099 100644
--- a/web/app/components/workflow/header/header-in-restoring.tsx
+++ b/web/app/components/workflow/header/header-in-restoring.tsx
@@ -17,6 +17,8 @@ import {
import Toast from '../../base/toast'
import RestoringTitle from './restoring-title'
import Button from '@/app/components/base/button'
+import { useStore as useAppStore } from '@/app/components/app/store'
+import { useInvalidAllLastRun } from '@/service/use-workflow'
export type HeaderInRestoringProps = {
onRestoreSettled?: () => void
@@ -26,6 +28,12 @@ const HeaderInRestoring = ({
}: HeaderInRestoringProps) => {
const { t } = useTranslation()
const workflowStore = useWorkflowStore()
+ const appDetail = useAppStore.getState().appDetail
+
+ const invalidAllLastRun = useInvalidAllLastRun(appDetail!.id)
+ const {
+ deleteAllInspectVars,
+ } = workflowStore.getState()
const currentVersion = useStore(s => s.currentVersion)
const setShowWorkflowVersionHistoryPanel = useStore(s => s.setShowWorkflowVersionHistoryPanel)
@@ -61,7 +69,9 @@ const HeaderInRestoring = ({
onRestoreSettled?.()
},
})
- }, [handleSyncWorkflowDraft, workflowStore, setShowWorkflowVersionHistoryPanel, onRestoreSettled, t])
+ deleteAllInspectVars()
+ invalidAllLastRun()
+ }, [setShowWorkflowVersionHistoryPanel, workflowStore, handleSyncWorkflowDraft, deleteAllInspectVars, invalidAllLastRun, t, onRestoreSettled])
return (
<>
diff --git a/web/app/components/workflow/header/index.tsx b/web/app/components/workflow/header/index.tsx
index e5391afb09..8f6f8204df 100644
--- a/web/app/components/workflow/header/index.tsx
+++ b/web/app/components/workflow/header/index.tsx
@@ -1,11 +1,19 @@
+import { usePathname } from 'next/navigation'
import {
useWorkflowMode,
} from '../hooks'
import type { HeaderInNormalProps } from './header-in-normal'
import HeaderInNormal from './header-in-normal'
-import HeaderInHistory from './header-in-view-history'
import type { HeaderInRestoringProps } from './header-in-restoring'
-import HeaderInRestoring from './header-in-restoring'
+import { useStore } from '../store'
+import dynamic from 'next/dynamic'
+
+const HeaderInHistory = dynamic(() => import('./header-in-view-history'), {
+ ssr: false,
+})
+const HeaderInRestoring = dynamic(() => import('./header-in-restoring'), {
+ ssr: false,
+})
export type HeaderProps = {
normal?: HeaderInNormalProps
@@ -15,16 +23,20 @@ const Header = ({
normal: normalProps,
restoring: restoringProps,
}: HeaderProps) => {
+ const pathname = usePathname()
+ const inWorkflowCanvas = pathname.endsWith('/workflow')
const {
normal,
restoring,
viewHistory,
} = useWorkflowMode()
+ const maximizeCanvas = useStore(s => s.maximizeCanvas)
return (
+ {inWorkflowCanvas && maximizeCanvas &&
}
{
normal && (
{
const { t } = useTranslation()
@@ -27,6 +29,16 @@ const RunMode = memo(() => {
const workflowRunningData = useStore(s => s.workflowRunningData)
const isRunning = workflowRunningData?.result.status === WorkflowRunningStatus.Running
+ const handleStop = () => {
+ handleStopRun(workflowRunningData?.task_id || '')
+ }
+
+ const { eventEmitter } = useEventEmitterContextContext()
+ eventEmitter?.useSubscription((v: any) => {
+ if (v.type === EVENT_WORKFLOW_STOP)
+ handleStop()
+ })
+
return (
<>
{
isRunning && (
handleStopRun(workflowRunningData?.task_id || '')}
+ onClick={handleStop}
>
diff --git a/web/app/components/workflow/header/running-title.tsx b/web/app/components/workflow/header/running-title.tsx
index 0460a96c91..95e763ead7 100644
--- a/web/app/components/workflow/header/running-title.tsx
+++ b/web/app/components/workflow/header/running-title.tsx
@@ -2,6 +2,7 @@ import { memo } from 'react'
import { useTranslation } from 'react-i18next'
import { useIsChatMode } from '../hooks'
import { useStore } from '../store'
+import { formatWorkflowRunIdentifier } from '../utils'
import { ClockPlay } from '@/app/components/base/icons/src/vender/line/time'
const RunningTitle = () => {
@@ -12,7 +13,7 @@ const RunningTitle = () => {
return (
{isChatMode ? `Test Chat#${historyWorkflowData?.sequence_number}` : `Test Run#${historyWorkflowData?.sequence_number}`}
+ {isChatMode ? `Test Chat${formatWorkflowRunIdentifier(historyWorkflowData?.finished_at)}` : `Test Run${formatWorkflowRunIdentifier(historyWorkflowData?.finished_at)}`}
·
{t('workflow.common.viewOnly')}
diff --git a/web/app/components/workflow/header/view-history.tsx b/web/app/components/workflow/header/view-history.tsx
index 21b4462867..08f952cd1a 100644
--- a/web/app/components/workflow/header/view-history.tsx
+++ b/web/app/components/workflow/header/view-history.tsx
@@ -18,6 +18,7 @@ import {
useWorkflowRun,
} from '../hooks'
import { ControlMode, WorkflowRunningStatus } from '../types'
+import { formatWorkflowRunIdentifier } from '../utils'
import cn from '@/utils/classnames'
import {
PortalToFollowElem,
@@ -199,7 +200,7 @@ const ViewHistory = ({
item.id === historyWorkflowData?.id && 'text-text-accent',
)}
>
- {`Test ${isChatMode ? 'Chat' : 'Run'} #${item.sequence_number}`}
+ {`Test ${isChatMode ? 'Chat' : 'Run'}${formatWorkflowRunIdentifier(item.finished_at)}`}
{item.created_by_account?.name} · {formatTimeFromNow((item.finished_at || item.created_at) * 1000)}
diff --git a/web/app/components/workflow/hooks-store/store.ts b/web/app/components/workflow/hooks-store/store.ts
index 9f5e1a6650..4e8f74c774 100644
--- a/web/app/components/workflow/hooks-store/store.ts
+++ b/web/app/components/workflow/hooks-store/store.ts
@@ -7,6 +7,12 @@ import {
} from 'zustand'
import { createStore } from 'zustand/vanilla'
import { HooksStoreContext } from './provider'
+import type { IOtherOptions } from '@/service/base'
+import type { VarInInspect } from '@/types/workflow'
+import type {
+ Node,
+ ValueSelector,
+} from '@/app/components/workflow/types'
type CommonHooksFnMap = {
doSyncWorkflowDraft: (
@@ -22,11 +28,30 @@ type CommonHooksFnMap = {
handleBackupDraft: () => void
handleLoadBackupDraft: () => void
handleRestoreFromPublishedWorkflow: (...args: any[]) => void
- handleRun: (...args: any[]) => void
+ handleRun: (params: any, callback?: IOtherOptions,) => void
handleStopRun: (...args: any[]) => void
handleStartWorkflowRun: () => void
handleWorkflowStartRunInWorkflow: () => void
handleWorkflowStartRunInChatflow: () => void
+ fetchInspectVars: () => Promise
+ hasNodeInspectVars: (nodeId: string) => boolean
+ hasSetInspectVar: (nodeId: string, name: string, sysVars: VarInInspect[], conversationVars: VarInInspect[]) => boolean
+ fetchInspectVarValue: (selector: ValueSelector) => Promise
+ editInspectVarValue: (nodeId: string, varId: string, value: any) => Promise
+ renameInspectVarName: (nodeId: string, oldName: string, newName: string) => Promise
+ appendNodeInspectVars: (nodeId: string, payload: VarInInspect[], allNodes: Node[]) => void
+ deleteInspectVar: (nodeId: string, varId: string) => Promise
+ deleteNodeInspectorVars: (nodeId: string) => Promise
+ deleteAllInspectorVars: () => Promise
+ isInspectVarEdited: (nodeId: string, name: string) => boolean
+ resetToLastRunVar: (nodeId: string, varId: string) => Promise
+ invalidateSysVarValues: () => void
+ resetConversationVar: (varId: string) => Promise
+ invalidateConversationVarValues: () => void
+ configsMap?: {
+ conversationVarsUrl: string
+ systemVarsUrl: string
+ }
}
export type Shape = {
@@ -45,6 +70,21 @@ export const createHooksStore = ({
handleStartWorkflowRun = noop,
handleWorkflowStartRunInWorkflow = noop,
handleWorkflowStartRunInChatflow = noop,
+ fetchInspectVars = async () => noop(),
+ hasNodeInspectVars = () => false,
+ hasSetInspectVar = () => false,
+ fetchInspectVarValue = async () => noop(),
+ editInspectVarValue = async () => noop(),
+ renameInspectVarName = async () => noop(),
+ appendNodeInspectVars = () => noop(),
+ deleteInspectVar = async () => noop(),
+ deleteNodeInspectorVars = async () => noop(),
+ deleteAllInspectorVars = async () => noop(),
+ isInspectVarEdited = () => false,
+ resetToLastRunVar = async () => noop(),
+ invalidateSysVarValues = noop,
+ resetConversationVar = async () => noop(),
+ invalidateConversationVarValues = noop,
}: Partial) => {
return createStore(set => ({
refreshAll: props => set(state => ({ ...state, ...props })),
@@ -59,6 +99,21 @@ export const createHooksStore = ({
handleStartWorkflowRun,
handleWorkflowStartRunInWorkflow,
handleWorkflowStartRunInChatflow,
+ fetchInspectVars,
+ hasNodeInspectVars,
+ hasSetInspectVar,
+ fetchInspectVarValue,
+ editInspectVarValue,
+ renameInspectVarName,
+ appendNodeInspectVars,
+ deleteInspectVar,
+ deleteNodeInspectorVars,
+ deleteAllInspectorVars,
+ isInspectVarEdited,
+ resetToLastRunVar,
+ invalidateSysVarValues,
+ resetConversationVar,
+ invalidateConversationVarValues,
}))
}
diff --git a/web/app/components/workflow/hooks/index.ts b/web/app/components/workflow/hooks/index.ts
index fda0f50aa6..c2eebb0533 100644
--- a/web/app/components/workflow/hooks/index.ts
+++ b/web/app/components/workflow/hooks/index.ts
@@ -17,3 +17,5 @@ export * from './use-workflow-interactions'
export * from './use-workflow-mode'
export * from './use-format-time-from-now'
export * from './use-workflow-refresh-draft'
+export * from './use-inspect-vars-crud'
+export * from './use-set-workflow-vars-with-value'
diff --git a/web/app/components/workflow/hooks/use-checklist.ts b/web/app/components/workflow/hooks/use-checklist.ts
index c1b0189b8b..47ebaa6710 100644
--- a/web/app/components/workflow/hooks/use-checklist.ts
+++ b/web/app/components/workflow/hooks/use-checklist.ts
@@ -9,6 +9,7 @@ import type {
CommonNodeType,
Edge,
Node,
+ ValueSelector,
} from '../types'
import { BlockEnum } from '../types'
import { useStore } from '../store'
@@ -18,7 +19,6 @@ import {
} from '../utils'
import {
CUSTOM_NODE,
- MAX_TREE_DEPTH,
} from '../constants'
import type { ToolNodeType } from '../nodes/tool/types'
import { useIsChatMode } from './use-workflow'
@@ -33,6 +33,9 @@ import { useDatasetsDetailStore } from '../datasets-detail-store/store'
import type { KnowledgeRetrievalNodeType } from '../nodes/knowledge-retrieval/types'
import type { DataSet } from '@/models/datasets'
import { fetchDatasets } from '@/service/datasets'
+import { MAX_TREE_DEPTH } from '@/config'
+import useNodesAvailableVarList from './use-nodes-available-var-list'
+import { getNodeUsedVars, isConversationVar, isENV, isSystemVar } from '../nodes/_base/components/variable/utils'
export const useChecklist = (nodes: Node[], edges: Edge[]) => {
const { t } = useTranslation()
@@ -45,6 +48,8 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
const { data: strategyProviders } = useStrategyProviders()
const datasetsDetail = useDatasetsDetailStore(s => s.datasetsDetail)
+ const map = useNodesAvailableVarList(nodes)
+
const getCheckData = useCallback((data: CommonNodeType<{}>) => {
let checkData = data
if (data.type === BlockEnum.KnowledgeRetrieval) {
@@ -70,6 +75,7 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
const node = nodes[i]
let toolIcon
let moreDataForCheckValid
+ let usedVars: ValueSelector[] = []
if (node.data.type === BlockEnum.Tool) {
const { provider_type } = node.data
@@ -84,8 +90,7 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
if (provider_type === CollectionType.workflow)
toolIcon = workflowTools.find(tool => tool.id === node.data.provider_id)?.icon
}
-
- if (node.data.type === BlockEnum.Agent) {
+ else if (node.data.type === BlockEnum.Agent) {
const data = node.data as AgentNodeType
const isReadyForCheckValid = !!strategyProviders
const provider = strategyProviders?.find(provider => provider.declaration.identity.name === data.agent_strategy_provider_name)
@@ -97,10 +102,34 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
isReadyForCheckValid,
}
}
+ else {
+ usedVars = getNodeUsedVars(node).filter(v => v.length > 0)
+ }
if (node.type === CUSTOM_NODE) {
const checkData = getCheckData(node.data)
- const { errorMessage } = nodesExtraData[node.data.type].checkValid(checkData, t, moreDataForCheckValid)
+ let { errorMessage } = nodesExtraData[node.data.type].checkValid(checkData, t, moreDataForCheckValid)
+
+ if (!errorMessage) {
+ const availableVars = map[node.id].availableVars
+
+ for (const variable of usedVars) {
+ const isEnv = isENV(variable)
+ const isConvVar = isConversationVar(variable)
+ const isSysVar = isSystemVar(variable)
+ if (!isEnv && !isConvVar && !isSysVar) {
+ const usedNode = availableVars.find(v => v.nodeId === variable?.[0])
+ if (usedNode) {
+ const usedVar = usedNode.vars.find(v => v.variable === variable?.[1])
+ if (!usedVar)
+ errorMessage = t('workflow.errorMsg.invalidVariable')
+ }
+ else {
+ errorMessage = t('workflow.errorMsg.invalidVariable')
+ }
+ }
+ }
+ }
if (errorMessage || !validNodes.find(n => n.id === node.id)) {
list.push({
diff --git a/web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts b/web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts
new file mode 100644
index 0000000000..27a9ea9d2d
--- /dev/null
+++ b/web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts
@@ -0,0 +1,78 @@
+import { useCallback } from 'react'
+import type { NodeWithVar, VarInInspect } from '@/types/workflow'
+import { useWorkflowStore } from '@/app/components/workflow/store'
+import { useStoreApi } from 'reactflow'
+import type { Node } from '@/app/components/workflow/types'
+import { fetchAllInspectVars } from '@/service/workflow'
+import { useInvalidateConversationVarValues, useInvalidateSysVarValues } from '@/service/use-workflow'
+import { useNodesInteractionsWithoutSync } from '@/app/components/workflow/hooks/use-nodes-interactions-without-sync'
+
+type Params = {
+ flowId: string
+ conversationVarsUrl: string
+ systemVarsUrl: string
+}
+
+export const useSetWorkflowVarsWithValue = ({
+ flowId,
+ conversationVarsUrl,
+ systemVarsUrl,
+}: Params) => {
+ const workflowStore = useWorkflowStore()
+ const store = useStoreApi()
+ const invalidateConversationVarValues = useInvalidateConversationVarValues(conversationVarsUrl)
+ const invalidateSysVarValues = useInvalidateSysVarValues(systemVarsUrl)
+ const { handleCancelAllNodeSuccessStatus } = useNodesInteractionsWithoutSync()
+
+ const setInspectVarsToStore = useCallback((inspectVars: VarInInspect[]) => {
+ const { setNodesWithInspectVars } = workflowStore.getState()
+ const { getNodes } = store.getState()
+ const nodeArr = getNodes()
+ const nodesKeyValue: Record = {}
+ nodeArr.forEach((node) => {
+ nodesKeyValue[node.id] = node
+ })
+
+ const withValueNodeIds: Record = {}
+ inspectVars.forEach((varItem) => {
+ const nodeId = varItem.selector[0]
+
+ const node = nodesKeyValue[nodeId]
+ if (!node)
+ return
+ withValueNodeIds[nodeId] = true
+ })
+ const withValueNodes = Object.keys(withValueNodeIds).map((nodeId) => {
+ return nodesKeyValue[nodeId]
+ })
+
+ const res: NodeWithVar[] = withValueNodes.map((node) => {
+ const nodeId = node.id
+ const varsUnderTheNode = inspectVars.filter((varItem) => {
+ return varItem.selector[0] === nodeId
+ })
+ const nodeWithVar = {
+ nodeId,
+ nodePayload: node.data,
+ nodeType: node.data.type,
+ title: node.data.title,
+ vars: varsUnderTheNode,
+ isSingRunRunning: false,
+ isValueFetched: false,
+ }
+ return nodeWithVar
+ })
+ setNodesWithInspectVars(res)
+ }, [workflowStore, store])
+
+ const fetchInspectVars = useCallback(async () => {
+ invalidateConversationVarValues()
+ invalidateSysVarValues()
+ const data = await fetchAllInspectVars(flowId)
+ setInspectVarsToStore(data)
+ handleCancelAllNodeSuccessStatus() // to make sure clear node output show the unset status
+ }, [invalidateConversationVarValues, invalidateSysVarValues, flowId, setInspectVarsToStore, handleCancelAllNodeSuccessStatus])
+ return {
+ fetchInspectVars,
+ }
+}
diff --git a/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts b/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts
new file mode 100644
index 0000000000..ffcfd81666
--- /dev/null
+++ b/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts
@@ -0,0 +1,240 @@
+import { fetchNodeInspectVars } from '@/service/workflow'
+import { useWorkflowStore } from '@/app/components/workflow/store'
+import type { ValueSelector } from '@/app/components/workflow/types'
+import type { VarInInspect } from '@/types/workflow'
+import { VarInInspectType } from '@/types/workflow'
+import {
+ useDeleteAllInspectorVars,
+ useDeleteInspectVar,
+ useDeleteNodeInspectorVars,
+ useEditInspectorVar,
+ useInvalidateConversationVarValues,
+ useInvalidateSysVarValues,
+ useResetConversationVar,
+ useResetToLastRunValue,
+} from '@/service/use-workflow'
+import { useCallback } from 'react'
+import { isConversationVar, isENV, isSystemVar } from '@/app/components/workflow/nodes/_base/components/variable/utils'
+import produce from 'immer'
+import type { Node } from '@/app/components/workflow/types'
+import { useNodesInteractionsWithoutSync } from '@/app/components/workflow/hooks/use-nodes-interactions-without-sync'
+import { useEdgesInteractionsWithoutSync } from '@/app/components/workflow/hooks/use-edges-interactions-without-sync'
+
+type Params = {
+ flowId: string
+ conversationVarsUrl: string
+ systemVarsUrl: string
+}
+export const useInspectVarsCrudCommon = ({
+ flowId,
+ conversationVarsUrl,
+ systemVarsUrl,
+}: Params) => {
+ const workflowStore = useWorkflowStore()
+ const invalidateConversationVarValues = useInvalidateConversationVarValues(conversationVarsUrl!)
+ const { mutateAsync: doResetConversationVar } = useResetConversationVar(flowId)
+ const { mutateAsync: doResetToLastRunValue } = useResetToLastRunValue(flowId)
+ const invalidateSysVarValues = useInvalidateSysVarValues(systemVarsUrl!)
+
+ const { mutateAsync: doDeleteAllInspectorVars } = useDeleteAllInspectorVars(flowId)
+ const { mutate: doDeleteNodeInspectorVars } = useDeleteNodeInspectorVars(flowId)
+ const { mutate: doDeleteInspectVar } = useDeleteInspectVar(flowId)
+
+ const { mutateAsync: doEditInspectorVar } = useEditInspectorVar(flowId)
+ const { handleCancelNodeSuccessStatus } = useNodesInteractionsWithoutSync()
+ const { handleEdgeCancelRunningStatus } = useEdgesInteractionsWithoutSync()
+ const getNodeInspectVars = useCallback((nodeId: string) => {
+ const { nodesWithInspectVars } = workflowStore.getState()
+ const node = nodesWithInspectVars.find(node => node.nodeId === nodeId)
+ return node
+ }, [workflowStore])
+
+ const getVarId = useCallback((nodeId: string, varName: string) => {
+ const node = getNodeInspectVars(nodeId)
+ if (!node)
+ return undefined
+ const varId = node.vars.find((varItem) => {
+ return varItem.selector[1] === varName
+ })?.id
+ return varId
+ }, [getNodeInspectVars])
+
+ const getInspectVar = useCallback((nodeId: string, name: string): VarInInspect | undefined => {
+ const node = getNodeInspectVars(nodeId)
+ if (!node)
+ return undefined
+
+ const variable = node.vars.find((varItem) => {
+ return varItem.name === name
+ })
+ return variable
+ }, [getNodeInspectVars])
+
+ const hasSetInspectVar = useCallback((nodeId: string, name: string, sysVars: VarInInspect[], conversationVars: VarInInspect[]) => {
+ const isEnv = isENV([nodeId])
+ if (isEnv) // always have value
+ return true
+ const isSys = isSystemVar([nodeId])
+ if (isSys)
+ return sysVars.some(varItem => varItem.selector?.[1]?.replace('sys.', '') === name)
+ const isChatVar = isConversationVar([nodeId])
+ if (isChatVar)
+ return conversationVars.some(varItem => varItem.selector?.[1] === name)
+ return getInspectVar(nodeId, name) !== undefined
+ }, [getInspectVar])
+
+ const hasNodeInspectVars = useCallback((nodeId: string) => {
+ return !!getNodeInspectVars(nodeId)
+ }, [getNodeInspectVars])
+
+ const fetchInspectVarValue = useCallback(async (selector: ValueSelector) => {
+ const {
+ appId,
+ setNodeInspectVars,
+ } = workflowStore.getState()
+ const nodeId = selector[0]
+ const isSystemVar = nodeId === 'sys'
+ const isConversationVar = nodeId === 'conversation'
+ if (isSystemVar) {
+ invalidateSysVarValues()
+ return
+ }
+ if (isConversationVar) {
+ invalidateConversationVarValues()
+ return
+ }
+ const vars = await fetchNodeInspectVars(appId, nodeId)
+ setNodeInspectVars(nodeId, vars)
+ }, [workflowStore, invalidateSysVarValues, invalidateConversationVarValues])
+
+ // after last run would call this
+ const appendNodeInspectVars = useCallback((nodeId: string, payload: VarInInspect[], allNodes: Node[]) => {
+ const {
+ nodesWithInspectVars,
+ setNodesWithInspectVars,
+ } = workflowStore.getState()
+ const nodes = produce(nodesWithInspectVars, (draft) => {
+ const nodeInfo = allNodes.find(node => node.id === nodeId)
+ if (nodeInfo) {
+ const index = draft.findIndex(node => node.nodeId === nodeId)
+ if (index === -1) {
+ draft.unshift({
+ nodeId,
+ nodeType: nodeInfo.data.type,
+ title: nodeInfo.data.title,
+ vars: payload,
+ nodePayload: nodeInfo.data,
+ })
+ }
+ else {
+ draft[index].vars = payload
+ // put the node to the topAdd commentMore actions
+ draft.unshift(draft.splice(index, 1)[0])
+ }
+ }
+ })
+ setNodesWithInspectVars(nodes)
+ handleCancelNodeSuccessStatus(nodeId)
+ }, [workflowStore, handleCancelNodeSuccessStatus])
+
+ const hasNodeInspectVar = useCallback((nodeId: string, varId: string) => {
+ const { nodesWithInspectVars } = workflowStore.getState()
+ const targetNode = nodesWithInspectVars.find(item => item.nodeId === nodeId)
+ if(!targetNode || !targetNode.vars)
+ return false
+ return targetNode.vars.some(item => item.id === varId)
+ }, [workflowStore])
+
+ const deleteInspectVar = useCallback(async (nodeId: string, varId: string) => {
+ const { deleteInspectVar } = workflowStore.getState()
+ if(hasNodeInspectVar(nodeId, varId)) {
+ await doDeleteInspectVar(varId)
+ deleteInspectVar(nodeId, varId)
+ }
+ }, [doDeleteInspectVar, workflowStore, hasNodeInspectVar])
+
+ const resetConversationVar = useCallback(async (varId: string) => {
+ await doResetConversationVar(varId)
+ invalidateConversationVarValues()
+ }, [doResetConversationVar, invalidateConversationVarValues])
+
+ const deleteNodeInspectorVars = useCallback(async (nodeId: string) => {
+ const { deleteNodeInspectVars } = workflowStore.getState()
+ if (hasNodeInspectVars(nodeId)) {
+ await doDeleteNodeInspectorVars(nodeId)
+ deleteNodeInspectVars(nodeId)
+ }
+ }, [doDeleteNodeInspectorVars, workflowStore, hasNodeInspectVars])
+
+ const deleteAllInspectorVars = useCallback(async () => {
+ const { deleteAllInspectVars } = workflowStore.getState()
+ await doDeleteAllInspectorVars()
+ await invalidateConversationVarValues()
+ await invalidateSysVarValues()
+ deleteAllInspectVars()
+ handleEdgeCancelRunningStatus()
+ }, [doDeleteAllInspectorVars, invalidateConversationVarValues, invalidateSysVarValues, workflowStore, handleEdgeCancelRunningStatus])
+
+ const editInspectVarValue = useCallback(async (nodeId: string, varId: string, value: any) => {
+ const { setInspectVarValue } = workflowStore.getState()
+ await doEditInspectorVar({
+ varId,
+ value,
+ })
+ setInspectVarValue(nodeId, varId, value)
+ if (nodeId === VarInInspectType.conversation)
+ invalidateConversationVarValues()
+ if (nodeId === VarInInspectType.system)
+ invalidateSysVarValues()
+ }, [doEditInspectorVar, invalidateConversationVarValues, invalidateSysVarValues, workflowStore])
+
+ const renameInspectVarName = useCallback(async (nodeId: string, oldName: string, newName: string) => {
+ const { renameInspectVarName } = workflowStore.getState()
+ const varId = getVarId(nodeId, oldName)
+ if (!varId)
+ return
+
+ const newSelector = [nodeId, newName]
+ await doEditInspectorVar({
+ varId,
+ name: newName,
+ })
+ renameInspectVarName(nodeId, varId, newSelector)
+ }, [doEditInspectorVar, getVarId, workflowStore])
+
+ const isInspectVarEdited = useCallback((nodeId: string, name: string) => {
+ const inspectVar = getInspectVar(nodeId, name)
+ if (!inspectVar)
+ return false
+
+ return inspectVar.edited
+ }, [getInspectVar])
+
+ const resetToLastRunVar = useCallback(async (nodeId: string, varId: string) => {
+ const { resetToLastRunVar } = workflowStore.getState()
+ const isSysVar = nodeId === 'sys'
+ const data = await doResetToLastRunValue(varId)
+
+ if(isSysVar)
+ invalidateSysVarValues()
+ else
+ resetToLastRunVar(nodeId, varId, data.value)
+ }, [doResetToLastRunValue, invalidateSysVarValues, workflowStore])
+
+ return {
+ hasNodeInspectVars,
+ hasSetInspectVar,
+ fetchInspectVarValue,
+ editInspectVarValue,
+ renameInspectVarName,
+ appendNodeInspectVars,
+ deleteInspectVar,
+ deleteNodeInspectorVars,
+ deleteAllInspectorVars,
+ isInspectVarEdited,
+ resetToLastRunVar,
+ invalidateSysVarValues,
+ resetConversationVar,
+ invalidateConversationVarValues,
+ }
+}
diff --git a/web/app/components/workflow/hooks/use-inspect-vars-crud.ts b/web/app/components/workflow/hooks/use-inspect-vars-crud.ts
new file mode 100644
index 0000000000..50188185c2
--- /dev/null
+++ b/web/app/components/workflow/hooks/use-inspect-vars-crud.ts
@@ -0,0 +1,49 @@
+import { useStore } from '../store'
+import { useHooksStore } from '@/app/components/workflow/hooks-store'
+import {
+ useConversationVarValues,
+ useSysVarValues,
+} from '@/service/use-workflow'
+
+const useInspectVarsCrud = () => {
+ const nodesWithInspectVars = useStore(s => s.nodesWithInspectVars)
+ const configsMap = useHooksStore(s => s.configsMap)
+ const { data: conversationVars } = useConversationVarValues(configsMap?.conversationVarsUrl)
+ const { data: systemVars } = useSysVarValues(configsMap?.systemVarsUrl)
+ const hasNodeInspectVars = useHooksStore(s => s.hasNodeInspectVars)
+ const hasSetInspectVar = useHooksStore(s => s.hasSetInspectVar)
+ const fetchInspectVarValue = useHooksStore(s => s.fetchInspectVarValue)
+ const editInspectVarValue = useHooksStore(s => s.editInspectVarValue)
+ const renameInspectVarName = useHooksStore(s => s.renameInspectVarName)
+ const appendNodeInspectVars = useHooksStore(s => s.appendNodeInspectVars)
+ const deleteInspectVar = useHooksStore(s => s.deleteInspectVar)
+ const deleteNodeInspectorVars = useHooksStore(s => s.deleteNodeInspectorVars)
+ const deleteAllInspectorVars = useHooksStore(s => s.deleteAllInspectorVars)
+ const isInspectVarEdited = useHooksStore(s => s.isInspectVarEdited)
+ const resetToLastRunVar = useHooksStore(s => s.resetToLastRunVar)
+ const invalidateSysVarValues = useHooksStore(s => s.invalidateSysVarValues)
+ const resetConversationVar = useHooksStore(s => s.resetConversationVar)
+ const invalidateConversationVarValues = useHooksStore(s => s.invalidateConversationVarValues)
+
+ return {
+ conversationVars: conversationVars || [],
+ systemVars: systemVars || [],
+ nodesWithInspectVars,
+ hasNodeInspectVars,
+ hasSetInspectVar,
+ fetchInspectVarValue,
+ editInspectVarValue,
+ renameInspectVarName,
+ appendNodeInspectVars,
+ deleteInspectVar,
+ deleteNodeInspectorVars,
+ deleteAllInspectorVars,
+ isInspectVarEdited,
+ resetToLastRunVar,
+ invalidateSysVarValues,
+ resetConversationVar,
+ invalidateConversationVarValues,
+ }
+}
+
+export default useInspectVarsCrud
diff --git a/web/app/components/workflow/hooks/use-nodes-available-var-list.ts b/web/app/components/workflow/hooks/use-nodes-available-var-list.ts
new file mode 100644
index 0000000000..5efe2519ef
--- /dev/null
+++ b/web/app/components/workflow/hooks/use-nodes-available-var-list.ts
@@ -0,0 +1,75 @@
+import {
+ useIsChatMode,
+ useWorkflow,
+ useWorkflowVariables,
+} from '@/app/components/workflow/hooks'
+import { BlockEnum, type Node, type NodeOutPutVar, type ValueSelector, type Var } from '@/app/components/workflow/types'
+type Params = {
+ onlyLeafNodeVar?: boolean
+ hideEnv?: boolean
+ hideChatVar?: boolean
+ filterVar: (payload: Var, selector: ValueSelector) => boolean
+ passedInAvailableNodes?: Node[]
+}
+
+const getNodeInfo = (nodeId: string, nodes: Node[]) => {
+ const allNodes = nodes
+ const node = allNodes.find(n => n.id === nodeId)
+ const isInIteration = !!node?.data.isInIteration
+ const isInLoop = !!node?.data.isInLoop
+ const parentNodeId = node?.parentId
+ const parentNode = allNodes.find(n => n.id === parentNodeId)
+ return {
+ node,
+ isInIteration,
+ isInLoop,
+ parentNode,
+ }
+}
+
+// TODO: loop type?
+const useNodesAvailableVarList = (nodes: Node[], {
+ onlyLeafNodeVar,
+ filterVar,
+ hideEnv = false,
+ hideChatVar = false,
+ passedInAvailableNodes,
+}: Params = {
+ onlyLeafNodeVar: false,
+ filterVar: () => true,
+ }) => {
+ const { getTreeLeafNodes, getBeforeNodesInSameBranchIncludeParent } = useWorkflow()
+ const { getNodeAvailableVars } = useWorkflowVariables()
+ const isChatMode = useIsChatMode()
+
+ const nodeAvailabilityMap: { [key: string ]: { availableVars: NodeOutPutVar[], availableNodes: Node[] } } = {}
+
+ nodes.forEach((node) => {
+ const nodeId = node.id
+ const availableNodes = passedInAvailableNodes || (onlyLeafNodeVar ? getTreeLeafNodes(nodeId) : getBeforeNodesInSameBranchIncludeParent(nodeId))
+ if (node.data.type === BlockEnum.Loop)
+ availableNodes.push(node)
+
+ const {
+ parentNode: iterationNode,
+ } = getNodeInfo(nodeId, nodes)
+
+ const availableVars = getNodeAvailableVars({
+ parentNode: iterationNode,
+ beforeNodes: availableNodes,
+ isChatMode,
+ filterVar,
+ hideEnv,
+ hideChatVar,
+ })
+ const result = {
+ node,
+ availableVars,
+ availableNodes,
+ }
+ nodeAvailabilityMap[nodeId] = result
+ })
+ return nodeAvailabilityMap
+}
+
+export default useNodesAvailableVarList
diff --git a/web/app/components/workflow/hooks/use-nodes-data.ts b/web/app/components/workflow/hooks/use-nodes-data.ts
index aeb45ddb93..7df6b2ffd0 100644
--- a/web/app/components/workflow/hooks/use-nodes-data.ts
+++ b/web/app/components/workflow/hooks/use-nodes-data.ts
@@ -34,15 +34,14 @@ export const useNodesExtraData = () => {
export const useAvailableBlocks = (nodeType?: BlockEnum, isInIteration?: boolean, isInLoop?: boolean) => {
const nodesExtraData = useNodesExtraData()
const availablePrevBlocks = useMemo(() => {
- if (!nodeType)
+ if (!nodeType || !nodesExtraData[nodeType])
return []
return nodesExtraData[nodeType].availablePrevNodes || []
}, [nodeType, nodesExtraData])
const availableNextBlocks = useMemo(() => {
- if (!nodeType)
+ if (!nodeType || !nodesExtraData[nodeType])
return []
-
return nodesExtraData[nodeType].availableNextNodes || []
}, [nodeType, nodesExtraData])
@@ -55,10 +54,7 @@ export const useAvailableBlocks = (nodeType?: BlockEnum, isInIteration?: boolean
if (isInLoop && (nType === BlockEnum.Iteration || nType === BlockEnum.Loop || nType === BlockEnum.End))
return false
- if (!isInLoop && nType === BlockEnum.LoopEnd)
- return false
-
- return true
+ return !(!isInLoop && nType === BlockEnum.LoopEnd)
}),
availableNextBlocks: availableNextBlocks.filter((nType) => {
if (isInIteration && (nType === BlockEnum.Iteration || nType === BlockEnum.Loop || nType === BlockEnum.End))
@@ -67,10 +63,7 @@ export const useAvailableBlocks = (nodeType?: BlockEnum, isInIteration?: boolean
if (isInLoop && (nType === BlockEnum.Iteration || nType === BlockEnum.Loop || nType === BlockEnum.End))
return false
- if (!isInLoop && nType === BlockEnum.LoopEnd)
- return false
-
- return true
+ return !(!isInLoop && nType === BlockEnum.LoopEnd)
}),
}
}, [isInIteration, availablePrevBlocks, availableNextBlocks, isInLoop])
diff --git a/web/app/components/workflow/hooks/use-nodes-interactions-without-sync.ts b/web/app/components/workflow/hooks/use-nodes-interactions-without-sync.ts
index 7fbf0ce868..e01609cdb6 100644
--- a/web/app/components/workflow/hooks/use-nodes-interactions-without-sync.ts
+++ b/web/app/components/workflow/hooks/use-nodes-interactions-without-sync.ts
@@ -1,6 +1,7 @@
import { useCallback } from 'react'
import produce from 'immer'
import { useStoreApi } from 'reactflow'
+import { NodeRunningStatus } from '../types'
export const useNodesInteractionsWithoutSync = () => {
const store = useStoreApi()
@@ -21,7 +22,41 @@ export const useNodesInteractionsWithoutSync = () => {
setNodes(newNodes)
}, [store])
+ const handleCancelAllNodeSuccessStatus = useCallback(() => {
+ const {
+ getNodes,
+ setNodes,
+ } = store.getState()
+
+ const nodes = getNodes()
+ const newNodes = produce(nodes, (draft) => {
+ draft.forEach((node) => {
+ if(node.data._runningStatus === NodeRunningStatus.Succeeded)
+ node.data._runningStatus = undefined
+ })
+ })
+ setNodes(newNodes)
+ }, [store])
+
+ const handleCancelNodeSuccessStatus = useCallback((nodeId: string) => {
+ const {
+ getNodes,
+ setNodes,
+ } = store.getState()
+
+ const newNodes = produce(getNodes(), (draft) => {
+ const node = draft.find(n => n.id === nodeId)
+ if (node && node.data._runningStatus === NodeRunningStatus.Succeeded) {
+ node.data._runningStatus = undefined
+ node.data._waitingRun = false
+ }
+ })
+ setNodes(newNodes)
+ }, [store])
+
return {
handleNodeCancelRunningStatus,
+ handleCancelAllNodeSuccessStatus,
+ handleCancelNodeSuccessStatus,
}
}
diff --git a/web/app/components/workflow/hooks/use-nodes-interactions.ts b/web/app/components/workflow/hooks/use-nodes-interactions.ts
index 94b10c9929..b598951adb 100644
--- a/web/app/components/workflow/hooks/use-nodes-interactions.ts
+++ b/web/app/components/workflow/hooks/use-nodes-interactions.ts
@@ -60,6 +60,7 @@ import {
useWorkflowReadOnly,
} from './use-workflow'
import { WorkflowHistoryEvent, useWorkflowHistory } from './use-workflow-history'
+import useInspectVarsCrud from './use-inspect-vars-crud'
export const useNodesInteractions = () => {
const { t } = useTranslation()
@@ -288,7 +289,9 @@ export const useNodesInteractions = () => {
setEdges(newEdges)
}, [store, workflowStore, getNodesReadOnly])
- const handleNodeSelect = useCallback((nodeId: string, cancelSelection?: boolean) => {
+ const handleNodeSelect = useCallback((nodeId: string, cancelSelection?: boolean, initShowLastRunTab?: boolean) => {
+ if(initShowLastRunTab)
+ workflowStore.setState({ initShowLastRunTab: true })
const {
getNodes,
setNodes,
@@ -530,6 +533,8 @@ export const useNodesInteractions = () => {
setEnteringNodePayload(undefined)
}, [store, handleNodeConnect, getNodesReadOnly, workflowStore, reactflow])
+ const { deleteNodeInspectorVars } = useInspectVarsCrud()
+
const handleNodeDelete = useCallback((nodeId: string) => {
if (getNodesReadOnly())
return
@@ -551,6 +556,7 @@ export const useNodesInteractions = () => {
if (currentNode.data.type === BlockEnum.Start)
return
+ deleteNodeInspectorVars(nodeId)
if (currentNode.data.type === BlockEnum.Iteration) {
const iterationChildren = nodes.filter(node => node.parentId === currentNode.id)
@@ -655,7 +661,7 @@ export const useNodesInteractions = () => {
else
saveStateToHistory(WorkflowHistoryEvent.NodeDelete)
- }, [getNodesReadOnly, store, handleSyncWorkflowDraft, saveStateToHistory, workflowStore, t])
+ }, [getNodesReadOnly, store, deleteNodeInspectorVars, handleSyncWorkflowDraft, saveStateToHistory, workflowStore, t])
const handleNodeAdd = useCallback((
{
diff --git a/web/app/components/workflow/hooks/use-set-workflow-vars-with-value.ts b/web/app/components/workflow/hooks/use-set-workflow-vars-with-value.ts
new file mode 100644
index 0000000000..a04c2de305
--- /dev/null
+++ b/web/app/components/workflow/hooks/use-set-workflow-vars-with-value.ts
@@ -0,0 +1,9 @@
+import { useHooksStore } from '@/app/components/workflow/hooks-store'
+
+export const useSetWorkflowVarsWithValue = () => {
+ const fetchInspectVars = useHooksStore(s => s.fetchInspectVars)
+
+ return {
+ fetchInspectVars,
+ }
+}
diff --git a/web/app/components/workflow/hooks/use-shortcuts.ts b/web/app/components/workflow/hooks/use-shortcuts.ts
index 0d0ba80fe1..118ec94058 100644
--- a/web/app/components/workflow/hooks/use-shortcuts.ts
+++ b/web/app/components/workflow/hooks/use-shortcuts.ts
@@ -11,6 +11,7 @@ import {
useEdgesInteractions,
useNodesInteractions,
useNodesSyncDraft,
+ useWorkflowCanvasMaximize,
useWorkflowMoveMode,
useWorkflowOrganize,
useWorkflowStartRun,
@@ -35,6 +36,7 @@ export const useShortcuts = (): void => {
handleModePointer,
} = useWorkflowMoveMode()
const { handleLayout } = useWorkflowOrganize()
+ const { handleToggleMaximizeCanvas } = useWorkflowCanvasMaximize()
const {
zoomTo,
@@ -61,7 +63,7 @@ export const useShortcuts = (): void => {
return !showFeaturesPanel && !isEventTargetInputArea(e.target as HTMLElement)
}, [workflowStore])
- useKeyPress(['delete'], (e) => {
+ useKeyPress(['delete', 'backspace'], (e) => {
if (shouldHandleShortcut(e)) {
e.preventDefault()
handleNodesDelete()
@@ -145,6 +147,16 @@ export const useShortcuts = (): void => {
}
}, { exactMatch: true, useCapture: true })
+ useKeyPress('f', (e) => {
+ if (shouldHandleShortcut(e)) {
+ e.preventDefault()
+ handleToggleMaximizeCanvas()
+ }
+ }, {
+ exactMatch: true,
+ useCapture: true,
+ })
+
useKeyPress(`${getKeyboardKeyCodeBySystem('ctrl')}.1`, (e) => {
if (shouldHandleShortcut(e)) {
e.preventDefault()
diff --git a/web/app/components/workflow/hooks/use-workflow-interactions.ts b/web/app/components/workflow/hooks/use-workflow-interactions.ts
index 636d3b94f9..d8653a5942 100644
--- a/web/app/components/workflow/hooks/use-workflow-interactions.ts
+++ b/web/app/components/workflow/hooks/use-workflow-interactions.ts
@@ -401,3 +401,29 @@ export const useDSL = () => {
handleExportDSL,
}
}
+
+export const useWorkflowCanvasMaximize = () => {
+ const { eventEmitter } = useEventEmitterContextContext()
+
+ const maximizeCanvas = useStore(s => s.maximizeCanvas)
+ const setMaximizeCanvas = useStore(s => s.setMaximizeCanvas)
+ const {
+ getNodesReadOnly,
+ } = useNodesReadOnly()
+
+ const handleToggleMaximizeCanvas = useCallback(() => {
+ if (getNodesReadOnly())
+ return
+
+ setMaximizeCanvas(!maximizeCanvas)
+ localStorage.setItem('workflow-canvas-maximize', String(!maximizeCanvas))
+ eventEmitter?.emit({
+ type: 'workflow-canvas-maximize',
+ payload: !maximizeCanvas,
+ } as any)
+ }, [eventEmitter, getNodesReadOnly, maximizeCanvas, setMaximizeCanvas])
+
+ return {
+ handleToggleMaximizeCanvas,
+ }
+}
diff --git a/web/app/components/workflow/hooks/use-workflow.ts b/web/app/components/workflow/hooks/use-workflow.ts
index 99dce4dc15..9c99699c16 100644
--- a/web/app/components/workflow/hooks/use-workflow.ts
+++ b/web/app/components/workflow/hooks/use-workflow.ts
@@ -40,6 +40,7 @@ import { useStore as useAppStore } from '@/app/components/app/store'
import {
fetchAllBuiltInTools,
fetchAllCustomTools,
+ fetchAllMCPTools,
fetchAllWorkflowTools,
} from '@/service/tools'
import { CollectionType } from '@/app/components/tools/types'
@@ -59,10 +60,6 @@ export const useWorkflow = () => {
const store = useStoreApi()
const workflowStore = useWorkflowStore()
const nodesExtraData = useNodesExtraData()
- const setPanelWidth = useCallback((width: number) => {
- localStorage.setItem('workflow-node-panel-width', `${width}`)
- workflowStore.setState({ panelWidth: width })
- }, [workflowStore])
const getTreeLeafNodes = useCallback((nodeId: string) => {
const {
@@ -273,8 +270,6 @@ export const useWorkflow = () => {
})
setNodes(newNodes)
}
-
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [store])
const isVarUsedInNodes = useCallback((varSelector: ValueSelector) => {
@@ -399,7 +394,6 @@ export const useWorkflow = () => {
}, [store])
return {
- setPanelWidth,
getTreeLeafNodes,
getBeforeNodesInSameBranch,
getBeforeNodesInSameBranchIncludeParent,
@@ -450,6 +444,13 @@ export const useFetchToolsData = () => {
workflowTools: workflowTools || [],
})
}
+ if(type === 'mcp') {
+ const mcpTools = await fetchAllMCPTools()
+
+ workflowStore.setState({
+ mcpTools: mcpTools || [],
+ })
+ }
}, [workflowStore])
return {
@@ -496,18 +497,24 @@ export const useToolIcon = (data: Node['data']) => {
const buildInTools = useStore(s => s.buildInTools)
const customTools = useStore(s => s.customTools)
const workflowTools = useStore(s => s.workflowTools)
+ const mcpTools = useStore(s => s.mcpTools)
+
const toolIcon = useMemo(() => {
+ if(!data)
+ return ''
if (data.type === BlockEnum.Tool) {
let targetTools = buildInTools
if (data.provider_type === CollectionType.builtIn)
targetTools = buildInTools
else if (data.provider_type === CollectionType.custom)
targetTools = customTools
+ else if (data.provider_type === CollectionType.mcp)
+ targetTools = mcpTools
else
targetTools = workflowTools
return targetTools.find(toolWithProvider => canFindTool(toolWithProvider.id, data.provider_id))?.icon
}
- }, [data, buildInTools, customTools, workflowTools])
+ }, [data, buildInTools, customTools, mcpTools, workflowTools])
return toolIcon
}
diff --git a/web/app/components/workflow/index.tsx b/web/app/components/workflow/index.tsx
index 549117faf7..a5894451c1 100644
--- a/web/app/components/workflow/index.tsx
+++ b/web/app/components/workflow/index.tsx
@@ -5,6 +5,7 @@ import {
memo,
useCallback,
useEffect,
+ useMemo,
useRef,
} from 'react'
import { setAutoFreeze } from 'immer'
@@ -41,6 +42,7 @@ import {
useNodesSyncDraft,
usePanelInteractions,
useSelectionInteractions,
+ useSetWorkflowVarsWithValue,
useShortcuts,
useWorkflow,
useWorkflowReadOnly,
@@ -56,6 +58,7 @@ import { CUSTOM_LOOP_START_NODE } from './nodes/loop-start/constants'
import CustomSimpleNode from './simple-node'
import { CUSTOM_SIMPLE_NODE } from './simple-node/constants'
import Operator from './operator'
+import Control from './operator/control'
import CustomEdge from './custom-edge'
import CustomConnectionLine from './custom-connection-line'
import HelpLine from './help-line'
@@ -76,10 +79,14 @@ import {
} from './constants'
import { WorkflowHistoryProvider } from './workflow-history-store'
import { useEventEmitterContextContext } from '@/context/event-emitter'
-import Confirm from '@/app/components/base/confirm'
import DatasetsDetailProvider from './datasets-detail-store/provider'
import { HooksStoreContextProvider } from './hooks-store'
import type { Shape as HooksStoreShape } from './hooks-store'
+import dynamic from 'next/dynamic'
+
+const Confirm = dynamic(() => import('@/app/components/base/confirm'), {
+ ssr: false,
+})
const nodeTypes = {
[CUSTOM_NODE]: CustomNode,
@@ -114,6 +121,32 @@ export const Workflow: FC = memo(({
const controlMode = useStore(s => s.controlMode)
const nodeAnimation = useStore(s => s.nodeAnimation)
const showConfirm = useStore(s => s.showConfirm)
+ const workflowCanvasHeight = useStore(s => s.workflowCanvasHeight)
+ const bottomPanelHeight = useStore(s => s.bottomPanelHeight)
+ const setWorkflowCanvasWidth = useStore(s => s.setWorkflowCanvasWidth)
+ const setWorkflowCanvasHeight = useStore(s => s.setWorkflowCanvasHeight)
+ const controlHeight = useMemo(() => {
+ if (!workflowCanvasHeight)
+ return '100%'
+ return workflowCanvasHeight - bottomPanelHeight
+ }, [workflowCanvasHeight, bottomPanelHeight])
+
+ // update workflow Canvas width and height
+ useEffect(() => {
+ if (workflowContainerRef.current) {
+ const resizeContainerObserver = new ResizeObserver((entries) => {
+ for (const entry of entries) {
+ const { inlineSize, blockSize } = entry.borderBoxSize[0]
+ setWorkflowCanvasWidth(inlineSize)
+ setWorkflowCanvasHeight(blockSize)
+ }
+ })
+ resizeContainerObserver.observe(workflowContainerRef.current)
+ return () => {
+ resizeContainerObserver.disconnect()
+ }
+ }
+ }, [setWorkflowCanvasHeight, setWorkflowCanvasWidth])
const {
setShowConfirm,
@@ -157,7 +190,6 @@ export const Workflow: FC = memo(({
return () => {
handleSyncWorkflowDraft(true, true)
}
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [])
const { handleRefreshWorkflowDraft } = useWorkflowRefreshDraft()
@@ -205,6 +237,7 @@ export const Workflow: FC = memo(({
handleFetchAllTools('builtin')
handleFetchAllTools('custom')
handleFetchAllTools('workflow')
+ handleFetchAllTools('mcp')
}, [handleFetchAllTools])
const {
@@ -245,6 +278,10 @@ export const Workflow: FC = memo(({
})
useShortcuts()
+ const { fetchInspectVars } = useSetWorkflowVarsWithValue()
+ useEffect(() => {
+ fetchInspectVars()
+ }, [])
const store = useStoreApi()
if (process.env.NODE_ENV === 'development') {
@@ -267,6 +304,12 @@ export const Workflow: FC = memo(({
>
+
+type WorkflowWithDefaultContextProps
+ = Pick
& {
children: React.ReactNode
}
diff --git a/web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx b/web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx
index dd6a1c6a22..9e67debd58 100644
--- a/web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx
+++ b/web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx
@@ -22,6 +22,7 @@ import type { ListRef } from '@/app/components/workflow/block-selector/market-pl
import PluginList, { type ListProps } from '@/app/components/workflow/block-selector/market-place-plugin/list'
import { useMarketplacePlugins } from '@/app/components/plugins/marketplace/hooks'
import { ToolTipContent } from '@/app/components/base/tooltip/content'
+import { useGlobalPublicStore } from '@/context/global-public-context'
const DEFAULT_TAGS: ListProps['tags'] = []
@@ -48,7 +49,6 @@ const NotFoundWarn = (props: {
}
- needsDelay
>
(ViewType.flat)
const [query, setQuery] = useState('')
@@ -132,13 +136,13 @@ export const AgentStrategySelector = memo((props: AgentStrategySelectorProps) =>
} = useMarketplacePlugins()
useEffect(() => {
+ if (!enable_marketplace) return
if (query) {
fetchPlugins({
query,
category: PluginType.agent,
})
}
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [query])
const pluginRef = useRef(null)
@@ -158,7 +162,7 @@ export const AgentStrategySelector = memo((props: AgentStrategySelectorProps) =>
alt='icon'
/>
}
{value?.agent_strategy_label || t('workflow.nodes.agent.strategy.selectTip')}
@@ -210,19 +214,25 @@ export const AgentStrategySelector = memo((props: AgentStrategySelectorProps) =>
agent_strategy_label: tool!.tool_label,
agent_output_schema: tool!.output_schema,
plugin_unique_identifier: tool!.provider_id,
+ meta: tool!.meta,
})
setOpen(false)
}}
className='h-full max-h-full max-w-none overflow-y-auto'
- indexBarClassName='top-0 xl:top-36' showWorkflowEmpty={false} hasSearchText={false} />
-
+ {enable_marketplace &&
+ />}
plugin_unique_identifier: string
+ meta?: PluginMeta
}
export type AgentStrategyProps = {
@@ -38,6 +41,7 @@ export type AgentStrategyProps = {
nodeOutputVars?: NodeOutPutVar[],
availableNodes?: Node[],
nodeId?: string
+ canChooseMCPTool: boolean
}
type CustomSchema = Omit & { type: Type } & Field
@@ -48,7 +52,7 @@ type MultipleToolSelectorSchema = CustomSchema<'array[tools]'>
type CustomField = ToolSelectorSchema | MultipleToolSelectorSchema
export const AgentStrategy = memo((props: AgentStrategyProps) => {
- const { strategy, onStrategyChange, formSchema, formValue, onFormValueChange, nodeOutputVars, availableNodes, nodeId } = props
+ const { strategy, onStrategyChange, formSchema, formValue, onFormValueChange, nodeOutputVars, availableNodes, nodeId, canChooseMCPTool } = props
const { t } = useTranslation()
const docLink = useDocLink()
const defaultModel = useDefaultModel(ModelTypeEnum.textGeneration)
@@ -57,6 +61,7 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
const {
setControlPromptEditorRerenderKey,
} = workflowStore.getState()
+
const override: ComponentProps>['override'] = [
[FormTypeEnum.textNumber, FormTypeEnum.textInput],
(schema, props) => {
@@ -118,6 +123,7 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
title={<>
{renderI18nObject(def.label)} {def.required && * }
}
+ key={def.variable}
tooltip={def.tooltip && renderI18nObject(def.tooltip)}
inline
>
@@ -167,6 +173,8 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
value={value}
onSelect={item => onChange(item)}
onDelete={() => onChange(null)}
+ canChooseMCPTool={canChooseMCPTool}
+ onSelectMultiple={noop}
/>
)
@@ -188,13 +196,14 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
onChange={onChange}
supportCollapse
required={schema.required}
+ canChooseMCPTool={canChooseMCPTool}
/>
)
}
}
}
return
-
+
{
strategy
?
@@ -214,6 +223,7 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
nodeId={nodeId}
nodeOutputVars={nodeOutputVars || []}
availableNodes={availableNodes || []}
+ canChooseMCPTool={canChooseMCPTool}
/>
:
= ({
const isArrayLikeType = [InputVarType.contexts, InputVarType.iterator].includes(type)
const isContext = type === InputVarType.contexts
const isIterator = type === InputVarType.iterator
+ const isIteratorItemFile = isIterator && payload.isFileItem
const singleFileValue = useMemo(() => {
if (payload.variable === '#files#')
return value?.[0] || []
@@ -202,12 +203,12 @@ const FormItem: FC = ({
}}
/>
)}
- {(type === InputVarType.multiFiles) && (
+ {(type === InputVarType.multiFiles || isIteratorItemFile) && (
onChange(files)}
fileConfig={{
- allowed_file_types: inStepRun
+ allowed_file_types: (inStepRun || isIteratorItemFile)
? [
SupportUploadFileTypes.image,
SupportUploadFileTypes.document,
@@ -215,7 +216,7 @@ const FormItem: FC = ({
SupportUploadFileTypes.video,
]
: payload.allowed_file_types,
- allowed_file_extensions: inStepRun
+ allowed_file_extensions: (inStepRun || isIteratorItemFile)
? [
...FILE_EXTS[SupportUploadFileTypes.image],
...FILE_EXTS[SupportUploadFileTypes.document],
@@ -223,8 +224,8 @@ const FormItem: FC = ({
...FILE_EXTS[SupportUploadFileTypes.video],
]
: payload.allowed_file_extensions,
- allowed_file_upload_methods: inStepRun ? [TransferMethod.local_file, TransferMethod.remote_url] : payload.allowed_file_upload_methods,
- number_limits: inStepRun ? 5 : payload.max_length,
+ allowed_file_upload_methods: (inStepRun || isIteratorItemFile) ? [TransferMethod.local_file, TransferMethod.remote_url] : payload.allowed_file_upload_methods,
+ number_limits: (inStepRun || isIteratorItemFile) ? 5 : payload.max_length,
fileUploadConfig: fileSettings?.fileUploadConfig,
}}
/>
@@ -272,7 +273,7 @@ const FormItem: FC = ({
}
{
- isIterator && (
+ (isIterator && !isIteratorItemFile) && (
{(value || []).map((item: any, index: number) => (
= ({
}
}, [valuesRef, onChange, mapKeysWithSameValueSelector])
const isArrayLikeType = [InputVarType.contexts, InputVarType.iterator].includes(inputs[0]?.type)
+ const isIteratorItemFile = inputs[0]?.type === InputVarType.iterator && inputs[0]?.isFileItem
+
const isContext = inputs[0]?.type === InputVarType.contexts
const handleAddContext = useCallback(() => {
const newValues = produce(values, (draft: any) => {
const key = inputs[0].variable
+ if (!draft[key])
+ draft[key] = []
draft[key].push(isContext ? RETRIEVAL_OUTPUT_STRUCT : '')
})
onChange(newValues)
@@ -75,7 +79,7 @@ const Form: FC = ({
{label && (
{label}
- {isArrayLikeType && (
+ {isArrayLikeType && !isIteratorItemFile && (
)}
diff --git a/web/app/components/workflow/nodes/_base/components/before-run-form/index.tsx b/web/app/components/workflow/nodes/_base/components/before-run-form/index.tsx
index ad8d0b9c61..11bd5156ef 100644
--- a/web/app/components/workflow/nodes/_base/components/before-run-form/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/before-run-form/index.tsx
@@ -1,30 +1,23 @@
'use client'
import type { FC } from 'react'
-import React, { useCallback } from 'react'
+import React, { useEffect, useRef } from 'react'
import { useTranslation } from 'react-i18next'
-import {
- RiCloseLine,
- RiLoader2Line,
-} from '@remixicon/react'
import type { Props as FormProps } from './form'
import Form from './form'
import cn from '@/utils/classnames'
import Button from '@/app/components/base/button'
-import { StopCircle } from '@/app/components/base/icons/src/vender/solid/mediaAndDevices'
import Split from '@/app/components/workflow/nodes/_base/components/split'
-import { InputVarType, NodeRunningStatus } from '@/app/components/workflow/types'
-import ResultPanel from '@/app/components/workflow/run/result-panel'
+import { InputVarType } from '@/app/components/workflow/types'
import Toast from '@/app/components/base/toast'
import { TransferMethod } from '@/types/app'
import { getProcessedFiles } from '@/app/components/base/file-uploader/utils'
-import type { BlockEnum } from '@/app/components/workflow/types'
+import type { BlockEnum, NodeRunningStatus } from '@/app/components/workflow/types'
import type { Emoji } from '@/app/components/tools/types'
import type { SpecialResultPanelProps } from '@/app/components/workflow/run/special-result-panel'
-import SpecialResultPanel from '@/app/components/workflow/run/special-result-panel'
-
+import PanelWrap from './panel-wrap'
const i18nPrefix = 'workflow.singleRun'
-type BeforeRunFormProps = {
+export type BeforeRunFormProps = {
nodeName: string
nodeType?: BlockEnum
toolIcon?: string | Emoji
@@ -32,12 +25,15 @@ type BeforeRunFormProps = {
onRun: (submitData: Record) => void
onStop: () => void
runningStatus: NodeRunningStatus
- result?: React.JSX.Element
forms: FormProps[]
showSpecialResultPanel?: boolean
+ existVarValuesInForms: Record[]
+ filteredExistVarForms: FormProps[]
} & Partial
function formatValue(value: string | any, type: InputVarType) {
+ if(value === undefined || value === null)
+ return value
if (type === InputVarType.number)
return Number.parseFloat(value)
if (type === InputVarType.json)
@@ -53,6 +49,8 @@ function formatValue(value: string | any, type: InputVarType) {
if (type === InputVarType.singleFile) {
if (Array.isArray(value))
return getProcessedFiles(value)
+ if (!value)
+ return undefined
return getProcessedFiles([value])[0]
}
@@ -60,22 +58,17 @@ function formatValue(value: string | any, type: InputVarType) {
}
const BeforeRunForm: FC = ({
nodeName,
- nodeType,
- toolIcon,
onHide,
onRun,
- onStop,
- runningStatus,
- result,
forms,
- showSpecialResultPanel,
- ...restResultPanelParams
+ filteredExistVarForms,
+ existVarValuesInForms,
}) => {
const { t } = useTranslation()
- const isFinished = runningStatus === NodeRunningStatus.Succeeded || runningStatus === NodeRunningStatus.Failed || runningStatus === NodeRunningStatus.Exception
- const isRunning = runningStatus === NodeRunningStatus.Running
const isFileLoaded = (() => {
+ if (!forms || forms.length === 0)
+ return true
// system files
const filesForm = forms.find(item => !!item.values['#files#'])
if (!filesForm)
@@ -87,12 +80,14 @@ const BeforeRunForm: FC = ({
return true
})()
- const handleRun = useCallback(() => {
+ const handleRun = () => {
let errMsg = ''
- forms.forEach((form) => {
+ forms.forEach((form, i) => {
+ const existVarValuesInForm = existVarValuesInForms[i]
+
form.inputs.forEach((input) => {
const value = form.values[input.variable] as any
- if (!errMsg && input.required && (value === '' || value === undefined || value === null || (input.type === InputVarType.files && value.length === 0)))
+ if (!errMsg && input.required && !(input.variable in existVarValuesInForm) && (value === '' || value === undefined || value === null || (input.type === InputVarType.files && value.length === 0)))
errMsg = t('workflow.errorMsg.fieldRequired', { field: typeof input.label === 'object' ? input.label.variable : input.label })
if (!errMsg && (input.type === InputVarType.singleFile || input.type === InputVarType.multiFiles) && value) {
@@ -137,69 +132,45 @@ const BeforeRunForm: FC = ({
}
onRun(submitData)
- }, [forms, onRun, t])
+ }
+ const hasRun = useRef(false)
+ useEffect(() => {
+ // React 18 run twice in dev mode
+ if(hasRun.current)
+ return
+ hasRun.current = true
+ if(filteredExistVarForms.length === 0)
+ onRun({})
+ }, [filteredExistVarForms, onRun])
+
+ if(filteredExistVarForms.length === 0)
+ return null
+
return (
-
-
-
-
- {t(`${i18nPrefix}.testRun`)} {nodeName}
-
-
{
- onHide()
- }}>
-
-
- {
- showSpecialResultPanel && (
-
-
- )
- }
- {
- !showSpecialResultPanel && (
-
-
- {forms.map((form, index) => (
-
-
- {index < forms.length - 1 &&
- ))}
-
-
- {isRunning && (
-
-
- )}
-
- {isRunning && {t(`${i18nPrefix}.${isRunning ? 'running' : 'startRun'}`)}
-
-
- {isRunning && (
-
- )}
- {isFinished && (
- <>
- {result}
-
- )}
+
+
+
+ {filteredExistVarForms.map((form, index) => (
+
+
+ {index < forms.length - 1 &&
- )
- }
+ ))}
+
+
+
+ {t(`${i18nPrefix}.startRun`)}
+
+
+
)
}
export default React.memo(BeforeRunForm)
diff --git a/web/app/components/workflow/nodes/_base/components/before-run-form/panel-wrap.tsx b/web/app/components/workflow/nodes/_base/components/before-run-form/panel-wrap.tsx
new file mode 100644
index 0000000000..7312adf6c6
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/before-run-form/panel-wrap.tsx
@@ -0,0 +1,41 @@
+'use client'
+import type { FC } from 'react'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import {
+ RiCloseLine,
+} from '@remixicon/react'
+
+const i18nPrefix = 'workflow.singleRun'
+
+export type Props = {
+ nodeName: string
+ onHide: () => void
+ children: React.ReactNode
+}
+
+const PanelWrap: FC
= ({
+ nodeName,
+ onHide,
+ children,
+}) => {
+ const { t } = useTranslation()
+ return (
+
+
+
+
+ {t(`${i18nPrefix}.testRun`)} {nodeName}
+
+
{
+ onHide()
+ }}>
+
+
+ {children}
+
+
= ({
return (
-
+
{title}
{
@@ -88,15 +89,16 @@ const Base: FC
= ({
)}
- {!isCopied
- ? (
-
- )
- : (
-
- )
- }
-
+
+ {!isCopied
+ ? (
+
diff --git a/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx b/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
index 3540c60a39..748698747c 100644
--- a/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
@@ -23,7 +23,7 @@ export type Props = {
value?: string | object
placeholder?: React.JSX.Element | string
onChange?: (value: string) => void
- title?: React.JSX.Element
+ title?: string | React.JSX.Element
language: CodeLanguage
headerRight?: React.JSX.Element
readOnly?: boolean
diff --git a/web/app/components/workflow/nodes/_base/components/form-input-boolean.tsx b/web/app/components/workflow/nodes/_base/components/form-input-boolean.tsx
new file mode 100644
index 0000000000..07c3a087b9
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/form-input-boolean.tsx
@@ -0,0 +1,35 @@
+'use client'
+import type { FC } from 'react'
+import cn from '@/utils/classnames'
+
+type Props = {
+ value: boolean
+ onChange: (value: boolean) => void
+}
+
+const FormInputBoolean: FC
= ({
+ value,
+ onChange,
+}) => {
+ return (
+
+
onChange(true)}
+ >True
+
onChange(false)}
+ >False
+
= ({
+ readOnly,
+ nodeId,
+ schema,
+ value,
+ onChange,
+ inPanel,
+ currentTool,
+ currentProvider,
+}) => {
+ const language = useLanguage()
+
+ const {
+ placeholder,
+ variable,
+ type,
+ default: defaultValue,
+ options,
+ scope,
+ } = schema as any
+ const varInput = value[variable]
+ const isString = type === FormTypeEnum.textInput || type === FormTypeEnum.secretInput
+ const isNumber = type === FormTypeEnum.textNumber
+ const isObject = type === FormTypeEnum.object
+ const isArray = type === FormTypeEnum.array
+ const isShowJSONEditor = isObject || isArray
+ const isFile = type === FormTypeEnum.file || type === FormTypeEnum.files
+ const isBoolean = type === FormTypeEnum.boolean
+ const isSelect = type === FormTypeEnum.select || type === FormTypeEnum.dynamicSelect
+ const isAppSelector = type === FormTypeEnum.appSelector
+ const isModelSelector = type === FormTypeEnum.modelSelector
+ const showTypeSwitch = isNumber || isObject || isArray
+ const isConstant = varInput?.type === VarKindType.constant || !varInput?.type
+ const showVariableSelector = isFile || varInput?.type === VarKindType.variable
+
+ const { availableVars, availableNodesWithParent } = useAvailableVarList(nodeId, {
+ onlyLeafNodeVar: false,
+ filterVar: (varPayload: Var) => {
+ return [VarType.string, VarType.number, VarType.secret].includes(varPayload.type)
+ },
+ })
+
+ const targetVarType = () => {
+ if (isString)
+ return VarType.string
+ else if (isNumber)
+ return VarType.number
+ else if (type === FormTypeEnum.files)
+ return VarType.arrayFile
+ else if (type === FormTypeEnum.file)
+ return VarType.file
+ // else if (isSelect)
+ // return VarType.select
+ // else if (isAppSelector)
+ // return VarType.appSelector
+ // else if (isModelSelector)
+ // return VarType.modelSelector
+ // else if (isBoolean)
+ // return VarType.boolean
+ else if (isObject)
+ return VarType.object
+ else if (isArray)
+ return VarType.arrayObject
+ else
+ return VarType.string
+ }
+
+ const getFilterVar = () => {
+ if (isNumber)
+ return (varPayload: any) => varPayload.type === VarType.number
+ else if (isString)
+ return (varPayload: any) => [VarType.string, VarType.number, VarType.secret].includes(varPayload.type)
+ else if (isFile)
+ return (varPayload: any) => [VarType.file, VarType.arrayFile].includes(varPayload.type)
+ else if (isBoolean)
+ return (varPayload: any) => varPayload.type === VarType.boolean
+ else if (isObject)
+ return (varPayload: any) => varPayload.type === VarType.object
+ else if (isArray)
+ return (varPayload: any) => [VarType.array, VarType.arrayString, VarType.arrayNumber, VarType.arrayObject].includes(varPayload.type)
+ return undefined
+ }
+
+ const getVarKindType = () => {
+ if (isFile)
+ return VarKindType.variable
+ if (isSelect || isBoolean || isNumber || isArray || isObject)
+ return VarKindType.constant
+ if (isString)
+ return VarKindType.mixed
+ }
+
+ const handleTypeChange = (newType: string) => {
+ if (newType === VarKindType.variable) {
+ onChange({
+ ...value,
+ [variable]: {
+ ...varInput,
+ type: VarKindType.variable,
+ value: '',
+ },
+ })
+ }
+ else {
+ onChange({
+ ...value,
+ [variable]: {
+ ...varInput,
+ type: VarKindType.constant,
+ value: defaultValue,
+ },
+ })
+ }
+ }
+
+ const handleValueChange = (newValue: any) => {
+ onChange({
+ ...value,
+ [variable]: {
+ ...varInput,
+ type: getVarKindType(),
+ value: isNumber ? Number.parseFloat(newValue) : newValue,
+ },
+ })
+ }
+
+ const handleAppOrModelSelect = (newValue: any) => {
+ onChange({
+ ...value,
+ [variable]: {
+ ...varInput,
+ ...newValue,
+ },
+ })
+ }
+
+ const handleVariableSelectorChange = (newValue: ValueSelector | string, variable: string) => {
+ onChange({
+ ...value,
+ [variable]: {
+ ...varInput,
+ type: VarKindType.variable,
+ value: newValue || '',
+ },
+ })
+ }
+
+ return (
+
+ )}
+ {isAppSelector && (
+ handleVariableSelectorChange(value, variable)}
+ filterVar={getFilterVar()}
+ schema={schema}
+ valueTypePlaceHolder={targetVarType()}
+ currentTool={currentTool}
+ currentProvider={currentProvider}
+ />
+ )}
+
+ )
+}
+export default FormInputItem
diff --git a/web/app/components/workflow/nodes/_base/components/form-input-type-switch.tsx b/web/app/components/workflow/nodes/_base/components/form-input-type-switch.tsx
new file mode 100644
index 0000000000..391e204844
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/form-input-type-switch.tsx
@@ -0,0 +1,47 @@
+'use client'
+import type { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+import {
+ RiEditLine,
+} from '@remixicon/react'
+import { Variable02 } from '@/app/components/base/icons/src/vender/solid/development'
+import Tooltip from '@/app/components/base/tooltip'
+import { VarType } from '@/app/components/workflow/nodes/tool/types'
+import cn from '@/utils/classnames'
+
+type Props = {
+ value: VarType
+ onChange: (value: VarType) => void
+}
+
+const FormInputTypeSwitch: FC
= ({
+ value,
+ onChange,
+}) => {
+ const { t } = useTranslation()
+ return (
+
+
+ onChange(VarType.variable)}
+ >
+
+
+
+ onChange(VarType.constant)}
+ >
+
+
+
+ {t('plugin.detailPanel.toolSelector.unsupportedMCPTool')}
+
+ }
+ >
+
+
+ )
+}
+export default React.memo(McpToolNotSupportTooltip)
diff --git a/web/app/components/workflow/nodes/_base/components/memory-config.tsx b/web/app/components/workflow/nodes/_base/components/memory-config.tsx
index 446fcfa8ae..168ad656b6 100644
--- a/web/app/components/workflow/nodes/_base/components/memory-config.tsx
+++ b/web/app/components/workflow/nodes/_base/components/memory-config.tsx
@@ -53,7 +53,7 @@ type Props = {
const MEMORY_DEFAULT: Memory = {
window: { enabled: false, size: WINDOW_SIZE_DEFAULT },
- query_prompt_template: '{{#sys.query#}}',
+ query_prompt_template: '{{#sys.query#}}\n\n{{#sys.files#}}',
}
const MemoryConfig: FC
= ({
diff --git a/web/app/components/workflow/nodes/_base/components/next-step/index.tsx b/web/app/components/workflow/nodes/_base/components/next-step/index.tsx
index afb642955c..25d1a0aa63 100644
--- a/web/app/components/workflow/nodes/_base/components/next-step/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/next-step/index.tsx
@@ -1,10 +1,10 @@
import { memo, useMemo } from 'react'
import { useTranslation } from 'react-i18next'
+import { isEqual } from 'lodash-es'
import {
getConnectedEdges,
getOutgoers,
- useEdges,
- useStoreApi,
+ useStore,
} from 'reactflow'
import { useToolIcon } from '../../../../hooks'
import BlockIcon from '../../../../block-icon'
@@ -26,12 +26,21 @@ const NextStep = ({
const { t } = useTranslation()
const data = selectedNode.data
const toolIcon = useToolIcon(data)
- const store = useStoreApi()
const branches = useMemo(() => {
return data._targetBranches || []
}, [data])
- const edges = useEdges()
- const outgoers = getOutgoers(selectedNode as Node, store.getState().getNodes(), edges)
+ const edges = useStore(s => s.edges.map(edge => ({
+ id: edge.id,
+ source: edge.source,
+ sourceHandle: edge.sourceHandle,
+ target: edge.target,
+ targetHandle: edge.targetHandle,
+ })), isEqual)
+ const nodes = useStore(s => s.getNodes().map(node => ({
+ id: node.id,
+ data: node.data,
+ })), isEqual)
+ const outgoers = getOutgoers(selectedNode as Node, nodes as Node[], edges)
const connectedEdges = getConnectedEdges([selectedNode] as Node[], edges).filter(edge => edge.source === selectedNode!.id)
const list = useMemo(() => {
diff --git a/web/app/components/workflow/nodes/_base/components/node-control.tsx b/web/app/components/workflow/nodes/_base/components/node-control.tsx
index a85c41741b..5b92b7b6b4 100644
--- a/web/app/components/workflow/nodes/_base/components/node-control.tsx
+++ b/web/app/components/workflow/nodes/_base/components/node-control.tsx
@@ -13,7 +13,7 @@ import {
useNodesInteractions,
useNodesSyncDraft,
} from '../../../hooks'
-import type { Node } from '../../../types'
+import { type Node, NodeRunningStatus } from '../../../types'
import { canRunBySingle } from '../../../utils'
import PanelOperator from './panel-operator'
import {
@@ -31,11 +31,12 @@ const NodeControl: FC = ({
const { handleNodeDataUpdate } = useNodeDataUpdate()
const { handleNodeSelect } = useNodesInteractions()
const { handleSyncWorkflowDraft } = useNodesSyncDraft()
-
+ const isSingleRunning = data._singleRunningStatus === NodeRunningStatus.Running
const handleOpenChange = useCallback((newOpen: boolean) => {
setOpen(newOpen)
}, [])
+ const isChildNode = !!(data.isInIteration || data.isInLoop)
return (
= ({
onClick={e => e.stopPropagation()}
>
{
- canRunBySingle(data.type) && (
+ canRunBySingle(data.type, isChildNode) && (
{
+ const nextData: Record
= {
+ _isSingleRun: !isSingleRunning,
+ }
+ if(isSingleRunning)
+ nextData._singleRunningStatus = undefined
+
handleNodeDataUpdate({
id,
- data: {
- _isSingleRun: !data._isSingleRun,
- },
+ data: nextData,
})
handleNodeSelect(id)
- if (!data._isSingleRun)
- handleSyncWorkflowDraft(true)
}}
>
{
- data._isSingleRun
+ isSingleRunning
? {
const { t } = useTranslation()
const reactflow = useReactFlow()
- const store = useStoreApi()
const { doSyncWorkflowDraft } = useNodesSyncDraft()
+ const {
+ nodePosition,
+ nodeWidth,
+ nodeHeight,
+ } = useStore(useShallow((s) => {
+ const nodes = s.getNodes()
+ const currentNode = nodes.find(node => node.id === nodeId)!
+
+ return {
+ nodePosition: currentNode.position,
+ nodeWidth: currentNode.width,
+ nodeHeight: currentNode.height,
+ }
+ }))
+ const transform = useStore(s => s.transform)
if (!nodePosition || !nodeWidth || !nodeHeight) return null
const workflowContainer = document.getElementById('workflow-container')
- const { transform } = store.getState()
const zoom = transform[2]
const { clientWidth, clientHeight } = workflowContainer!
diff --git a/web/app/components/workflow/nodes/_base/components/panel-operator/panel-operator-popup.tsx b/web/app/components/workflow/nodes/_base/components/panel-operator/panel-operator-popup.tsx
index 28d7358ddb..b079c7b5e0 100644
--- a/web/app/components/workflow/nodes/_base/components/panel-operator/panel-operator-popup.tsx
+++ b/web/app/components/workflow/nodes/_base/components/panel-operator/panel-operator-popup.tsx
@@ -83,14 +83,16 @@ const PanelOperatorPopup = ({
const link = useNodeHelpLink(data.type)
+ const isChildNode = !!(data.isInIteration || data.isInLoop)
+
return (
{
- (showChangeBlock || canRunBySingle(data.type)) && (
+ (showChangeBlock || canRunBySingle(data.type, isChildNode)) && (
<>
{
- canRunBySingle(data.type) && (
+ canRunBySingle(data.type, isChildNode) && (
}
- needsDelay
>
@@ -205,12 +204,12 @@ const Editor: FC
= ({
{!isCopied
? (
-
)
: (
-
)
}
diff --git a/web/app/components/workflow/nodes/_base/components/setting-item.tsx b/web/app/components/workflow/nodes/_base/components/setting-item.tsx
index 134bf4a551..abbfaef490 100644
--- a/web/app/components/workflow/nodes/_base/components/setting-item.tsx
+++ b/web/app/components/workflow/nodes/_base/components/setting-item.tsx
@@ -13,7 +13,7 @@ export const SettingItem = memo(({ label, children, status, tooltip }: SettingIt
const indicator: ComponentProps['color'] = status === 'error' ? 'red' : status === 'warning' ? 'yellow' : undefined
const needTooltip = ['error', 'warning'].includes(status as any)
return
-
+
{label}
diff --git a/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx b/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx
index ceb38fbcfd..94b3ce7bfc 100644
--- a/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx
+++ b/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx
@@ -15,7 +15,7 @@ import { pluginManifestToCardPluginProps } from '@/app/components/plugins/instal
import { Badge as Badge2, BadgeState } from '@/app/components/base/badge/index'
import Link from 'next/link'
import { useTranslation } from 'react-i18next'
-import { marketplaceUrlPrefix } from '@/config'
+import { getMarketplaceUrl } from '@/utils/var'
export type SwitchPluginVersionProps = {
uniqueIdentifier: string
@@ -82,7 +82,7 @@ export const SwitchPluginVersion: FC = (props) => {
modalBottomLeft={
diff --git a/web/app/components/workflow/nodes/_base/components/variable/constant-field.tsx b/web/app/components/workflow/nodes/_base/components/variable/constant-field.tsx
index 0adfa3c9fb..0d965e2d22 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/constant-field.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/constant-field.tsx
@@ -13,6 +13,8 @@ type Props = {
readonly: boolean
value: string
onChange: (value: string | number, varKindType: VarKindType, varInfo?: Var) => void
+ onOpenChange?: (open: boolean) => void
+ isLoading?: boolean
}
const DEFAULT_SCHEMA = {} as CredentialFormSchema
@@ -22,6 +24,8 @@ const ConstantField: FC = ({
readonly,
value,
onChange,
+ onOpenChange,
+ isLoading,
}) => {
const language = useLanguage()
const placeholder = (schema as CredentialFormSchemaSelect).placeholder
@@ -36,7 +40,7 @@ const ConstantField: FC = ({
return (
<>
- {schema.type === FormTypeEnum.select && (
+ {(schema.type === FormTypeEnum.select || schema.type === FormTypeEnum.dynamicSelect) && (
= ({
items={(schema as CredentialFormSchemaSelect).options.map(option => ({ value: option.value, name: option.label[language] || option.label.en_US }))}
onSelect={item => handleSelectChange(item.value)}
placeholder={placeholder?.[language] || placeholder?.en_US}
+ onOpenChange={onOpenChange}
+ isLoading={isLoading}
/>
)}
{schema.type === FormTypeEnum.textNumber && (
diff --git a/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/field.tsx b/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/field.tsx
index f90f30e7ce..ecc67885d1 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/field.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/field.tsx
@@ -41,7 +41,7 @@ const Field: FC = ({
!readonly && onSelect?.([...valueSelector, name])}
+ onMouseDown={() => !readonly && onSelect?.([...valueSelector, name])}
>
diff --git a/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/index.tsx b/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/index.tsx
index 302ed3ca75..5a84300fcd 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/index.tsx
@@ -74,7 +74,7 @@ const PickerPanel: FC
= ({
...props
}) => {
return (
-
+
)
diff --git a/web/app/components/workflow/nodes/_base/components/variable/output-var-list.tsx b/web/app/components/workflow/nodes/_base/components/variable/output-var-list.tsx
index dba93aaf97..831e6eb6ef 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/output-var-list.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/output-var-list.tsx
@@ -8,7 +8,7 @@ import RemoveButton from '../remove-button'
import VarTypePicker from './var-type-picker'
import Input from '@/app/components/base/input'
import type { VarType } from '@/app/components/workflow/types'
-import { checkKeys } from '@/utils/var'
+import { checkKeys, replaceSpaceWithUnderscreInVarNameInput } from '@/utils/var'
import Toast from '@/app/components/base/toast'
type Props = {
@@ -37,6 +37,8 @@ const OutputVarList: FC
= ({
const handleVarNameChange = useCallback((index: number) => {
return (e: React.ChangeEvent) => {
const oldKey = list[index].variable
+
+ replaceSpaceWithUnderscreInVarNameInput(e.target)
const newKey = e.target.value
const { isValid, errorKey, errorMessageKey } = checkKeys([newKey], true)
@@ -62,7 +64,6 @@ const OutputVarList: FC = ({
})
onChange(newOutputs, index, newKey)
}
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [list, onChange, outputs, outputKeyOrders])
const handleVarTypeChange = useCallback((index: number) => {
@@ -73,7 +74,6 @@ const OutputVarList: FC = ({
})
onChange(newOutputs)
}
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [list, onChange, outputs, outputKeyOrders])
const handleVarRemove = useCallback((index: number) => {
diff --git a/web/app/components/workflow/nodes/_base/components/variable/utils.ts b/web/app/components/workflow/nodes/_base/components/variable/utils.ts
index 428c204dd3..3737db8abf 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/utils.ts
+++ b/web/app/components/workflow/nodes/_base/components/variable/utils.ts
@@ -462,6 +462,7 @@ const formatItem = (
return {
variable: `env.${env.name}`,
type: env.value_type,
+ description: env.description,
}
}) as Var[]
break
@@ -472,7 +473,7 @@ const formatItem = (
return {
variable: `conversation.${chatVar.name}`,
type: chatVar.value_type,
- des: chatVar.description,
+ description: chatVar.description,
}
}) as Var[]
break
@@ -611,6 +612,7 @@ const getIterationItemType = ({
}): VarType => {
const outputVarNodeId = valueSelector[0]
const isSystem = isSystemVar(valueSelector)
+ const isChatVar = isConversationVar(valueSelector)
const targetVar = isSystem ? beforeNodesOutputVars.find(v => v.isStartNode) : beforeNodesOutputVars.find(v => v.nodeId === outputVarNodeId)
@@ -620,7 +622,7 @@ const getIterationItemType = ({
let arrayType: VarType = VarType.string
let curr: any = targetVar.vars
- if (isSystem) {
+ if (isSystem || isChatVar) {
arrayType = curr.find((v: any) => v.variable === (valueSelector).join('.'))?.type
}
else {
@@ -644,7 +646,7 @@ const getIterationItemType = ({
case VarType.arrayObject:
return VarType.object
case VarType.array:
- return VarType.any
+ return VarType.arrayObject // Use more specific type instead of any
case VarType.arrayFile:
return VarType.file
default:
@@ -948,9 +950,7 @@ export const getNodeUsedVars = (node: Node): ValueSelector[] => {
break
}
case BlockEnum.Answer: {
- res = (data as AnswerNodeType).variables?.map((v) => {
- return v.value_selector
- })
+ res = matchNotSystemVars([(data as AnswerNodeType).answer])
break
}
case BlockEnum.LLM: {
@@ -977,6 +977,7 @@ export const getNodeUsedVars = (node: Node): ValueSelector[] => {
res = (data as IfElseNodeType).conditions?.map((c) => {
return c.variable_selector || []
}) || []
+ res.push(...((data as IfElseNodeType).cases || []).flatMap(c => (c.conditions || [])).map(c => c.variable_selector || []))
break
}
case BlockEnum.Code: {
@@ -996,6 +997,9 @@ export const getNodeUsedVars = (node: Node): ValueSelector[] => {
res = [payload.query_variable_selector]
const varInInstructions = matchNotSystemVars([payload.instruction || ''])
res.push(...varInInstructions)
+
+ const classes = payload.classes.map(c => c.name)
+ res.push(...matchNotSystemVars(classes))
break
}
case BlockEnum.HttpRequest: {
@@ -1090,13 +1094,13 @@ export const getNodeUsedVarPassToServerKey = (node: Node, valueSelector: ValueSe
break
}
case BlockEnum.Code: {
- const targetVar = (data as CodeNodeType).variables?.find(v => v.value_selector.join('.') === valueSelector.join('.'))
+ const targetVar = (data as CodeNodeType).variables?.find(v => Array.isArray(v.value_selector) && v.value_selector && v.value_selector.join('.') === valueSelector.join('.'))
if (targetVar)
res = targetVar.variable
break
}
case BlockEnum.TemplateTransform: {
- const targetVar = (data as TemplateTransformNodeType).variables?.find(v => v.value_selector.join('.') === valueSelector.join('.'))
+ const targetVar = (data as TemplateTransformNodeType).variables?.find(v => Array.isArray(v.value_selector) && v.value_selector && v.value_selector.join('.') === valueSelector.join('.'))
if (targetVar)
res = targetVar.variable
break
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx
index 181b278051..b1a8d52a05 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx
@@ -1,6 +1,6 @@
'use client'
import type { FC } from 'react'
-import React, { useCallback } from 'react'
+import React, { useCallback, useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import produce from 'immer'
import RemoveButton from '../remove-button'
@@ -8,8 +8,12 @@ import VarReferencePicker from './var-reference-picker'
import Input from '@/app/components/base/input'
import type { ValueSelector, Var, Variable } from '@/app/components/workflow/types'
import { VarType as VarKindType } from '@/app/components/workflow/nodes/tool/types'
-import { checkKeys } from '@/utils/var'
+import { checkKeys, replaceSpaceWithUnderscreInVarNameInput } from '@/utils/var'
import Toast from '@/app/components/base/toast'
+import { ReactSortable } from 'react-sortablejs'
+import { v4 as uuid4 } from 'uuid'
+import { RiDraggable } from '@remixicon/react'
+import cn from '@/utils/classnames'
type Props = {
nodeId: string
@@ -36,8 +40,18 @@ const VarList: FC = ({
}) => {
const { t } = useTranslation()
+ const listWithIds = useMemo(() => list.map((item) => {
+ const id = uuid4()
+ return {
+ id,
+ variable: { ...item },
+ }
+ }), [list])
+
const handleVarNameChange = useCallback((index: number) => {
return (e: React.ChangeEvent) => {
+ replaceSpaceWithUnderscreInVarNameInput(e.target)
+
const newKey = e.target.value
const { isValid, errorKey, errorMessageKey } = checkKeys([newKey], true)
if (!isValid) {
@@ -65,15 +79,24 @@ const VarList: FC = ({
}, [list, onVarNameChange, onChange])
const handleVarReferenceChange = useCallback((index: number) => {
- return (value: ValueSelector | string, varKindType: VarKindType) => {
+ return (value: ValueSelector | string, varKindType: VarKindType, varInfo?: Var) => {
const newList = produce(list, (draft) => {
if (!isSupportConstantValue || varKindType === VarKindType.variable) {
draft[index].value_selector = value as ValueSelector
+ draft[index].value_type = varInfo?.type
if (isSupportConstantValue)
draft[index].variable_type = VarKindType.variable
- if (!draft[index].variable)
- draft[index].variable = value[value.length - 1]
+ if (!draft[index].variable) {
+ const variables = draft.map(v => v.variable)
+ let newVarName = value[value.length - 1]
+ let count = 1
+ while (variables.includes(newVarName)) {
+ newVarName = `${value[value.length - 1]}_${count}`
+ count++
+ }
+ draft[index].variable = newVarName
+ }
}
else {
draft[index].variable_type = VarKindType.constant
@@ -94,36 +117,56 @@ const VarList: FC = ({
}
}, [list, onChange])
+ const varCount = list.length
+
return (
-
- {list.map((item, index) => (
-
-
- )}
-
- ))}
-
{ onChange(list.map(item => item.variable)) }}
+ handle='.handle'
+ ghostClass='opacity-50'
+ animation={150}
+ >
+ {list.map((variable, index) => {
+ const canDrag = (() => {
+ if (readonly)
+ return false
+ return varCount > 1
+ })()
+ return (
+
+
+ )}
+ {canDrag &&
+ )
+ })}
+
)
}
export default React.memo(VarList)
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
index e9825cd44a..08a20b52e4 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
@@ -6,6 +6,7 @@ import {
RiArrowDownSLine,
RiCloseLine,
RiErrorWarningFill,
+ RiLoader4Line,
RiMoreLine,
} from '@remixicon/react'
import produce from 'immer'
@@ -16,8 +17,9 @@ import VarReferencePopup from './var-reference-popup'
import { getNodeInfoById, isConversationVar, isENV, isSystemVar, varTypeToStructType } from './utils'
import ConstantField from './constant-field'
import cn from '@/utils/classnames'
-import type { Node, NodeOutPutVar, ValueSelector, Var } from '@/app/components/workflow/types'
-import type { CredentialFormSchema } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import type { Node, NodeOutPutVar, ToolWithProvider, ValueSelector, Var } from '@/app/components/workflow/types'
+import type { CredentialFormSchemaSelect } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import { type CredentialFormSchema, type FormOption, FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
import { BlockEnum } from '@/app/components/workflow/types'
import { VarBlockIcon } from '@/app/components/workflow/block-icon'
import { Line3 } from '@/app/components/base/icons/src/public/common'
@@ -40,6 +42,8 @@ import Tooltip from '@/app/components/base/tooltip'
import { isExceptionVariable } from '@/app/components/workflow/utils'
import VarFullPathPanel from './var-full-path-panel'
import { noop } from 'lodash-es'
+import { useFetchDynamicOptions } from '@/service/use-plugins'
+import type { Tool } from '@/app/components/tools/types'
const TRIGGER_DEFAULT_WIDTH = 227
@@ -68,6 +72,8 @@ type Props = {
minWidth?: number
popupFor?: 'assigned' | 'toAssigned'
zIndex?: number
+ currentTool?: Tool
+ currentProvider?: ToolWithProvider
}
const DEFAULT_VALUE_SELECTOR: Props['value'] = []
@@ -97,6 +103,8 @@ const VarReferencePicker: FC = ({
minWidth,
popupFor,
zIndex,
+ currentTool,
+ currentProvider,
}) => {
const { t } = useTranslation()
const store = useStoreApi()
@@ -130,7 +138,6 @@ const VarReferencePicker: FC = ({
useEffect(() => {
if (triggerRef.current)
setTriggerWidth(triggerRef.current.clientWidth)
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [triggerRef.current])
const [varKindType, setVarKindType] = useState(defaultVarKindType)
@@ -141,7 +148,6 @@ const VarReferencePicker: FC = ({
const [open, setOpen] = useState(false)
useEffect(() => {
onOpen()
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [open])
const hasValue = !isConstant && value.length > 0
@@ -176,9 +182,11 @@ const VarReferencePicker: FC = ({
return startNode?.data
const node = getNodeInfoById(availableNodes, outputVarNodeId)?.data
- return {
- ...node,
- id: outputVarNodeId,
+ if (node) {
+ return {
+ ...node,
+ id: outputVarNodeId,
+ }
}
}, [value, hasValue, isConstant, isIterationVar, iterationNode, availableNodes, outputVarNodeId, startNode, isLoopVar, loopNode])
@@ -316,6 +324,42 @@ const VarReferencePicker: FC = ({
return null
}, [isValidVar, isShowAPart, hasValue, t, outputVarNode?.title, outputVarNode?.type, value, type])
+
+ const [dynamicOptions, setDynamicOptions] = useState(null)
+ const [isLoading, setIsLoading] = useState(false)
+ const { mutateAsync: fetchDynamicOptions } = useFetchDynamicOptions(
+ currentProvider?.plugin_id || '', currentProvider?.name || '', currentTool?.name || '', (schema as CredentialFormSchemaSelect)?.variable || '',
+ 'tool',
+ )
+ const handleFetchDynamicOptions = async () => {
+ if (schema?.type !== FormTypeEnum.dynamicSelect || !currentTool || !currentProvider)
+ return
+ setIsLoading(true)
+ try {
+ const data = await fetchDynamicOptions()
+ setDynamicOptions(data?.options || [])
+ }
+ finally {
+ setIsLoading(false)
+ }
+ }
+ useEffect(() => {
+ handleFetchDynamicOptions()
+ }, [currentTool, currentProvider, schema])
+
+ const schemaWithDynamicSelect = useMemo(() => {
+ if (schema?.type !== FormTypeEnum.dynamicSelect)
+ return schema
+ // rewrite schema.options with dynamicOptions
+ if (dynamicOptions) {
+ return {
+ ...schema,
+ options: dynamicOptions,
+ }
+ }
+ return schema
+ }, [dynamicOptions])
+
return (
= ({
void)}
- schema={schema as CredentialFormSchema}
+ schema={schemaWithDynamicSelect as CredentialFormSchema}
readonly={readonly}
+ isLoading={isLoading}
/>
)
: (
@@ -412,6 +457,7 @@ const VarReferencePicker: FC = ({
)}
{!hasValue &&
}
+ {isLoading &&
}
{isEnv &&
}
{isChatVar &&
}
= ({
{!isValidVar &&
}
)
- :
{placeholder ?? t('workflow.common.setVarValuePlaceholder')}
}
+ :
+ {isLoading ? (
+
+ {placeholder ?? t('workflow.common.setVarValuePlaceholder')}
+
+ ) : (
+ placeholder ?? t('workflow.common.setVarValuePlaceholder')
+ )}
+
}
= ({
onChange={handleVarReferenceChange}
itemWidth={isAddBtnTrigger ? 260 : (minWidth || triggerWidth)}
isSupportFileVar={isSupportFileVar}
+ zIndex={zIndex}
/>
)}
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx
index 9398ae7361..3746a85441 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx
@@ -13,6 +13,7 @@ type Props = {
onChange: (value: ValueSelector, varDetail: Var) => void
itemWidth?: number
isSupportFileVar?: boolean
+ zIndex?: number
}
const VarReferencePopup: FC = ({
vars,
@@ -20,6 +21,7 @@ const VarReferencePopup: FC = ({
onChange,
itemWidth,
isSupportFileVar = true,
+ zIndex,
}) => {
const { t } = useTranslation()
const docLink = useDocLink()
@@ -60,6 +62,7 @@ const VarReferencePopup: FC = ({
onChange={onChange}
itemWidth={itemWidth}
isSupportFileVar={isSupportFileVar}
+ zIndex={zIndex}
/>
}
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
index 27063a2ba3..325d1889aa 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
@@ -46,6 +46,7 @@ type ItemProps = {
isSupportFileVar?: boolean
isException?: boolean
isLoopVar?: boolean
+ zIndex?: number
}
const objVarTypes = [VarType.object, VarType.file]
@@ -60,6 +61,7 @@ const Item: FC = ({
isSupportFileVar,
isException,
isLoopVar,
+ zIndex,
}) => {
const isStructureOutput = itemData.type === VarType.object && (itemData.children as StructuredOutput)?.schema?.properties
const isFile = itemData.type === VarType.file && !isStructureOutput
@@ -116,7 +118,6 @@ const Item: FC = ({
const open = (isObj || isStructureOutput) && isHovering
useEffect(() => {
onHovering && onHovering(isHovering)
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [isHovering])
const handleChosen = (e: React.MouseEvent) => {
e.stopPropagation()
@@ -171,7 +172,7 @@ const Item: FC = ({
{(isStructureOutput || isObj) && (
= ({
const isHovering = isItemHovering || isChildrenHovering
useEffect(() => {
onHovering && onHovering(isHovering)
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [isHovering])
useEffect(() => {
onHovering && onHovering(isItemHovering)
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [isItemHovering])
// absolute top-[-2px]
return (
@@ -260,6 +259,7 @@ type Props = {
maxHeightClass?: string
onClose?: () => void
onBlur?: () => void
+ zIndex?: number
autoFocus?: boolean
}
const VarReferenceVars: FC = ({
@@ -272,6 +272,7 @@ const VarReferenceVars: FC = ({
maxHeightClass,
onClose,
onBlur,
+ zIndex,
autoFocus = true,
}) => {
const { t } = useTranslation()
@@ -357,6 +358,7 @@ const VarReferenceVars: FC = ({
isSupportFileVar={isSupportFileVar}
isException={v.isException}
isLoopVar={item.isLoop}
+ zIndex={zIndex}
/>
))}
))
diff --git a/web/app/components/workflow/nodes/_base/components/workflow-panel/index.spec.tsx b/web/app/components/workflow/nodes/_base/components/workflow-panel/index.spec.tsx
new file mode 100644
index 0000000000..5c6ffb7a52
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/workflow-panel/index.spec.tsx
@@ -0,0 +1,178 @@
+/**
+ * Workflow Panel Width Persistence Tests
+ * Tests for GitHub issue #22745: Panel width persistence bug fix
+ */
+
+import '@testing-library/jest-dom'
+
+type PanelWidthSource = 'user' | 'system'
+
+// Mock localStorage for testing
+const createMockLocalStorage = () => {
+ const storage: Record
= {}
+ return {
+ getItem: jest.fn((key: string) => storage[key] || null),
+ setItem: jest.fn((key: string, value: string) => {
+ storage[key] = value
+ }),
+ removeItem: jest.fn((key: string) => {
+ delete storage[key]
+ }),
+ clear: jest.fn(() => {
+ Object.keys(storage).forEach(key => delete storage[key])
+ }),
+ get storage() { return { ...storage } },
+ }
+}
+
+// Core panel width logic extracted from the component
+const createPanelWidthManager = (storageKey: string) => {
+ return {
+ updateWidth: (width: number, source: PanelWidthSource = 'user') => {
+ const newValue = Math.max(400, Math.min(width, 800))
+ if (source === 'user')
+ localStorage.setItem(storageKey, `${newValue}`)
+
+ return newValue
+ },
+ getStoredWidth: () => {
+ const stored = localStorage.getItem(storageKey)
+ return stored ? Number.parseFloat(stored) : 400
+ },
+ }
+}
+
+describe('Workflow Panel Width Persistence', () => {
+ let mockLocalStorage: ReturnType
+
+ beforeEach(() => {
+ mockLocalStorage = createMockLocalStorage()
+ Object.defineProperty(globalThis, 'localStorage', {
+ value: mockLocalStorage,
+ writable: true,
+ })
+ })
+
+ afterEach(() => {
+ jest.clearAllMocks()
+ })
+
+ describe('Node Panel Width Management', () => {
+ const storageKey = 'workflow-node-panel-width'
+
+ it('should save user resize to localStorage', () => {
+ const manager = createPanelWidthManager(storageKey)
+
+ const result = manager.updateWidth(500, 'user')
+
+ expect(result).toBe(500)
+ expect(localStorage.setItem).toHaveBeenCalledWith(storageKey, '500')
+ })
+
+ it('should not save system compression to localStorage', () => {
+ const manager = createPanelWidthManager(storageKey)
+
+ const result = manager.updateWidth(200, 'system')
+
+ expect(result).toBe(400) // Respects minimum width
+ expect(localStorage.setItem).not.toHaveBeenCalled()
+ })
+
+ it('should enforce minimum width of 400px', () => {
+ const manager = createPanelWidthManager(storageKey)
+
+ // User tries to set below minimum
+ const userResult = manager.updateWidth(300, 'user')
+ expect(userResult).toBe(400)
+ expect(localStorage.setItem).toHaveBeenCalledWith(storageKey, '400')
+
+ // System compression below minimum
+ const systemResult = manager.updateWidth(150, 'system')
+ expect(systemResult).toBe(400)
+ expect(localStorage.setItem).toHaveBeenCalledTimes(1) // Only user call
+ })
+
+ it('should preserve user preferences during system compression', () => {
+ localStorage.setItem(storageKey, '600')
+ const manager = createPanelWidthManager(storageKey)
+
+ // System compresses panel
+ manager.updateWidth(200, 'system')
+
+ // User preference should remain unchanged
+ expect(localStorage.getItem(storageKey)).toBe('600')
+ })
+ })
+
+ describe('Bug Scenario Reproduction', () => {
+ it('should reproduce original bug behavior (for comparison)', () => {
+ const storageKey = 'workflow-node-panel-width'
+
+ // Original buggy behavior - always saves regardless of source
+ const buggyUpdate = (width: number) => {
+ localStorage.setItem(storageKey, `${width}`)
+ return Math.max(400, width)
+ }
+
+ localStorage.setItem(storageKey, '500') // User preference
+ buggyUpdate(200) // System compression pollutes localStorage
+
+ expect(localStorage.getItem(storageKey)).toBe('200') // Bug: corrupted state
+ })
+
+ it('should verify fix prevents localStorage pollution', () => {
+ const storageKey = 'workflow-node-panel-width'
+ const manager = createPanelWidthManager(storageKey)
+
+ localStorage.setItem(storageKey, '500') // User preference
+ manager.updateWidth(200, 'system') // System compression
+
+ expect(localStorage.getItem(storageKey)).toBe('500') // Fix: preserved state
+ })
+ })
+
+ describe('Edge Cases', () => {
+ it('should handle multiple rapid operations correctly', () => {
+ const manager = createPanelWidthManager('workflow-node-panel-width')
+
+ // Rapid system adjustments
+ manager.updateWidth(300, 'system')
+ manager.updateWidth(250, 'system')
+ manager.updateWidth(180, 'system')
+
+ // Single user adjustment
+ manager.updateWidth(550, 'user')
+
+ expect(localStorage.setItem).toHaveBeenCalledTimes(1)
+ expect(localStorage.setItem).toHaveBeenCalledWith('workflow-node-panel-width', '550')
+ })
+
+ it('should handle corrupted localStorage gracefully', () => {
+ localStorage.setItem('workflow-node-panel-width', '150') // Below minimum
+ const manager = createPanelWidthManager('workflow-node-panel-width')
+
+ const storedWidth = manager.getStoredWidth()
+ expect(storedWidth).toBe(150) // Returns raw value
+
+ // User can correct the preference
+ const correctedWidth = manager.updateWidth(500, 'user')
+ expect(correctedWidth).toBe(500)
+ expect(localStorage.getItem('workflow-node-panel-width')).toBe('500')
+ })
+ })
+
+ describe('TypeScript Type Safety', () => {
+ it('should enforce source parameter type', () => {
+ const manager = createPanelWidthManager('workflow-node-panel-width')
+
+ // Valid source values
+ manager.updateWidth(500, 'user')
+ manager.updateWidth(500, 'system')
+
+ // Default to 'user'
+ manager.updateWidth(500)
+
+ expect(localStorage.setItem).toHaveBeenCalledTimes(2) // user + default
+ })
+ })
+})
diff --git a/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx b/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx
new file mode 100644
index 0000000000..93fab83172
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx
@@ -0,0 +1,492 @@
+import type {
+ FC,
+ ReactNode,
+} from 'react'
+import {
+ cloneElement,
+ memo,
+ useCallback,
+ useEffect,
+ useMemo,
+ useRef,
+ useState,
+} from 'react'
+import {
+ RiCloseLine,
+ RiPlayLargeLine,
+} from '@remixicon/react'
+import { useShallow } from 'zustand/react/shallow'
+import { useTranslation } from 'react-i18next'
+import NextStep from '../next-step'
+import PanelOperator from '../panel-operator'
+import NodePosition from '@/app/components/workflow/nodes/_base/components/node-position'
+import HelpLink from '../help-link'
+import {
+ DescriptionInput,
+ TitleInput,
+} from '../title-description-input'
+import ErrorHandleOnPanel from '../error-handle/error-handle-on-panel'
+import RetryOnPanel from '../retry/retry-on-panel'
+import { useResizePanel } from '../../hooks/use-resize-panel'
+import cn from '@/utils/classnames'
+import BlockIcon from '@/app/components/workflow/block-icon'
+import Split from '@/app/components/workflow/nodes/_base/components/split'
+import {
+ WorkflowHistoryEvent,
+ useAvailableBlocks,
+ useNodeDataUpdate,
+ useNodesInteractions,
+ useNodesReadOnly,
+ useToolIcon,
+ useWorkflowHistory,
+} from '@/app/components/workflow/hooks'
+import {
+ canRunBySingle,
+ hasErrorHandleNode,
+ hasRetryNode,
+} from '@/app/components/workflow/utils'
+import Tooltip from '@/app/components/base/tooltip'
+import { BlockEnum, type Node, NodeRunningStatus } from '@/app/components/workflow/types'
+import { useStore as useAppStore } from '@/app/components/app/store'
+import { useStore } from '@/app/components/workflow/store'
+import Tab, { TabType } from './tab'
+import LastRun from './last-run'
+import useLastRun from './last-run/use-last-run'
+import BeforeRunForm from '../before-run-form'
+import { debounce } from 'lodash-es'
+import { NODES_EXTRA_DATA } from '@/app/components/workflow/constants'
+import { useLogs } from '@/app/components/workflow/run/hooks'
+import PanelWrap from '../before-run-form/panel-wrap'
+import SpecialResultPanel from '@/app/components/workflow/run/special-result-panel'
+import { Stop } from '@/app/components/base/icons/src/vender/line/mediaAndDevices'
+import {
+ AuthorizedInNode,
+ PluginAuth,
+} from '@/app/components/plugins/plugin-auth'
+import { AuthCategory } from '@/app/components/plugins/plugin-auth'
+import { canFindTool } from '@/utils'
+
+type BasePanelProps = {
+ children: ReactNode
+ id: Node['id']
+ data: Node['data']
+}
+
+const BasePanel: FC = ({
+ id,
+ data,
+ children,
+}) => {
+ const { t } = useTranslation()
+ const { showMessageLogModal } = useAppStore(useShallow(state => ({
+ showMessageLogModal: state.showMessageLogModal,
+ })))
+ const isSingleRunning = data._singleRunningStatus === NodeRunningStatus.Running
+
+ const showSingleRunPanel = useStore(s => s.showSingleRunPanel)
+ const workflowCanvasWidth = useStore(s => s.workflowCanvasWidth)
+ const nodePanelWidth = useStore(s => s.nodePanelWidth)
+ const otherPanelWidth = useStore(s => s.otherPanelWidth)
+ const setNodePanelWidth = useStore(s => s.setNodePanelWidth)
+
+ const reservedCanvasWidth = 400 // Reserve the minimum visible width for the canvas
+
+ const maxNodePanelWidth = useMemo(() => {
+ if (!workflowCanvasWidth)
+ return 720
+
+ const available = workflowCanvasWidth - (otherPanelWidth || 0) - reservedCanvasWidth
+ return Math.max(available, 400)
+ }, [workflowCanvasWidth, otherPanelWidth])
+
+ const updateNodePanelWidth = useCallback((width: number, source: 'user' | 'system' = 'user') => {
+ // Ensure the width is within the min and max range
+ const newValue = Math.max(400, Math.min(width, maxNodePanelWidth))
+
+ if (source === 'user')
+ localStorage.setItem('workflow-node-panel-width', `${newValue}`)
+
+ setNodePanelWidth(newValue)
+ }, [maxNodePanelWidth, setNodePanelWidth])
+
+ const handleResize = useCallback((width: number) => {
+ updateNodePanelWidth(width, 'user')
+ }, [updateNodePanelWidth])
+
+ const {
+ triggerRef,
+ containerRef,
+ } = useResizePanel({
+ direction: 'horizontal',
+ triggerDirection: 'left',
+ minWidth: 400,
+ maxWidth: maxNodePanelWidth,
+ onResize: debounce(handleResize),
+ })
+
+ const debounceUpdate = debounce((width: number) => {
+ updateNodePanelWidth(width, 'system')
+ })
+
+ useEffect(() => {
+ if (!workflowCanvasWidth)
+ return
+
+ // If the total width of the three exceeds the canvas, shrink the node panel to the available range (at least 400px)
+ const total = nodePanelWidth + otherPanelWidth + reservedCanvasWidth
+ if (total > workflowCanvasWidth) {
+ const target = Math.max(workflowCanvasWidth - otherPanelWidth - reservedCanvasWidth, 400)
+ debounceUpdate(target)
+ }
+ }, [nodePanelWidth, otherPanelWidth, workflowCanvasWidth, debounceUpdate])
+
+ const { handleNodeSelect } = useNodesInteractions()
+ const { nodesReadOnly } = useNodesReadOnly()
+ const { availableNextBlocks } = useAvailableBlocks(data.type, data.isInIteration, data.isInLoop)
+ const toolIcon = useToolIcon(data)
+
+ const { saveStateToHistory } = useWorkflowHistory()
+
+ const {
+ handleNodeDataUpdate,
+ handleNodeDataUpdateWithSyncDraft,
+ } = useNodeDataUpdate()
+
+ const handleTitleBlur = useCallback((title: string) => {
+ handleNodeDataUpdateWithSyncDraft({ id, data: { title } })
+ saveStateToHistory(WorkflowHistoryEvent.NodeTitleChange)
+ }, [handleNodeDataUpdateWithSyncDraft, id, saveStateToHistory])
+ const handleDescriptionChange = useCallback((desc: string) => {
+ handleNodeDataUpdateWithSyncDraft({ id, data: { desc } })
+ saveStateToHistory(WorkflowHistoryEvent.NodeDescriptionChange)
+ }, [handleNodeDataUpdateWithSyncDraft, id, saveStateToHistory])
+
+ const isChildNode = !!(data.isInIteration || data.isInLoop)
+ const isSupportSingleRun = canRunBySingle(data.type, isChildNode)
+ const appDetail = useAppStore(state => state.appDetail)
+
+ const hasClickRunning = useRef(false)
+ const [isPaused, setIsPaused] = useState(false)
+
+ useEffect(() => {
+ if(data._singleRunningStatus === NodeRunningStatus.Running) {
+ hasClickRunning.current = true
+ setIsPaused(false)
+ }
+ else if(data._isSingleRun && data._singleRunningStatus === undefined && hasClickRunning) {
+ setIsPaused(true)
+ hasClickRunning.current = false
+ }
+ }, [data])
+
+ const updateNodeRunningStatus = useCallback((status: NodeRunningStatus) => {
+ handleNodeDataUpdate({
+ id,
+ data: {
+ ...data,
+ _singleRunningStatus: status,
+ },
+ })
+ }, [handleNodeDataUpdate, id, data])
+
+ useEffect(() => {
+ // console.log(`id changed: ${id}, hasClickRunning: ${hasClickRunning.current}`)
+ hasClickRunning.current = false
+ }, [id])
+
+ const {
+ isShowSingleRun,
+ hideSingleRun,
+ runningStatus,
+ handleStop,
+ runInputData,
+ runInputDataRef,
+ runResult,
+ getInputVars,
+ toVarInputs,
+ tabType,
+ isRunAfterSingleRun,
+ setTabType,
+ singleRunParams,
+ nodeInfo,
+ setRunInputData,
+ handleSingleRun,
+ handleRunWithParams,
+ getExistVarValuesInForms,
+ getFilteredExistVarForms,
+ } = useLastRun({
+ id,
+ data,
+ defaultRunInputData: NODES_EXTRA_DATA[data.type]?.defaultRunInputData || {},
+ isPaused,
+ })
+
+ useEffect(() => {
+ setIsPaused(false)
+ }, [tabType])
+
+ const logParams = useLogs()
+ const passedLogParams = (() => {
+ if ([BlockEnum.Tool, BlockEnum.Agent, BlockEnum.Iteration, BlockEnum.Loop].includes(data.type))
+ return logParams
+
+ return {}
+ })()
+
+ const buildInTools = useStore(s => s.buildInTools)
+ const currCollection = useMemo(() => {
+ return buildInTools.find(item => canFindTool(item.id, data.provider_id))
+ }, [buildInTools, data.provider_id])
+ const showPluginAuth = useMemo(() => {
+ return data.type === BlockEnum.Tool && currCollection?.allow_delete
+ }, [currCollection, data.type])
+ const handleAuthorizationItemClick = useCallback((credential_id: string) => {
+ handleNodeDataUpdateWithSyncDraft({
+ id,
+ data: {
+ credential_id,
+ },
+ })
+ }, [handleNodeDataUpdateWithSyncDraft, id])
+
+ if(logParams.showSpecialResultPanel) {
+ return (
+
+ )
+ }
+
+ if (isShowSingleRun) {
+ return (
+
+ )
+ }
+
+ return (
+
+
+
+
+
+
+
+
+ {
+ isSupportSingleRun && !nodesReadOnly && (
+
+ {
+ if(isSingleRunning) {
+ handleNodeDataUpdate({
+ id,
+ data: {
+ _isSingleRun: false,
+ _singleRunningStatus: undefined,
+ },
+ })
+ }
+ else {
+ handleSingleRun()
+ }
+ }}
+ >
+ {
+ isSingleRunning ?
+
+ )
+ }
+
+
+
+
+
handleNodeSelect(id, true)}
+ >
+
+
+
+
+
+ {
+ showPluginAuth && (
+
+
+
+ )
+ }
+ {
+ !showPluginAuth && (
+
+
+ )
+ }
+
+
+
+ {tabType === TabType.settings && (
+ <>
+
+ {cloneElement(children as any, {
+ id,
+ data,
+ panelProps: {
+ getInputVars,
+ toVarInputs,
+ runInputData,
+ setRunInputData,
+ runResult,
+ runInputDataRef,
+ },
+ })}
+
+
+ {
+ hasRetryNode(data.type) && (
+
+ )
+ }
+ {
+ hasErrorHandleNode(data.type) && (
+
+ )
+ }
+ {
+ !!availableNextBlocks.length && (
+
+
+ {t('workflow.panel.nextStep').toLocaleUpperCase()}
+
+
+ {t('workflow.panel.addNextStep')}
+
+
+
+ )
+ }
+
+ )}
+
+ {tabType === TabType.lastRun && (
+
+ )}
+
+
+
+const LastRun: FC = ({
+ appId,
+ nodeId,
+ canSingleRun,
+ isRunAfterSingleRun,
+ updateNodeRunningStatus,
+ nodeInfo,
+ runningStatus: oneStepRunRunningStatus,
+ onSingleRunClicked,
+ singleRunResult,
+ isPaused,
+ ...otherResultPanelProps
+}) => {
+ const isOneStepRunSucceed = oneStepRunRunningStatus === NodeRunningStatus.Succeeded
+ const isOneStepRunFailed = oneStepRunRunningStatus === NodeRunningStatus.Failed
+ // hide page and return to page would lost the oneStepRunRunningStatus
+ const [hidePageOneStepFinishedStatus, setHidePageOneStepFinishedStatus] = React.useState(null)
+ const [pageHasHide, setPageHasHide] = useState(false)
+ const [pageShowed, setPageShowed] = useState(false)
+
+ const hidePageOneStepRunFinished = [NodeRunningStatus.Succeeded, NodeRunningStatus.Failed].includes(hidePageOneStepFinishedStatus!)
+ const canRunLastRun = !isRunAfterSingleRun || isOneStepRunSucceed || isOneStepRunFailed || (pageHasHide && hidePageOneStepRunFinished)
+ const { data: lastRunResult, isFetching, error } = useLastRun(appId, nodeId, canRunLastRun)
+ const isRunning = useMemo(() => {
+ if(isPaused)
+ return false
+
+ if(!isRunAfterSingleRun)
+ return isFetching
+ return [NodeRunningStatus.Running, NodeRunningStatus.NotStart].includes(oneStepRunRunningStatus!)
+ }, [isFetching, isPaused, isRunAfterSingleRun, oneStepRunRunningStatus])
+
+ const noLastRun = (error as any)?.status === 404
+ const runResult = (canRunLastRun ? lastRunResult : singleRunResult) || lastRunResult || {}
+
+ const resetHidePageStatus = useCallback(() => {
+ setPageHasHide(false)
+ setPageShowed(false)
+ setHidePageOneStepFinishedStatus(null)
+ }, [])
+ useEffect(() => {
+ if (pageShowed && hidePageOneStepFinishedStatus && (!oneStepRunRunningStatus || oneStepRunRunningStatus === NodeRunningStatus.NotStart)) {
+ updateNodeRunningStatus(hidePageOneStepFinishedStatus)
+ resetHidePageStatus()
+ }
+ }, [isOneStepRunSucceed, isOneStepRunFailed, oneStepRunRunningStatus])
+
+ useEffect(() => {
+ if([NodeRunningStatus.Succeeded, NodeRunningStatus.Failed].includes(oneStepRunRunningStatus!))
+ setHidePageOneStepFinishedStatus(oneStepRunRunningStatus!)
+ }, [oneStepRunRunningStatus])
+
+ useEffect(() => {
+ resetHidePageStatus()
+ }, [nodeId])
+
+ const handlePageVisibilityChange = useCallback(() => {
+ if (document.visibilityState === 'hidden')
+ setPageHasHide(true)
+ else
+ setPageShowed(true)
+ }, [])
+ useEffect(() => {
+ document.addEventListener('visibilitychange', handlePageVisibilityChange)
+
+ return () => {
+ document.removeEventListener('visibilitychange', handlePageVisibilityChange)
+ }
+ }, [handlePageVisibilityChange])
+
+ if (isFetching && !isRunAfterSingleRun) {
+ return (
+
+
)
+ }
+
+ if (isRunning)
+ return
+
+ )
+}
+export default React.memo(LastRun)
diff --git a/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/no-data.tsx b/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/no-data.tsx
new file mode 100644
index 0000000000..ad0058efae
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/no-data.tsx
@@ -0,0 +1,36 @@
+'use client'
+import type { FC } from 'react'
+import React from 'react'
+import { ClockPlay } from '@/app/components/base/icons/src/vender/line/time'
+import Button from '@/app/components/base/button'
+import { RiPlayLine } from '@remixicon/react'
+import { useTranslation } from 'react-i18next'
+
+type Props = {
+ canSingleRun: boolean
+ onSingleRun: () => void
+}
+
+const NoData: FC = ({
+ canSingleRun,
+ onSingleRun,
+}) => {
+ const { t } = useTranslation()
+ return (
+
+
+
{t('workflow.debug.noData.description')}
+ {canSingleRun && (
+
+ {t('workflow.debug.noData.runThisNode')}
+
+ )}
+
= {
+ [BlockEnum.LLM]: useLLMSingleRunFormParams,
+ [BlockEnum.KnowledgeRetrieval]: useKnowledgeRetrievalSingleRunFormParams,
+ [BlockEnum.Code]: useCodeSingleRunFormParams,
+ [BlockEnum.TemplateTransform]: useTemplateTransformSingleRunFormParams,
+ [BlockEnum.QuestionClassifier]: useQuestionClassifierSingleRunFormParams,
+ [BlockEnum.HttpRequest]: useHttpRequestSingleRunFormParams,
+ [BlockEnum.Tool]: useToolSingleRunFormParams,
+ [BlockEnum.ParameterExtractor]: useParameterExtractorSingleRunFormParams,
+ [BlockEnum.Iteration]: useIterationSingleRunFormParams,
+ [BlockEnum.Agent]: useAgentSingleRunFormParams,
+ [BlockEnum.DocExtractor]: useDocExtractorSingleRunFormParams,
+ [BlockEnum.Loop]: useLoopSingleRunFormParams,
+ [BlockEnum.Start]: useStartSingleRunFormParams,
+ [BlockEnum.IfElse]: useIfElseSingleRunFormParams,
+ [BlockEnum.VariableAggregator]: useVariableAggregatorSingleRunFormParams,
+ [BlockEnum.Assigner]: useVariableAssignerSingleRunFormParams,
+ [BlockEnum.VariableAssigner]: undefined,
+ [BlockEnum.End]: undefined,
+ [BlockEnum.Answer]: undefined,
+ [BlockEnum.ListFilter]: undefined,
+ [BlockEnum.IterationStart]: undefined,
+ [BlockEnum.LoopStart]: undefined,
+ [BlockEnum.LoopEnd]: undefined,
+}
+
+const useSingleRunFormParamsHooks = (nodeType: BlockEnum) => {
+ return (params: any) => {
+ return singleRunFormParamsHooks[nodeType]?.(params) || {}
+ }
+}
+
+const getDataForCheckMoreHooks: Record = {
+ [BlockEnum.Tool]: useToolGetDataForCheckMore,
+ [BlockEnum.LLM]: undefined,
+ [BlockEnum.KnowledgeRetrieval]: undefined,
+ [BlockEnum.Code]: undefined,
+ [BlockEnum.TemplateTransform]: undefined,
+ [BlockEnum.QuestionClassifier]: undefined,
+ [BlockEnum.HttpRequest]: undefined,
+ [BlockEnum.ParameterExtractor]: undefined,
+ [BlockEnum.Iteration]: undefined,
+ [BlockEnum.Agent]: undefined,
+ [BlockEnum.DocExtractor]: undefined,
+ [BlockEnum.Loop]: undefined,
+ [BlockEnum.Start]: undefined,
+ [BlockEnum.IfElse]: undefined,
+ [BlockEnum.VariableAggregator]: undefined,
+ [BlockEnum.End]: undefined,
+ [BlockEnum.Answer]: undefined,
+ [BlockEnum.VariableAssigner]: undefined,
+ [BlockEnum.ListFilter]: undefined,
+ [BlockEnum.IterationStart]: undefined,
+ [BlockEnum.Assigner]: undefined,
+ [BlockEnum.LoopStart]: undefined,
+ [BlockEnum.LoopEnd]: undefined,
+}
+
+const useGetDataForCheckMoreHooks = (nodeType: BlockEnum) => {
+ return (id: string, payload: CommonNodeType) => {
+ return getDataForCheckMoreHooks[nodeType]?.({ id, payload }) || {
+ getData: () => {
+ return {}
+ },
+ }
+ }
+}
+
+type Params = Omit, 'isRunAfterSingleRun'>
+const useLastRun = ({
+ ...oneStepRunParams
+}: Params) => {
+ const { conversationVars, systemVars, hasSetInspectVar } = useInspectVarsCrud()
+ const blockType = oneStepRunParams.data.type
+ const isStartNode = blockType === BlockEnum.Start
+ const isIterationNode = blockType === BlockEnum.Iteration
+ const isLoopNode = blockType === BlockEnum.Loop
+ const isAggregatorNode = blockType === BlockEnum.VariableAggregator
+ const { handleSyncWorkflowDraft } = useNodesSyncDraft()
+ const {
+ getData: getDataForCheckMore,
+ } = useGetDataForCheckMoreHooks(blockType)(oneStepRunParams.id, oneStepRunParams.data)
+ const [isRunAfterSingleRun, setIsRunAfterSingleRun] = useState(false)
+
+ const {
+ id,
+ data,
+ } = oneStepRunParams
+ const oneStepRunRes = useOneStepRun({
+ ...oneStepRunParams,
+ iteratorInputKey: blockType === BlockEnum.Iteration ? `${id}.input_selector` : '',
+ moreDataForCheckValid: getDataForCheckMore(),
+ isRunAfterSingleRun,
+ })
+
+ const {
+ appId,
+ hideSingleRun,
+ handleRun: doCallRunApi,
+ getInputVars,
+ toVarInputs,
+ varSelectorsToVarInputs,
+ runInputData,
+ runInputDataRef,
+ setRunInputData,
+ showSingleRun,
+ runResult,
+ iterationRunResult,
+ loopRunResult,
+ setNodeRunning,
+ checkValid,
+ } = oneStepRunRes
+
+ const {
+ nodeInfo,
+ ...singleRunParams
+ } = useSingleRunFormParamsHooks(blockType)({
+ id,
+ payload: data,
+ runInputData,
+ runInputDataRef,
+ getInputVars,
+ setRunInputData,
+ toVarInputs,
+ varSelectorsToVarInputs,
+ runResult,
+ iterationRunResult,
+ loopRunResult,
+ })
+
+ const toSubmitData = useCallback((data: Record) => {
+ if(!isIterationNode && !isLoopNode)
+ return data
+
+ const allVarObject = singleRunParams?.allVarObject || {}
+ const formattedData: Record = {}
+ Object.keys(allVarObject).forEach((key) => {
+ const [varSectorStr, nodeId] = key.split(DELIMITER)
+ formattedData[`${nodeId}.${allVarObject[key].inSingleRunPassedKey}`] = data[varSectorStr]
+ })
+ if(isIterationNode) {
+ const iteratorInputKey = `${id}.input_selector`
+ formattedData[iteratorInputKey] = data[iteratorInputKey]
+ }
+ return formattedData
+ }, [isIterationNode, isLoopNode, singleRunParams?.allVarObject, id])
+
+ const callRunApi = (data: Record, cb?: () => void) => {
+ handleSyncWorkflowDraft(true, true, {
+ onSuccess() {
+ doCallRunApi(toSubmitData(data))
+ cb?.()
+ },
+ })
+ }
+ const workflowStore = useWorkflowStore()
+ const { setInitShowLastRunTab } = workflowStore.getState()
+ const initShowLastRunTab = useStore(s => s.initShowLastRunTab)
+ const [tabType, setTabType] = useState(initShowLastRunTab ? TabType.lastRun : TabType.settings)
+ useEffect(() => {
+ if(initShowLastRunTab)
+ setTabType(TabType.lastRun)
+
+ setInitShowLastRunTab(false)
+ }, [initShowLastRunTab])
+ const invalidLastRun = useInvalidLastRun(appId!, id)
+
+ const handleRunWithParams = async (data: Record) => {
+ const { isValid } = checkValid()
+ if(!isValid)
+ return
+ setNodeRunning()
+ setIsRunAfterSingleRun(true)
+ setTabType(TabType.lastRun)
+ callRunApi(data, () => {
+ invalidLastRun()
+ })
+ hideSingleRun()
+ }
+
+ const handleTabClicked = useCallback((type: TabType) => {
+ setIsRunAfterSingleRun(false)
+ setTabType(type)
+ }, [])
+
+ const getExistVarValuesInForms = (forms: FormProps[]) => {
+ if (!forms || forms.length === 0)
+ return []
+
+ const valuesArr = forms.map((form) => {
+ const values: Record = {}
+ form.inputs.forEach(({ variable, getVarValueFromDependent }) => {
+ const isGetValueFromDependent = getVarValueFromDependent || !variable.includes('.')
+ if(isGetValueFromDependent && !singleRunParams?.getDependentVar)
+ return
+
+ const selector = isGetValueFromDependent ? (singleRunParams?.getDependentVar(variable) || []) : variable.slice(1, -1).split('.')
+ if(!selector || selector.length === 0)
+ return
+ const [nodeId, varName] = selector.slice(0, 2)
+ if(!isStartNode && nodeId === id) { // inner vars like loop vars
+ values[variable] = true
+ return
+ }
+ const inspectVarValue = hasSetInspectVar(nodeId, varName, systemVars, conversationVars) // also detect system var , env and conversation var
+ if (inspectVarValue)
+ values[variable] = true
+ })
+ return values
+ })
+ return valuesArr
+ }
+
+ const isAllVarsHasValue = (vars?: ValueSelector[]) => {
+ if(!vars || vars.length === 0)
+ return true
+ return vars.every((varItem) => {
+ const [nodeId, varName] = varItem.slice(0, 2)
+ const inspectVarValue = hasSetInspectVar(nodeId, varName, systemVars, conversationVars) // also detect system var , env and conversation var
+ return inspectVarValue
+ })
+ }
+
+ const isSomeVarsHasValue = (vars?: ValueSelector[]) => {
+ if(!vars || vars.length === 0)
+ return true
+ return vars.some((varItem) => {
+ const [nodeId, varName] = varItem.slice(0, 2)
+ const inspectVarValue = hasSetInspectVar(nodeId, varName, systemVars, conversationVars) // also detect system var , env and conversation var
+ return inspectVarValue
+ })
+ }
+ const getFilteredExistVarForms = (forms: FormProps[]) => {
+ if (!forms || forms.length === 0)
+ return []
+
+ const existVarValuesInForms = getExistVarValuesInForms(forms)
+
+ const res = forms.map((form, i) => {
+ const existVarValuesInForm = existVarValuesInForms[i]
+ const newForm = { ...form }
+ const inputs = form.inputs.filter((input) => {
+ return !(input.variable in existVarValuesInForm)
+ })
+ newForm.inputs = inputs
+ return newForm
+ }).filter(form => form.inputs.length > 0)
+ return res
+ }
+
+ const checkAggregatorVarsSet = (vars: ValueSelector[][]) => {
+ if(!vars || vars.length === 0)
+ return true
+ // in each group, at last one set is ok
+ return vars.every((varItem) => {
+ return isSomeVarsHasValue(varItem)
+ })
+ }
+
+ const handleSingleRun = () => {
+ const { isValid } = checkValid()
+ if(!isValid)
+ return
+ const vars = singleRunParams?.getDependentVars?.()
+ // no need to input params
+ if (isAggregatorNode ? checkAggregatorVarsSet(vars) : isAllVarsHasValue(vars)) {
+ callRunApi({}, async () => {
+ setIsRunAfterSingleRun(true)
+ setNodeRunning()
+ invalidLastRun()
+ setTabType(TabType.lastRun)
+ })
+ }
+ else {
+ showSingleRun()
+ }
+ }
+
+ return {
+ ...oneStepRunRes,
+ tabType,
+ isRunAfterSingleRun,
+ setTabType: handleTabClicked,
+ singleRunParams,
+ nodeInfo,
+ setRunInputData,
+ handleSingleRun,
+ handleRunWithParams,
+ getExistVarValuesInForms,
+ getFilteredExistVarForms,
+ }
+}
+
+export default useLastRun
diff --git a/web/app/components/workflow/nodes/_base/components/workflow-panel/tab.tsx b/web/app/components/workflow/nodes/_base/components/workflow-panel/tab.tsx
new file mode 100644
index 0000000000..09d7ed266d
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/workflow-panel/tab.tsx
@@ -0,0 +1,34 @@
+'use client'
+import TabHeader from '@/app/components/base/tab-header'
+import type { FC } from 'react'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+
+export enum TabType {
+ settings = 'settings',
+ lastRun = 'lastRun',
+}
+
+type Props = {
+ value: TabType,
+ onChange: (value: TabType) => void
+}
+
+const Tab: FC = ({
+ value,
+ onChange,
+}) => {
+ const { t } = useTranslation()
+ return (
+ = {
[BlockEnum.LLM]: checkLLMValid,
@@ -66,13 +70,15 @@ const checkValidFns: Record = {
[BlockEnum.Loop]: checkLoopValid,
} as any
-type Params = {
+export type Params = {
id: string
data: CommonNodeType 
-Dify is an open-source LLM app development platform. Its intuitive interface combines agentic AI workflow, RAG pipeline, agent capabilities, model management, observability features, and more, allowing you to quickly move from prototype to production.
+Dify is an open-source platform for developing LLM applications. Its intuitive interface combines agentic AI workflows, RAG pipelines, agent capabilities, model management, observability features, and more—allowing you to quickly move from prototype to production.
## Quick start
@@ -65,7 +65,7 @@ Dify is an open-source LLM app development platform. Its intuitive interface com
-The easiest way to start the Dify server is through [docker compose](docker/docker-compose.yaml). Before running Dify with the following commands, make sure that [Docker](https://docs.docker.com/get-docker/) and [Docker Compose](https://docs.docker.com/compose/install/) are installed on your machine:
+The easiest way to start the Dify server is through [Docker Compose](docker/docker-compose.yaml). Before running Dify with the following commands, make sure that [Docker](https://docs.docker.com/get-docker/) and [Docker Compose](https://docs.docker.com/compose/install/) are installed on your machine:
```bash
cd dify
@@ -205,6 +205,7 @@ If you'd like to configure a highly-available setup, there are community-contrib
- [Helm Chart by @magicsong](https://github.com/magicsong/ai-charts)
- [YAML file by @Winson-030](https://github.com/Winson-030/dify-kubernetes)
- [YAML file by @wyy-holding](https://github.com/wyy-holding/dify-k8s)
+- [🚀 NEW! YAML files (Supports Dify v1.6.0) by @Zhoneym](https://github.com/Zhoneym/DifyAI-Kubernetes)
#### Using Terraform for Deployment
@@ -226,6 +227,15 @@ Deploy Dify to AWS with [CDK](https://aws.amazon.com/cdk/)
- [AWS CDK by @KevinZhao](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+#### Using Alibaba Cloud Computing Nest
+
+Quickly deploy Dify to Alibaba cloud with [Alibaba Cloud Computing Nest](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88)
+
+#### Using Alibaba Cloud Data Management
+
+One-Click deploy Dify to Alibaba Cloud with [Alibaba Cloud Data Management](https://www.alibabacloud.com/help/en/dms/dify-in-invitational-preview/)
+
+
## Contributing
For those who'd like to contribute code, see our [Contribution Guide](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md).
@@ -252,8 +262,8 @@ At the same time, please consider supporting Dify by sharing it on social media
## Security disclosure
-To protect your privacy, please avoid posting security issues on GitHub. Instead, send your questions to security@dify.ai and we will provide you with a more detailed answer.
+To protect your privacy, please avoid posting security issues on GitHub. Instead, report issues to security@dify.ai, and our team will respond with detailed answer.
## License
-This repository is available under the [Dify Open Source License](LICENSE), which is essentially Apache 2.0 with a few additional restrictions.
+This repository is licensed under the [Dify Open Source License](LICENSE), based on Apache 2.0 with additional conditions.
diff --git a/README_AR.md b/README_AR.md
index df288fd33c..e959ca0f78 100644
--- a/README_AR.md
+++ b/README_AR.md
@@ -188,6 +188,7 @@ docker compose up -d
- [رسم بياني Helm من قبل @magicsong](https://github.com/magicsong/ai-charts)
- [ملف YAML من قبل @Winson-030](https://github.com/Winson-030/dify-kubernetes)
- [ملف YAML من قبل @wyy-holding](https://github.com/wyy-holding/dify-k8s)
+- [🚀 جديد! ملفات YAML (تدعم Dify v1.6.0) بواسطة @Zhoneym](https://github.com/Zhoneym/DifyAI-Kubernetes)
#### استخدام Terraform للتوزيع
@@ -209,6 +210,14 @@ docker compose up -d
- [AWS CDK بواسطة @KevinZhao](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+#### استخدام Alibaba Cloud للنشر
+ [بسرعة نشر Dify إلى سحابة علي بابا مع عش الحوسبة السحابية علي بابا](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88)
+
+#### استخدام Alibaba Cloud Data Management للنشر
+
+انشر Dify على علي بابا كلاود بنقرة واحدة باستخدام [Alibaba Cloud Data Management](https://www.alibabacloud.com/help/en/dms/dify-in-invitational-preview/)
+
+
## المساهمة
لأولئك الذين يرغبون في المساهمة، انظر إلى [دليل المساهمة](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md) لدينا.
diff --git a/README_BN.md b/README_BN.md
index 4a5b5f3928..29d7374ea5 100644
--- a/README_BN.md
+++ b/README_BN.md
@@ -204,6 +204,8 @@ GitHub-এ ডিফাইকে স্টার দিয়ে রাখুন
- [Helm Chart by @magicsong](https://github.com/magicsong/ai-charts)
- [YAML file by @Winson-030](https://github.com/Winson-030/dify-kubernetes)
- [YAML file by @wyy-holding](https://github.com/wyy-holding/dify-k8s)
+- [🚀 নতুন! YAML ফাইলসমূহ (Dify v1.6.0 সমর্থিত) তৈরি করেছেন @Zhoneym](https://github.com/Zhoneym/DifyAI-Kubernetes)
+
#### টেরাফর্ম ব্যবহার করে ডিপ্লয়
@@ -225,6 +227,15 @@ GitHub-এ ডিফাইকে স্টার দিয়ে রাখুন
- [AWS CDK by @KevinZhao](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+#### Alibaba Cloud ব্যবহার করে ডিপ্লয়
+
+ [Alibaba Cloud Computing Nest](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88)
+
+#### Alibaba Cloud Data Management ব্যবহার করে ডিপ্লয়
+
+ [Alibaba Cloud Data Management](https://www.alibabacloud.com/help/en/dms/dify-in-invitational-preview/)
+
+
## Contributing
যারা কোড অবদান রাখতে চান, তাদের জন্য আমাদের [অবদান নির্দেশিকা] দেখুন (https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md)।
diff --git a/README_CN.md b/README_CN.md
index ba7ee0006d..486a368c09 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -194,9 +194,9 @@ docker compose up -d
如果您需要自定义配置，请参考 [.env.example](docker/.env.example) 文件中的注释，并更新 `.env` 文件中对应的值。此外，您可能需要根据您的具体部署环境和需求对 `docker-compose.yaml` 文件本身进行调整，例如更改镜像版本、端口映射或卷挂载。完成任何更改后，请重新运行 `docker-compose up -d`。您可以在[此处](https://docs.dify.ai/getting-started/install-self-hosted/environments)找到可用环境变量的完整列表。
-#### 使用 Helm Chart 部署
+#### 使用 Helm Chart 或 Kubernetes 资源清单（YAML）部署
-使用 [Helm Chart](https://helm.sh/) 版本或者 YAML 文件，可以在 Kubernetes 上部署 Dify。
+使用 [Helm Chart](https://helm.sh/) 版本或者 Kubernetes 资源清单（YAML），可以在 Kubernetes 上部署 Dify。
- [Helm Chart by @LeoQuote](https://github.com/douban/charts/tree/master/charts/dify)
- [Helm Chart by @BorisPolonsky](https://github.com/BorisPolonsky/dify-helm)
@@ -204,6 +204,10 @@ docker compose up -d
- [YAML 文件 by @Winson-030](https://github.com/Winson-030/dify-kubernetes)
- [YAML file by @wyy-holding](https://github.com/wyy-holding/dify-k8s)
+- [🚀 NEW! YAML 文件 (支持 Dify v1.6.0) by @Zhoneym](https://github.com/Zhoneym/DifyAI-Kubernetes)
+
+
+
#### 使用 Terraform 部署
使用 [terraform](https://www.terraform.io/) 一键将 Dify 部署到云平台
@@ -221,6 +225,15 @@ docker compose up -d
##### AWS
- [AWS CDK by @KevinZhao](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+#### 使用 阿里云计算巢 部署
+
+使用 [阿里云计算巢](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88) 将 Dify 一键部署到 阿里云
+
+#### 使用 阿里云数据管理DMS 部署
+
+使用 [阿里云数据管理DMS](https://help.aliyun.com/zh/dms/dify-in-invitational-preview) 将 Dify 一键部署到 阿里云
+
+
## Star History
[](https://star-history.com/#langgenius/dify&Date)
diff --git a/README_DE.md b/README_DE.md
index f6023a3935..fce52c34c2 100644
--- a/README_DE.md
+++ b/README_DE.md
@@ -203,6 +203,7 @@ Falls Sie eine hochverfügbare Konfiguration einrichten möchten, gibt es von de
- [Helm Chart by @magicsong](https://github.com/magicsong/ai-charts)
- [YAML file by @Winson-030](https://github.com/Winson-030/dify-kubernetes)
- [YAML file by @wyy-holding](https://github.com/wyy-holding/dify-k8s)
+- [🚀 NEW! YAML files (Supports Dify v1.6.0) by @Zhoneym](https://github.com/Zhoneym/DifyAI-Kubernetes)
#### Terraform für die Bereitstellung verwenden
@@ -221,6 +222,15 @@ Bereitstellung von Dify auf AWS mit [CDK](https://aws.amazon.com/cdk/)
##### AWS
- [AWS CDK by @KevinZhao](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+#### Alibaba Cloud
+
+[Alibaba Cloud Computing Nest](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88)
+
+#### Alibaba Cloud Data Management
+
+Ein-Klick-Bereitstellung von Dify in der Alibaba Cloud mit [Alibaba Cloud Data Management](https://www.alibabacloud.com/help/en/dms/dify-in-invitational-preview/)
+
+
## Contributing
Falls Sie Code beitragen möchten, lesen Sie bitte unseren [Contribution Guide](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md). Gleichzeitig bitten wir Sie, Dify zu unterstützen, indem Sie es in den sozialen Medien teilen und auf Veranstaltungen und Konferenzen präsentieren.
diff --git a/README_ES.md b/README_ES.md
index 12f2ce8c11..6fd6dfcee8 100644
--- a/README_ES.md
+++ b/README_ES.md
@@ -203,6 +203,7 @@ Si desea configurar una configuración de alta disponibilidad, la comunidad prop
- [Gráfico Helm por @magicsong](https://github.com/magicsong/ai-charts)
- [Ficheros YAML por @Winson-030](https://github.com/Winson-030/dify-kubernetes)
- [Ficheros YAML por @wyy-holding](https://github.com/wyy-holding/dify-k8s)
+- [🚀 ¡NUEVO! Archivos YAML (compatible con Dify v1.6.0) por @Zhoneym](https://github.com/Zhoneym/DifyAI-Kubernetes)
#### Uso de Terraform para el despliegue
@@ -221,6 +222,15 @@ Despliegue Dify en AWS usando [CDK](https://aws.amazon.com/cdk/)
##### AWS
- [AWS CDK por @KevinZhao](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+#### Alibaba Cloud
+
+[Alibaba Cloud Computing Nest](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88)
+
+#### Alibaba Cloud Data Management
+
+Despliega Dify en Alibaba Cloud con un solo clic con [Alibaba Cloud Data Management](https://www.alibabacloud.com/help/en/dms/dify-in-invitational-preview/)
+
+
## Contribuir
Para aquellos que deseen contribuir con código, consulten nuestra [Guía de contribución](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md).
diff --git a/README_FR.md b/README_FR.md
index b106615b31..b2209fb495 100644
--- a/README_FR.md
+++ b/README_FR.md
@@ -201,6 +201,7 @@ Si vous souhaitez configurer une configuration haute disponibilité, la communau
- [Helm Chart par @magicsong](https://github.com/magicsong/ai-charts)
- [Fichier YAML par @Winson-030](https://github.com/Winson-030/dify-kubernetes)
- [Fichier YAML par @wyy-holding](https://github.com/wyy-holding/dify-k8s)
+- [🚀 NOUVEAU ! Fichiers YAML (compatible avec Dify v1.6.0) par @Zhoneym](https://github.com/Zhoneym/DifyAI-Kubernetes)
#### Utilisation de Terraform pour le déploiement
@@ -219,6 +220,15 @@ Déployez Dify sur AWS en utilisant [CDK](https://aws.amazon.com/cdk/)
##### AWS
- [AWS CDK par @KevinZhao](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+#### Alibaba Cloud
+
+[Alibaba Cloud Computing Nest](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88)
+
+#### Alibaba Cloud Data Management
+
+Déployez Dify en un clic sur Alibaba Cloud avec [Alibaba Cloud Data Management](https://www.alibabacloud.com/help/en/dms/dify-in-invitational-preview/)
+
+
## Contribuer
Pour ceux qui souhaitent contribuer du code, consultez notre [Guide de contribution](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md).
diff --git a/README_JA.md b/README_JA.md
index 26703f3958..c658225f90 100644
--- a/README_JA.md
+++ b/README_JA.md
@@ -155,7 +155,7 @@ DifyはオープンソースのLLMアプリケーション開発プラットフ
[こちら](https://dify.ai)のDify Cloudサービスを利用して、セットアップ不要で試すことができます。サンドボックスプランには、200回のGPT-4呼び出しが無料で含まれています。
- **Dify Community Editionのセルフホスティング**
-この[スタートガイド](#quick-start)を使用して、ローカル環境でDifyを簡単に実行できます。
+この[スタートガイド](#クイックスタート)を使用して、ローカル環境でDifyを簡単に実行できます。
詳しくは[ドキュメント](https://docs.dify.ai)をご覧ください。
- **企業/組織向けのDify**
@@ -202,6 +202,7 @@ docker compose up -d
- [Helm Chart by @magicsong](https://github.com/magicsong/ai-charts)
- [YAML file by @Winson-030](https://github.com/Winson-030/dify-kubernetes)
- [YAML file by @wyy-holding](https://github.com/wyy-holding/dify-k8s)
+- [🚀 新着！YAML ファイル（Dify v1.6.0 対応）by @Zhoneym](https://github.com/Zhoneym/DifyAI-Kubernetes)
#### Terraformを使用したデプロイ
@@ -220,6 +221,13 @@ docker compose up -d
##### AWS
- [@KevinZhaoによるAWS CDK](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+#### Alibaba Cloud
+[Alibaba Cloud Computing Nest](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88)
+
+#### Alibaba Cloud Data Management
+[Alibaba Cloud Data Management](https://www.alibabacloud.com/help/en/dms/dify-in-invitational-preview/) を利用して、DifyをAlibaba Cloudへワンクリックでデプロイできます
+
+
## 貢献
コードに貢献したい方は、[Contribution Guide](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md)を参照してください。
diff --git a/README_KL.md b/README_KL.md
index ea91baa5aa..bfafcc7407 100644
--- a/README_KL.md
+++ b/README_KL.md
@@ -201,6 +201,7 @@ If you'd like to configure a highly-available setup, there are community-contrib
- [Helm Chart by @magicsong](https://github.com/magicsong/ai-charts)
- [YAML file by @Winson-030](https://github.com/Winson-030/dify-kubernetes)
- [YAML file by @wyy-holding](https://github.com/wyy-holding/dify-k8s)
+- [🚀 NEW! YAML files (Supports Dify v1.6.0) by @Zhoneym](https://github.com/Zhoneym/DifyAI-Kubernetes)
#### Terraform atorlugu pilersitsineq
@@ -219,6 +220,15 @@ wa'logh nIqHom neH ghun deployment toy'wI' [CDK](https://aws.amazon.com/cdk/) lo
##### AWS
- [AWS CDK qachlot @KevinZhao](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+#### Alibaba Cloud
+
+[Alibaba Cloud Computing Nest](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88)
+
+#### Alibaba Cloud Data Management
+
+[Alibaba Cloud Data Management](https://www.alibabacloud.com/help/en/dms/dify-in-invitational-preview/)
+
+
## Contributing
For those who'd like to contribute code, see our [Contribution Guide](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md).
diff --git a/README_KR.md b/README_KR.md
index 89301e8b2c..282117e776 100644
--- a/README_KR.md
+++ b/README_KR.md
@@ -195,6 +195,7 @@ Dify를 Kubernetes에 배포하고 프리미엄 스케일링 설정을 구성했
- [Helm Chart by @magicsong](https://github.com/magicsong/ai-charts)
- [YAML file by @Winson-030](https://github.com/Winson-030/dify-kubernetes)
- [YAML file by @wyy-holding](https://github.com/wyy-holding/dify-k8s)
+- [🚀 NEW! YAML files (Supports Dify v1.6.0) by @Zhoneym](https://github.com/Zhoneym/DifyAI-Kubernetes)
#### Terraform을 사용한 배포
@@ -213,6 +214,15 @@ Dify를 Kubernetes에 배포하고 프리미엄 스케일링 설정을 구성했
##### AWS
- [KevinZhao의 AWS CDK](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+#### Alibaba Cloud
+
+[Alibaba Cloud Computing Nest](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88)
+
+#### Alibaba Cloud Data Management
+
+[Alibaba Cloud Data Management](https://www.alibabacloud.com/help/en/dms/dify-in-invitational-preview/)를 통해 원클릭으로 Dify를 Alibaba Cloud에 배포할 수 있습니다
+
+
## 기여
코드에 기여하고 싶은 분들은 [기여 가이드](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md)를 참조하세요.
diff --git a/README_PT.md b/README_PT.md
index 157772d528..576f6b48f7 100644
--- a/README_PT.md
+++ b/README_PT.md
@@ -200,6 +200,7 @@ Se deseja configurar uma instalação de alta disponibilidade, há [Helm Charts]
- [Helm Chart de @magicsong](https://github.com/magicsong/ai-charts)
- [Arquivo YAML por @Winson-030](https://github.com/Winson-030/dify-kubernetes)
- [Arquivo YAML por @wyy-holding](https://github.com/wyy-holding/dify-k8s)
+- [🚀 NOVO! Arquivos YAML (Compatível com Dify v1.6.0) por @Zhoneym](https://github.com/Zhoneym/DifyAI-Kubernetes)
#### Usando o Terraform para Implantação
@@ -218,6 +219,15 @@ Implante o Dify na AWS usando [CDK](https://aws.amazon.com/cdk/)
##### AWS
- [AWS CDK por @KevinZhao](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+#### Alibaba Cloud
+
+[Alibaba Cloud Computing Nest](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88)
+
+#### Alibaba Cloud Data Management
+
+Implante o Dify na Alibaba Cloud com um clique usando o [Alibaba Cloud Data Management](https://www.alibabacloud.com/help/en/dms/dify-in-invitational-preview/)
+
+
## Contribuindo
Para aqueles que desejam contribuir com código, veja nosso [Guia de Contribuição](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md).
diff --git a/README_SI.md b/README_SI.md
index 14de1ea792..7ded001d86 100644
--- a/README_SI.md
+++ b/README_SI.md
@@ -201,6 +201,7 @@ Star Dify on GitHub and be instantly notified of new releases.
- [Helm Chart by @BorisPolonsky](https://github.com/BorisPolonsky/dify-helm)
- [YAML file by @Winson-030](https://github.com/Winson-030/dify-kubernetes)
- [YAML file by @wyy-holding](https://github.com/wyy-holding/dify-k8s)
+- [🚀 NEW! YAML files (Supports Dify v1.6.0) by @Zhoneym](https://github.com/Zhoneym/DifyAI-Kubernetes)
#### Uporaba Terraform za uvajanje
@@ -219,6 +220,15 @@ Uvedite Dify v AWS z uporabo [CDK](https://aws.amazon.com/cdk/)
##### AWS
- [AWS CDK by @KevinZhao](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+#### Alibaba Cloud
+
+[Alibaba Cloud Computing Nest](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88)
+
+#### Alibaba Cloud Data Management
+
+Z enim klikom namestite Dify na Alibaba Cloud z [Alibaba Cloud Data Management](https://www.alibabacloud.com/help/en/dms/dify-in-invitational-preview/)
+
+
## Prispevam
Za tiste, ki bi radi prispevali kodo, si oglejte naš vodnik za prispevke . Hkrati vas prosimo, da podprete Dify tako, da ga delite na družbenih medijih ter na dogodkih in konferencah.
diff --git a/README_TR.md b/README_TR.md
index 563a05af3c..6e94e54fa0 100644
--- a/README_TR.md
+++ b/README_TR.md
@@ -194,6 +194,7 @@ Yüksek kullanılabilirliğe sahip bir kurulum yapılandırmak isterseniz, Dify'
- [@BorisPolonsky tarafından Helm Chart](https://github.com/BorisPolonsky/dify-helm)
- [@Winson-030 tarafından YAML dosyası](https://github.com/Winson-030/dify-kubernetes)
- [@wyy-holding tarafından YAML dosyası](https://github.com/wyy-holding/dify-k8s)
+- [🚀 YENİ! YAML dosyaları (Dify v1.6.0 destekli) @Zhoneym tarafından](https://github.com/Zhoneym/DifyAI-Kubernetes)
#### Dağıtım için Terraform Kullanımı
@@ -212,6 +213,15 @@ Dify'ı bulut platformuna tek tıklamayla dağıtın [terraform](https://www.ter
##### AWS
- [AWS CDK tarafından @KevinZhao](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+#### Alibaba Cloud
+
+[Alibaba Cloud Computing Nest](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88)
+
+#### Alibaba Cloud Data Management
+
+[Alibaba Cloud Data Management](https://www.alibabacloud.com/help/en/dms/dify-in-invitational-preview/) kullanarak Dify'ı tek tıkla Alibaba Cloud'a dağıtın
+
+
## Katkıda Bulunma
Kod katkısında bulunmak isteyenler için [Katkı Kılavuzumuza](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md) bakabilirsiniz.
diff --git a/README_TW.md b/README_TW.md
index f4a76ac109..6e3e22b5c1 100644
--- a/README_TW.md
+++ b/README_TW.md
@@ -197,12 +197,13 @@ Dify 的所有功能都提供相應的 API，因此您可以輕鬆地將 Dify
如果您需要自定義配置，請參考我們的 [.env.example](docker/.env.example) 文件中的註釋，並在您的 `.env` 文件中更新相應的值。此外，根據您特定的部署環境和需求，您可能需要調整 `docker-compose.yaml` 文件本身，例如更改映像版本、端口映射或卷掛載。進行任何更改後，請重新運行 `docker-compose up -d`。您可以在[這裡](https://docs.dify.ai/getting-started/install-self-hosted/environments)找到可用環境變數的完整列表。
-如果您想配置高可用性設置，社區貢獻的 [Helm Charts](https://helm.sh/) 和 YAML 文件允許在 Kubernetes 上部署 Dify。
+如果您想配置高可用性設置，社區貢獻的 [Helm Charts](https://helm.sh/) 和 Kubernetes 資源清單（YAML）允許在 Kubernetes 上部署 Dify。
- [由 @LeoQuote 提供的 Helm Chart](https://github.com/douban/charts/tree/master/charts/dify)
- [由 @BorisPolonsky 提供的 Helm Chart](https://github.com/BorisPolonsky/dify-helm)
- [由 @Winson-030 提供的 YAML 文件](https://github.com/Winson-030/dify-kubernetes)
- [由 @wyy-holding 提供的 YAML 文件](https://github.com/wyy-holding/dify-k8s)
+- [🚀 NEW! YAML 檔案（支援 Dify v1.6.0）by @Zhoneym](https://github.com/Zhoneym/DifyAI-Kubernetes)
### 使用 Terraform 進行部署
@@ -224,6 +225,15 @@ Dify 的所有功能都提供相應的 API，因此您可以輕鬆地將 Dify
- [由 @KevinZhao 提供的 AWS CDK](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+#### 使用 阿里云计算巢進行部署
+
+[阿里云](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88)
+
+#### 使用 阿里雲數據管理DMS 進行部署
+
+透過 [阿里雲數據管理DMS](https://www.alibabacloud.com/help/en/dms/dify-in-invitational-preview/)，一鍵將 Dify 部署至阿里雲
+
+
## 貢獻
對於想要貢獻程式碼的開發者，請參閱我們的[貢獻指南](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md)。
diff --git a/README_VI.md b/README_VI.md
index 4e1e05cbf3..51314e6de5 100644
--- a/README_VI.md
+++ b/README_VI.md
@@ -196,6 +196,7 @@ Nếu bạn muốn cấu hình một cài đặt có độ sẵn sàng cao, có
- [Helm Chart bởi @BorisPolonsky](https://github.com/BorisPolonsky/dify-helm)
- [Tệp YAML bởi @Winson-030](https://github.com/Winson-030/dify-kubernetes)
- [Tệp YAML bởi @wyy-holding](https://github.com/wyy-holding/dify-k8s)
+- [🚀 MỚI! Tệp YAML (Hỗ trợ Dify v1.6.0) bởi @Zhoneym](https://github.com/Zhoneym/DifyAI-Kubernetes)
#### Sử dụng Terraform để Triển khai
@@ -214,6 +215,16 @@ Triển khai Dify trên AWS bằng [CDK](https://aws.amazon.com/cdk/)
##### AWS
- [AWS CDK bởi @KevinZhao](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
+
+#### Alibaba Cloud
+
+[Alibaba Cloud Computing Nest](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Dify%E7%A4%BE%E5%8C%BA%E7%89%88)
+
+#### Alibaba Cloud Data Management
+
+Triển khai Dify lên Alibaba Cloud chỉ với một cú nhấp chuột bằng [Alibaba Cloud Data Management](https://www.alibabacloud.com/help/en/dms/dify-in-invitational-preview/)
+
+
## Đóng góp
Đối với những người muốn đóng góp mã, xem [Hướng dẫn Đóng góp](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md) của chúng tôi.
diff --git a/api/.env.example b/api/.env.example
index 7878308588..daa0df535b 100644
--- a/api/.env.example
+++ b/api/.env.example
@@ -5,17 +5,22 @@
SECRET_KEY=
# Console API base URL
-CONSOLE_API_URL=http://127.0.0.1:5001
-CONSOLE_WEB_URL=http://127.0.0.1:3000
+CONSOLE_API_URL=http://localhost:5001
+CONSOLE_WEB_URL=http://localhost:3000
# Service API base URL
-SERVICE_API_URL=http://127.0.0.1:5001
+SERVICE_API_URL=http://localhost:5001
# Web APP base URL
-APP_WEB_URL=http://127.0.0.1:3000
+APP_WEB_URL=http://localhost:3000
# Files URL
-FILES_URL=http://127.0.0.1:5001
+FILES_URL=http://localhost:5001
+
+# INTERNAL_FILES_URL is used for plugin daemon communication within Docker network.
+# Set this to the internal Docker service URL for proper plugin file access.
+# Example: INTERNAL_FILES_URL=http://api:5001
+INTERNAL_FILES_URL=http://127.0.0.1:5001
# The time in seconds after the signature is rejected
FILES_ACCESS_TIMEOUT=300
@@ -49,7 +54,7 @@ REDIS_CLUSTERS_PASSWORD=
# celery configuration
CELERY_BROKER_URL=redis://:difyai123456@localhost:${REDIS_PORT}/1
-
+CELERY_BACKEND=redis
# PostgreSQL database configuration
DB_USERNAME=postgres
DB_PASSWORD=difyai123456
@@ -133,12 +138,14 @@ SUPABASE_API_KEY=your-access-key
SUPABASE_URL=your-server-url
# CORS configuration
-WEB_API_CORS_ALLOW_ORIGINS=http://127.0.0.1:3000,*
-CONSOLE_CORS_ALLOW_ORIGINS=http://127.0.0.1:3000,*
+WEB_API_CORS_ALLOW_ORIGINS=http://localhost:3000,*
+CONSOLE_CORS_ALLOW_ORIGINS=http://localhost:3000,*
# Vector database configuration
-# support: weaviate, qdrant, milvus, myscale, relyt, pgvecto_rs, pgvector, pgvector, chroma, opensearch, tidb_vector, couchbase, vikingdb, upstash, lindorm, oceanbase, opengauss, tablestore
+# Supported values are `weaviate`, `qdrant`, `milvus`, `myscale`, `relyt`, `pgvector`, `pgvecto-rs`, `chroma`, `opensearch`, `oracle`, `tencent`, `elasticsearch`, `elasticsearch-ja`, `analyticdb`, `couchbase`, `vikingdb`, `oceanbase`, `opengauss`, `tablestore`,`vastbase`,`tidb`,`tidb_on_qdrant`,`baidu`,`lindorm`,`huawei_cloud`,`upstash`, `matrixone`.
VECTOR_STORE=weaviate
+# Prefix used to create collection name in vector database
+VECTOR_INDEX_NAME_PREFIX=Vector_index
# Weaviate configuration
WEAVIATE_ENDPOINT=http://localhost:8080
@@ -294,6 +301,13 @@ VIKINGDB_SCHEMA=http
VIKINGDB_CONNECTION_TIMEOUT=30
VIKINGDB_SOCKET_TIMEOUT=30
+# Matrixone configration
+MATRIXONE_HOST=127.0.0.1
+MATRIXONE_PORT=6001
+MATRIXONE_USER=dump
+MATRIXONE_PASSWORD=111
+MATRIXONE_DATABASE=dify
+
# Lindorm configuration
LINDORM_URL=http://ld-*******************-proxy-search-pub.lindorm.aliyuncs.com:30070
LINDORM_USERNAME=admin
@@ -332,9 +346,11 @@ PROMPT_GENERATION_MAX_TOKENS=512
CODE_GENERATION_MAX_TOKENS=1024
PLUGIN_BASED_TOKEN_COUNTING_ENABLED=false
-# Mail configuration, support: resend, smtp
+# Mail configuration, support: resend, smtp, sendgrid
MAIL_TYPE=
+# If using SendGrid, use the 'from' field for authentication if necessary.
MAIL_DEFAULT_SEND_FROM=no-reply 
+