+ 
diff --git a/README_AR.md b/README_AR.md
index ceb0be4b8f..ae21281afb 100644
--- a/README_AR.md
+++ b/README_AR.md
@@ -45,6 +45,7 @@
+
| الميزة | @@ -136,8 +138,8 @@
|---|
+ 📌 ডিফাই ওয়ার্কফ্লো ফাইল আপলোড পরিচিতি: গুগল নোটবুক-এলএম পডকাস্ট পুনর্নির্মাণ +
+ ++ ডিফাই ক্লাউড · + সেল্ফ-হোস্টিং · + ডকুমেন্টেশন · + ব্যাবসায়িক অনুসন্ধান +
+ +
+
+ 
+
+
+ 
| বৈশিষ্ট্য | +Dify.AI | +LangChain | +Flowise | +OpenAI Assistants API | +
|---|---|---|---|---|
| প্রোগ্রামিং পদ্ধতি | +API + App-oriented | +Python Code | +App-oriented | +API-oriented | +
| সাপোর্টেড LLMs | +Rich Variety | +Rich Variety | +Rich Variety | +OpenAI-only | +
| RAG ইঞ্জিন | +✅ | +✅ | +✅ | +✅ | +
| এজেন্ট | +✅ | +✅ | +❌ | +✅ | +
| ওয়ার্কফ্লো | +✅ | +❌ | +✅ | +❌ | +
| অবজার্ভেবল | +✅ | +✅ | +❌ | +❌ | +
| এন্টারপ্রাইজ ফিচার (SSO/Access control) | +✅ | +❌ | +❌ | +❌ | +
| লোকাল ডেপ্লয়মেন্ট | +✅ | +✅ | +✅ | +❌ | +
+
+
Dify ist eine Open-Source-Plattform zur Entwicklung von LLM-Anwendungen. Ihre intuitive Benutzeroberfläche vereint agentenbasierte KI-Workflows, RAG-Pipelines, Agentenfunktionen, Modellverwaltung, Überwachungsfunktionen und mehr, sodass Sie schnell von einem Prototyp in die Produktion übergehen können.
diff --git a/README_ES.md b/README_ES.md
index bbbd6f854d..29ea5dbfcb 100644
--- a/README_ES.md
+++ b/README_ES.md
@@ -45,6 +45,7 @@
+
#
diff --git a/README_FR.md b/README_FR.md
index afbf18b069..59a8402141 100644
--- a/README_FR.md
+++ b/README_FR.md
@@ -45,6 +45,7 @@
+
#
diff --git a/README_JA.md b/README_JA.md
index e7c99fba2c..2ebddbb5b9 100644
--- a/README_JA.md
+++ b/README_JA.md
@@ -15,7 +15,7 @@
-
+
@@ -45,6 +45,7 @@
+
#
@@ -56,7 +57,7 @@
DifyはオープンソースのLLMアプリケーション開発プラットフォームです。直感的なインターフェイスには、AIワークフロー、RAGパイプライン、エージェント機能、モデル管理、観測機能などが組み合わさっており、プロトタイプから生産まで迅速に進めることができます。以下の機能が含まれます：
-**1. ワークフロー**:
+**1. ワークフロー**:
強力なAIワークフローをビジュアルキャンバス上で構築し、テストできます。すべての機能、および以下の機能を使用できます。
@@ -64,25 +65,25 @@ DifyはオープンソースのLLMアプリケーション開発プラットフ
-**2. 総合的なモデルサポート**:
+**2. 総合的なモデルサポート**:
数百ものプロプライエタリ/オープンソースのLLMと、数十もの推論プロバイダーおよびセルフホスティングソリューションとのシームレスな統合を提供します。GPT、Mistral、Llama3、OpenAI APIと互換性のあるすべてのモデルを統合されています。サポートされているモデルプロバイダーの完全なリストは[こちら](https://docs.dify.ai/getting-started/readme/model-providers)をご覧ください。
-**3. プロンプトIDE**:
+**3. プロンプトIDE**:
プロンプトの作成、モデルパフォーマンスの比較が行え、チャットベースのアプリに音声合成などの機能も追加できます。
-**4. RAGパイプライン**:
+**4. RAGパイプライン**:
ドキュメントの取り込みから検索までをカバーする広範なRAG機能ができます。ほかにもPDF、PPT、その他の一般的なドキュメントフォーマットからのテキスト抽出のサポートも提供します。
-**5. エージェント機能**:
+**5. エージェント機能**:
LLM Function CallingやReActに基づくエージェントの定義が可能で、AIエージェント用のプリビルトまたはカスタムツールを追加できます。Difyには、Google検索、DALL·E、Stable Diffusion、WolframAlphaなどのAIエージェント用の50以上の組み込みツールが提供します。
-**6. LLMOps**:
+**6. LLMOps**:
アプリケーションのログやパフォーマンスを監視と分析し、生産のデータと注釈に基づいて、プロンプト、データセット、モデルを継続的に改善できます。
-**7. Backend-as-a-Service**:
+**7. Backend-as-a-Service**:
すべての機能はAPIを提供されており、Difyを自分のビジネスロジックに簡単に統合できます。
@@ -164,7 +165,7 @@ DifyはオープンソースのLLMアプリケーション開発プラットフ
- **企業/組織向けのDify**
企業中心の機能を提供しています。[メールを送信](mailto:business@dify.ai?subject=[GitHub]Business%20License%20Inquiry)して企業のニーズについて相談してください。
- > AWSを使用しているスタートアップ企業や中小企業の場合は、[AWS Marketplace](https://aws.amazon.com/marketplace/pp/prodview-t23mebxzwjhu6)のDify Premiumをチェックして、ワンクリックで自分のAWS VPCにデプロイできます。さらに、手頃な価格のAMIオファリングとして、ロゴやブランディングをカスタマイズしてアプリケーションを作成するオプションがあります。
+ > AWSを使用しているスタートアップ企業や中小企業の場合は、[AWS Marketplace](https://aws.amazon.com/marketplace/pp/prodview-t22mebxzwjhu6)のDify Premiumをチェックして、ワンクリックで自分のAWS VPCにデプロイできます。さらに、手頃な価格のAMIオファリングとして、ロゴやブランディングをカスタマイズしてアプリケーションを作成するオプションがあります。
## 最新の情報を入手
@@ -177,7 +178,7 @@ GitHub上でDifyにスターを付けることで、Difyに関する新しいニ
## クイックスタート
> Difyをインストールする前に、お使いのマシンが以下の最小システム要件を満たしていることを確認してください：
->
+>
>- CPU >= 2コア
>- RAM >= 4GB
@@ -219,7 +220,7 @@ docker compose up -d
[CDK](https://aws.amazon.com/cdk/) を使用して、DifyをAWSにデプロイします
-##### AWS
+##### AWS
- [@KevinZhaoによるAWS CDK](https://github.com/aws-samples/solution-for-deploying-dify-on-aws)
## 貢献
diff --git a/README_KL.md b/README_KL.md
index c8cd22810e..eebd7d67ee 100644
--- a/README_KL.md
+++ b/README_KL.md
@@ -45,6 +45,7 @@
+
#
diff --git a/README_KR.md b/README_KR.md
index 7be18b2312..4c1735a81e 100644
--- a/README_KR.md
+++ b/README_KR.md
@@ -45,6 +45,7 @@
+
diff --git a/README_PT.md b/README_PT.md
index 16f3d4041a..af7eb3c822 100644
--- a/README_PT.md
+++ b/README_PT.md
@@ -50,6 +50,7 @@
+
Dify é uma plataforma de desenvolvimento de aplicativos LLM de código aberto. Sua interface intuitiva combina workflow de IA, pipeline RAG, capacidades de agente, gerenciamento de modelos, recursos de observabilidade e muito mais, permitindo que você vá rapidamente do protótipo à produção. Aqui está uma lista das principais funcionalidades:
diff --git a/README_SI.md b/README_SI.md
index 29e2ad4fb5..5b7c9611f9 100644
--- a/README_SI.md
+++ b/README_SI.md
@@ -47,6 +47,7 @@
+
diff --git a/README_TR.md b/README_TR.md
index d858618eaa..7af8582b7d 100644
--- a/README_TR.md
+++ b/README_TR.md
@@ -45,6 +45,7 @@
+
diff --git a/README_VI.md b/README_VI.md
index 730a415ebe..2f64541285 100644
--- a/README_VI.md
+++ b/README_VI.md
@@ -45,6 +45,7 @@
+
diff --git a/api/configs/middleware/vdb/oracle_config.py b/api/configs/middleware/vdb/oracle_config.py
index 5d2cf67ba3..ea39909ef4 100644
--- a/api/configs/middleware/vdb/oracle_config.py
+++ b/api/configs/middleware/vdb/oracle_config.py
@@ -1,6 +1,6 @@
from typing import Optional
-from pydantic import Field, PositiveInt
+from pydantic import Field
from pydantic_settings import BaseSettings
@@ -9,16 +9,6 @@ class OracleConfig(BaseSettings):
Configuration settings for Oracle database
"""
- ORACLE_HOST: Optional[str] = Field(
- description="Hostname or IP address of the Oracle database server (e.g., 'localhost' or 'oracle.example.com')",
- default=None,
- )
-
- ORACLE_PORT: PositiveInt = Field(
- description="Port number on which the Oracle database server is listening (default is 1521)",
- default=1521,
- )
-
ORACLE_USER: Optional[str] = Field(
description="Username for authenticating with the Oracle database",
default=None,
@@ -29,7 +19,28 @@ class OracleConfig(BaseSettings):
default=None,
)
- ORACLE_DATABASE: Optional[str] = Field(
- description="Name of the Oracle database or service to connect to (e.g., 'ORCL' or 'pdborcl')",
+ ORACLE_DSN: Optional[str] = Field(
+ description="Oracle database connection string. For traditional database, use format 'host:port/service_name'. "
+ "For autonomous database, use the service name from tnsnames.ora in the wallet",
default=None,
)
+
+ ORACLE_CONFIG_DIR: Optional[str] = Field(
+ description="Directory containing the tnsnames.ora configuration file. Only used in thin mode connection",
+ default=None,
+ )
+
+ ORACLE_WALLET_LOCATION: Optional[str] = Field(
+ description="Oracle wallet directory path containing the wallet files for secure connection",
+ default=None,
+ )
+
+ ORACLE_WALLET_PASSWORD: Optional[str] = Field(
+ description="Password to decrypt the Oracle wallet, if it is encrypted",
+ default=None,
+ )
+
+ ORACLE_IS_AUTONOMOUS: bool = Field(
+ description="Flag indicating whether connecting to Oracle Autonomous Database",
+ default=False,
+ )
diff --git a/api/contexts/__init__.py b/api/contexts/__init__.py
index 91438d086a..127b8fe76d 100644
--- a/api/contexts/__init__.py
+++ b/api/contexts/__init__.py
@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
from contexts.wrapper import RecyclableContextVar
if TYPE_CHECKING:
+ from core.model_runtime.entities.model_entities import AIModelEntity
from core.plugin.entities.plugin_daemon import PluginModelProviderEntity
from core.tools.plugin_tool.provider import PluginToolProviderController
from core.workflow.entities.variable_pool import VariablePool
@@ -20,11 +21,19 @@ To avoid race-conditions caused by gunicorn thread recycling, using RecyclableCo
plugin_tool_providers: RecyclableContextVar[dict[str, "PluginToolProviderController"]] = RecyclableContextVar(
ContextVar("plugin_tool_providers")
)
+
plugin_tool_providers_lock: RecyclableContextVar[Lock] = RecyclableContextVar(ContextVar("plugin_tool_providers_lock"))
plugin_model_providers: RecyclableContextVar[list["PluginModelProviderEntity"] | None] = RecyclableContextVar(
ContextVar("plugin_model_providers")
)
+
plugin_model_providers_lock: RecyclableContextVar[Lock] = RecyclableContextVar(
ContextVar("plugin_model_providers_lock")
)
+
+plugin_model_schema_lock: RecyclableContextVar[Lock] = RecyclableContextVar(ContextVar("plugin_model_schema_lock"))
+
+plugin_model_schemas: RecyclableContextVar[dict[str, "AIModelEntity"]] = RecyclableContextVar(
+ ContextVar("plugin_model_schemas")
+)
diff --git a/api/core/app/apps/advanced_chat/generate_task_pipeline.py b/api/core/app/apps/advanced_chat/generate_task_pipeline.py
index 3d6ba5ce37..5dd3ba11c8 100644
--- a/api/core/app/apps/advanced_chat/generate_task_pipeline.py
+++ b/api/core/app/apps/advanced_chat/generate_task_pipeline.py
@@ -582,6 +582,15 @@ class AdvancedChatAppGenerateTaskPipeline:
session.commit()
yield workflow_finish_resp
+ elif event.stopped_by in (
+ QueueStopEvent.StopBy.INPUT_MODERATION,
+ QueueStopEvent.StopBy.ANNOTATION_REPLY,
+ ):
+ # When hitting input-moderation or annotation-reply, the workflow will not start
+ with Session(db.engine, expire_on_commit=False) as session:
+ # Save message
+ self._save_message(session=session)
+ session.commit()
yield self._message_end_to_stream_response()
break
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 e79a3c0157..cdd1bba6be 100644
--- a/api/core/model_runtime/model_providers/__base/ai_model.py
+++ b/api/core/model_runtime/model_providers/__base/ai_model.py
@@ -1,8 +1,11 @@
import decimal
+import hashlib
+from threading import Lock
from typing import Optional
from pydantic import BaseModel, ConfigDict, Field
+import contexts
from core.model_runtime.entities.common_entities import I18nObject
from core.model_runtime.entities.defaults import PARAMETER_RULE_TEMPLATE
from core.model_runtime.entities.model_entities import (
@@ -139,15 +142,35 @@ class AIModel(BaseModel):
:return: model schema
"""
plugin_model_manager = PluginModelManager()
- return plugin_model_manager.get_model_schema(
- tenant_id=self.tenant_id,
- user_id="unknown",
- plugin_id=self.plugin_id,
- provider=self.provider_name,
- model_type=self.model_type.value,
- model=model,
- credentials=credentials or {},
- )
+ cache_key = f"{self.tenant_id}:{self.plugin_id}:{self.provider_name}:{self.model_type.value}:{model}"
+ # sort credentials
+ sorted_credentials = sorted(credentials.items()) if credentials else []
+ cache_key += ":".join([hashlib.md5(f"{k}:{v}".encode()).hexdigest() for k, v in sorted_credentials])
+
+ try:
+ contexts.plugin_model_schemas.get()
+ except LookupError:
+ contexts.plugin_model_schemas.set({})
+ contexts.plugin_model_schema_lock.set(Lock())
+
+ with contexts.plugin_model_schema_lock.get():
+ if cache_key in contexts.plugin_model_schemas.get():
+ return contexts.plugin_model_schemas.get()[cache_key]
+
+ schema = plugin_model_manager.get_model_schema(
+ tenant_id=self.tenant_id,
+ user_id="unknown",
+ plugin_id=self.plugin_id,
+ provider=self.provider_name,
+ model_type=self.model_type.value,
+ model=model,
+ credentials=credentials or {},
+ )
+
+ if schema:
+ contexts.plugin_model_schemas.get()[cache_key] = schema
+
+ return schema
def get_customizable_model_schema_from_credentials(self, model: str, credentials: dict) -> Optional[AIModelEntity]:
"""
diff --git a/api/core/model_runtime/model_providers/model_provider_factory.py b/api/core/model_runtime/model_providers/model_provider_factory.py
index 4e9b20b033..d2fd4916a4 100644
--- a/api/core/model_runtime/model_providers/model_provider_factory.py
+++ b/api/core/model_runtime/model_providers/model_provider_factory.py
@@ -1,3 +1,4 @@
+import hashlib
import logging
import os
from collections.abc import Sequence
@@ -206,17 +207,35 @@ class ModelProviderFactory:
Get model schema
"""
plugin_id, provider_name = self.get_plugin_id_and_provider_name_from_provider(provider)
- model_schema = self.plugin_model_manager.get_model_schema(
- tenant_id=self.tenant_id,
- user_id="unknown",
- plugin_id=plugin_id,
- provider=provider_name,
- model_type=model_type.value,
- model=model,
- credentials=credentials,
- )
+ cache_key = f"{self.tenant_id}:{plugin_id}:{provider_name}:{model_type.value}:{model}"
+ # sort credentials
+ sorted_credentials = sorted(credentials.items()) if credentials else []
+ cache_key += ":".join([hashlib.md5(f"{k}:{v}".encode()).hexdigest() for k, v in sorted_credentials])
- return model_schema
+ try:
+ contexts.plugin_model_schemas.get()
+ except LookupError:
+ contexts.plugin_model_schemas.set({})
+ contexts.plugin_model_schema_lock.set(Lock())
+
+ with contexts.plugin_model_schema_lock.get():
+ if cache_key in contexts.plugin_model_schemas.get():
+ return contexts.plugin_model_schemas.get()[cache_key]
+
+ schema = self.plugin_model_manager.get_model_schema(
+ tenant_id=self.tenant_id,
+ user_id="unknown",
+ plugin_id=plugin_id,
+ provider=provider_name,
+ model_type=model_type.value,
+ model=model,
+ credentials=credentials or {},
+ )
+
+ if schema:
+ contexts.plugin_model_schemas.get()[cache_key] = schema
+
+ return schema
def get_models(
self,
diff --git a/api/core/rag/datasource/vdb/milvus/milvus_vector.py b/api/core/rag/datasource/vdb/milvus/milvus_vector.py
index 9a184f7dd9..cc29b92825 100644
--- a/api/core/rag/datasource/vdb/milvus/milvus_vector.py
+++ b/api/core/rag/datasource/vdb/milvus/milvus_vector.py
@@ -72,8 +72,18 @@ class MilvusVector(BaseVector):
self._client = self._init_client(config)
self._consistency_level = "Session" # Consistency level for Milvus operations
self._fields: list[str] = [] # List of fields in the collection
+ if self._client.has_collection(collection_name):
+ self._load_collection_fields()
self._hybrid_search_enabled = self._check_hybrid_search_support() # Check if hybrid search is supported
+ def _load_collection_fields(self, fields: Optional[list[str]] = None) -> None:
+ if fields is None:
+ # Load collection fields from remote server
+ collection_info = self._client.describe_collection(self._collection_name)
+ fields = [field["name"] for field in collection_info["fields"]]
+ # Since primary field is auto-id, no need to track it
+ self._fields = [f for f in fields if f != Field.PRIMARY_KEY.value]
+
def _check_hybrid_search_support(self) -> bool:
"""
Check if the current Milvus version supports hybrid search.
@@ -306,10 +316,7 @@ class MilvusVector(BaseVector):
)
schema.add_function(bm25_function)
- for x in schema.fields:
- self._fields.append(x.name)
- # Since primary field is auto-id, no need to track it
- self._fields.remove(Field.PRIMARY_KEY.value)
+ self._load_collection_fields([f.name for f in schema.fields])
# Create Index params for the collection
index_params_obj = IndexParams()
diff --git a/api/core/rag/datasource/vdb/oracle/oraclevector.py b/api/core/rag/datasource/vdb/oracle/oraclevector.py
index a58df7eb9f..8262c219b4 100644
--- a/api/core/rag/datasource/vdb/oracle/oraclevector.py
+++ b/api/core/rag/datasource/vdb/oracle/oraclevector.py
@@ -23,25 +23,30 @@ oracledb.defaults.fetch_lobs = False
class OracleVectorConfig(BaseModel):
- host: str
- port: int
user: str
password: str
- database: str
+ dsn: str
+ config_dir: str | None = None
+ wallet_location: str | None = None
+ wallet_password: str | None = None
+ is_autonomous: bool = False
@model_validator(mode="before")
@classmethod
def validate_config(cls, values: dict) -> dict:
- if not values["host"]:
- raise ValueError("config ORACLE_HOST is required")
- if not values["port"]:
- raise ValueError("config ORACLE_PORT is required")
if not values["user"]:
raise ValueError("config ORACLE_USER is required")
if not values["password"]:
raise ValueError("config ORACLE_PASSWORD is required")
- if not values["database"]:
- raise ValueError("config ORACLE_DB is required")
+ if not values["dsn"]:
+ raise ValueError("config ORACLE_DSN is required")
+ if values.get("is_autonomous", False):
+ if not values.get("config_dir"):
+ raise ValueError("config_dir is required for autonomous database")
+ if not values.get("wallet_location"):
+ raise ValueError("wallet_location is required for autonomous database")
+ if not values.get("wallet_password"):
+ raise ValueError("wallet_password is required for autonomous database")
return values
@@ -56,7 +61,7 @@ CREATE TABLE IF NOT EXISTS {table_name} (
SQL_CREATE_INDEX = """
CREATE INDEX IF NOT EXISTS idx_docs_{table_name} ON {table_name}(text)
INDEXTYPE IS CTXSYS.CONTEXT PARAMETERS
-('FILTER CTXSYS.NULL_FILTER SECTION GROUP CTXSYS.HTML_SECTION_GROUP LEXER sys.my_chinese_vgram_lexer')
+('FILTER CTXSYS.NULL_FILTER SECTION GROUP CTXSYS.HTML_SECTION_GROUP LEXER multilingual_lexer')
"""
@@ -103,14 +108,25 @@ class OracleVector(BaseVector):
)
def _create_connection_pool(self, config: OracleVectorConfig):
- return oracledb.create_pool(
- user=config.user,
- password=config.password,
- dsn="{}:{}/{}".format(config.host, config.port, config.database),
- min=1,
- max=50,
- increment=1,
- )
+ pool_params = {
+ "user": config.user,
+ "password": config.password,
+ "dsn": config.dsn,
+ "min": 1,
+ "max": 50,
+ "increment": 1,
+ }
+
+ if config.is_autonomous:
+ pool_params.update(
+ {
+ "config_dir": config.config_dir,
+ "wallet_location": config.wallet_location,
+ "wallet_password": config.wallet_password,
+ }
+ )
+
+ return oracledb.create_pool(**pool_params)
@contextmanager
def _get_cursor(self):
@@ -287,10 +303,12 @@ class OracleVectorFactory(AbstractVectorFactory):
return OracleVector(
collection_name=collection_name,
config=OracleVectorConfig(
- host=dify_config.ORACLE_HOST or "localhost",
- port=dify_config.ORACLE_PORT,
user=dify_config.ORACLE_USER or "system",
password=dify_config.ORACLE_PASSWORD or "oracle",
- database=dify_config.ORACLE_DATABASE or "orcl",
+ dsn=dify_config.ORACLE_DSN or "oracle:1521/freepdb1",
+ config_dir=dify_config.ORACLE_CONFIG_DIR,
+ wallet_location=dify_config.ORACLE_WALLET_LOCATION,
+ wallet_password=dify_config.ORACLE_WALLET_PASSWORD,
+ is_autonomous=dify_config.ORACLE_IS_AUTONOMOUS,
),
)
diff --git a/api/core/workflow/graph_engine/entities/graph.py b/api/core/workflow/graph_engine/entities/graph.py
index 1c6b4b6618..5c672c985b 100644
--- a/api/core/workflow/graph_engine/entities/graph.py
+++ b/api/core/workflow/graph_engine/entities/graph.py
@@ -590,8 +590,6 @@ class Graph(BaseModel):
start_node_id=node_id,
routes_node_ids=routes_node_ids,
)
- # Exclude conditional branch nodes
- and all(edge.run_condition is None for edge in reverse_edge_mapping.get(node_id, []))
):
if node_id not in merge_branch_node_ids:
merge_branch_node_ids[node_id] = []
diff --git a/api/core/workflow/nodes/llm/node.py b/api/core/workflow/nodes/llm/node.py
index f717a2a877..b61b5b5cb5 100644
--- a/api/core/workflow/nodes/llm/node.py
+++ b/api/core/workflow/nodes/llm/node.py
@@ -191,6 +191,22 @@ class LLMNode(BaseNode[LLMNodeData]):
# deduct quota
self.deduct_llm_quota(tenant_id=self.tenant_id, model_instance=model_instance, usage=usage)
break
+ outputs = {"text": result_text, "usage": jsonable_encoder(usage), "finish_reason": finish_reason}
+
+ yield RunCompletedEvent(
+ run_result=NodeRunResult(
+ status=WorkflowNodeExecutionStatus.SUCCEEDED,
+ inputs=node_inputs,
+ process_data=process_data,
+ outputs=outputs,
+ metadata={
+ NodeRunMetadataKey.TOTAL_TOKENS: usage.total_tokens,
+ NodeRunMetadataKey.TOTAL_PRICE: usage.total_price,
+ NodeRunMetadataKey.CURRENCY: usage.currency,
+ },
+ llm_usage=usage,
+ )
+ )
except LLMNodeError as e:
yield RunCompletedEvent(
run_result=NodeRunResult(
@@ -211,23 +227,6 @@ class LLMNode(BaseNode[LLMNodeData]):
)
)
- outputs = {"text": result_text, "usage": jsonable_encoder(usage), "finish_reason": finish_reason}
-
- yield RunCompletedEvent(
- run_result=NodeRunResult(
- status=WorkflowNodeExecutionStatus.SUCCEEDED,
- inputs=node_inputs,
- process_data=process_data,
- outputs=outputs,
- metadata={
- NodeRunMetadataKey.TOTAL_TOKENS: usage.total_tokens,
- NodeRunMetadataKey.TOTAL_PRICE: usage.total_price,
- NodeRunMetadataKey.CURRENCY: usage.currency,
- },
- llm_usage=usage,
- )
- )
-
def _invoke_llm(
self,
node_data_model: ModelConfig,
diff --git a/api/migrations/versions/2024_12_20_0628-e1944c35e15e_add_retry_index_field_to_node_execution_.py b/api/migrations/versions/2024_12_20_0628-e1944c35e15e_add_retry_index_field_to_node_execution_.py
index 814dec423c..0facd0ecc0 100644
--- a/api/migrations/versions/2024_12_20_0628-e1944c35e15e_add_retry_index_field_to_node_execution_.py
+++ b/api/migrations/versions/2024_12_20_0628-e1944c35e15e_add_retry_index_field_to_node_execution_.py
@@ -1,4 +1,5 @@
"""add retry_index field to node-execution model
+
Revision ID: e1944c35e15e
Revises: 11b07f66c737
Create Date: 2024-12-20 06:28:30.287197
diff --git a/api/models/workflow.py b/api/models/workflow.py
index a0120f275b..8f550357a7 100644
--- a/api/models/workflow.py
+++ b/api/models/workflow.py
@@ -191,7 +191,7 @@ class Workflow(Base):
features["file_upload"]["enabled"] = image_enabled
features["file_upload"]["number_limits"] = image_number_limits
features["file_upload"]["allowed_file_upload_methods"] = image_transfer_methods
- features["file_upload"]["allowed_file_types"] = ["image"]
+ features["file_upload"]["allowed_file_types"] = features["file_upload"].get("allowed_file_types", ["image"])
features["file_upload"]["allowed_file_extensions"] = []
del features["file_upload"]["image"]
self._features = json.dumps(features)
diff --git a/api/services/plugin/plugin_service.py b/api/services/plugin/plugin_service.py
index f84baf6b81..749bb1a5b4 100644
--- a/api/services/plugin/plugin_service.py
+++ b/api/services/plugin/plugin_service.py
@@ -1,6 +1,9 @@
import logging
-from collections.abc import Sequence
+from collections.abc import Mapping, Sequence
from mimetypes import guess_type
+from typing import Optional
+
+from pydantic import BaseModel
from configs import dify_config
from core.helper import marketplace
@@ -18,11 +21,71 @@ from core.plugin.entities.plugin_daemon import PluginInstallTask, PluginUploadRe
from core.plugin.manager.asset import PluginAssetManager
from core.plugin.manager.debugging import PluginDebuggingManager
from core.plugin.manager.plugin import PluginInstallationManager
+from extensions.ext_redis import redis_client
logger = logging.getLogger(__name__)
class PluginService:
+ class LatestPluginCache(BaseModel):
+ plugin_id: str
+ version: str
+ unique_identifier: str
+
+ REDIS_KEY_PREFIX = "plugin_service:latest_plugin:"
+ REDIS_TTL = 60 * 5 # 5 minutes
+
+ @staticmethod
+ def fetch_latest_plugin_version(plugin_ids: Sequence[str]) -> Mapping[str, Optional[LatestPluginCache]]:
+ """
+ Fetch the latest plugin version
+ """
+ result: dict[str, Optional[PluginService.LatestPluginCache]] = {}
+
+ try:
+ cache_not_exists = []
+
+ # Try to get from Redis first
+ for plugin_id in plugin_ids:
+ cached_data = redis_client.get(f"{PluginService.REDIS_KEY_PREFIX}{plugin_id}")
+ if cached_data:
+ result[plugin_id] = PluginService.LatestPluginCache.model_validate_json(cached_data)
+ else:
+ cache_not_exists.append(plugin_id)
+
+ if cache_not_exists:
+ manifests = {
+ manifest.plugin_id: manifest
+ for manifest in marketplace.batch_fetch_plugin_manifests(cache_not_exists)
+ }
+
+ for plugin_id, manifest in manifests.items():
+ latest_plugin = PluginService.LatestPluginCache(
+ plugin_id=plugin_id,
+ version=manifest.latest_version,
+ unique_identifier=manifest.latest_package_identifier,
+ )
+
+ # Store in Redis
+ redis_client.setex(
+ f"{PluginService.REDIS_KEY_PREFIX}{plugin_id}",
+ PluginService.REDIS_TTL,
+ latest_plugin.model_dump_json(),
+ )
+
+ result[plugin_id] = latest_plugin
+
+ # pop plugin_id from cache_not_exists
+ cache_not_exists.remove(plugin_id)
+
+ for plugin_id in cache_not_exists:
+ result[plugin_id] = None
+
+ return result
+ except Exception:
+ logger.exception("failed to fetch latest plugin version")
+ return result
+
@staticmethod
def get_debugging_key(tenant_id: str) -> str:
"""
@@ -40,9 +103,7 @@ class PluginService:
plugins = manager.list_plugins(tenant_id)
plugin_ids = [plugin.plugin_id for plugin in plugins if plugin.source == PluginInstallationSource.Marketplace]
try:
- manifests = {
- manifest.plugin_id: manifest for manifest in marketplace.batch_fetch_plugin_manifests(plugin_ids)
- }
+ manifests = PluginService.fetch_latest_plugin_version(plugin_ids)
except Exception:
manifests = {}
logger.exception("failed to fetch plugin manifests")
@@ -50,9 +111,11 @@ class PluginService:
for plugin in plugins:
if plugin.source == PluginInstallationSource.Marketplace:
if plugin.plugin_id in manifests:
- # set latest_version
- plugin.latest_version = manifests[plugin.plugin_id].latest_version
- plugin.latest_unique_identifier = manifests[plugin.plugin_id].latest_package_identifier
+ latest_plugin_cache = manifests[plugin.plugin_id]
+ if latest_plugin_cache:
+ # set latest_version
+ plugin.latest_version = latest_plugin_cache.version
+ plugin.latest_unique_identifier = latest_plugin_cache.unique_identifier
return plugins
diff --git a/api/tests/integration_tests/vdb/oracle/test_oraclevector.py b/api/tests/integration_tests/vdb/oracle/test_oraclevector.py
index 3252b04276..76e8b7bccd 100644
--- a/api/tests/integration_tests/vdb/oracle/test_oraclevector.py
+++ b/api/tests/integration_tests/vdb/oracle/test_oraclevector.py
@@ -13,11 +13,9 @@ class OracleVectorTest(AbstractVectorTest):
self.vector = OracleVector(
collection_name=self.collection_name,
config=OracleVectorConfig(
- host="localhost",
- port=1521,
user="dify",
password="dify",
- database="FREEPDB1",
+ dsn="localhost:1521/FREEPDB1",
),
)
diff --git a/docker/.env.example b/docker/.env.example
index afd2caf501..438af9fc52 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -483,11 +483,13 @@ CHROMA_AUTH_PROVIDER=chromadb.auth.token_authn.TokenAuthClientProvider
CHROMA_AUTH_CREDENTIALS=
# Oracle configuration, only available when VECTOR_STORE is `oracle`
-ORACLE_HOST=oracle
-ORACLE_PORT=1521
ORACLE_USER=dify
ORACLE_PASSWORD=dify
-ORACLE_DATABASE=FREEPDB1
+ORACLE_DSN=oracle:1521/FREEPDB1
+ORACLE_CONFIG_DIR=/app/api/storage/wallet
+ORACLE_WALLET_LOCATION=/app/api/storage/wallet
+ORACLE_WALLET_PASSWORD=dify
+ORACLE_IS_AUTONOMOUS=false
# relyt configurations, only available when VECTOR_STORE is `relyt`
RELYT_HOST=db
diff --git a/docker/docker-compose-template.yaml b/docker/docker-compose-template.yaml
index 860fce1f9a..bae3636570 100644
--- a/docker/docker-compose-template.yaml
+++ b/docker/docker-compose-template.yaml
@@ -12,6 +12,8 @@ services:
SENTRY_DSN: ${API_SENTRY_DSN:-}
SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0}
SENTRY_PROFILES_SAMPLE_RATE: ${API_SENTRY_PROFILES_SAMPLE_RATE:-1.0}
+ PLUGIN_REMOTE_INSTALL_HOST: ${EXPOSE_PLUGIN_DEBUGGING_HOST:-localhost}
+ PLUGIN_REMOTE_INSTALL_PORT: ${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}
PLUGIN_MAX_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
INNER_API_KEY_FOR_PLUGIN: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
depends_on:
@@ -142,8 +144,8 @@ services:
PPROF_ENABLED: ${PLUGIN_PPROF_ENABLED:-false}
DIFY_INNER_API_URL: ${PLUGIN_DIFY_INNER_API_URL:-http://api:5001}
DIFY_INNER_API_KEY: ${INNER_API_KEY_FOR_PLUGIN:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
- PLUGIN_REMOTE_INSTALLING_HOST: ${PLUGIN_REMOTE_INSTALL_HOST:-0.0.0.0}
- PLUGIN_REMOTE_INSTALLING_PORT: ${PLUGIN_REMOTE_INSTALL_PORT:-5003}
+ PLUGIN_REMOTE_INSTALLING_HOST: ${EXPOSE_PLUGIN_DEBUGGING_HOST:-localhost}
+ PLUGIN_REMOTE_INSTALLING_PORT: ${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}
PLUGIN_WORKING_PATH: ${PLUGIN_WORKING_PATH:-/app/storage/cwd}
FORCE_VERIFYING_SIGNATURE: ${FORCE_VERIFYING_SIGNATURE:-true}
ports:
diff --git a/docker/docker-compose.middleware.yaml b/docker/docker-compose.middleware.yaml
index d9d723df31..72e60d3cff 100644
--- a/docker/docker-compose.middleware.yaml
+++ b/docker/docker-compose.middleware.yaml
@@ -84,8 +84,8 @@ services:
PPROF_ENABLED: ${PLUGIN_PPROF_ENABLED:-false}
DIFY_INNER_API_URL: ${PLUGIN_DIFY_INNER_API_URL:-http://host.docker.internal:5001}
DIFY_INNER_API_KEY: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
- PLUGIN_REMOTE_INSTALLING_HOST: ${PLUGIN_DEBUGGING_HOST:-0.0.0.0}
- PLUGIN_REMOTE_INSTALLING_PORT: ${PLUGIN_DEBUGGING_PORT:-5003}
+ PLUGIN_REMOTE_INSTALLING_HOST: ${EXPOSE_PLUGIN_DEBUGGING_HOST:-localhost}
+ PLUGIN_REMOTE_INSTALLING_PORT: ${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}
PLUGIN_WORKING_PATH: ${PLUGIN_WORKING_PATH:-/app/storage/cwd}
FORCE_VERIFYING_SIGNATURE: ${FORCE_VERIFYING_SIGNATURE:-true}
ports:
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 469c2d1b77..72a615263f 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -197,11 +197,13 @@ x-shared-env: &shared-api-worker-env
CHROMA_DATABASE: ${CHROMA_DATABASE:-default_database}
CHROMA_AUTH_PROVIDER: ${CHROMA_AUTH_PROVIDER:-chromadb.auth.token_authn.TokenAuthClientProvider}
CHROMA_AUTH_CREDENTIALS: ${CHROMA_AUTH_CREDENTIALS:-}
- ORACLE_HOST: ${ORACLE_HOST:-oracle}
- ORACLE_PORT: ${ORACLE_PORT:-1521}
ORACLE_USER: ${ORACLE_USER:-dify}
ORACLE_PASSWORD: ${ORACLE_PASSWORD:-dify}
- ORACLE_DATABASE: ${ORACLE_DATABASE:-FREEPDB1}
+ ORACLE_DSN: ${ORACLE_DSN:-oracle:1521/FREEPDB1}
+ ORACLE_CONFIG_DIR: ${ORACLE_CONFIG_DIR:-/app/api/storage/wallet}
+ ORACLE_WALLET_LOCATION: ${ORACLE_WALLET_LOCATION:-/app/api/storage/wallet}
+ ORACLE_WALLET_PASSWORD: ${ORACLE_WALLET_PASSWORD:-dify}
+ ORACLE_IS_AUTONOMOUS: ${ORACLE_IS_AUTONOMOUS:-false}
RELYT_HOST: ${RELYT_HOST:-db}
RELYT_PORT: ${RELYT_PORT:-5432}
RELYT_USER: ${RELYT_USER:-postgres}
@@ -424,6 +426,8 @@ services:
SENTRY_DSN: ${API_SENTRY_DSN:-}
SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0}
SENTRY_PROFILES_SAMPLE_RATE: ${API_SENTRY_PROFILES_SAMPLE_RATE:-1.0}
+ PLUGIN_REMOTE_INSTALL_HOST: ${EXPOSE_PLUGIN_DEBUGGING_HOST:-localhost}
+ PLUGIN_REMOTE_INSTALL_PORT: ${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}
PLUGIN_MAX_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
INNER_API_KEY_FOR_PLUGIN: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
depends_on:
@@ -554,8 +558,8 @@ services:
PPROF_ENABLED: ${PLUGIN_PPROF_ENABLED:-false}
DIFY_INNER_API_URL: ${PLUGIN_DIFY_INNER_API_URL:-http://api:5001}
DIFY_INNER_API_KEY: ${INNER_API_KEY_FOR_PLUGIN:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
- PLUGIN_REMOTE_INSTALLING_HOST: ${PLUGIN_REMOTE_INSTALL_HOST:-0.0.0.0}
- PLUGIN_REMOTE_INSTALLING_PORT: ${PLUGIN_REMOTE_INSTALL_PORT:-5003}
+ PLUGIN_REMOTE_INSTALLING_HOST: ${EXPOSE_PLUGIN_DEBUGGING_HOST:-localhost}
+ PLUGIN_REMOTE_INSTALLING_PORT: ${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}
PLUGIN_WORKING_PATH: ${PLUGIN_WORKING_PATH:-/app/storage/cwd}
FORCE_VERIFYING_SIGNATURE: ${FORCE_VERIFYING_SIGNATURE:-true}
ports:
diff --git a/docker/startupscripts/init_user.script b/docker/startupscripts/init_user.script
index 7aa7c28049..55e8510d2f 100755
--- a/docker/startupscripts/init_user.script
+++ b/docker/startupscripts/init_user.script
@@ -5,6 +5,6 @@ create user dify identified by dify DEFAULT TABLESPACE users quota unlimited on
grant DB_DEVELOPER_ROLE to dify;
BEGIN
-CTX_DDL.CREATE_PREFERENCE('my_chinese_vgram_lexer','CHINESE_VGRAM_LEXER');
+CTX_DDL.CREATE_PREFERENCE('dify.multilingual_lexer','CHINESE_VGRAM_LEXER');
END;
/
diff --git a/web/app/(shareLayout)/layout.tsx b/web/app/(shareLayout)/layout.tsx
index 0782603ebc..94ac1deb0b 100644
--- a/web/app/(shareLayout)/layout.tsx
+++ b/web/app/(shareLayout)/layout.tsx
@@ -1,7 +1,6 @@
import React from 'react'
import type { FC } from 'react'
import type { Metadata } from 'next'
-import { SharePageContextProvider } from '@/context/share-page-context'
export const metadata: Metadata = {
icons: 'data:,', // prevent browser from using default favicon
@@ -12,9 +11,7 @@ const Layout: FC<{
}> = ({ children }) => {
return (