feat: reset parameters when switch agent strategy

This reverts commit f63cc9e069.

.github/workflows/api-tests.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - main
-      - plugins/beta
     paths:
       - api/**
       - docker/**
@@ -48,9 +47,15 @@ jobs:
       - name: Run Unit tests
         run: poetry run -C api bash dev/pytest/pytest_unit_tests.sh
 
+      - name: Run ModelRuntime
+        run: poetry run -C api bash dev/pytest/pytest_model_runtime.sh
+
       - name: Run dify config tests
         run: poetry run -C api python dev/pytest/pytest_config_tests.py
 
+      - name: Run Tool
+        run: poetry run -C api bash dev/pytest/pytest_tools.sh
+
       - name: Run mypy
         run: |
           pushd api

.github/workflows/build-push.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - "main"
       - "deploy/dev"
-      - "plugins/beta"
+      - "dev/plugin-deploy"
   release:
     types: [published]
 
@@ -140,3 +140,16 @@ jobs:
       - name: Inspect image
         run: |
           docker buildx imagetools inspect ${{ env[matrix.image_name_env] }}:${{ steps.meta.outputs.version }}
+
+      - name: print context var
+        uses: actions/checkout@v4
+
+      - name: deploy pod in plugin env
+        if: github.ref == 'refs/heads/dev/plugin-deploy'
+        env:
+          IMAGEHASH: ${{ github.sha }}
+          APICMD: "${{ secrets.PLUGIN_CD_API_CURL }}"
+          WEBCMD: "${{ secrets.PLUGIN_CD_WEB_CURL }}"
+        run: |
+          bash -c "${APICMD/yourNewVersion/$IMAGEHASH}"
+          bash -c "${WEBCMD/yourNewVersion/$IMAGEHASH}"

.github/workflows/db-migration-test.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - main
-      - plugins/beta
     paths:
       - api/migrations/**
       - .github/workflows/db-migration-test.yml

.github/workflows/deploy-plugin-dev.yml

@@ -0,0 +1,23 @@
+name: Deploy Plugin Dev
+
+on:
+  workflow_run:
+    workflows: ["Build and Push API & Web"]
+    branches:
+      - "dev/plugin-deploy"
+    types:
+      - completed
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    if: |
+      github.event.workflow_run.conclusion == 'success'
+    steps:
+      - name: Deploy to server
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: "echo 123"

.github/workflows/style.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - main
-      - plugins/beta
 
 concurrency:
   group: style-${{ github.head_ref || github.run_id }}
@@ -83,6 +82,34 @@ jobs:
         if: steps.changed-files.outputs.any_changed == 'true'
         run: pnpm run lint
 
+  docker-compose-template:
+    name: Docker Compose Template
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Check changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v45
+        with:
+          files: |
+            docker/generate_docker_compose
+            docker/.env.example
+            docker/docker-compose-template.yaml
+            docker/docker-compose.yaml
+
+      - name: Generate Docker Compose
+        if: steps.changed-files.outputs.any_changed == 'true'
+        run: |
+          cd docker
+          ./generate_docker_compose
+
+      - name: Check for changes
+        if: steps.changed-files.outputs.any_changed == 'true'
+        run: git diff --exit-code
+
   superlinter:
     name: SuperLinter
     runs-on: ubuntu-latest
@@ -107,7 +134,7 @@ jobs:
         if: steps.changed-files.outputs.any_changed == 'true'
         env:
           BASH_SEVERITY: warning
-          DEFAULT_BRANCH: plugins/beta
+          DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           IGNORE_GENERATED_FILES: true
           IGNORE_GITIGNORED_FILES: true

api/Dockerfile

@@ -55,7 +55,6 @@ RUN apt-get update \
     && 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 \
     && apt-get autoremove -y \

api/configs/packaging/__init__.py

@@ -9,7 +9,7 @@ class PackagingInfo(BaseSettings):
 
     CURRENT_VERSION: str = Field(
         description="Dify version",
-        default="1.0.0-beta.1",
+        default="0.15.0",
     )
 
     COMMIT_SHA: str = Field(

api/core/app/apps/advanced_chat/generate_task_pipeline.py

@@ -384,7 +384,6 @@ class AdvancedChatAppGenerateTaskPipeline:
                         task_id=self._application_generate_entity.task_id,
                         workflow_node_execution=workflow_node_execution,
                     )
-                    session.commit()
 
                 if node_finish_resp:
                     yield node_finish_resp

api/core/app/apps/workflow_app_runner.py

@@ -386,6 +386,7 @@ class WorkflowBasedAppRunner(AppRunner):
                     status=event.status,
                     data=event.data,
                     metadata=event.metadata,
+                    node_id=event.node_id,
                 )
             )
         elif isinstance(event, ParallelBranchRunStartedEvent):

api/core/app/entities/queue_entities.py

@@ -330,6 +330,7 @@ class QueueAgentLogEvent(AppQueueEvent):
     status: str
     data: Mapping[str, Any]
     metadata: Optional[Mapping[str, Any]] = None
+    node_id: str
 
 
 class QueueNodeRetryEvent(QueueNodeStartedEvent):

api/core/app/entities/task_entities.py

@@ -717,6 +717,7 @@ class AgentLogStreamResponse(StreamResponse):
         status: str
         data: Mapping[str, Any]
         metadata: Optional[Mapping[str, Any]] = None
+        node_id: str
 
     event: StreamEvent = StreamEvent.AGENT_LOG
     data: Data

api/core/app/task_pipeline/workflow_cycle_manage.py

@@ -863,5 +863,6 @@ class WorkflowCycleManage:
                 status=event.status,
                 data=event.data,
                 metadata=event.metadata,
+                node_id=event.node_id,
             ),
         )

api/core/helper/ssrf_proxy.py

@@ -60,12 +60,10 @@ def make_request(method, url, max_retries=SSRF_DEFAULT_MAX_RETRIES, **kwargs):
             if response.status_code not in STATUS_FORCELIST:
                 return response
             else:
-                logging.warning(
-                    f"Received status code {response.status_code} for URL {url} which is in the force list")
+                logging.warning(f"Received status code {response.status_code} for URL {url} which is in the force list")
 
         except httpx.RequestError as e:
-            logging.warning(f"Request to URL {url} failed on attempt {
-                            retries + 1}: {e}")
+            logging.warning(f"Request to URL {url} failed on attempt {retries + 1}: {e}")
             if max_retries == 0:
                 raise
 

api/core/rag/datasource/vdb/lindorm/lindorm_vector.py

@@ -17,8 +17,7 @@ from extensions.ext_redis import redis_client
 from models.dataset import Dataset
 
 logger = logging.getLogger(__name__)
-logging.basicConfig(level=logging.INFO,
-                    format="%(asctime)s - %(levelname)s - %(message)s")
+logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")
 logging.getLogger("lindorm").setLevel(logging.WARN)
 
 ROUTING_FIELD = "routing_field"
@@ -135,8 +134,7 @@ class LindormVectorStore(BaseVector):
                 self._client.delete(index=self._collection_name, id=id, params=params)
                 self.refresh()
             else:
-                logger.warning(
-                    f"DELETE BY ID: ID {id} does not exist in the index.")
+                logger.warning(f"DELETE BY ID: ID {id} does not exist in the index.")
 
     def delete(self) -> None:
         if self._using_ugc:
@@ -147,8 +145,7 @@ class LindormVectorStore(BaseVector):
             self.refresh()
         else:
             if self._client.indices.exists(index=self._collection_name):
-                self._client.indices.delete(
-                    index=self._collection_name, params={"timeout": 60})
+                self._client.indices.delete(index=self._collection_name, params={"timeout": 60})
                 logger.info("Delete index success")
             else:
                 logger.warning(f"Index '{self._collection_name}' does not exist. No deletion performed.")
@@ -171,14 +168,13 @@ class LindormVectorStore(BaseVector):
             raise ValueError("All elements in query_vector should be floats")
 
         top_k = kwargs.get("top_k", 10)
-        query = default_vector_search_query(
-            query_vector=query_vector, k=top_k, **kwargs)
+        query = default_vector_search_query(query_vector=query_vector, k=top_k, **kwargs)
         try:
             params = {}
             if self._using_ugc:
                 params["routing"] = self._routing
             response = self._client.search(index=self._collection_name, body=query, params=params)
-        except Exception as e:
+        except Exception:
             logger.exception(f"Error executing vector search, query: {query}")
             raise
 
@@ -224,8 +220,7 @@ class LindormVectorStore(BaseVector):
             routing=routing,
             routing_field=self._routing_field,
         )
-        response = self._client.search(
-            index=self._collection_name, body=full_text_query)
+        response = self._client.search(index=self._collection_name, body=full_text_query)
         docs = []
         for hit in response["hits"]["hits"]:
             docs.append(
@@ -243,8 +238,7 @@ class LindormVectorStore(BaseVector):
         with redis_client.lock(lock_name, timeout=20):
             collection_exist_cache_key = f"vector_indexing_{self._collection_name}"
             if redis_client.get(collection_exist_cache_key):
-                logger.info(
-                    f"Collection {self._collection_name} already exists.")
+                logger.info(f"Collection {self._collection_name} already exists.")
                 return
             if self._client.indices.exists(index=self._collection_name):
                 logger.info(f"{self._collection_name.lower()} already exists.")
@@ -264,13 +258,10 @@ class LindormVectorStore(BaseVector):
             hnsw_ef_construction = kwargs.pop("hnsw_ef_construction", 500)
             ivfpq_m = kwargs.pop("ivfpq_m", dimension)
             nlist = kwargs.pop("nlist", 1000)
-            centroids_use_hnsw = kwargs.pop(
-                "centroids_use_hnsw", True if nlist >= 5000 else False)
+            centroids_use_hnsw = kwargs.pop("centroids_use_hnsw", True if nlist >= 5000 else False)
             centroids_hnsw_m = kwargs.pop("centroids_hnsw_m", 24)
-            centroids_hnsw_ef_construct = kwargs.pop(
-                "centroids_hnsw_ef_construct", 500)
-            centroids_hnsw_ef_search = kwargs.pop(
-                "centroids_hnsw_ef_search", 100)
+            centroids_hnsw_ef_construct = kwargs.pop("centroids_hnsw_ef_construct", 500)
+            centroids_hnsw_ef_search = kwargs.pop("centroids_hnsw_ef_search", 100)
             mapping = default_text_mapping(
                 dimension,
                 method_name,
@@ -290,8 +281,7 @@ class LindormVectorStore(BaseVector):
                 using_ugc=self._using_ugc,
                 **kwargs,
             )
-            self._client.indices.create(
-                index=self._collection_name.lower(), body=mapping)
+            self._client.indices.create(index=self._collection_name.lower(), body=mapping)
             redis_client.set(collection_exist_cache_key, 1, ex=3600)
             # logger.info(f"create index success: {self._collection_name}")
 
@@ -396,8 +386,7 @@ def default_text_search_query(
     # build complex search_query when either of must/must_not/should/filter is specified
     if must:
         if not isinstance(must, list):
-            raise RuntimeError(
-                f"unexpected [must] clause with {type(filters)}")
+            raise RuntimeError(f"unexpected [must] clause with {type(filters)}")
         if query_clause not in must:
             must.append(query_clause)
     else:
@@ -407,22 +396,19 @@ def default_text_search_query(
 
     if must_not:
         if not isinstance(must_not, list):
-            raise RuntimeError(
-                f"unexpected [must_not] clause with {type(filters)}")
+            raise RuntimeError(f"unexpected [must_not] clause with {type(filters)}")
         boolean_query["must_not"] = must_not
 
     if should:
         if not isinstance(should, list):
-            raise RuntimeError(
-                f"unexpected [should] clause with {type(filters)}")
+            raise RuntimeError(f"unexpected [should] clause with {type(filters)}")
         boolean_query["should"] = should
         if minimum_should_match != 0:
             boolean_query["minimum_should_match"] = minimum_should_match
 
     if filters:
         if not isinstance(filters, list):
-            raise RuntimeError(
-                f"unexpected [filter] clause with {type(filters)}")
+            raise RuntimeError(f"unexpected [filter] clause with {type(filters)}")
         boolean_query["filter"] = filters
 
     search_query = {"size": k, "query": {"bool": boolean_query}}

api/core/rag/extractor/word_extractor.py

@@ -50,7 +50,7 @@ class WordExtractor(BaseExtractor):
 
             self.web_path = self.file_path
             # TODO: use a better way to handle the file
-            self.temp_file = tempfile.NamedTemporaryFile()  # noqa SIM115
+            self.temp_file = tempfile.NamedTemporaryFile()  # noqa: SIM115
             self.temp_file.write(r.content)
             self.file_path = self.temp_file.name
         elif not os.path.isfile(self.file_path):

api/core/tools/tool_manager.py

@@ -160,8 +160,8 @@ class ToolManager:
         """
         get the tool runtime
 
-        :param provider_type: the type of the provider
-        :param provider_name: the name of the provider
+        :param provider_type: the type of  the provider
+        :param provider_name: the name of  the provider
         :param tool_name: the name of the tool
 
         :return: the tool

api/core/workflow/graph_engine/entities/event.py

@@ -204,6 +204,7 @@ class AgentLogEvent(BaseAgentEvent):
     status: str = Field(..., description="status")
     data: Mapping[str, Any] = Field(..., description="data")
     metadata: Optional[Mapping[str, Any]] = Field(default=None, description="metadata")
+    node_id: str = Field(..., description="agent node id")
 
 
 InNodeEvent = BaseNodeEvent | BaseParallelBranchEvent | BaseIterationEvent | BaseAgentEvent

api/core/workflow/nodes/tool/tool_node.py

@@ -338,6 +338,7 @@ class ToolNode(BaseNode[ToolNodeData]):
                     data=message.message.data,
                     label=message.message.label,
                     metadata=message.message.metadata,
+                    node_id=self.node_id,
                 )
 
                 # check if the agent log is already in the list

api/models/staging.py

@@ -0,0 +1,27 @@
+from datetime import datetime
+
+from sqlalchemy.orm import Mapped
+
+from extensions.ext_database import db
+from models.base import Base
+
+from .types import StringUUID
+
+
+class StagingAccountWhitelist(Base):
+    __tablename__ = "staging_account_whitelists"
+
+    __table_args__ = (
+        db.PrimaryKeyConstraint("id", name="staging_account_whitelist_pkey"),
+        db.Index("account_email_idx", "email"),
+    )
+
+    id: Mapped[str] = db.Column(StringUUID, server_default=db.text("uuid_generate_v4()"))
+    email: Mapped[str] = db.Column(db.String(255), nullable=False)
+    disabled: Mapped[bool] = db.Column(db.Boolean, nullable=False, server_default=db.text("false"))
+    created_at: Mapped[datetime] = db.Column(
+        db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)")
+    )
+    updated_at: Mapped[datetime] = db.Column(
+        db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)")
+    )

api/services/account_service.py

@@ -33,6 +33,7 @@ from models.account import (
     TenantStatus,
 )
 from models.model import DifySetup
+from models.staging import StagingAccountWhitelist
 from services.billing_service import BillingService
 from services.errors.account import (
     AccountAlreadyInTenantError,
@@ -347,6 +348,9 @@ class AccountService:
 
     @staticmethod
     def login(account: Account, *, ip_address: Optional[str] = None) -> TokenPair:
+        if not AccountService.verify_account_whitelist(account.email):
+            raise ValueError("Account is not whitelisted")
+
         if ip_address:
             AccountService.update_login_info(account=account, ip_address=ip_address)
 
@@ -378,6 +382,9 @@ class AccountService:
         if not account:
             raise ValueError("Invalid account")
 
+        if not AccountService.verify_account_whitelist(account.email):
+            raise ValueError("Account is not whitelisted")
+
         # Generate new access token and refresh token
         new_access_token = AccountService.get_account_jwt_token(account)
         new_refresh_token = _generate_refresh_token()
@@ -387,6 +394,16 @@ class AccountService:
 
         return TokenPair(access_token=new_access_token, refresh_token=new_refresh_token)
 
+    @staticmethod
+    def verify_account_whitelist(email: str) -> bool:
+        with Session(db.engine) as session:
+            return (
+                session.query(StagingAccountWhitelist)
+                .filter(StagingAccountWhitelist.email == email, StagingAccountWhitelist.disabled == False)
+                .first()
+                is not None
+            )
+
     @staticmethod
     def load_logged_in_account(*, account_id: str):
         return AccountService.load_user(account_id)
@@ -431,9 +448,13 @@ class AccountService:
     def send_email_code_login_email(
         cls, account: Optional[Account] = None, email: Optional[str] = None, language: Optional[str] = "en-US"
     ):
-        email = account.email if account else email
-        if email is None:
-            raise ValueError("Email must be provided.")
+        if email:
+            if not AccountService.verify_account_whitelist(email):
+                raise ValueError("Account is not whitelisted")
+        elif account:
+            if not AccountService.verify_account_whitelist(account.email):
+                raise ValueError("Account is not whitelisted")
+
         if cls.email_code_login_rate_limiter.is_rate_limited(email):
             from controllers.console.auth.error import EmailCodeLoginRateLimitExceededError
 

api/services/tools/builtin_tools_manage_service.py

@@ -258,7 +258,7 @@ class BuiltinToolManageService:
                     include_set=dify_config.POSITION_TOOL_INCLUDES_SET,  # type: ignore
                     exclude_set=dify_config.POSITION_TOOL_EXCLUDES_SET,  # type: ignore
                     data=provider_controller,
-                    name_func=lambda x: x.identity.name,
+                    name_func=lambda x: x.entity.identity.name,
                 ):
                     continue
 

api/services/tools/tools_transform_service.py

@@ -54,7 +54,7 @@ class ToolTransformService:
     @staticmethod
     def repack_provider(tenant_id: str, provider: Union[dict, ToolProviderApiEntity]):
         """
-        repack provider
+        repack  provider
 
         :param provider: the provider dict
         """

api/tests/integration_tests/model_runtime/gpustack/test_speech2text.py

@@ -0,0 +1,55 @@
+import os
+from pathlib import Path
+
+import pytest
+
+from core.model_runtime.errors.validate import CredentialsValidateFailedError
+from core.model_runtime.model_providers.gpustack.speech2text.speech2text import GPUStackSpeech2TextModel
+
+
+def test_validate_credentials():
+    model = GPUStackSpeech2TextModel()
+
+    with pytest.raises(CredentialsValidateFailedError):
+        model.validate_credentials(
+            model="faster-whisper-medium",
+            credentials={
+                "endpoint_url": "invalid_url",
+                "api_key": "invalid_api_key",
+            },
+        )
+
+    model.validate_credentials(
+        model="faster-whisper-medium",
+        credentials={
+            "endpoint_url": os.environ.get("GPUSTACK_SERVER_URL"),
+            "api_key": os.environ.get("GPUSTACK_API_KEY"),
+        },
+    )
+
+
+def test_invoke_model():
+    model = GPUStackSpeech2TextModel()
+
+    # Get the directory of the current file
+    current_dir = os.path.dirname(os.path.abspath(__file__))
+
+    # Get assets directory
+    assets_dir = os.path.join(os.path.dirname(current_dir), "assets")
+
+    # Construct the path to the audio file
+    audio_file_path = os.path.join(assets_dir, "audio.mp3")
+
+    file = Path(audio_file_path).read_bytes()
+
+    result = model.invoke(
+        model="faster-whisper-medium",
+        credentials={
+            "endpoint_url": os.environ.get("GPUSTACK_SERVER_URL"),
+            "api_key": os.environ.get("GPUSTACK_API_KEY"),
+        },
+        file=file,
+    )
+
+    assert isinstance(result, str)
+    assert result == "1, 2, 3, 4, 5, 6, 7, 8, 9, 10"

api/tests/integration_tests/model_runtime/gpustack/test_tts.py

@@ -0,0 +1,24 @@
+import os
+
+from core.model_runtime.model_providers.gpustack.tts.tts import GPUStackText2SpeechModel
+
+
+def test_invoke_model():
+    model = GPUStackText2SpeechModel()
+
+    result = model.invoke(
+        model="cosyvoice-300m-sft",
+        tenant_id="test",
+        credentials={
+            "endpoint_url": os.environ.get("GPUSTACK_SERVER_URL"),
+            "api_key": os.environ.get("GPUSTACK_API_KEY"),
+        },
+        content_text="Hello world",
+        voice="Chinese Female",
+    )
+
+    content = b""
+    for chunk in result:
+        content += chunk
+
+    assert content != b""

api/tests/unit_tests/core/helper/test_marketplace.py

@@ -2,6 +2,6 @@ from core.helper.marketplace import download_plugin_pkg
 
 
 def test_download_plugin_pkg():
-    pkg = download_plugin_pkg("langgenius/bing:0.0.1@e58735424d2104f208c2bd683c5142e0332045b425927067acf432b26f3d970b")
+    pkg = download_plugin_pkg("yeuoly/google:0.0.1@4ff79ee644987e5b744d9c5b7a735d459fe66f26b28724326a7834d7e459e708")
     assert pkg is not None
     assert len(pkg) > 0

api/tests/unit_tests/core/prompt/test_prompt_transform.py

@@ -1,52 +1,52 @@
-# from unittest.mock import MagicMock
+from unittest.mock import MagicMock
 
-# from core.app.app_config.entities import ModelConfigEntity
-# from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
-# from core.model_runtime.entities.message_entities import UserPromptMessage
-# from core.model_runtime.entities.model_entities import AIModelEntity, ModelPropertyKey, ParameterRule
-# from core.model_runtime.entities.provider_entities import ProviderEntity
-# from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-# from core.prompt.prompt_transform import PromptTransform
+from core.app.app_config.entities import ModelConfigEntity
+from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
+from core.model_runtime.entities.message_entities import UserPromptMessage
+from core.model_runtime.entities.model_entities import AIModelEntity, ModelPropertyKey, ParameterRule
+from core.model_runtime.entities.provider_entities import ProviderEntity
+from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
+from core.prompt.prompt_transform import PromptTransform
 
 
-# def test__calculate_rest_token():
-#     model_schema_mock = MagicMock(spec=AIModelEntity)
-#     parameter_rule_mock = MagicMock(spec=ParameterRule)
-#     parameter_rule_mock.name = "max_tokens"
-#     model_schema_mock.parameter_rules = [parameter_rule_mock]
-#     model_schema_mock.model_properties = {ModelPropertyKey.CONTEXT_SIZE: 62}
+def test__calculate_rest_token():
+    model_schema_mock = MagicMock(spec=AIModelEntity)
+    parameter_rule_mock = MagicMock(spec=ParameterRule)
+    parameter_rule_mock.name = "max_tokens"
+    model_schema_mock.parameter_rules = [parameter_rule_mock]
+    model_schema_mock.model_properties = {ModelPropertyKey.CONTEXT_SIZE: 62}
 
-#     large_language_model_mock = MagicMock(spec=LargeLanguageModel)
-#     large_language_model_mock.get_num_tokens.return_value = 6
+    large_language_model_mock = MagicMock(spec=LargeLanguageModel)
+    large_language_model_mock.get_num_tokens.return_value = 6
 
-#     provider_mock = MagicMock(spec=ProviderEntity)
-#     provider_mock.provider = "openai"
+    provider_mock = MagicMock(spec=ProviderEntity)
+    provider_mock.provider = "openai"
 
-#     provider_configuration_mock = MagicMock(spec=ProviderConfiguration)
-#     provider_configuration_mock.provider = provider_mock
-#     provider_configuration_mock.model_settings = None
+    provider_configuration_mock = MagicMock(spec=ProviderConfiguration)
+    provider_configuration_mock.provider = provider_mock
+    provider_configuration_mock.model_settings = None
 
-#     provider_model_bundle_mock = MagicMock(spec=ProviderModelBundle)
-#     provider_model_bundle_mock.model_type_instance = large_language_model_mock
-#     provider_model_bundle_mock.configuration = provider_configuration_mock
+    provider_model_bundle_mock = MagicMock(spec=ProviderModelBundle)
+    provider_model_bundle_mock.model_type_instance = large_language_model_mock
+    provider_model_bundle_mock.configuration = provider_configuration_mock
 
-#     model_config_mock = MagicMock(spec=ModelConfigEntity)
-#     model_config_mock.model = "gpt-4"
-#     model_config_mock.credentials = {}
-#     model_config_mock.parameters = {"max_tokens": 50}
-#     model_config_mock.model_schema = model_schema_mock
-#     model_config_mock.provider_model_bundle = provider_model_bundle_mock
+    model_config_mock = MagicMock(spec=ModelConfigEntity)
+    model_config_mock.model = "gpt-4"
+    model_config_mock.credentials = {}
+    model_config_mock.parameters = {"max_tokens": 50}
+    model_config_mock.model_schema = model_schema_mock
+    model_config_mock.provider_model_bundle = provider_model_bundle_mock
 
-#     prompt_transform = PromptTransform()
+    prompt_transform = PromptTransform()
 
-#     prompt_messages = [UserPromptMessage(content="Hello, how are you?")]
-#     rest_tokens = prompt_transform._calculate_rest_token(prompt_messages, model_config_mock)
+    prompt_messages = [UserPromptMessage(content="Hello, how are you?")]
+    rest_tokens = prompt_transform._calculate_rest_token(prompt_messages, model_config_mock)
 
-#     # Validate based on the mock configuration and expected logic
-#     expected_rest_tokens = (
-#         model_schema_mock.model_properties[ModelPropertyKey.CONTEXT_SIZE]
-#         - model_config_mock.parameters["max_tokens"]
-#         - large_language_model_mock.get_num_tokens.return_value
-#     )
-#     assert rest_tokens == expected_rest_tokens
-#     assert rest_tokens == 6
+    # Validate based on the mock configuration and expected logic
+    expected_rest_tokens = (
+        model_schema_mock.model_properties[ModelPropertyKey.CONTEXT_SIZE]
+        - model_config_mock.parameters["max_tokens"]
+        - large_language_model_mock.get_num_tokens.return_value
+    )
+    assert rest_tokens == expected_rest_tokens
+    assert rest_tokens == 6

api/tests/unit_tests/core/test_provider_manager.py

@@ -1,190 +1,186 @@
-# from core.entities.provider_entities import ModelSettings
-# from core.model_runtime.entities.model_entities import ModelType
-# from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
-# from core.provider_manager import ProviderManager
-# from models.provider import LoadBalancingModelConfig, ProviderModelSetting
+from core.entities.provider_entities import ModelSettings
+from core.model_runtime.entities.model_entities import ModelType
+from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
+from core.provider_manager import ProviderManager
+from models.provider import LoadBalancingModelConfig, ProviderModelSetting
 
 
-# def test__to_model_settings(mocker):
-#     # Get all provider entities
-#     model_provider_factory = ModelProviderFactory("test_tenant")
-#     provider_entities = model_provider_factory.get_providers()
+def test__to_model_settings(mocker):
+    # Get all provider entities
+    model_provider_factory = ModelProviderFactory("test_tenant")
+    provider_entities = model_provider_factory.get_providers()
 
-#     provider_entity = None
-#     for provider in provider_entities:
-#         if provider.provider == "openai":
-#             provider_entity = provider
+    provider_entity = None
+    for provider in provider_entities:
+        if provider.provider == "openai":
+            provider_entity = provider
 
-#     # Mocking the inputs
-#     provider_model_settings = [
-#         ProviderModelSetting(
-#             id="id",
-#             tenant_id="tenant_id",
-#             provider_name="openai",
-#             model_name="gpt-4",
-#             model_type="text-generation",
-#             enabled=True,
-#             load_balancing_enabled=True,
-#         )
-#     ]
-#     load_balancing_model_configs = [
-#         LoadBalancingModelConfig(
-#             id="id1",
-#             tenant_id="tenant_id",
-#             provider_name="openai",
-#             model_name="gpt-4",
-#             model_type="text-generation",
-#             name="__inherit__",
-#             encrypted_config=None,
-#             enabled=True,
-#         ),
-#         LoadBalancingModelConfig(
-#             id="id2",
-#             tenant_id="tenant_id",
-#             provider_name="openai",
-#             model_name="gpt-4",
-#             model_type="text-generation",
-#             name="first",
-#             encrypted_config='{"openai_api_key": "fake_key"}',
-#             enabled=True,
-#         ),
-#     ]
+    # Mocking the inputs
+    provider_model_settings = [
+        ProviderModelSetting(
+            id="id",
+            tenant_id="tenant_id",
+            provider_name="openai",
+            model_name="gpt-4",
+            model_type="text-generation",
+            enabled=True,
+            load_balancing_enabled=True,
+        )
+    ]
+    load_balancing_model_configs = [
+        LoadBalancingModelConfig(
+            id="id1",
+            tenant_id="tenant_id",
+            provider_name="openai",
+            model_name="gpt-4",
+            model_type="text-generation",
+            name="__inherit__",
+            encrypted_config=None,
+            enabled=True,
+        ),
+        LoadBalancingModelConfig(
+            id="id2",
+            tenant_id="tenant_id",
+            provider_name="openai",
+            model_name="gpt-4",
+            model_type="text-generation",
+            name="first",
+            encrypted_config='{"openai_api_key": "fake_key"}',
+            enabled=True,
+        ),
+    ]
 
-#     mocker.patch(
-#         "core.helper.model_provider_cache.ProviderCredentialsCache.get", return_value={"openai_api_key": "fake_key"}
-#     )
+    mocker.patch(
+        "core.helper.model_provider_cache.ProviderCredentialsCache.get", return_value={"openai_api_key": "fake_key"}
+    )
 
-#     provider_manager = ProviderManager()
+    provider_manager = ProviderManager()
 
-#     # Running the method
-#     result = provider_manager._to_model_settings(provider_entity,
-#  provider_model_settings, load_balancing_model_configs)
+    # Running the method
+    result = provider_manager._to_model_settings(provider_entity, provider_model_settings, load_balancing_model_configs)
 
-#     # Asserting that the result is as expected
-#     assert len(result) == 1
-#     assert isinstance(result[0], ModelSettings)
-#     assert result[0].model == "gpt-4"
-#     assert result[0].model_type == ModelType.LLM
-#     assert result[0].enabled is True
-#     assert len(result[0].load_balancing_configs) == 2
-#     assert result[0].load_balancing_configs[0].name == "__inherit__"
-#     assert result[0].load_balancing_configs[1].name == "first"
+    # Asserting that the result is as expected
+    assert len(result) == 1
+    assert isinstance(result[0], ModelSettings)
+    assert result[0].model == "gpt-4"
+    assert result[0].model_type == ModelType.LLM
+    assert result[0].enabled is True
+    assert len(result[0].load_balancing_configs) == 2
+    assert result[0].load_balancing_configs[0].name == "__inherit__"
+    assert result[0].load_balancing_configs[1].name == "first"
 
 
-# def test__to_model_settings_only_one_lb(mocker):
-#     # Get all provider entities
-#     model_provider_factory = ModelProviderFactory("test_tenant")
-#     provider_entities = model_provider_factory.get_providers()
+def test__to_model_settings_only_one_lb(mocker):
+    # Get all provider entities
+    model_provider_factory = ModelProviderFactory("test_tenant")
+    provider_entities = model_provider_factory.get_providers()
 
-#     provider_entity = None
-#     for provider in provider_entities:
-#         if provider.provider == "openai":
-#             provider_entity = provider
+    provider_entity = None
+    for provider in provider_entities:
+        if provider.provider == "openai":
+            provider_entity = provider
 
-#     # Mocking the inputs
-#     provider_model_settings = [
-#         ProviderModelSetting(
-#             id="id",
-#             tenant_id="tenant_id",
-#             provider_name="openai",
-#             model_name="gpt-4",
-#             model_type="text-generation",
-#             enabled=True,
-#             load_balancing_enabled=True,
-#         )
-#     ]
-#     load_balancing_model_configs = [
-#         LoadBalancingModelConfig(
-#             id="id1",
-#             tenant_id="tenant_id",
-#             provider_name="openai",
-#             model_name="gpt-4",
-#             model_type="text-generation",
-#             name="__inherit__",
-#             encrypted_config=None,
-#             enabled=True,
-#         )
-#     ]
+    # Mocking the inputs
+    provider_model_settings = [
+        ProviderModelSetting(
+            id="id",
+            tenant_id="tenant_id",
+            provider_name="openai",
+            model_name="gpt-4",
+            model_type="text-generation",
+            enabled=True,
+            load_balancing_enabled=True,
+        )
+    ]
+    load_balancing_model_configs = [
+        LoadBalancingModelConfig(
+            id="id1",
+            tenant_id="tenant_id",
+            provider_name="openai",
+            model_name="gpt-4",
+            model_type="text-generation",
+            name="__inherit__",
+            encrypted_config=None,
+            enabled=True,
+        )
+    ]
 
-#     mocker.patch(
-#         "core.helper.model_provider_cache.ProviderCredentialsCache.get", return_value={"openai_api_key": "fake_key"}
-#     )
+    mocker.patch(
+        "core.helper.model_provider_cache.ProviderCredentialsCache.get", return_value={"openai_api_key": "fake_key"}
+    )
 
-#     provider_manager = ProviderManager()
+    provider_manager = ProviderManager()
 
-#     # Running the method
-#     result = provider_manager._to_model_settings(
-#     provider_entity, provider_model_settings, load_balancing_model_configs)
+    # Running the method
+    result = provider_manager._to_model_settings(provider_entity, provider_model_settings, load_balancing_model_configs)
 
-#     # Asserting that the result is as expected
-#     assert len(result) == 1
-#     assert isinstance(result[0], ModelSettings)
-#     assert result[0].model == "gpt-4"
-#     assert result[0].model_type == ModelType.LLM
-#     assert result[0].enabled is True
-#     assert len(result[0].load_balancing_configs) == 0
+    # Asserting that the result is as expected
+    assert len(result) == 1
+    assert isinstance(result[0], ModelSettings)
+    assert result[0].model == "gpt-4"
+    assert result[0].model_type == ModelType.LLM
+    assert result[0].enabled is True
+    assert len(result[0].load_balancing_configs) == 0
 
 
-# def test__to_model_settings_lb_disabled(mocker):
-#     # Get all provider entities
-#     model_provider_factory = ModelProviderFactory("test_tenant")
-#     provider_entities = model_provider_factory.get_providers()
+def test__to_model_settings_lb_disabled(mocker):
+    # Get all provider entities
+    model_provider_factory = ModelProviderFactory("test_tenant")
+    provider_entities = model_provider_factory.get_providers()
 
-#     provider_entity = None
-#     for provider in provider_entities:
-#         if provider.provider == "openai":
-#             provider_entity = provider
+    provider_entity = None
+    for provider in provider_entities:
+        if provider.provider == "openai":
+            provider_entity = provider
 
-#     # Mocking the inputs
-#     provider_model_settings = [
-#         ProviderModelSetting(
-#             id="id",
-#             tenant_id="tenant_id",
-#             provider_name="openai",
-#             model_name="gpt-4",
-#             model_type="text-generation",
-#             enabled=True,
-#             load_balancing_enabled=False,
-#         )
-#     ]
-#     load_balancing_model_configs = [
-#         LoadBalancingModelConfig(
-#             id="id1",
-#             tenant_id="tenant_id",
-#             provider_name="openai",
-#             model_name="gpt-4",
-#             model_type="text-generation",
-#             name="__inherit__",
-#             encrypted_config=None,
-#             enabled=True,
-#         ),
-#         LoadBalancingModelConfig(
-#             id="id2",
-#             tenant_id="tenant_id",
-#             provider_name="openai",
-#             model_name="gpt-4",
-#             model_type="text-generation",
-#             name="first",
-#             encrypted_config='{"openai_api_key": "fake_key"}',
-#             enabled=True,
-#         ),
-#     ]
+    # Mocking the inputs
+    provider_model_settings = [
+        ProviderModelSetting(
+            id="id",
+            tenant_id="tenant_id",
+            provider_name="openai",
+            model_name="gpt-4",
+            model_type="text-generation",
+            enabled=True,
+            load_balancing_enabled=False,
+        )
+    ]
+    load_balancing_model_configs = [
+        LoadBalancingModelConfig(
+            id="id1",
+            tenant_id="tenant_id",
+            provider_name="openai",
+            model_name="gpt-4",
+            model_type="text-generation",
+            name="__inherit__",
+            encrypted_config=None,
+            enabled=True,
+        ),
+        LoadBalancingModelConfig(
+            id="id2",
+            tenant_id="tenant_id",
+            provider_name="openai",
+            model_name="gpt-4",
+            model_type="text-generation",
+            name="first",
+            encrypted_config='{"openai_api_key": "fake_key"}',
+            enabled=True,
+        ),
+    ]
 
-#     mocker.patch(
-#         "core.helper.model_provider_cache.ProviderCredentialsCache.get",
-#  return_value={"openai_api_key": "fake_key"}
-#     )
+    mocker.patch(
+        "core.helper.model_provider_cache.ProviderCredentialsCache.get", return_value={"openai_api_key": "fake_key"}
+    )
 
-#     provider_manager = ProviderManager()
+    provider_manager = ProviderManager()
 
-#     # Running the method
-#     result = provider_manager._to_model_settings(provider_entity,
-# provider_model_settings, load_balancing_model_configs)
+    # Running the method
+    result = provider_manager._to_model_settings(provider_entity, provider_model_settings, load_balancing_model_configs)
 
-#     # Asserting that the result is as expected
-#     assert len(result) == 1
-#     assert isinstance(result[0], ModelSettings)
-#     assert result[0].model == "gpt-4"
-#     assert result[0].model_type == ModelType.LLM
-#     assert result[0].enabled is True
-#     assert len(result[0].load_balancing_configs) == 0
+    # Asserting that the result is as expected
+    assert len(result) == 1
+    assert isinstance(result[0], ModelSettings)
+    assert result[0].model == "gpt-4"
+    assert result[0].model_type == ModelType.LLM
+    assert result[0].enabled is True
+    assert len(result[0].load_balancing_configs) == 0

api/tests/unit_tests/core/workflow/nodes/llm/test_node.py

@@ -3,20 +3,24 @@ from typing import Optional
 
 import pytest
 
+from configs import dify_config
 from core.app.entities.app_invoke_entities import InvokeFrom, ModelConfigWithCredentialsEntity
 from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
 from core.entities.provider_entities import CustomConfiguration, SystemConfiguration
 from core.file import File, FileTransferMethod, FileType
 from core.model_runtime.entities.common_entities import I18nObject
 from core.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
     ImagePromptMessageContent,
     PromptMessage,
     PromptMessageRole,
+    SystemPromptMessage,
     TextPromptMessageContent,
     UserPromptMessage,
 )
-from core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
+from core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelFeature, ModelType
 from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
+from core.prompt.entities.advanced_prompt_entities import MemoryConfig
 from core.variables import ArrayAnySegment, ArrayFileSegment, NoneSegment
 from core.workflow.entities.variable_pool import VariablePool
 from core.workflow.graph_engine import Graph, GraphInitParams, GraphRuntimeState
@@ -34,6 +38,7 @@ from core.workflow.nodes.llm.node import LLMNode
 from models.enums import UserFrom
 from models.provider import ProviderType
 from models.workflow import WorkflowType
+from tests.unit_tests.core.workflow.nodes.llm.test_scenarios import LLMNodeTestScenario
 
 
 class MockTokenBufferMemory:
@@ -107,21 +112,22 @@ def llm_node():
 @pytest.fixture
 def model_config():
     # Create actual provider and model type instances
-    model_provider_factory = ModelProviderFactory(tenant_id="test")
-    provider_instance = model_provider_factory.get_plugin_model_provider("openai")
-    model_type_instance = model_provider_factory.get_model_type_instance("openai", ModelType.LLM)
+    model_provider_factory = ModelProviderFactory()
+    provider_instance = model_provider_factory.get_provider_instance("openai")
+    model_type_instance = provider_instance.get_model_instance(ModelType.LLM)
 
     # Create a ProviderModelBundle
     provider_model_bundle = ProviderModelBundle(
         configuration=ProviderConfiguration(
             tenant_id="1",
-            provider=provider_instance,
+            provider=provider_instance.get_provider_schema(),
             preferred_provider_type=ProviderType.CUSTOM,
             using_provider_type=ProviderType.CUSTOM,
             system_configuration=SystemConfiguration(enabled=False),
             custom_configuration=CustomConfiguration(provider=None),
             model_settings=[],
         ),
+        provider_instance=provider_instance,
         model_type_instance=model_type_instance,
     )
 
@@ -205,240 +211,236 @@ def test_fetch_files_with_non_existent_variable(llm_node):
     assert result == []
 
 
-# def test_fetch_prompt_messages__vison_disabled(faker, llm_node, model_config):
-# TODO: Add test
-# pass
-# prompt_template = []
-# llm_node.node_data.prompt_template = prompt_template
+def test_fetch_prompt_messages__vison_disabled(faker, llm_node, model_config):
+    prompt_template = []
+    llm_node.node_data.prompt_template = prompt_template
 
-# fake_vision_detail = faker.random_element(
-#     [ImagePromptMessageContent.DETAIL.HIGH, ImagePromptMessageContent.DETAIL.LOW]
-# )
-# fake_remote_url = faker.url()
-# files = [
-#     File(
-#         id="1",
-#         tenant_id="test",
-#         type=FileType.IMAGE,
-#         filename="test1.jpg",
-#         transfer_method=FileTransferMethod.REMOTE_URL,
-#         remote_url=fake_remote_url,
-#         storage_key="",
-#     )
-# ]
+    fake_vision_detail = faker.random_element(
+        [ImagePromptMessageContent.DETAIL.HIGH, ImagePromptMessageContent.DETAIL.LOW]
+    )
+    fake_remote_url = faker.url()
+    files = [
+        File(
+            id="1",
+            tenant_id="test",
+            type=FileType.IMAGE,
+            filename="test1.jpg",
+            transfer_method=FileTransferMethod.REMOTE_URL,
+            remote_url=fake_remote_url,
+            storage_key="",
+        )
+    ]
 
-# fake_query = faker.sentence()
+    fake_query = faker.sentence()
 
-# prompt_messages, _ = llm_node._fetch_prompt_messages(
-#     sys_query=fake_query,
-#     sys_files=files,
-#     context=None,
-#     memory=None,
-#     model_config=model_config,
-#     prompt_template=prompt_template,
-#     memory_config=None,
-#     vision_enabled=False,
-#     vision_detail=fake_vision_detail,
-#     variable_pool=llm_node.graph_runtime_state.variable_pool,
-#     jinja2_variables=[],
-# )
+    prompt_messages, _ = llm_node._fetch_prompt_messages(
+        sys_query=fake_query,
+        sys_files=files,
+        context=None,
+        memory=None,
+        model_config=model_config,
+        prompt_template=prompt_template,
+        memory_config=None,
+        vision_enabled=False,
+        vision_detail=fake_vision_detail,
+        variable_pool=llm_node.graph_runtime_state.variable_pool,
+        jinja2_variables=[],
+    )
 
-# assert prompt_messages == [UserPromptMessage(content=fake_query)]
+    assert prompt_messages == [UserPromptMessage(content=fake_query)]
 
 
-# def test_fetch_prompt_messages__basic(faker, llm_node, model_config):
-# TODO: Add test
-# pass
-# Setup dify config
-# dify_config.MULTIMODAL_SEND_FORMAT = "url"
+def test_fetch_prompt_messages__basic(faker, llm_node, model_config):
+    # Setup dify config
+    dify_config.MULTIMODAL_SEND_FORMAT = "url"
 
-# # Generate fake values for prompt template
-# fake_assistant_prompt = faker.sentence()
-# fake_query = faker.sentence()
-# fake_context = faker.sentence()
-# fake_window_size = faker.random_int(min=1, max=3)
-# fake_vision_detail = faker.random_element(
-#     [ImagePromptMessageContent.DETAIL.HIGH, ImagePromptMessageContent.DETAIL.LOW]
-# )
-# fake_remote_url = faker.url()
+    # Generate fake values for prompt template
+    fake_assistant_prompt = faker.sentence()
+    fake_query = faker.sentence()
+    fake_context = faker.sentence()
+    fake_window_size = faker.random_int(min=1, max=3)
+    fake_vision_detail = faker.random_element(
+        [ImagePromptMessageContent.DETAIL.HIGH, ImagePromptMessageContent.DETAIL.LOW]
+    )
+    fake_remote_url = faker.url()
 
-# # Setup mock memory with history messages
-# mock_history = [
-#     UserPromptMessage(content=faker.sentence()),
-#     AssistantPromptMessage(content=faker.sentence()),
-#     UserPromptMessage(content=faker.sentence()),
-#     AssistantPromptMessage(content=faker.sentence()),
-#     UserPromptMessage(content=faker.sentence()),
-#     AssistantPromptMessage(content=faker.sentence()),
-# ]
+    # Setup mock memory with history messages
+    mock_history = [
+        UserPromptMessage(content=faker.sentence()),
+        AssistantPromptMessage(content=faker.sentence()),
+        UserPromptMessage(content=faker.sentence()),
+        AssistantPromptMessage(content=faker.sentence()),
+        UserPromptMessage(content=faker.sentence()),
+        AssistantPromptMessage(content=faker.sentence()),
+    ]
 
-# # Setup memory configuration
-# memory_config = MemoryConfig(
-#     role_prefix=MemoryConfig.RolePrefix(user="Human", assistant="Assistant"),
-#     window=MemoryConfig.WindowConfig(enabled=True, size=fake_window_size),
-#     query_prompt_template=None,
-# )
+    # Setup memory configuration
+    memory_config = MemoryConfig(
+        role_prefix=MemoryConfig.RolePrefix(user="Human", assistant="Assistant"),
+        window=MemoryConfig.WindowConfig(enabled=True, size=fake_window_size),
+        query_prompt_template=None,
+    )
 
-# memory = MockTokenBufferMemory(history_messages=mock_history)
+    memory = MockTokenBufferMemory(history_messages=mock_history)
 
-# # Test scenarios covering different file input combinations
-# test_scenarios = [
-#     LLMNodeTestScenario(
-#         description="No files",
-#         sys_query=fake_query,
-#         sys_files=[],
-#         features=[],
-#         vision_enabled=False,
-#         vision_detail=None,
-#         window_size=fake_window_size,
-#         prompt_template=[
-#             LLMNodeChatModelMessage(
-#                 text=fake_context,
-#                 role=PromptMessageRole.SYSTEM,
-#                 edition_type="basic",
-#             ),
-#             LLMNodeChatModelMessage(
-#                 text="{#context#}",
-#                 role=PromptMessageRole.USER,
-#                 edition_type="basic",
-#             ),
-#             LLMNodeChatModelMessage(
-#                 text=fake_assistant_prompt,
-#                 role=PromptMessageRole.ASSISTANT,
-#                 edition_type="basic",
-#             ),
-#         ],
-#         expected_messages=[
-#             SystemPromptMessage(content=fake_context),
-#             UserPromptMessage(content=fake_context),
-#             AssistantPromptMessage(content=fake_assistant_prompt),
-#         ]
-#         + mock_history[fake_window_size * -2 :]
-#         + [
-#             UserPromptMessage(content=fake_query),
-#         ],
-#     ),
-#     LLMNodeTestScenario(
-#         description="User files",
-#         sys_query=fake_query,
-#         sys_files=[
-#             File(
-#                 tenant_id="test",
-#                 type=FileType.IMAGE,
-#                 filename="test1.jpg",
-#                 transfer_method=FileTransferMethod.REMOTE_URL,
-#                 remote_url=fake_remote_url,
-#                 extension=".jpg",
-#                 mime_type="image/jpg",
-#                 storage_key="",
-#             )
-#         ],
-#         vision_enabled=True,
-#         vision_detail=fake_vision_detail,
-#         features=[ModelFeature.VISION],
-#         window_size=fake_window_size,
-#         prompt_template=[
-#             LLMNodeChatModelMessage(
-#                 text=fake_context,
-#                 role=PromptMessageRole.SYSTEM,
-#                 edition_type="basic",
-#             ),
-#             LLMNodeChatModelMessage(
-#                 text="{#context#}",
-#                 role=PromptMessageRole.USER,
-#                 edition_type="basic",
-#             ),
-#             LLMNodeChatModelMessage(
-#                 text=fake_assistant_prompt,
-#                 role=PromptMessageRole.ASSISTANT,
-#                 edition_type="basic",
-#             ),
-#         ],
-#         expected_messages=[
-#             SystemPromptMessage(content=fake_context),
-#             UserPromptMessage(content=fake_context),
-#             AssistantPromptMessage(content=fake_assistant_prompt),
-#         ]
-#         + mock_history[fake_window_size * -2 :]
-#         + [
-#             UserPromptMessage(
-#                 content=[
-#                     TextPromptMessageContent(data=fake_query),
-#                     ImagePromptMessageContent(
-#                         url=fake_remote_url, mime_type="image/jpg", format="jpg", detail=fake_vision_detail
-#                     ),
-#                 ]
-#             ),
-#         ],
-#     ),
-#     LLMNodeTestScenario(
-#         description="Prompt template with variable selector of File",
-#         sys_query=fake_query,
-#         sys_files=[],
-#         vision_enabled=False,
-#         vision_detail=fake_vision_detail,
-#         features=[ModelFeature.VISION],
-#         window_size=fake_window_size,
-#         prompt_template=[
-#             LLMNodeChatModelMessage(
-#                 text="{{#input.image#}}",
-#                 role=PromptMessageRole.USER,
-#                 edition_type="basic",
-#             ),
-#         ],
-#         expected_messages=[
-#             UserPromptMessage(
-#                 content=[
-#                     ImagePromptMessageContent(
-#                         url=fake_remote_url, mime_type="image/jpg", format="jpg", detail=fake_vision_detail
-#                     ),
-#                 ]
-#             ),
-#         ]
-#         + mock_history[fake_window_size * -2 :]
-#         + [UserPromptMessage(content=fake_query)],
-#         file_variables={
-#             "input.image": File(
-#                 tenant_id="test",
-#                 type=FileType.IMAGE,
-#                 filename="test1.jpg",
-#                 transfer_method=FileTransferMethod.REMOTE_URL,
-#                 remote_url=fake_remote_url,
-#                 extension=".jpg",
-#                 mime_type="image/jpg",
-#                 storage_key="",
-#             )
-#         },
-#     ),
-# ]
+    # Test scenarios covering different file input combinations
+    test_scenarios = [
+        LLMNodeTestScenario(
+            description="No files",
+            sys_query=fake_query,
+            sys_files=[],
+            features=[],
+            vision_enabled=False,
+            vision_detail=None,
+            window_size=fake_window_size,
+            prompt_template=[
+                LLMNodeChatModelMessage(
+                    text=fake_context,
+                    role=PromptMessageRole.SYSTEM,
+                    edition_type="basic",
+                ),
+                LLMNodeChatModelMessage(
+                    text="{#context#}",
+                    role=PromptMessageRole.USER,
+                    edition_type="basic",
+                ),
+                LLMNodeChatModelMessage(
+                    text=fake_assistant_prompt,
+                    role=PromptMessageRole.ASSISTANT,
+                    edition_type="basic",
+                ),
+            ],
+            expected_messages=[
+                SystemPromptMessage(content=fake_context),
+                UserPromptMessage(content=fake_context),
+                AssistantPromptMessage(content=fake_assistant_prompt),
+            ]
+            + mock_history[fake_window_size * -2 :]
+            + [
+                UserPromptMessage(content=fake_query),
+            ],
+        ),
+        LLMNodeTestScenario(
+            description="User files",
+            sys_query=fake_query,
+            sys_files=[
+                File(
+                    tenant_id="test",
+                    type=FileType.IMAGE,
+                    filename="test1.jpg",
+                    transfer_method=FileTransferMethod.REMOTE_URL,
+                    remote_url=fake_remote_url,
+                    extension=".jpg",
+                    mime_type="image/jpg",
+                    storage_key="",
+                )
+            ],
+            vision_enabled=True,
+            vision_detail=fake_vision_detail,
+            features=[ModelFeature.VISION],
+            window_size=fake_window_size,
+            prompt_template=[
+                LLMNodeChatModelMessage(
+                    text=fake_context,
+                    role=PromptMessageRole.SYSTEM,
+                    edition_type="basic",
+                ),
+                LLMNodeChatModelMessage(
+                    text="{#context#}",
+                    role=PromptMessageRole.USER,
+                    edition_type="basic",
+                ),
+                LLMNodeChatModelMessage(
+                    text=fake_assistant_prompt,
+                    role=PromptMessageRole.ASSISTANT,
+                    edition_type="basic",
+                ),
+            ],
+            expected_messages=[
+                SystemPromptMessage(content=fake_context),
+                UserPromptMessage(content=fake_context),
+                AssistantPromptMessage(content=fake_assistant_prompt),
+            ]
+            + mock_history[fake_window_size * -2 :]
+            + [
+                UserPromptMessage(
+                    content=[
+                        TextPromptMessageContent(data=fake_query),
+                        ImagePromptMessageContent(
+                            url=fake_remote_url, mime_type="image/jpg", format="jpg", detail=fake_vision_detail
+                        ),
+                    ]
+                ),
+            ],
+        ),
+        LLMNodeTestScenario(
+            description="Prompt template with variable selector of File",
+            sys_query=fake_query,
+            sys_files=[],
+            vision_enabled=False,
+            vision_detail=fake_vision_detail,
+            features=[ModelFeature.VISION],
+            window_size=fake_window_size,
+            prompt_template=[
+                LLMNodeChatModelMessage(
+                    text="{{#input.image#}}",
+                    role=PromptMessageRole.USER,
+                    edition_type="basic",
+                ),
+            ],
+            expected_messages=[
+                UserPromptMessage(
+                    content=[
+                        ImagePromptMessageContent(
+                            url=fake_remote_url, mime_type="image/jpg", format="jpg", detail=fake_vision_detail
+                        ),
+                    ]
+                ),
+            ]
+            + mock_history[fake_window_size * -2 :]
+            + [UserPromptMessage(content=fake_query)],
+            file_variables={
+                "input.image": File(
+                    tenant_id="test",
+                    type=FileType.IMAGE,
+                    filename="test1.jpg",
+                    transfer_method=FileTransferMethod.REMOTE_URL,
+                    remote_url=fake_remote_url,
+                    extension=".jpg",
+                    mime_type="image/jpg",
+                    storage_key="",
+                )
+            },
+        ),
+    ]
 
-# for scenario in test_scenarios:
-#     model_config.model_schema.features = scenario.features
+    for scenario in test_scenarios:
+        model_config.model_schema.features = scenario.features
 
-#     for k, v in scenario.file_variables.items():
-#         selector = k.split(".")
-#         llm_node.graph_runtime_state.variable_pool.add(selector, v)
+        for k, v in scenario.file_variables.items():
+            selector = k.split(".")
+            llm_node.graph_runtime_state.variable_pool.add(selector, v)
 
-#     # Call the method under test
-#     prompt_messages, _ = llm_node._fetch_prompt_messages(
-#         sys_query=scenario.sys_query,
-#         sys_files=scenario.sys_files,
-#         context=fake_context,
-#         memory=memory,
-#         model_config=model_config,
-#         prompt_template=scenario.prompt_template,
-#         memory_config=memory_config,
-#         vision_enabled=scenario.vision_enabled,
-#         vision_detail=scenario.vision_detail,
-#         variable_pool=llm_node.graph_runtime_state.variable_pool,
-#         jinja2_variables=[],
-#     )
+        # Call the method under test
+        prompt_messages, _ = llm_node._fetch_prompt_messages(
+            sys_query=scenario.sys_query,
+            sys_files=scenario.sys_files,
+            context=fake_context,
+            memory=memory,
+            model_config=model_config,
+            prompt_template=scenario.prompt_template,
+            memory_config=memory_config,
+            vision_enabled=scenario.vision_enabled,
+            vision_detail=scenario.vision_detail,
+            variable_pool=llm_node.graph_runtime_state.variable_pool,
+            jinja2_variables=[],
+        )
 
-#     # Verify the result
-#     assert len(prompt_messages) == len(scenario.expected_messages), f"Scenario failed: {scenario.description}"
-#     assert (
-#         prompt_messages == scenario.expected_messages
-#     ), f"Message content mismatch in scenario: {scenario.description}"
+        # Verify the result
+        assert len(prompt_messages) == len(scenario.expected_messages), f"Scenario failed: {scenario.description}"
+        assert (
+            prompt_messages == scenario.expected_messages
+        ), f"Message content mismatch in scenario: {scenario.description}"
 
 
 def test_handle_list_messages_basic(llm_node):

api/tests/unit_tests/core/workflow/nodes/test_continue_on_error.py

@@ -126,7 +126,7 @@ class ContinueOnErrorTestHelper:
             },
         }
         if default_value:
-            node.node_data.default_value = default_value
+            node["data"]["default_value"] = default_value
         return node
 
     @staticmethod
@@ -331,55 +331,55 @@ def test_http_node_fail_branch_continue_on_error():
     assert sum(1 for e in events if isinstance(e, NodeRunStreamChunkEvent)) == 1
 
 
-# def test_tool_node_default_value_continue_on_error():
-#     """Test tool node with default value error strategy"""
-#     graph_config = {
-#         "edges": DEFAULT_VALUE_EDGE,
-#         "nodes": [
-#             {"data": {"title": "start", "type": "start", "variables": []}, "id": "start"},
-#             {"data": {"title": "answer", "type": "answer", "answer": "{{#node.result#}}"}, "id": "answer"},
-#             ContinueOnErrorTestHelper.get_tool_node(
-#                 "default-value", [{"key": "result", "type": "string", "value": "default tool result"}]
-#             ),
-#         ],
-#     }
+def test_tool_node_default_value_continue_on_error():
+    """Test tool node with default value error strategy"""
+    graph_config = {
+        "edges": DEFAULT_VALUE_EDGE,
+        "nodes": [
+            {"data": {"title": "start", "type": "start", "variables": []}, "id": "start"},
+            {"data": {"title": "answer", "type": "answer", "answer": "{{#node.result#}}"}, "id": "answer"},
+            ContinueOnErrorTestHelper.get_tool_node(
+                "default-value", [{"key": "result", "type": "string", "value": "default tool result"}]
+            ),
+        ],
+    }
 
-#     graph_engine = ContinueOnErrorTestHelper.create_test_graph_engine(graph_config)
-#     events = list(graph_engine.run())
+    graph_engine = ContinueOnErrorTestHelper.create_test_graph_engine(graph_config)
+    events = list(graph_engine.run())
 
-#     assert any(isinstance(e, NodeRunExceptionEvent) for e in events)
-#     assert any(
-#         isinstance(e, GraphRunPartialSucceededEvent) and e.outputs == {"answer": "default tool result"} for e in events  # noqa: E501
-#     )
-#     assert sum(1 for e in events if isinstance(e, NodeRunStreamChunkEvent)) == 1
+    assert any(isinstance(e, NodeRunExceptionEvent) for e in events)
+    assert any(
+        isinstance(e, GraphRunPartialSucceededEvent) and e.outputs == {"answer": "default tool result"} for e in events
+    )
+    assert sum(1 for e in events if isinstance(e, NodeRunStreamChunkEvent)) == 1
 
 
-# def test_tool_node_fail_branch_continue_on_error():
-#     """Test HTTP node with fail-branch error strategy"""
-#     graph_config = {
-#         "edges": FAIL_BRANCH_EDGES,
-#         "nodes": [
-#             {"data": {"title": "Start", "type": "start", "variables": []}, "id": "start"},
-#             {
-#                 "data": {"title": "success", "type": "answer", "answer": "tool execute successful"},
-#                 "id": "success",
-#             },
-#             {
-#                 "data": {"title": "error", "type": "answer", "answer": "tool execute failed"},
-#                 "id": "error",
-#             },
-#             ContinueOnErrorTestHelper.get_tool_node(),
-#         ],
-#     }
+def test_tool_node_fail_branch_continue_on_error():
+    """Test HTTP node with fail-branch error strategy"""
+    graph_config = {
+        "edges": FAIL_BRANCH_EDGES,
+        "nodes": [
+            {"data": {"title": "Start", "type": "start", "variables": []}, "id": "start"},
+            {
+                "data": {"title": "success", "type": "answer", "answer": "tool execute successful"},
+                "id": "success",
+            },
+            {
+                "data": {"title": "error", "type": "answer", "answer": "tool execute failed"},
+                "id": "error",
+            },
+            ContinueOnErrorTestHelper.get_tool_node(),
+        ],
+    }
 
-#     graph_engine = ContinueOnErrorTestHelper.create_test_graph_engine(graph_config)
-#     events = list(graph_engine.run())
+    graph_engine = ContinueOnErrorTestHelper.create_test_graph_engine(graph_config)
+    events = list(graph_engine.run())
 
-#     assert any(isinstance(e, NodeRunExceptionEvent) for e in events)
-#     assert any(
-#         isinstance(e, GraphRunPartialSucceededEvent) and e.outputs == {"answer": "tool execute failed"} for e in events  # noqa: E501
-#     )
-#     assert sum(1 for e in events if isinstance(e, NodeRunStreamChunkEvent)) == 1
+    assert any(isinstance(e, NodeRunExceptionEvent) for e in events)
+    assert any(
+        isinstance(e, GraphRunPartialSucceededEvent) and e.outputs == {"answer": "tool execute failed"} for e in events
+    )
+    assert sum(1 for e in events if isinstance(e, NodeRunStreamChunkEvent)) == 1
 
 
 def test_llm_node_default_value_continue_on_error():

docker-legacy/docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3'
 services:
   # API service
   api:
-    image: langgenius/dify-api:1.0.0-beta.1
+    image: langgenius/dify-api:0.15.0
     restart: always
     environment:
       # Startup mode, 'api' starts the API server.
@@ -227,7 +227,7 @@ services:
   # worker service
   # The Celery worker for processing the queue.
   worker:
-    image: langgenius/dify-api:1.0.0-beta.1
+    image: langgenius/dify-api:0.15.0
     restart: always
     environment:
       CONSOLE_WEB_URL: ''
@@ -397,7 +397,7 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:1.0.0-beta.1
+    image: langgenius/dify-web:0.15.0
     restart: always
     environment:
       # The base URL of console application api server, refers to the Console base URL of WEB service if console domain is

docker/.env.example

@@ -937,7 +937,7 @@ TOP_K_MAX_VALUE=10
 # Plugin Daemon Configuration
 # ------------------------------
 
-DB_PLUGIN_DATABASE=dify_plugin
+DB_PLUGIN_DATABASE=dify-plugin
 EXPOSE_PLUGIN_DAEMON_PORT=5002
 PLUGIN_DAEMON_PORT=5002
 PLUGIN_DAEMON_KEY=lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi

docker/docker-compose-template.yaml

@@ -2,15 +2,13 @@ x-shared-env: &shared-api-worker-env
 services:
   # API service
   api:
-    image: langgenius/dify-api:1.0.0-beta.1
+    image: langgenius/dify-api:dev-plugin-deploy
     restart: always
     environment:
       # Use the shared environment variables.
       <<: *shared-api-worker-env
       # Startup mode, 'api' starts the API server.
       MODE: api
-      CONSOLE_API_URL: ${CONSOLE_API_URL:-http://localhost:5001}
-      CONSOLE_WEB_URL: ${CONSOLE_WEB_URL:-http://localhost:3000}
       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}
@@ -18,8 +16,8 @@ services:
       PLUGIN_API_URL: ${PLUGIN_DAEMON_URL:-http://plugin_daemon:5002}
       PLUGIN_MAX_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
       INNER_API_KEY_FOR_PLUGIN: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
-      MARKETPLACE_ENABLED: ${MARKETPLACE_ENABLED:-true}
-      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
+      MARKETPLACE_ENABLED: ${MARKETPLACE_ENABLED:-false}
+      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace-plugin.dify.dev}
       PLUGIN_REMOTE_INSTALL_PORT: ${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}
       PLUGIN_REMOTE_INSTALL_HOST: ${EXPOSE_PLUGIN_DEBUGGING_HOST:-localhost}
       ENDPOINT_URL_TEMPLATE: ${ENDPOINT_URL_TEMPLATE:-http://localhost/e/{hook_id}}
@@ -36,7 +34,7 @@ services:
   # worker service
   # The Celery worker for processing the queue.
   worker:
-    image: langgenius/dify-api:1.0.0-beta.1
+    image: langgenius/dify-api:dev-plugin-deploy
     restart: always
     environment:
       # Use the shared environment variables.
@@ -51,7 +49,7 @@ services:
       PLUGIN_MAX_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
       INNER_API_KEY_FOR_PLUGIN: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
       MARKETPLACE_ENABLED: ${MARKETPLACE_ENABLED:-false}
-      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
+      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace-plugin.dify.dev}
     depends_on:
       - db
       - redis
@@ -64,7 +62,7 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:1.0.0-beta.1
+    image: langgenius/dify-web:dev-plugin-deploy
     restart: always
     environment:
       CONSOLE_API_URL: ${CONSOLE_API_URL:-}
@@ -73,8 +71,8 @@ services:
       NEXT_TELEMETRY_DISABLED: ${NEXT_TELEMETRY_DISABLED:-0}
       TEXT_GENERATION_TIMEOUT_MS: ${TEXT_GENERATION_TIMEOUT_MS:-60000}
       CSP_WHITELIST: ${CSP_WHITELIST:-}
-      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
-      MARKETPLACE_URL: ${MARKETPLACE_URL:-https://marketplace.dify.ai}
+      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace-plugin.dify.dev}
+      MARKETPLACE_URL: ${MARKETPLACE_URL:-https://marketplace-plugin.dify.dev}
       TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-}
 
   # The postgres database.
@@ -140,7 +138,7 @@ services:
 
   # plugin daemon
   plugin_daemon:
-    image: langgenius/dify-plugin-daemon:0.0.1-local
+    image: langgenius/dify-plugin-daemon:47c8bed17c22f67bd035d0979e696cb00ca45b16-local
     restart: always
     environment:
       # Use the shared environment variables.

docker/docker-compose.middleware.yaml

@@ -66,7 +66,7 @@ services:
 
   # plugin daemon
   plugin_daemon:
-    image: langgenius/dify-plugin-daemon:0.0.1-local
+    image: langgenius/dify-plugin-daemon:47c8bed17c22f67bd035d0979e696cb00ca45b16-local
     restart: always
     environment:
       # Use the shared environment variables.

docker/docker-compose.yaml

@@ -388,7 +388,6 @@ x-shared-env: &shared-api-worker-env
   CSP_WHITELIST: ${CSP_WHITELIST:-}
   CREATE_TIDB_SERVICE_JOB_ENABLED: ${CREATE_TIDB_SERVICE_JOB_ENABLED:-false}
   MAX_SUBMIT_COUNT: ${MAX_SUBMIT_COUNT:-100}
-  TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-10}
   DB_PLUGIN_DATABASE: ${DB_PLUGIN_DATABASE:-dify-plugin}
   EXPOSE_PLUGIN_DAEMON_PORT: ${EXPOSE_PLUGIN_DAEMON_PORT:-5002}
   PLUGIN_DAEMON_PORT: ${PLUGIN_DAEMON_PORT:-5002}
@@ -405,19 +404,18 @@ x-shared-env: &shared-api-worker-env
   ENDPOINT_URL_TEMPLATE: ${ENDPOINT_URL_TEMPLATE:-http://localhost/e/{hook_id}}
   MARKETPLACE_ENABLED: ${MARKETPLACE_ENABLED:-true}
   MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace-plugin.dify.dev}
+  TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-10}
 
 services:
   # API service
   api:
-    image: langgenius/dify-api:1.0.0-beta.1
+    image: langgenius/dify-api:dev-plugin-deploy
     restart: always
     environment:
       # Use the shared environment variables.
       <<: *shared-api-worker-env
       # Startup mode, 'api' starts the API server.
       MODE: api
-      CONSOLE_API_URL: ${CONSOLE_API_URL:-http://localhost:5001}
-      CONSOLE_WEB_URL: ${CONSOLE_WEB_URL:-http://localhost:3000}
       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}
@@ -425,8 +423,8 @@ services:
       PLUGIN_API_URL: ${PLUGIN_DAEMON_URL:-http://plugin_daemon:5002}
       PLUGIN_MAX_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
       INNER_API_KEY_FOR_PLUGIN: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
-      MARKETPLACE_ENABLED: ${MARKETPLACE_ENABLED:-true}
-      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
+      MARKETPLACE_ENABLED: ${MARKETPLACE_ENABLED:-false}
+      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace-plugin.dify.dev}
       PLUGIN_REMOTE_INSTALL_PORT: ${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}
       PLUGIN_REMOTE_INSTALL_HOST: ${EXPOSE_PLUGIN_DEBUGGING_HOST:-localhost}
       ENDPOINT_URL_TEMPLATE: ${ENDPOINT_URL_TEMPLATE:-http://localhost/e/{hook_id}}
@@ -443,7 +441,7 @@ services:
   # worker service
   # The Celery worker for processing the queue.
   worker:
-    image: langgenius/dify-api:1.0.0-beta.1
+    image: langgenius/dify-api:dev-plugin-deploy
     restart: always
     environment:
       # Use the shared environment variables.
@@ -458,7 +456,7 @@ services:
       PLUGIN_MAX_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
       INNER_API_KEY_FOR_PLUGIN: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
       MARKETPLACE_ENABLED: ${MARKETPLACE_ENABLED:-false}
-      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
+      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace-plugin.dify.dev}
     depends_on:
       - db
       - redis
@@ -471,17 +469,19 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:1.0.0-beta.1
+    image: langgenius/dify-web:dev-plugin-deploy
     restart: always
     environment:
       CONSOLE_API_URL: ${CONSOLE_API_URL:-}
       APP_API_URL: ${APP_API_URL:-}
+      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-}
+      MARKETPLACE_URL: ${MARKETPLACE_URL:-}
       SENTRY_DSN: ${WEB_SENTRY_DSN:-}
       NEXT_TELEMETRY_DISABLED: ${NEXT_TELEMETRY_DISABLED:-0}
       TEXT_GENERATION_TIMEOUT_MS: ${TEXT_GENERATION_TIMEOUT_MS:-60000}
       CSP_WHITELIST: ${CSP_WHITELIST:-}
-      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
-      MARKETPLACE_URL: ${MARKETPLACE_URL:-https://marketplace.dify.ai}
+      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace-plugin.dify.dev}
+      MARKETPLACE_URL: ${MARKETPLACE_URL:-https://marketplace-plugin.dify.dev}
       TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-}
 
   # The postgres database.
@@ -547,7 +547,7 @@ services:
 
   # plugin daemon
   plugin_daemon:
-    image: langgenius/dify-plugin-daemon:0.0.1-local
+    image: langgenius/dify-plugin-daemon:47c8bed17c22f67bd035d0979e696cb00ca45b16-local
     restart: always
     environment:
       # Use the shared environment variables.
@@ -557,6 +557,7 @@ services:
       SERVER_KEY: ${PLUGIN_DAEMON_KEY:-lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi}
       MAX_PLUGIN_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
       PPROF_ENABLED: ${PLUGIN_PPROF_ENABLED:-false}
+      DEBUGGING_PORT: ${PLUGIN_DEBUGGING_PORT:-5003}
       DIFY_INNER_API_URL: ${PLUGIN_DIFY_INNER_API_URL:-http://api: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}

docker/middleware.env.example

@@ -92,7 +92,7 @@ EXPOSE_WEAVIATE_PORT=8080
 # Plugin Daemon Configuration
 # ------------------------------
 
-DB_PLUGIN_DATABASE=dify_plugin
+DB_PLUGIN_DATABASE=dify-plugin
 EXPOSE_PLUGIN_DAEMON_PORT=5002
 PLUGIN_DAEMON_PORT=5002
 PLUGIN_DAEMON_KEY=lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/annotations/page.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import Main from '@/app/components/app/log-annotation'
 import { PageType } from '@/app/components/base/features/new-feature-panel/annotation-reply/type'
 
-export interface IProps {
+export type IProps = {
   params: { appId: string }
 }
 

web/app/account/avatar.tsx

@@ -8,7 +8,7 @@ import { logout } from '@/service/common'
 import { useAppContext } from '@/context/app-context'
 import { LogOut01 } from '@/app/components/base/icons/src/vender/line/general'
 
-export interface IAppSelector {
+export type IAppSelector = {
   isMobile: boolean
 }
 

web/app/components/app/annotation/filter.tsx

@@ -6,11 +6,11 @@ import useSWR from 'swr'
 import Input from '@/app/components/base/input'
 import { fetchAnnotationsCount } from '@/service/log'
 
-export interface QueryParam {
+export type QueryParam = {
   keyword?: string
 }
 
-interface IFilterProps {
+type IFilterProps = {
   appId: string
   queryParams: QueryParam
   setQueryParams: (v: QueryParam) => void

web/app/components/app/annotation/list.tsx

@@ -9,7 +9,7 @@ import ActionButton from '@/app/components/base/action-button'
 import useTimestamp from '@/hooks/use-timestamp'
 import cn from '@/utils/classnames'
 
-interface Props {
+type Props = {
   list: AnnotationItem[]
   onRemove: (id: string) => void
   onView: (item: AnnotationItem) => void

web/app/components/app/configuration/config-prompt/conversation-history/history-panel.tsx

@@ -9,7 +9,7 @@ import { MessageClockCircle } from '@/app/components/base/icons/src/vender/solid
 import I18n from '@/context/i18n'
 import { LanguagesSupported } from '@/i18n/language'
 
-interface Props {
+type Props = {
   showWarning: boolean
   onShowEditModal: () => void
 }

web/app/components/app/configuration/config-var/config-modal/field.tsx

@@ -3,7 +3,7 @@ import type { FC } from 'react'
 import React from 'react'
 import cn from '@/utils/classnames'
 
-interface Props {
+type Props = {
   className?: string
   title: string
   children: JSX.Element

web/app/components/app/configuration/config-var/config-modal/index.tsx

@@ -23,7 +23,7 @@ import { DEFAULT_VALUE_MAX_LEN } from '@/config'
 
 const TEXT_MAX_LENGTH = 256
 
-export interface IConfigModalProps {
+export type IConfigModalProps = {
   isCreate?: boolean
   payload?: InputVar
   isShow: boolean

web/app/components/app/configuration/config-var/config-string/index.tsx

@@ -3,7 +3,7 @@ import type { FC } from 'react'
 import React, { useEffect } from 'react'
 import Input from '@/app/components/base/input'
 
-export interface IConfigStringProps {
+export type IConfigStringProps = {
   value: number | undefined
   maxLength: number
   modelId: string

web/app/components/app/configuration/config-var/index.tsx

@@ -33,7 +33,7 @@ import { InputVarType } from '@/app/components/workflow/types'
 
 export const ADD_EXTERNAL_DATA_TOOL = 'ADD_EXTERNAL_DATA_TOOL'
 
-interface ExternalDataToolParams {
+type ExternalDataToolParams = {
   key: string
   type: string
   index: number
@@ -43,7 +43,7 @@ interface ExternalDataToolParams {
   icon_background?: string
 }
 
-export interface IConfigVarProps {
+export type IConfigVarProps = {
   promptVariables: PromptVariable[]
   readonly?: boolean
   onPromptVariablesChange?: (promptVariables: PromptVariable[]) => void

web/app/components/app/configuration/config-var/select-type-item/index.tsx

@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'
 import cn from '@/utils/classnames'
 import type { InputVarType } from '@/app/components/workflow/types'
 import InputVarTypeIcon from '@/app/components/workflow/nodes/_base/components/input-var-type-icon'
-export interface ISelectTypeItemProps {
+export type ISelectTypeItemProps = {
   type: InputVarType
   selected: boolean
   onClick: () => void

web/app/components/app/configuration/config/automatic/get-automatic-res.tsx

@@ -38,7 +38,7 @@ import ModelName from '@/app/components/header/account-setting/model-provider-pa
 import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { useModelListAndDefaultModelAndCurrentProviderAndModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
 
-export interface IGetAutomaticResProps {
+export type IGetAutomaticResProps = {
   mode: AppType
   model: Model
   isShow: boolean

web/app/components/app/configuration/dataset-config/settings-modal/index.tsx

@@ -12,7 +12,7 @@ import Divider from '@/app/components/base/divider'
 import Button from '@/app/components/base/button'
 import Input from '@/app/components/base/input'
 import Textarea from '@/app/components/base/textarea'
-import { type DataSet } from '@/models/datasets'
+import type { DataSet } from '@/models/datasets'
 import { useToastContext } from '@/app/components/base/toast'
 import { updateDatasetSetting } from '@/service/datasets'
 import { useAppContext } from '@/context/app-context'
@@ -33,7 +33,7 @@ import { ModelTypeEnum } from '@/app/components/header/account-setting/model-pro
 import { fetchMembers } from '@/service/common'
 import type { Member } from '@/models/common'
 
-interface SettingsModalProps {
+type SettingsModalProps = {
   currentDataset: DataSet
   onCancel: () => void
   onSave: (newDataset: DataSet) => void

web/app/components/app/configuration/debug/debug-with-multiple-model/chat-item.tsx

@@ -31,7 +31,7 @@ import { useFeatures } from '@/app/components/base/features/hooks'
 import type { InputForm } from '@/app/components/base/chat/chat/type'
 import { getLastAnswer } from '@/app/components/base/chat/utils'
 
-interface ChatItemProps {
+type ChatItemProps = {
   modelAndParameter: ModelAndParameter
 }
 const ChatItem: FC<ChatItemProps> = ({

web/app/components/app/configuration/debug/debug-with-multiple-model/text-generation-item.tsx

@@ -15,7 +15,7 @@ import { useEventEmitterContextContext } from '@/context/event-emitter'
 import { useProviderContext } from '@/context/provider-context'
 import { useFeatures } from '@/app/components/base/features/hooks'
 
-interface TextGenerationItemProps {
+type TextGenerationItemProps = {
   modelAndParameter: ModelAndParameter
 }
 const TextGenerationItem: FC<TextGenerationItemProps> = ({

web/app/components/app/configuration/debug/debug-with-single-model/index.tsx

@@ -27,10 +27,10 @@ import { useFeatures } from '@/app/components/base/features/hooks'
 import { getLastAnswer } from '@/app/components/base/chat/utils'
 import type { InputForm } from '@/app/components/base/chat/chat/type'
 
-interface DebugWithSingleModelProps {
+type DebugWithSingleModelProps = {
   checkCanSend?: () => boolean
 }
-export interface DebugWithSingleModelRefType {
+export type DebugWithSingleModelRefType = {
   handleRestart: () => void
 }
 const DebugWithSingleModel = forwardRef<DebugWithSingleModelRefType, DebugWithSingleModelProps>(({

web/app/components/app/configuration/debug/index.tsx

@@ -48,7 +48,7 @@ import PromptLogModal from '@/app/components/base/prompt-log-modal'
 import { useStore as useAppStore } from '@/app/components/app/store'
 import { useFeatures, useFeaturesStore } from '@/app/components/base/features/hooks'
 
-interface IDebug {
+type IDebug = {
   isAPIKeySet: boolean
   onSetting: () => void
   inputs: Inputs

web/app/components/app/configuration/prompt-value-panel/index.tsx

@@ -23,7 +23,7 @@ import { DEFAULT_VALUE_MAX_LEN } from '@/config'
 import { useStore as useAppStore } from '@/app/components/app/store'
 import cn from '@/utils/classnames'
 
-export interface IPromptValuePanelProps {
+export type IPromptValuePanelProps = {
   appType: AppType
   onSend?: () => void
   inputs: Inputs

web/app/components/app/configuration/tools/external-data-tool-modal.tsx

@@ -21,13 +21,13 @@ import { useToastContext } from '@/app/components/base/toast'
 import AppIcon from '@/app/components/base/app-icon'
 
 const systemTypes = ['api']
-interface ExternalDataToolModalProps {
+type ExternalDataToolModalProps = {
   data: ExternalDataTool
   onCancel: () => void
   onSave: (externalDataTool: ExternalDataTool) => void
   onValidateBeforeSave?: (externalDataTool: ExternalDataTool) => boolean
 }
-interface Provider {
+type Provider = {
   key: string
   name: string
   form_schema?: CodeBasedExtensionItem['form_schema']

web/app/components/app/duplicate-modal/index.tsx

@@ -13,7 +13,7 @@ import { useProviderContext } from '@/context/provider-context'
 import AppsFull from '@/app/components/billing/apps-full-in-dialog'
 import type { AppIconType } from '@/types/app'
 
-export interface DuplicateAppModalProps {
+export type DuplicateAppModalProps = {
   appName: string
   icon_type: AppIconType | null
   icon: string

web/app/components/app/store.ts

@@ -2,7 +2,7 @@ import { create } from 'zustand'
 import type { App, AppSSO } from '@/types/app'
 import type { IChatItem } from '@/app/components/base/chat/chat/type'
 
-interface State {
+type State = {
   appDetail?: App & Partial<AppSSO>
   appSidebarExpand: string
   currentLogItem?: IChatItem
@@ -13,7 +13,7 @@ interface State {
   showAppConfigureFeaturesModal: boolean
 }
 
-interface Action {
+type Action = {
   setAppDetail: (appDetail?: App & Partial<AppSSO>) => void
   setAppSiderbarExpand: (state: string) => void
   setCurrentLogItem: (item?: IChatItem) => void

web/app/components/app/switch-app-modal/index.tsx

@@ -25,7 +25,7 @@ import { AlertTriangle } from '@/app/components/base/icons/src/vender/solid/aler
 import AppIcon from '@/app/components/base/app-icon'
 import { useStore as useAppStore } from '@/app/components/app/store'
 
-interface SwitchAppModalProps {
+type SwitchAppModalProps = {
   show: boolean
   appDetail: App
   onSuccess?: () => void

web/app/components/app/text-generate/item/index.tsx

@@ -33,7 +33,7 @@ import { useChatContext } from '@/app/components/base/chat/chat/context'
 
 const MAX_DEPTH = 3
 
-export interface IGenerationItemProps {
+export type IGenerationItemProps = {
   isWorkflow?: boolean
   workflowProcessData?: WorkflowProcess
   className?: string

web/app/components/app/workflow-log/detail.tsx

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { RiCloseLine } from '@remixicon/react'
 import Run from '@/app/components/workflow/run'
 
-interface ILogDetail {
+type ILogDetail = {
   runID: string
   onClose: () => void
 }

web/app/components/app/workflow-log/filter.tsx

@@ -6,7 +6,7 @@ import type { QueryParam } from './index'
 import Chip from '@/app/components/base/chip'
 import Input from '@/app/components/base/input'
 
-interface IFilterProps {
+type IFilterProps = {
   queryParams: QueryParam
   setQueryParams: (v: QueryParam) => void
 }

web/app/components/base/audio-btn/audio.player.manager.ts

@@ -12,7 +12,6 @@ export class AudioPlayerManager {
   private audioPlayers: AudioPlayer | null = null
   private msgId: string | undefined
 
-  // eslint-disable-next-line
   private constructor() {
   }
 

web/app/components/base/audio-btn/index.tsx

@@ -7,7 +7,7 @@ import Tooltip from '@/app/components/base/tooltip'
 import Loading from '@/app/components/base/loading'
 import { AudioPlayerManager } from '@/app/components/base/audio-btn/audio.player.manager'
 
-interface AudioBtnProps {
+type AudioBtnProps = {
   id?: string
   voice?: string
   value?: string

web/app/components/base/button/add-button.tsx

@@ -4,7 +4,7 @@ import React from 'react'
 import { RiAddLine } from '@remixicon/react'
 import cn from '@/utils/classnames'
 
-interface Props {
+type Props = {
   className?: string
   onClick: () => void
 }

web/app/components/base/chat/chat-with-history/config-panel/form-input.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'
 import { memo } from 'react'
 import Textarea from '@/app/components/base/textarea'
 
-interface InputProps {
+type InputProps = {
   form: any
   value: string
   onChange: (variable: string, value: string) => void

web/app/components/base/chat/chat-with-history/context.tsx

@@ -16,7 +16,7 @@ import type {
   ConversationItem,
 } from '@/models/share'
 
-export interface ChatWithHistoryContextValue {
+export type ChatWithHistoryContextValue = {
   appInfoError?: any
   appInfoLoading?: boolean
   appMeta?: AppMeta

web/app/components/base/chat/chat-with-history/index.tsx

@@ -20,7 +20,7 @@ import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
 import { checkOrSetAccessToken } from '@/app/components/share/utils'
 import AppUnavailable from '@/app/components/base/app-unavailable'
 
-interface ChatWithHistoryProps {
+type ChatWithHistoryProps = {
   className?: string
 }
 const ChatWithHistory: FC<ChatWithHistoryProps> = ({
@@ -99,7 +99,7 @@ const ChatWithHistory: FC<ChatWithHistoryProps> = ({
   )
 }
 
-export interface ChatWithHistoryWrapProps {
+export type ChatWithHistoryWrapProps = {
   installedAppInfo?: InstalledApp
   className?: string
 }

web/app/components/base/chat/chat/answer/agent-content.tsx

@@ -8,7 +8,7 @@ import Thought from '@/app/components/base/chat/chat/thought'
 import { FileList } from '@/app/components/base/file-uploader'
 import { getProcessedFilesFromResponse } from '@/app/components/base/file-uploader/utils'
 
-interface AgentContentProps {
+type AgentContentProps = {
   item: ChatItem
   responding?: boolean
 }

web/app/components/base/chat/chat/answer/basic-content.tsx

@@ -4,7 +4,7 @@ import type { ChatItem } from '../../types'
 import { Markdown } from '@/app/components/base/markdown'
 import cn from '@/utils/classnames'
 
-interface BasicContentProps {
+type BasicContentProps = {
   item: ChatItem
 }
 const BasicContent: FC<BasicContentProps> = ({

web/app/components/base/chat/chat/answer/index.tsx

@@ -23,7 +23,7 @@ import { ChevronRight } from '@/app/components/base/icons/src/vender/line/arrows
 import cn from '@/utils/classnames'
 import { FileList } from '@/app/components/base/file-uploader'
 
-interface AnswerProps {
+type AnswerProps = {
   item: ChatItem
   question: string
   index: number

web/app/components/base/chat/chat/answer/operation.tsx

@@ -21,7 +21,7 @@ import {
 import Tooltip from '@/app/components/base/tooltip'
 import Log from '@/app/components/base/chat/chat/log'
 
-interface OperationProps {
+type OperationProps = {
   item: ChatItem
   question: string
   index: number

web/app/components/base/chat/chat/hooks.ts

@@ -33,7 +33,7 @@ import {
 } from '@/app/components/base/file-uploader/utils'
 
 type GetAbortController = (abortController: AbortController) => void
-interface SendCallback {
+type SendCallback = {
   onGetConversationMessages?: (conversationId: string, getAbortController: GetAbortController) => Promise<any>
   onGetSuggestedQuestions?: (responseItemId: string, getAbortController: GetAbortController) => Promise<any>
   onConversationComplete?: (conversationId: string) => void

web/app/components/base/chat/chat/index.tsx

@@ -35,7 +35,7 @@ import PromptLogModal from '@/app/components/base/prompt-log-modal'
 import { useStore as useAppStore } from '@/app/components/app/store'
 import type { AppData } from '@/models/share'
 
-export interface ChatProps {
+export type ChatProps = {
   appData?: AppData
   chatList: ChatItem[]
   config?: ChatConfig

web/app/components/base/chat/chat/question.tsx

@@ -12,7 +12,7 @@ import { User } from '@/app/components/base/icons/src/public/avatar'
 import { Markdown } from '@/app/components/base/markdown'
 import { FileList } from '@/app/components/base/file-uploader'
 
-interface QuestionProps {
+type QuestionProps = {
   item: ChatItem
   questionIcon?: ReactNode
   theme: Theme | null | undefined

web/app/components/base/chat/chat/thought/index.tsx

@@ -4,7 +4,7 @@ import React from 'react'
 import type { ThoughtItem, ToolInfoInThought } from '../type'
 import ToolDetail from '@/app/components/base/chat/chat/answer/tool-detail'
 
-export interface IThoughtProps {
+export type IThoughtProps = {
   thought: ThoughtItem
   isFinished: boolean
 }

web/app/components/base/chat/chat/type.ts

@@ -4,13 +4,13 @@ import type { FileEntity } from '@/app/components/base/file-uploader/types'
 import type { InputVarType } from '@/app/components/workflow/types'
 import type { FileResponse } from '@/types/workflow'
 
-export interface MessageMore {
+export type MessageMore = {
   time: string
   tokens: number
   latency: number | string
 }
 
-export interface FeedbackType {
+export type FeedbackType = {
   rating: MessageRating
   content?: string | null
 }
@@ -26,7 +26,7 @@ export type SubmitAnnotationFunc = (
 
 export type DisplayScene = 'web' | 'console'
 
-export interface ToolInfoInThought {
+export type ToolInfoInThought = {
   name: string
   label: string
   input: string
@@ -34,7 +34,7 @@ export interface ToolInfoInThought {
   isFinished: boolean
 }
 
-export interface ThoughtItem {
+export type ThoughtItem = {
   id: string
   tool: string // plugin or dataset. May has multi.
   thought: string
@@ -47,7 +47,7 @@ export interface ThoughtItem {
   message_files?: FileEntity[]
 }
 
-export interface CitationItem {
+export type CitationItem = {
   content: string
   data_source_type: string
   dataset_name: string
@@ -62,7 +62,7 @@ export interface CitationItem {
   word_count: number
 }
 
-export interface IChatItem {
+export type IChatItem = {
   id: string
   content: string
   citation?: CitationItem[]
@@ -104,7 +104,7 @@ export interface IChatItem {
   nextSibling?: string
 }
 
-export interface Metadata {
+export type Metadata = {
   retriever_resources?: CitationItem[]
   annotation_reply: {
     id: string
@@ -115,20 +115,20 @@ export interface Metadata {
   }
 }
 
-export interface MessageEnd {
+export type MessageEnd = {
   id: string
   metadata: Metadata
   files?: FileResponse[]
 }
 
-export interface MessageReplace {
+export type MessageReplace = {
   id: string
   task_id: string
   answer: string
   conversation_id: string
 }
 
-export interface AnnotationReply {
+export type AnnotationReply = {
   id: string
   task_id: string
   answer: string
@@ -137,7 +137,7 @@ export interface AnnotationReply {
   annotation_author_name: string
 }
 
-export interface InputForm {
+export type InputForm = {
   type: InputVarType
   label: string
   variable: any

web/app/components/base/chat/embedded-chatbot/config-panel/form-input.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'
 import { memo } from 'react'
 import Textarea from '@/app/components/base/textarea'
 
-interface InputProps {
+type InputProps = {
   form: any
   value: string
   onChange: (variable: string, value: string) => void

web/app/components/base/chat/embedded-chatbot/context.tsx

@@ -15,7 +15,7 @@ import type {
   ConversationItem,
 } from '@/models/share'
 
-export interface EmbeddedChatbotContextValue {
+export type EmbeddedChatbotContextValue = {
   appInfoError?: any
   appInfoLoading?: boolean
   appMeta?: AppMeta

web/app/components/base/chat/types.ts

@@ -14,32 +14,32 @@ export type {
   PromptVariable,
 } from '@/models/debug'
 
-export interface UserInputForm {
+export type UserInputForm = {
   default: string
   label: string
   required: boolean
   variable: string
 }
 
-export interface UserInputFormTextInput {
+export type UserInputFormTextInput = {
   'text-input': UserInputForm & {
     max_length: number
   }
 }
 
-export interface UserInputFormSelect {
+export type UserInputFormSelect = {
   select: UserInputForm & {
     options: string[]
   }
 }
 
-export interface UserInputFormParagraph {
+export type UserInputFormParagraph = {
   paragraph: UserInputForm
 }
 
 export type VisionConfig = VisionSettings
 
-export interface EnableType {
+export type EnableType = {
   enabled: boolean
 }
 
@@ -50,7 +50,7 @@ export type ChatConfig = Omit<ModelConfig, 'model'> & {
   supportCitationHitInfo?: boolean
 }
 
-export interface WorkflowProcess {
+export type WorkflowProcess = {
   status: WorkflowRunningStatus
   tracing: NodeTracing[]
   expand?: boolean // for UI
@@ -73,10 +73,10 @@ export type OnSend = (message: string, files?: FileEntity[], last_answer?: ChatI
 
 export type OnRegenerate = (chatItem: ChatItem) => void
 
-export interface Callback {
+export type Callback = {
   onSuccess: () => void
 }
 
-export interface Feedback {
+export type Feedback = {
   rating: 'like' | 'dislike' | null
 }

web/app/components/base/features/store.ts

@@ -2,16 +2,16 @@ import { createStore } from 'zustand'
 import type { Features } from './types'
 import { Resolution, TransferMethod } from '@/types/app'
 
-export interface FeaturesModal {
+export type FeaturesModal = {
   showFeaturesModal: boolean
   setShowFeaturesModal: (showFeaturesModal: boolean) => void
 }
 
-export interface FeaturesState {
+export type FeaturesState = {
   features: Features
 }
 
-export interface FeaturesAction {
+export type FeaturesAction = {
   setFeatures: (features: Features) => void
 }
 

web/app/components/base/features/types.ts

@@ -1,7 +1,7 @@
 import type { Resolution, TransferMethod, TtsAutoPlay } from '@/types/app'
 import type { FileUploadConfigResponse } from '@/models/common'
 
-export interface EnabledOrDisabled {
+export type EnabledOrDisabled = {
   enabled?: boolean
 }
 
@@ -42,7 +42,7 @@ export type FileUpload = {
   fileUploadConfig?: FileUploadConfigResponse
 } & EnabledOrDisabled
 
-export interface AnnotationReplyConfig {
+export type AnnotationReplyConfig = {
   enabled: boolean
   id?: string
   score_threshold?: number
@@ -64,7 +64,7 @@ export enum FeatureEnum {
   annotationReply = 'annotationReply',
 }
 
-export interface Features {
+export type Features = {
   [FeatureEnum.moreLikeThis]?: MoreLikeThis
   [FeatureEnum.opening]?: OpeningStatement
   [FeatureEnum.suggested]?: SuggestedQuestionsAfterAnswer

web/app/components/base/image-uploader/image-preview.tsx

@@ -7,7 +7,7 @@ import { useHotkeys } from 'react-hotkeys-hook'
 import Tooltip from '@/app/components/base/tooltip'
 import Toast from '@/app/components/base/toast'
 
-interface ImagePreviewProps {
+type ImagePreviewProps = {
   url: string
   title: string
   onCancel: () => void

web/app/components/base/markdown.tsx

@@ -9,7 +9,7 @@ import RemarkGfm from 'remark-gfm'
 import RehypeRaw from 'rehype-raw'
 import SyntaxHighlighter from 'react-syntax-highlighter'
 import { atelierHeathLight } from 'react-syntax-highlighter/dist/esm/styles/hljs'
-import { Component, createContext, memo, useContext, useEffect, useMemo, useRef, useState } from 'react'
+import { Component, createContext, memo, useContext, useMemo, useRef, useState } from 'react'
 import cn from '@/utils/classnames'
 import CopyBtn from '@/app/components/base/copy-btn'
 import SVGBtn from '@/app/components/base/svg'

web/app/components/base/message-log-modal/index.tsx

@@ -7,7 +7,7 @@ import cn from '@/utils/classnames'
 import type { IChatItem } from '@/app/components/base/chat/chat/type'
 import Run from '@/app/components/workflow/run'
 
-interface MessageLogModalProps {
+type MessageLogModalProps = {
   currentLogItem?: IChatItem
   defaultTab?: string
   width: number

web/app/components/base/param-item/top-k-item.tsx

@@ -12,7 +12,7 @@ type Props = {
 }
 
 const maxTopK = (() => {
-  const configValue = parseInt(globalThis.document?.body?.getAttribute('data-public-top-k-max-value') || '', 10)
+  const configValue = Number.parseInt(globalThis.document?.body?.getAttribute('data-public-top-k-max-value') || '', 10)
   if (configValue && !isNaN(configValue))
     return configValue
   return 10
@@ -33,7 +33,7 @@ const TopKItem: FC<Props> = ({
 }) => {
   const { t } = useTranslation()
   const handleParamChange = (key: string, value: number) => {
-    let notOutRangeValue = parseFloat(value.toFixed(2))
+    let notOutRangeValue = Number.parseFloat(value.toFixed(2))
     notOutRangeValue = Math.max(VALUE_LIMIT.min, notOutRangeValue)
     notOutRangeValue = Math.min(VALUE_LIMIT.max, notOutRangeValue)
     onChange(key, notOutRangeValue)

web/app/components/base/prompt-editor/index.tsx

@@ -61,7 +61,7 @@ import {
 import { useEventEmitterContextContext } from '@/context/event-emitter'
 import cn from '@/utils/classnames'
 
-export interface PromptEditorProps {
+export type PromptEditorProps = {
   instanceId?: string
   compact?: boolean
   className?: string

web/app/components/base/prompt-editor/plugins/component-picker-block/index.tsx

@@ -32,7 +32,7 @@ import type { PickerBlockMenuOption } from './menu'
 import VarReferenceVars from '@/app/components/workflow/nodes/_base/components/variable/var-reference-vars'
 import { useEventEmitterContextContext } from '@/context/event-emitter'
 
-interface ComponentPickerProps {
+type ComponentPickerProps = {
   triggerString: string
   contextBlock?: ContextBlockType
   queryBlock?: QueryBlockType

web/app/components/base/sort/index.tsx

@@ -14,7 +14,7 @@ export type Item = {
   name: string
 } & Record<string, any>
 
-interface Props {
+type Props = {
   order?: string
   value: number | string
   items: Item[]

web/app/components/base/switch/index.tsx

@@ -11,62 +11,60 @@ type SwitchProps = {
   className?: string
 }
 
-const Switch = React.forwardRef(
-  ({ onChange, size = 'md', defaultValue = false, disabled = false, className }: SwitchProps,
-    propRef: React.Ref<HTMLButtonElement>) => {
-    const [enabled, setEnabled] = useState(defaultValue)
-    useEffect(() => {
-      setEnabled(defaultValue)
-    }, [defaultValue])
-    const wrapStyle = {
-      lg: 'h-6 w-11',
-      l: 'h-5 w-9',
-      md: 'h-4 w-7',
-      sm: 'h-3 w-5',
-    }
+const Switch = React.forwardRef<HTMLButtonElement>(({ onChange, size = 'md', defaultValue = false, disabled = false, className }: SwitchProps, ref) => {
+  const [enabled, setEnabled] = useState(defaultValue)
+  useEffect(() => {
+    setEnabled(defaultValue)
+  }, [defaultValue])
+  const wrapStyle = {
+    lg: 'h-6 w-11',
+    l: 'h-5 w-9',
+    md: 'h-4 w-7',
+    sm: 'h-3 w-5',
+  }
 
-    const circleStyle = {
-      lg: 'h-5 w-5',
-      l: 'h-4 w-4',
-      md: 'h-3 w-3',
-      sm: 'h-2 w-2',
-    }
+  const circleStyle = {
+    lg: 'h-5 w-5',
+    l: 'h-4 w-4',
+    md: 'h-3 w-3',
+    sm: 'h-2 w-2',
+  }
 
-    const translateLeft = {
-      lg: 'translate-x-5',
-      l: 'translate-x-4',
-      md: 'translate-x-3',
-      sm: 'translate-x-2',
-    }
-    return (
-      <OriginalSwitch
-        ref={propRef}
-        checked={enabled}
-        onChange={(checked: boolean) => {
-          if (disabled)
-            return
-          setEnabled(checked)
-          onChange?.(checked)
-        }}
+  const translateLeft = {
+    lg: 'translate-x-5',
+    l: 'translate-x-4',
+    md: 'translate-x-3',
+    sm: 'translate-x-2',
+  }
+  return (
+    <OriginalSwitch
+      ref={ref}
+      checked={enabled}
+      onChange={(checked: boolean) => {
+        if (disabled)
+          return
+        setEnabled(checked)
+        onChange?.(checked)
+      }}
+      className={classNames(
+        wrapStyle[size],
+        enabled ? 'bg-components-toggle-bg' : 'bg-components-toggle-bg-unchecked',
+        'relative inline-flex  flex-shrink-0 cursor-pointer rounded-[5px] border-2 border-transparent transition-colors duration-200 ease-in-out',
+        disabled ? '!opacity-50 !cursor-not-allowed' : '',
+        className,
+      )}
+    >
+      <span
+        aria-hidden="true"
         className={classNames(
-          wrapStyle[size],
-          enabled ? 'bg-components-toggle-bg' : 'bg-components-toggle-bg-unchecked',
-          'relative inline-flex  flex-shrink-0 cursor-pointer rounded-[5px] border-2 border-transparent transition-colors duration-200 ease-in-out',
-          disabled ? '!opacity-50 !cursor-not-allowed' : '',
-          className,
+          circleStyle[size],
+          enabled ? translateLeft[size] : 'translate-x-0',
+          'pointer-events-none inline-block transform rounded-[3px] bg-components-toggle-knob shadow ring-0 transition duration-200 ease-in-out',
         )}
-      >
-        <span
-          aria-hidden="true"
-          className={classNames(
-            circleStyle[size],
-            enabled ? translateLeft[size] : 'translate-x-0',
-            'pointer-events-none inline-block transform rounded-[3px] bg-components-toggle-knob shadow ring-0 transition duration-200 ease-in-out',
-          )}
-        />
-      </OriginalSwitch>
-    )
-  })
+      />
+    </OriginalSwitch>
+  )
+})
 
 Switch.displayName = 'Switch'
 

web/app/components/base/tab-slider-plain/index.tsx

@@ -3,12 +3,12 @@ import type { FC } from 'react'
 import React from 'react'
 import cn from '@/utils/classnames'
 
-interface Option {
+type Option = {
   value: string
   text: string | JSX.Element
 }
 
-interface ItemProps {
+type ItemProps = {
   className?: string
   isActive: boolean
   onClick: (v: string) => void
@@ -38,7 +38,7 @@ const Item: FC<ItemProps> = ({
   )
 }
 
-interface Props {
+type Props = {
   className?: string
   value: string
   onChange: (v: string) => void

web/app/components/base/tag-input/index.tsx

@@ -7,7 +7,7 @@ import { RiAddLine, RiCloseLine } from '@remixicon/react'
 import cn from '@/utils/classnames'
 import { useToastContext } from '@/app/components/base/toast'
 
-interface TagInputProps {
+type TagInputProps = {
   items: string[]
   onChange: (items: string[]) => void
   disableRemove?: boolean

web/app/components/base/tag-management/filter.tsx

@@ -18,7 +18,7 @@ import type { Tag } from '@/app/components/base/tag-management/constant'
 
 import { fetchTagList } from '@/service/tag'
 
-interface TagFilterProps {
+type TagFilterProps = {
   type: 'knowledge' | 'app'
   value: string[]
   onChange: (v: string[]) => void

web/app/components/base/tag-management/selector.tsx

@@ -16,7 +16,7 @@ import Checkbox from '@/app/components/base/checkbox'
 import { bindTag, createTag, fetchTagList, unBindTag } from '@/service/tag'
 import { ToastContext } from '@/app/components/base/toast'
 
-interface TagSelectorProps {
+type TagSelectorProps = {
   targetID: string
   isPopover?: boolean
   position?: 'bl' | 'br'

web/app/components/base/text-generation/types.ts

@@ -7,32 +7,32 @@ import type { ExternalDataTool } from '@/models/common'
 export type { VisionFile } from '@/types/app'
 export { TransferMethod } from '@/types/app'
 
-export interface UserInputForm {
+export type UserInputForm = {
   default: string
   label: string
   required: boolean
   variable: string
 }
 
-export interface UserInputFormTextInput {
+export type UserInputFormTextInput = {
   'text-input': UserInputForm & {
     max_length: number
   }
 }
 
-export interface UserInputFormSelect {
+export type UserInputFormSelect = {
   select: UserInputForm & {
     options: string[]
   }
 }
 
-export interface UserInputFormParagraph {
+export type UserInputFormParagraph = {
   paragraph: UserInputForm
 }
 
 export type VisionConfig = VisionSettings
 
-export interface EnableType {
+export type EnableType = {
   enabled: boolean
 }
 

web/app/components/base/toast/index.tsx

@@ -51,8 +51,7 @@ const Toast = ({
     'top-0',
     'right-0',
   )}>
-    <div className={`absolute inset-0 opacity-40 ${
-      (type === 'success' && 'bg-toast-success-bg')
+    <div className={`absolute inset-0 opacity-40 -z-10 ${(type === 'success' && 'bg-toast-success-bg')
       || (type === 'warning' && 'bg-toast-warning-bg')
       || (type === 'error' && 'bg-toast-error-bg')
       || (type === 'info' && 'bg-toast-info-bg')
@@ -65,8 +64,11 @@ const Toast = ({
         {type === 'warning' && <RiAlertFill className={`${size === 'md' ? 'w-5 h-5' : 'w-4 h-4'} text-text-warning-secondary`} aria-hidden="true" />}
         {type === 'info' && <RiInformation2Fill className={`${size === 'md' ? 'w-5 h-5' : 'w-4 h-4'} text-text-accent`} aria-hidden="true" />}
       </div>
-      <div className={`flex py-1 ${size === 'md' ? 'px-1' : 'px-0.5'} flex-col items-start gap-1 grow`}>
-        <div className='text-text-primary system-sm-semibold'>{message}</div>
+      <div className={`flex py-1 ${size === 'md' ? 'px-1' : 'px-0.5'} flex-col items-start gap-1 grow z-10`}>
+        <div className='flex items-center gap-1'>
+          <div className='text-text-primary system-sm-semibold'>{message}</div>
+          {customComponent}
+        </div>
         {children && <div className='text-text-secondary system-xs-regular'>
           {children}
         </div>
@@ -130,7 +132,7 @@ Toast.notify = ({
 
     root.render(
       <ToastContext.Provider value={{
-        notify: () => {},
+        notify: () => { },
         close: () => {
           if (holder) {
             root.unmount()

web/app/components/datasets/create/empty-dataset-creation-modal/index.tsx

@@ -12,7 +12,7 @@ import Button from '@/app/components/base/button'
 import { ToastContext } from '@/app/components/base/toast'
 import { createEmptyDataset } from '@/service/datasets'
 
-interface IProps {
+type IProps = {
   show: boolean
   onHide: () => void
 }

web/app/components/datasets/create/step-two/index.tsx

@@ -37,7 +37,7 @@ import Button from '@/app/components/base/button'
 import FloatRightContainer from '@/app/components/base/float-right-container'
 import RetrievalMethodConfig from '@/app/components/datasets/common/retrieval-method-config'
 import EconomicalRetrievalMethodConfig from '@/app/components/datasets/common/economical-retrieval-method-config'
-import { type RetrievalConfig } from '@/types/app'
+import type { RetrievalConfig } from '@/types/app'
 import { isReRankModelSelected } from '@/app/components/datasets/common/check-rerank-model'
 import Toast from '@/app/components/base/toast'
 import type { NotionPage } from '@/models/common'
@@ -205,7 +205,7 @@ const StepTwo = ({
     if (value === ChunkingMode.parentChild && indexType === IndexingType.ECONOMICAL)
       setIndexType(IndexingType.QUALIFIED)
     setDocForm(value)
-    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+    // eslint-disable-next-line
     currentEstimateMutation.reset()
   }
 
@@ -393,7 +393,7 @@ const StepTwo = ({
       score_threshold_enabled: false,
       score_threshold: 0.5,
     })
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [rerankDefaultModel, isRerankDefaultModelValid])
 
   const getCreationParams = () => {

web/app/components/datasets/create/step-two/language-select/index.tsx

@@ -6,7 +6,7 @@ import cn from '@/utils/classnames'
 import Popover from '@/app/components/base/popover'
 import { languages } from '@/i18n/language'
 
-export interface ILanguageSelectProps {
+export type ILanguageSelectProps = {
   currentLanguage: string
   onSelect: (language: string) => void
   disabled?: boolean

web/app/components/datasets/create/website/jina-reader/base/checkbox-with-label.tsx

@@ -5,7 +5,7 @@ import cn from '@/utils/classnames'
 import Checkbox from '@/app/components/base/checkbox'
 import Tooltip from '@/app/components/base/tooltip'
 
-interface Props {
+type Props = {
   className?: string
   isChecked: boolean
   onChange: (isChecked: boolean) => void

web/app/components/datasets/create/website/jina-reader/base/error-message.tsx

@@ -4,7 +4,7 @@ import React from 'react'
 import cn from '@/utils/classnames'
 import { AlertTriangle } from '@/app/components/base/icons/src/vender/solid/alertsAndFeedback'
 
-interface Props {
+type Props = {
   className?: string
   title: string
   errorMsg?: string

web/app/components/datasets/create/website/jina-reader/base/field.tsx

@@ -5,7 +5,7 @@ import Input from './input'
 import cn from '@/utils/classnames'
 import Tooltip from '@/app/components/base/tooltip'
 
-interface Props {
+type Props = {
   className?: string
   label: string
   labelClassName?: string

web/app/components/datasets/create/website/jina-reader/base/input.tsx

@@ -2,7 +2,7 @@
 import type { FC } from 'react'
 import React, { useCallback } from 'react'
 
-interface Props {
+type Props = {
   value: string | number
   onChange: (value: string | number) => void
   placeholder?: string