+
+ 
diff --git a/README_AR.md b/README_AR.md
index d42c7508b1..ceb0be4b8f 100644
--- a/README_AR.md
+++ b/README_AR.md
@@ -21,6 +21,9 @@
+
+
diff --git a/README_CN.md b/README_CN.md
index 8d1cfbf274..ca94db87b0 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -21,6 +21,9 @@
+
+
diff --git a/README_ES.md b/README_ES.md
index 9763de69fb..bbbd6f854d 100644
--- a/README_ES.md
+++ b/README_ES.md
@@ -21,6 +21,9 @@
+
+
diff --git a/README_FR.md b/README_FR.md
index 974c0b9297..3890c2a996 100644
--- a/README_FR.md
+++ b/README_FR.md
@@ -21,6 +21,9 @@
+
+
diff --git a/README_JA.md b/README_JA.md
index 9651219157..c4266c66f8 100644
--- a/README_JA.md
+++ b/README_JA.md
@@ -21,6 +21,9 @@
+
+
diff --git a/README_KL.md b/README_KL.md
index dd37b8243b..852382284b 100644
--- a/README_KL.md
+++ b/README_KL.md
@@ -21,6 +21,9 @@
+
+
diff --git a/README_KR.md b/README_KR.md
index 8edbb99226..7be18b2312 100644
--- a/README_KR.md
+++ b/README_KR.md
@@ -21,6 +21,9 @@
+
+
diff --git a/README_PT.md b/README_PT.md
index f947538952..16f3d4041a 100644
--- a/README_PT.md
+++ b/README_PT.md
@@ -25,6 +25,9 @@
+
+
diff --git a/README_SI.md b/README_SI.md
index 6badf47f01..8e4f0fa6a6 100644
--- a/README_SI.md
+++ b/README_SI.md
@@ -22,6 +22,9 @@
+
+
diff --git a/README_TR.md b/README_TR.md
index 24ed0c9a08..d858618eaa 100644
--- a/README_TR.md
+++ b/README_TR.md
@@ -21,6 +21,9 @@
+
+
@@ -62,8 +65,6 @@ Görsel bir arayüz üzerinde güçlü AI iş akışları oluşturun ve test edi
-Özür dilerim, haklısınız. Daha anlamlı ve akıcı bir çeviri yapmaya çalışayım. İşte güncellenmiş çeviri:
-
**3. Prompt IDE**:
Komut istemlerini oluşturmak, model performansını karşılaştırmak ve sohbet tabanlı uygulamalara metin-konuşma gibi ek özellikler eklemek için kullanıcı dostu bir arayüz.
@@ -150,8 +151,6 @@ Görsel bir arayüz üzerinde güçlü AI iş akışları oluşturun ve test edi
## Dify'ı Kullanma
- **Cloud **
-İşte verdiğiniz metnin Türkçe çevirisi, kod bloğu içinde:
--
Herkesin sıfır kurulumla denemesi için bir [Dify Cloud](https://dify.ai) hizmeti sunuyoruz. Bu hizmet, kendi kendine dağıtılan versiyonun tüm yeteneklerini sağlar ve sandbox planında 200 ücretsiz GPT-4 çağrısı içerir.
- **Dify Topluluk Sürümünü Kendi Sunucunuzda Barındırma**
@@ -177,8 +176,6 @@ GitHub'da Dify'a yıldız verin ve yeni sürümlerden anında haberdar olun.
>- RAM >= 4GB
-İşte verdiğiniz metnin Türkçe çevirisi, kod bloğu içinde:
-
Dify sunucusunu başlatmanın en kolay yolu, [docker-compose.yml](docker/docker-compose.yaml) dosyamızı çalıştırmaktır. Kurulum komutunu çalıştırmadan önce, makinenizde [Docker](https://docs.docker.com/get-docker/) ve [Docker Compose](https://docs.docker.com/compose/install/)'un kurulu olduğundan emin olun:
```bash
diff --git a/README_VI.md b/README_VI.md
index 9076fcaae7..730a415ebe 100644
--- a/README_VI.md
+++ b/README_VI.md
@@ -21,6 +21,9 @@
+
+
diff --git a/api/Dockerfile b/api/Dockerfile
index fd3532e32d..8207c66f83 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -48,16 +48,18 @@ ENV TZ=UTC
WORKDIR /app/api
-RUN apt-get update \
- && apt-get install -y --no-install-recommends curl nodejs libgmp-dev libmpfr-dev libmpc-dev \
- # if you located in China, you can use aliyun mirror to speed up
- # && echo "deb http://mirrors.aliyun.com/debian testing main" > /etc/apt/sources.list \
- && echo "deb http://deb.debian.org/debian testing main" > /etc/apt/sources.list \
- && apt-get update \
- # For Security
- && apt-get install -y --no-install-recommends expat=2.6.4-1 libldap-2.5-0=2.5.19+dfsg-1 perl=5.40.0-8 libsqlite3-0=3.46.1-1 zlib1g=1:1.3.dfsg+really1.3.1-1+b1 \
- # install a chinese font to support the use of tools like matplotlib
- && apt-get install -y fonts-noto-cjk \
+RUN \
+ apt-get update \
+ # Install dependencies
+ && apt-get install -y --no-install-recommends \
+ # basic environment
+ curl nodejs libgmp-dev libmpfr-dev libmpc-dev \
+ # For Security
+ expat libldap-2.5-0 perl libsqlite3-0 zlib1g \
+ # install a chinese font to support the use of tools like matplotlib
+ fonts-noto-cjk \
+ # install libmagic to support the use of python-magic guess MIMETYPE
+ libmagic1 \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/*
@@ -76,7 +78,6 @@ COPY . /app/api/
COPY docker/entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
-
ARG COMMIT_SHA
ENV COMMIT_SHA=${COMMIT_SHA}
diff --git a/api/configs/feature/hosted_service/__init__.py b/api/configs/feature/hosted_service/__init__.py
index 7dd47e3658..71d06f4623 100644
--- a/api/configs/feature/hosted_service/__init__.py
+++ b/api/configs/feature/hosted_service/__init__.py
@@ -1,9 +1,40 @@
from typing import Optional
-from pydantic import Field, NonNegativeInt
+from pydantic import Field, NonNegativeInt, computed_field
from pydantic_settings import BaseSettings
+class HostedCreditConfig(BaseSettings):
+ HOSTED_MODEL_CREDIT_CONFIG: str = Field(
+ description="Model credit configuration in format 'model:credits,model:credits', e.g., 'gpt-4:20,gpt-4o:10'",
+ default="",
+ )
+
+ def get_model_credits(self, model_name: str) -> int:
+ """
+ Get credit value for a specific model name.
+ Returns 1 if model is not found in configuration (default credit).
+
+ :param model_name: The name of the model to search for
+ :return: The credit value for the model
+ """
+ if not self.HOSTED_MODEL_CREDIT_CONFIG:
+ return 1
+
+ try:
+ credit_map = dict(
+ item.strip().split(":", 1) for item in self.HOSTED_MODEL_CREDIT_CONFIG.split(",") if ":" in item
+ )
+
+ # Search for matching model pattern
+ for pattern, credit in credit_map.items():
+ if pattern.strip() == model_name:
+ return int(credit)
+ return 1 # Default quota if no match found
+ except (ValueError, AttributeError):
+ return 1 # Return default quota if parsing fails
+
+
class HostedOpenAiConfig(BaseSettings):
"""
Configuration for hosted OpenAI service
@@ -202,5 +233,7 @@ class HostedServiceConfig(
HostedZhipuAIConfig,
# moderation
HostedModerationConfig,
+ # credit config
+ HostedCreditConfig,
):
pass
diff --git a/api/controllers/common/helpers.py b/api/controllers/common/helpers.py
index 2bae203712..2979375169 100644
--- a/api/controllers/common/helpers.py
+++ b/api/controllers/common/helpers.py
@@ -1,12 +1,32 @@
import mimetypes
import os
+import platform
import re
import urllib.parse
+import warnings
from collections.abc import Mapping
from typing import Any
from uuid import uuid4
import httpx
+
+try:
+ import magic
+except ImportError:
+ if platform.system() == "Windows":
+ warnings.warn(
+ "To use python-magic guess MIMETYPE, you need to run `pip install python-magic-bin`", stacklevel=2
+ )
+ elif platform.system() == "Darwin":
+ warnings.warn("To use python-magic guess MIMETYPE, you need to run `brew install libmagic`", stacklevel=2)
+ elif platform.system() == "Linux":
+ warnings.warn(
+ "To use python-magic guess MIMETYPE, you need to run `sudo apt-get install libmagic1`", stacklevel=2
+ )
+ else:
+ warnings.warn("To use python-magic guess MIMETYPE, you need to install `libmagic`", stacklevel=2)
+ magic = None # type: ignore
+
from pydantic import BaseModel
from configs import dify_config
@@ -47,6 +67,13 @@ def guess_file_info_from_response(response: httpx.Response):
# If guessing fails, use Content-Type from response headers
mimetype = response.headers.get("Content-Type", "application/octet-stream")
+ # Use python-magic to guess MIME type if still unknown or generic
+ if mimetype == "application/octet-stream" and magic is not None:
+ try:
+ mimetype = magic.from_buffer(response.content[:1024], mime=True)
+ except magic.MagicException:
+ pass
+
extension = os.path.splitext(filename)[1]
# Ensure filename has an extension
diff --git a/api/controllers/console/datasets/datasets.py b/api/controllers/console/datasets/datasets.py
index abb817b244..fee651480a 100644
--- a/api/controllers/console/datasets/datasets.py
+++ b/api/controllers/console/datasets/datasets.py
@@ -620,7 +620,6 @@ class DatasetRetrievalSettingApi(Resource):
match vector_type:
case (
VectorType.RELYT
- | VectorType.PGVECTOR
| VectorType.TIDB_VECTOR
| VectorType.CHROMA
| VectorType.TENCENT
diff --git a/api/controllers/console/explore/message.py b/api/controllers/console/explore/message.py
index 405d5ed607..ff12959a65 100644
--- a/api/controllers/console/explore/message.py
+++ b/api/controllers/console/explore/message.py
@@ -50,7 +50,7 @@ class MessageListApi(InstalledAppResource):
try:
return MessageService.pagination_by_first_id(
- app_model, current_user, args["conversation_id"], args["first_id"], args["limit"], "desc"
+ app_model, current_user, args["conversation_id"], args["first_id"], args["limit"]
)
except services.errors.conversation.ConversationNotExistsError:
raise NotFound("Conversation Not Exists.")
diff --git a/api/controllers/inner_api/workspace/workspace.py b/api/controllers/inner_api/workspace/workspace.py
index d7346b13b1..8b2a7c0c4e 100644
--- a/api/controllers/inner_api/workspace/workspace.py
+++ b/api/controllers/inner_api/workspace/workspace.py
@@ -1,3 +1,5 @@
+import json
+
from flask_restful import Resource, reqparse # type: ignore
from controllers.console.wraps import setup_required
@@ -29,4 +31,34 @@ class EnterpriseWorkspace(Resource):
return {"message": "enterprise workspace created."}
+class EnterpriseWorkspaceNoOwnerEmail(Resource):
+ @setup_required
+ @inner_api_only
+ def post(self):
+ parser = reqparse.RequestParser()
+ parser.add_argument("name", type=str, required=True, location="json")
+ args = parser.parse_args()
+
+ tenant = TenantService.create_tenant(args["name"], is_from_dashboard=True)
+
+ tenant_was_created.send(tenant)
+
+ resp = {
+ "id": tenant.id,
+ "name": tenant.name,
+ "encrypt_public_key": tenant.encrypt_public_key,
+ "plan": tenant.plan,
+ "status": tenant.status,
+ "custom_config": json.loads(tenant.custom_config) if tenant.custom_config else {},
+ "created_at": tenant.created_at.isoformat() if tenant.created_at else None,
+ "updated_at": tenant.updated_at.isoformat() if tenant.updated_at else None,
+ }
+
+ return {
+ "message": "enterprise workspace created.",
+ "tenant": resp,
+ }
+
+
api.add_resource(EnterpriseWorkspace, "/enterprise/workspace")
+api.add_resource(EnterpriseWorkspaceNoOwnerEmail, "/enterprise/workspace/ownerless")
diff --git a/api/controllers/service_api/dataset/document.py b/api/controllers/service_api/dataset/document.py
index 2e148dd84c..3053e75a0c 100644
--- a/api/controllers/service_api/dataset/document.py
+++ b/api/controllers/service_api/dataset/document.py
@@ -18,6 +18,7 @@ from controllers.service_api.app.error import (
from controllers.service_api.dataset.error import (
ArchivedDocumentImmutableError,
DocumentIndexingError,
+ InvalidMetadataError,
)
from controllers.service_api.wraps import DatasetApiResource, cloud_edition_billing_resource_check
from core.errors.error import ProviderTokenNotInitError
@@ -50,6 +51,9 @@ class DocumentAddByTextApi(DatasetApiResource):
"indexing_technique", type=str, choices=Dataset.INDEXING_TECHNIQUE_LIST, nullable=False, location="json"
)
parser.add_argument("retrieval_model", type=dict, required=False, nullable=False, location="json")
+ parser.add_argument("doc_type", type=str, required=False, nullable=True, location="json")
+ parser.add_argument("doc_metadata", type=dict, required=False, nullable=True, location="json")
+
args = parser.parse_args()
dataset_id = str(dataset_id)
tenant_id = str(tenant_id)
@@ -61,6 +65,28 @@ class DocumentAddByTextApi(DatasetApiResource):
if not dataset.indexing_technique and not args["indexing_technique"]:
raise ValueError("indexing_technique is required.")
+ # Validate metadata if provided
+ if args.get("doc_type") or args.get("doc_metadata"):
+ if not args.get("doc_type") or not args.get("doc_metadata"):
+ raise InvalidMetadataError("Both doc_type and doc_metadata must be provided when adding metadata")
+
+ if args["doc_type"] not in DocumentService.DOCUMENT_METADATA_SCHEMA:
+ raise InvalidMetadataError(
+ "Invalid doc_type. Must be one of: " + ", ".join(DocumentService.DOCUMENT_METADATA_SCHEMA.keys())
+ )
+
+ if not isinstance(args["doc_metadata"], dict):
+ raise InvalidMetadataError("doc_metadata must be a dictionary")
+
+ # Validate metadata schema based on doc_type
+ if args["doc_type"] != "others":
+ metadata_schema = DocumentService.DOCUMENT_METADATA_SCHEMA[args["doc_type"]]
+ for key, value in args["doc_metadata"].items():
+ if key in metadata_schema and not isinstance(value, metadata_schema[key]):
+ raise InvalidMetadataError(f"Invalid type for metadata field {key}")
+ # set to MetaDataConfig
+ args["metadata"] = {"doc_type": args["doc_type"], "doc_metadata": args["doc_metadata"]}
+
text = args.get("text")
name = args.get("name")
if text is None or name is None:
@@ -107,6 +133,8 @@ class DocumentUpdateByTextApi(DatasetApiResource):
"doc_language", type=str, default="English", required=False, nullable=False, location="json"
)
parser.add_argument("retrieval_model", type=dict, required=False, nullable=False, location="json")
+ parser.add_argument("doc_type", type=str, required=False, nullable=True, location="json")
+ parser.add_argument("doc_metadata", type=dict, required=False, nullable=True, location="json")
args = parser.parse_args()
dataset_id = str(dataset_id)
tenant_id = str(tenant_id)
@@ -115,6 +143,32 @@ class DocumentUpdateByTextApi(DatasetApiResource):
if not dataset:
raise ValueError("Dataset is not exist.")
+ # indexing_technique is already set in dataset since this is an update
+ args["indexing_technique"] = dataset.indexing_technique
+
+ # Validate metadata if provided
+ if args.get("doc_type") or args.get("doc_metadata"):
+ if not args.get("doc_type") or not args.get("doc_metadata"):
+ raise InvalidMetadataError("Both doc_type and doc_metadata must be provided when adding metadata")
+
+ if args["doc_type"] not in DocumentService.DOCUMENT_METADATA_SCHEMA:
+ raise InvalidMetadataError(
+ "Invalid doc_type. Must be one of: " + ", ".join(DocumentService.DOCUMENT_METADATA_SCHEMA.keys())
+ )
+
+ if not isinstance(args["doc_metadata"], dict):
+ raise InvalidMetadataError("doc_metadata must be a dictionary")
+
+ # Validate metadata schema based on doc_type
+ if args["doc_type"] != "others":
+ metadata_schema = DocumentService.DOCUMENT_METADATA_SCHEMA[args["doc_type"]]
+ for key, value in args["doc_metadata"].items():
+ if key in metadata_schema and not isinstance(value, metadata_schema[key]):
+ raise InvalidMetadataError(f"Invalid type for metadata field {key}")
+
+ # set to MetaDataConfig
+ args["metadata"] = {"doc_type": args["doc_type"], "doc_metadata": args["doc_metadata"]}
+
if args["text"]:
text = args.get("text")
name = args.get("name")
@@ -161,6 +215,30 @@ class DocumentAddByFileApi(DatasetApiResource):
args["doc_form"] = "text_model"
if "doc_language" not in args:
args["doc_language"] = "English"
+
+ # Validate metadata if provided
+ if args.get("doc_type") or args.get("doc_metadata"):
+ if not args.get("doc_type") or not args.get("doc_metadata"):
+ raise InvalidMetadataError("Both doc_type and doc_metadata must be provided when adding metadata")
+
+ if args["doc_type"] not in DocumentService.DOCUMENT_METADATA_SCHEMA:
+ raise InvalidMetadataError(
+ "Invalid doc_type. Must be one of: " + ", ".join(DocumentService.DOCUMENT_METADATA_SCHEMA.keys())
+ )
+
+ if not isinstance(args["doc_metadata"], dict):
+ raise InvalidMetadataError("doc_metadata must be a dictionary")
+
+ # Validate metadata schema based on doc_type
+ if args["doc_type"] != "others":
+ metadata_schema = DocumentService.DOCUMENT_METADATA_SCHEMA[args["doc_type"]]
+ for key, value in args["doc_metadata"].items():
+ if key in metadata_schema and not isinstance(value, metadata_schema[key]):
+ raise InvalidMetadataError(f"Invalid type for metadata field {key}")
+
+ # set to MetaDataConfig
+ args["metadata"] = {"doc_type": args["doc_type"], "doc_metadata": args["doc_metadata"]}
+
# get dataset info
dataset_id = str(dataset_id)
tenant_id = str(tenant_id)
@@ -228,6 +306,29 @@ class DocumentUpdateByFileApi(DatasetApiResource):
if "doc_language" not in args:
args["doc_language"] = "English"
+ # Validate metadata if provided
+ if args.get("doc_type") or args.get("doc_metadata"):
+ if not args.get("doc_type") or not args.get("doc_metadata"):
+ raise InvalidMetadataError("Both doc_type and doc_metadata must be provided when adding metadata")
+
+ if args["doc_type"] not in DocumentService.DOCUMENT_METADATA_SCHEMA:
+ raise InvalidMetadataError(
+ "Invalid doc_type. Must be one of: " + ", ".join(DocumentService.DOCUMENT_METADATA_SCHEMA.keys())
+ )
+
+ if not isinstance(args["doc_metadata"], dict):
+ raise InvalidMetadataError("doc_metadata must be a dictionary")
+
+ # Validate metadata schema based on doc_type
+ if args["doc_type"] != "others":
+ metadata_schema = DocumentService.DOCUMENT_METADATA_SCHEMA[args["doc_type"]]
+ for key, value in args["doc_metadata"].items():
+ if key in metadata_schema and not isinstance(value, metadata_schema[key]):
+ raise InvalidMetadataError(f"Invalid type for metadata field {key}")
+
+ # set to MetaDataConfig
+ args["metadata"] = {"doc_type": args["doc_type"], "doc_metadata": args["doc_metadata"]}
+
# get dataset info
dataset_id = str(dataset_id)
tenant_id = str(tenant_id)
diff --git a/api/controllers/web/message.py b/api/controllers/web/message.py
index 2afc11f601..e6e546690c 100644
--- a/api/controllers/web/message.py
+++ b/api/controllers/web/message.py
@@ -91,7 +91,7 @@ class MessageListApi(WebApiResource):
try:
return MessageService.pagination_by_first_id(
- app_model, end_user, args["conversation_id"], args["first_id"], args["limit"], "desc"
+ app_model, end_user, args["conversation_id"], args["first_id"], args["limit"]
)
except services.errors.conversation.ConversationNotExistsError:
raise NotFound("Conversation Not Exists.")
diff --git a/api/core/app/apps/agent_chat/app_runner.py b/api/core/app/apps/agent_chat/app_runner.py
index ac71f02b6d..c670536140 100644
--- a/api/core/app/apps/agent_chat/app_runner.py
+++ b/api/core/app/apps/agent_chat/app_runner.py
@@ -202,7 +202,7 @@ class AgentChatAppRunner(AppRunner):
# change function call strategy based on LLM model
llm_model = cast(LargeLanguageModel, model_instance.model_type_instance)
model_schema = llm_model.get_model_schema(model_instance.model, model_instance.credentials)
- if not model_schema or not model_schema.features:
+ if not model_schema:
raise ValueError("Model schema not found")
if {ModelFeature.MULTI_TOOL_CALL, ModelFeature.TOOL_CALL}.intersection(model_schema.features or []):
diff --git a/api/core/helper/ssrf_proxy.py b/api/core/helper/ssrf_proxy.py
index 424983a819..af1e527eb5 100644
--- a/api/core/helper/ssrf_proxy.py
+++ b/api/core/helper/ssrf_proxy.py
@@ -11,15 +11,6 @@ from configs import dify_config
SSRF_DEFAULT_MAX_RETRIES = dify_config.SSRF_DEFAULT_MAX_RETRIES
-proxy_mounts = (
- {
- "http://": httpx.HTTPTransport(proxy=dify_config.SSRF_PROXY_HTTP_URL),
- "https://": httpx.HTTPTransport(proxy=dify_config.SSRF_PROXY_HTTPS_URL),
- }
- if dify_config.SSRF_PROXY_HTTP_URL and dify_config.SSRF_PROXY_HTTPS_URL
- else None
-)
-
BACKOFF_FACTOR = 0.5
STATUS_FORCELIST = [429, 500, 502, 503, 504]
@@ -51,7 +42,11 @@ def make_request(method, url, max_retries=SSRF_DEFAULT_MAX_RETRIES, **kwargs):
if dify_config.SSRF_PROXY_ALL_URL:
with httpx.Client(proxy=dify_config.SSRF_PROXY_ALL_URL) as client:
response = client.request(method=method, url=url, **kwargs)
- elif proxy_mounts:
+ elif dify_config.SSRF_PROXY_HTTP_URL and dify_config.SSRF_PROXY_HTTPS_URL:
+ proxy_mounts = {
+ "http://": httpx.HTTPTransport(proxy=dify_config.SSRF_PROXY_HTTP_URL),
+ "https://": httpx.HTTPTransport(proxy=dify_config.SSRF_PROXY_HTTPS_URL),
+ }
with httpx.Client(mounts=proxy_mounts) as client:
response = client.request(method=method, url=url, **kwargs)
else:
diff --git a/api/core/model_runtime/model_providers/__base/ai_model.py b/api/core/model_runtime/model_providers/__base/ai_model.py
index e2b9560337..4cac66ac4a 100644
--- a/api/core/model_runtime/model_providers/__base/ai_model.py
+++ b/api/core/model_runtime/model_providers/__base/ai_model.py
@@ -221,13 +221,12 @@ class AIModel(ABC):
:param credentials: model credentials
:return: model schema
"""
- # get predefined models (predefined_models)
- models = self.predefined_models()
-
- model_map = {model.model: model for model in models}
- if model in model_map:
- return model_map[model]
+ # Try to get model schema from predefined models
+ for predefined_model in self.predefined_models():
+ if model == predefined_model.model:
+ return predefined_model
+ # Try to get model schema from credentials
if credentials:
model_schema = self.get_customizable_model_schema_from_credentials(model, credentials)
if model_schema:
diff --git a/api/core/model_runtime/model_providers/__base/large_language_model.py b/api/core/model_runtime/model_providers/__base/large_language_model.py
index 402a30376b..b45b2ca025 100644
--- a/api/core/model_runtime/model_providers/__base/large_language_model.py
+++ b/api/core/model_runtime/model_providers/__base/large_language_model.py
@@ -30,6 +30,11 @@ from core.model_runtime.model_providers.__base.ai_model import AIModel
logger = logging.getLogger(__name__)
+HTML_THINKING_TAG = (
+ '