Merge pull request #73 from apconw/dev

v1.1.3版本

Author: apconw

.env.dev

@@ -10,12 +10,12 @@ MYSQL_DATABASE=chat_db
 DIFY_SERVER_URL="http://127.0.0.1:18000"
 
 # Dify 数据问答画布key
-DIFY_DATABASE_QA_API_KEY="app-AXDUw8TtcY7N6TMGHkPaC4VF"
+DIFY_DATABASE_QA_API_KEY="app-i6hHQ1u9BEqzkL3PYZh9Rqrk"
 
 # minio
 MINIO_ENDPOINT=localhost:19000
-MINIO_ACCESS_KEY=sIR5eeDkiwoo779yNJbw
-MiNIO_SECRET_KEY=MreuQ3aC1ymHJeo3QfzSg7aPz7PqlxeOw39nZUdE
+MINIO_ACCESS_KEY=A1TwSUF3NCdh1qdA3zUO
+MiNIO_SECRET_KEY=KYvzplcksgLEii1fm2MpIZscuFTXh65BDIr6Jg1J
 
 #关闭pandas-ai匿名收集信息
 SCARF_NO_ANALYTICS=true

.gitignore

@@ -5,7 +5,17 @@ __pycache__/
 
 tests/
 docker/volume/
-docker/dify/volume/
+docker/dify/volumes/*
+!docker/dify/docker/volumes/myscale/config/users.d/custom_users_config.xml
+!docker/dify/docker/volumes/oceanbase/init.d/vec_memory.sql
+!docker/dify/docker/volumes/opensearch/opensearch_dashboards.yml
+!docker/dify/docker/volumes/sandbox/conf/config.yaml
+!docker/dify/docker/volumes/sandbox/conf/config.yaml.example
+!docker/dify/docker/volumes/sandbox/dependencies/python-requirements.txt
+
+
+
+
 
 web/node_modules/
 web/dist/

Makefile

@@ -5,7 +5,7 @@ include web/Makefile
 SERVER_PROJECT_NAME = sanic-web
 
 # 服务端 Docker 镜像标签
-SERVER_DOCKER_IMAGE = apconw/$(SERVER_PROJECT_NAME):1.1.2
+SERVER_DOCKER_IMAGE = apconw/$(SERVER_PROJECT_NAME):1.1.3
 
 
 # 构建 Vue 3 前端项目镜像

controllers/user_service_api.py

@@ -49,8 +49,9 @@ async def query_user_qa_record(request):
     """
     page = int(request.json.get("page", 1))
     limit = int(request.json.get("limit", 10))
+    search_text = request.json.get("search_text")
     user_info = await get_user_info(request)
-    return await query_user_record(user_info["id"], page, limit)
+    return await query_user_record(user_info["id"], page, limit, search_text)
 
 
 @bp.post("/delete_user_record")

docker/dify/docker/.env

@@ -5,7 +5,6 @@
 # ------------------------------
 # Common Variables
 # ------------------------------
-
 # service 服务名称
 COMPOSE_PROJECT_NAME=dify_service
 
@@ -42,6 +41,12 @@ APP_WEB_URL=
 # File preview or download Url prefix.
 # used to display File preview or download Url to the front-end or as Multi-model inputs;
 # Url is signed and has expiration time.
+# Setting FILES_URL is required for file processing plugins.
+#   - For https://example.com, use FILES_URL=https://example.com
+#   - For http://example.com, use FILES_URL=http://example.com
+#   Recommendation: use a dedicated domain (e.g., https://upload.example.com).
+#   Alternatively, use http://<your-ip>:5001 or http://api:5001,
+#   ensuring port 5001 is externally accessible (see docker-compose.yaml).
 FILES_URL=
 
 # ------------------------------
@@ -71,15 +76,15 @@ DEBUG=false
 # which is convenient for debugging.
 FLASK_DEBUG=false
 
-# A secretkey that is used for securely signing the session cookie
+# A secret key that is used for securely signing the session cookie
 # and encrypting sensitive information on the database.
 # You can generate a strong key using `openssl rand -base64 42`.
 SECRET_KEY=sk-9f73s3ljTXVcMT3Blb3ljTqtsKiGHXVcMT3BlbkFJLK7U
 
 # Password for admin user initialization.
 # If left unset, admin user will not be prompted for a password
-# when creating the initial admin account. 
-# The length of the password cannot exceed 30 charactors.
+# when creating the initial admin account.
+# The length of the password cannot exceed 30 characters.
 INIT_PASSWORD=
 
 # Deployment environment.
@@ -177,6 +182,12 @@ CELERY_MIN_WORKERS=
 API_TOOL_DEFAULT_CONNECT_TIMEOUT=10
 API_TOOL_DEFAULT_READ_TIMEOUT=60
 
+# -------------------------------
+# Datasource Configuration
+# --------------------------------
+ENABLE_WEBSITE_JINAREADER=true
+ENABLE_WEBSITE_FIRECRAWL=true
+ENABLE_WEBSITE_WATERCRAWL=true
 
 # ------------------------------
 # Database Configuration
@@ -386,7 +397,7 @@ 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`, `tidb_vector`, `oracle`, `tencent`, `elasticsearch`, `elasticsearch-ja`, `analyticdb`, `couchbase`, `vikingdb`, `oceanbase`, `opengauss`.
+# 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`.
 VECTOR_STORE=weaviate
 
 # The Weaviate endpoint URL. Only available when VECTOR_STORE is `weaviate`.
@@ -403,10 +414,12 @@ QDRANT_GRPC_PORT=6334
 # Milvus configuration. Only available when VECTOR_STORE is `milvus`.
 # The milvus uri.
 MILVUS_URI=http://host.docker.internal:19530
+MILVUS_DATABASE=
 MILVUS_TOKEN=
 MILVUS_USER=
 MILVUS_PASSWORD=
 MILVUS_ENABLE_HYBRID_SEARCH=False
+MILVUS_ANALYZER_PARAMS=
 
 # MyScale configuration, only available when VECTOR_STORE is `myscale`
 # For multi-language support, please set MYSCALE_FTS_PARAMS with referring to:
@@ -437,6 +450,15 @@ PGVECTOR_MAX_CONNECTION=5
 PGVECTOR_PG_BIGM=false
 PGVECTOR_PG_BIGM_VERSION=1.2-20240606
 
+# vastbase configurations, only available when VECTOR_STORE is `vastbase`
+VASTBASE_HOST=vastbase
+VASTBASE_PORT=5432
+VASTBASE_USER=dify
+VASTBASE_PASSWORD=Difyai123456
+VASTBASE_DATABASE=dify
+VASTBASE_MIN_CONNECTION=1
+VASTBASE_MAX_CONNECTION=5
+
 # pgvecto-rs configurations, only available when VECTOR_STORE is `pgvecto-rs`
 PGVECTO_RS_HOST=pgvecto-rs
 PGVECTO_RS_PORT=5432
@@ -506,9 +528,13 @@ RELYT_DATABASE=postgres
 # open search configuration, only available when VECTOR_STORE is `opensearch`
 OPENSEARCH_HOST=opensearch
 OPENSEARCH_PORT=9200
+OPENSEARCH_SECURE=true
+OPENSEARCH_AUTH_METHOD=basic
 OPENSEARCH_USER=admin
 OPENSEARCH_PASSWORD=admin
-OPENSEARCH_SECURE=true
+# If using AWS managed IAM, e.g. Managed Cluster or OpenSearch Serverless
+OPENSEARCH_AWS_REGION=ap-southeast-1
+OPENSEARCH_AWS_SERVICE=aoss
 
 # tencent vector configurations, only available when VECTOR_STORE is `tencent`
 TENCENT_VECTOR_DB_URL=http://127.0.0.1
@@ -518,6 +544,7 @@ TENCENT_VECTOR_DB_USERNAME=dify
 TENCENT_VECTOR_DB_DATABASE=dify
 TENCENT_VECTOR_DB_SHARD=1
 TENCENT_VECTOR_DB_REPLICAS=2
+TENCENT_VECTOR_DB_ENABLE_HYBRID_SEARCH=false
 
 # ElasticSearch configuration, only available when VECTOR_STORE is `elasticsearch`
 ELASTICSEARCH_HOST=0.0.0.0
@@ -548,6 +575,7 @@ VIKINGDB_SOCKET_TIMEOUT=30
 LINDORM_URL=http://lindorm:30070
 LINDORM_USERNAME=lindorm
 LINDORM_PASSWORD=lindorm
+LINDORM_QUERY_TIMEOUT=1
 
 # OceanBase Vector configuration, only available when VECTOR_STORE is `oceanbase`
 OCEANBASE_VECTOR_HOST=oceanbase
@@ -557,6 +585,7 @@ OCEANBASE_VECTOR_PASSWORD=difyai123456
 OCEANBASE_VECTOR_DATABASE=test
 OCEANBASE_CLUSTER_NAME=difyai
 OCEANBASE_MEMORY_LIMIT=6G
+OCEANBASE_ENABLE_HYBRID_SEARCH=false
 
 # opengauss configurations, only available when VECTOR_STORE is `opengauss`
 OPENGAUSS_HOST=opengauss
@@ -566,11 +595,24 @@ OPENGAUSS_PASSWORD=Dify@123
 OPENGAUSS_DATABASE=dify
 OPENGAUSS_MIN_CONNECTION=1
 OPENGAUSS_MAX_CONNECTION=5
+OPENGAUSS_ENABLE_PQ=false
+
+# huawei cloud search service vector configurations, only available when VECTOR_STORE is `huawei_cloud`
+HUAWEI_CLOUD_HOSTS=https://127.0.0.1:9200
+HUAWEI_CLOUD_USER=admin
+HUAWEI_CLOUD_PASSWORD=admin
 
 # Upstash Vector configuration, only available when VECTOR_STORE is `upstash`
 UPSTASH_VECTOR_URL=https://xxx-vector.upstash.io
 UPSTASH_VECTOR_TOKEN=dify
 
+# TableStore Vector configuration
+# (only used when VECTOR_STORE is tablestore)
+TABLESTORE_ENDPOINT=https://instance-name.cn-hangzhou.ots.aliyuncs.com
+TABLESTORE_INSTANCE_NAME=instance-name
+TABLESTORE_ACCESS_KEY_ID=xxx
+TABLESTORE_ACCESS_KEY_SECRET=xxx
+
 # ------------------------------
 # Knowledge Configuration
 # ------------------------------
@@ -598,17 +640,22 @@ SCARF_NO_ANALYTICS=true
 # ------------------------------
 
 # The maximum number of tokens allowed for prompt generation.
-# This setting controls the upper limit of tokens that can be used by the LLM 
+# This setting controls the upper limit of tokens that can be used by the LLM
 # when generating a prompt in the prompt generation tool.
 # Default: 512 tokens.
 PROMPT_GENERATION_MAX_TOKENS=512
 
 # The maximum number of tokens allowed for code generation.
-# This setting controls the upper limit of tokens that can be used by the LLM 
+# This setting controls the upper limit of tokens that can be used by the LLM
 # when generating code in the code generation tool.
 # Default: 1024 tokens.
 CODE_GENERATION_MAX_TOKENS=1024
 
+# Enable or disable plugin based token counting. If disabled, token counting will return 0.
+# This can improve performance by skipping token counting operations.
+# Default: false (disabled).
+PLUGIN_BASED_TOKEN_COUNTING_ENABLED=false
+
 # ------------------------------
 # Multi-modal Configuration
 # ------------------------------
@@ -725,6 +772,12 @@ MAX_VARIABLE_SIZE=204800
 WORKFLOW_PARALLEL_DEPTH_LIMIT=3
 WORKFLOW_FILE_UPLOAD_LIMIT=10
 
+# Workflow storage configuration
+# Options: rdbms, hybrid
+# rdbms: Use only the relational database (default)
+# hybrid: Save new data to object storage, read from both object storage and RDBMS
+WORKFLOW_NODE_EXECUTION_STORAGE=rdbms
+
 # HTTP request node in workflow configuration
 HTTP_REQUEST_NODE_MAX_BINARY_SIZE=10485760
 HTTP_REQUEST_NODE_MAX_TEXT_SIZE=1048576
@@ -744,6 +797,9 @@ MAX_TOOLS_NUM=10
 # Maximum number of Parallelism branches in the workflow
 MAX_PARALLEL_LIMIT=10
 
+# The maximum number of iterations for agent setting
+MAX_ITERATIONS_NUM=5
+
 # ------------------------------
 # Environment Variables for web Service
 # ------------------------------
@@ -811,7 +867,7 @@ CHROMA_IS_PERSISTENT=TRUE
 
 # ------------------------------
 # Environment Variables for Oracle Service
-# (only used when VECTOR_STORE is Oracle)
+# (only used when VECTOR_STORE is oracle)
 # ------------------------------
 ORACLE_PWD=Dify123456
 ORACLE_CHARACTERSET=AL32UTF8
@@ -995,3 +1051,46 @@ PLUGIN_PYTHON_ENV_INIT_TIMEOUT=120
 PLUGIN_MAX_EXECUTION_TIMEOUT=600
 # PIP_MIRROR_URL=https://pypi.tuna.tsinghua.edu.cn/simple
 PIP_MIRROR_URL=
+
+# https://github.com/langgenius/dify-plugin-daemon/blob/main/.env.example
+# Plugin storage type, local aws_s3 tencent_cos azure_blob
+PLUGIN_STORAGE_TYPE=local
+PLUGIN_STORAGE_LOCAL_ROOT=/app/storage
+PLUGIN_WORKING_PATH=/app/storage/cwd
+PLUGIN_INSTALLED_PATH=plugin
+PLUGIN_PACKAGE_CACHE_PATH=plugin_packages
+PLUGIN_MEDIA_CACHE_PATH=assets
+# Plugin oss bucket
+PLUGIN_STORAGE_OSS_BUCKET=
+# Plugin oss s3 credentials
+PLUGIN_S3_USE_AWS_MANAGED_IAM=false
+PLUGIN_S3_ENDPOINT=
+PLUGIN_S3_USE_PATH_STYLE=false
+PLUGIN_AWS_ACCESS_KEY=
+PLUGIN_AWS_SECRET_KEY=
+PLUGIN_AWS_REGION=
+# Plugin oss azure blob
+PLUGIN_AZURE_BLOB_STORAGE_CONTAINER_NAME=
+PLUGIN_AZURE_BLOB_STORAGE_CONNECTION_STRING=
+# Plugin oss tencent cos
+PLUGIN_TENCENT_COS_SECRET_KEY=
+PLUGIN_TENCENT_COS_SECRET_ID=
+PLUGIN_TENCENT_COS_REGION=
+
+# ------------------------------
+# OTLP Collector Configuration
+# ------------------------------
+ENABLE_OTEL=false
+OTLP_BASE_ENDPOINT=http://localhost:4318
+OTLP_API_KEY=
+OTEL_EXPORTER_TYPE=otlp
+OTEL_SAMPLING_RATE=0.1
+OTEL_BATCH_EXPORT_SCHEDULE_DELAY=5000
+OTEL_MAX_QUEUE_SIZE=2048
+OTEL_MAX_EXPORT_BATCH_SIZE=512
+OTEL_METRIC_EXPORT_INTERVAL=60000
+OTEL_BATCH_EXPORT_TIMEOUT=10000
+OTEL_METRIC_EXPORT_TIMEOUT=30000
+
+# Prevent Clickjacking
+ALLOW_EMBED=false