Merge branch 'plugins/beta' into plugins/fix-be-ci-errors

.github/workflows/style.yml

@@ -66,6 +66,12 @@ jobs:
         uses: tj-actions/changed-files@v45
         with:
           files: web/**
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+          run_install: false
 
       - name: Setup NodeJS
         uses: actions/setup-node@v4
@@ -81,7 +87,7 @@ jobs:
 
       - name: Web style check
         if: steps.changed-files.outputs.any_changed == 'true'
-        run: pnpm run lint
+        run: echo "${{ steps.changed-files.outputs.all_changed_files }}" | sed 's|web/||g' | xargs pnpm eslint # wait for next lint support eslint v9
 
   superlinter:
     name: SuperLinter

api/.env.example

@@ -422,8 +422,9 @@ POSITION_PROVIDER_INCLUDES=
 POSITION_PROVIDER_EXCLUDES=
 
 # Plugin configuration
-PLUGIN_API_KEY=lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1
+PLUGIN_API_KEY=lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi
 PLUGIN_API_URL=http://127.0.0.1:5002
+PLUGIN_DAEMON_URL=http://127.0.0.1:5002
 PLUGIN_REMOTE_INSTALL_PORT=5003
 PLUGIN_REMOTE_INSTALL_HOST=localhost
 PLUGIN_MAX_PACKAGE_SIZE=15728640

dev/pytest/pytest_config_tests.py

@@ -10,6 +10,8 @@
     "HTTP_REQUEST_MAX_CONNECT_TIMEOUT",
     "HTTP_REQUEST_MAX_READ_TIMEOUT",
     "HTTP_REQUEST_MAX_WRITE_TIMEOUT",
+    "INNER_API_KEY",
+    "INNER_API_KEY_FOR_PLUGIN",
     "KEYWORD_DATA_SOURCE_TYPE",
     "LOGIN_LOCKOUT_DURATION",
     "LOG_FORMAT",
@@ -18,6 +20,10 @@
     "OCI_ENDPOINT",
     "OCI_REGION",
     "OCI_SECRET_KEY",
+    "PLUGIN_API_KEY",
+    "PLUGIN_API_URL",
+    "PLUGIN_REMOTE_INSTALL_HOST",
+    "PLUGIN_REMOTE_INSTALL_PORT",
     "REDIS_DB",
     "RESEND_API_URL",
     "RESPECT_XFORWARD_HEADERS_ENABLED",
@@ -40,6 +46,8 @@
     "HTTP_REQUEST_MAX_CONNECT_TIMEOUT",
     "HTTP_REQUEST_MAX_READ_TIMEOUT",
     "HTTP_REQUEST_MAX_WRITE_TIMEOUT",
+    "INNER_API_KEY",
+    "INNER_API_KEY_FOR_PLUGIN",
     "KEYWORD_DATA_SOURCE_TYPE",
     "LOGIN_LOCKOUT_DURATION",
     "LOG_FORMAT",
@@ -58,6 +66,10 @@
     "PGVECTO_RS_PASSWORD",
     "PGVECTO_RS_PORT",
     "PGVECTO_RS_USER",
+    "PLUGIN_API_KEY",
+    "PLUGIN_API_URL",
+    "PLUGIN_REMOTE_INSTALL_HOST",
+    "PLUGIN_REMOTE_INSTALL_PORT",
     "RESPECT_XFORWARD_HEADERS_ENABLED",
     "SCARF_NO_ANALYTICS",
     "SSRF_DEFAULT_CONNECT_TIME_OUT",

docker/docker-compose-template.yaml

@@ -14,14 +14,10 @@ services:
       SENTRY_DSN: ${API_SENTRY_DSN:-}
       SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0}
       SENTRY_PROFILES_SAMPLE_RATE: ${API_SENTRY_PROFILES_SAMPLE_RATE:-1.0}
-      PLUGIN_API_KEY: ${PLUGIN_DAEMON_KEY:-lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi}
-      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}
-      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}}
     depends_on:
       - db
@@ -151,9 +147,9 @@ services:
       MAX_PLUGIN_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
       PPROF_ENABLED: ${PLUGIN_PPROF_ENABLED:-false}
       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}
-      PLUGIN_REMOTE_INSTALLING_PORT: ${PLUGIN_DEBUGGING_PORT:-5003}
+      DIFY_INNER_API_KEY: ${INNER_API_KEY_FOR_PLUGIN:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
+      PLUGIN_REMOTE_INSTALLING_HOST: ${PLUGIN_REMOTE_INSTALL_HOST:-0.0.0.0}
+      PLUGIN_REMOTE_INSTALLING_PORT: ${PLUGIN_REMOTE_INSTALL_PORT:-5003}
       PLUGIN_WORKING_PATH: ${PLUGIN_WORKING_PATH:-/app/storage/cwd}
     ports:
       - "${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}:${PLUGIN_DEBUGGING_PORT:-5003}"

docker/docker-compose.yaml

@@ -389,7 +389,7 @@ x-shared-env: &shared-api-worker-env
   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}
+  DB_PLUGIN_DATABASE: ${DB_PLUGIN_DATABASE:-dify_plugin}
   EXPOSE_PLUGIN_DAEMON_PORT: ${EXPOSE_PLUGIN_DAEMON_PORT:-5002}
   PLUGIN_DAEMON_PORT: ${PLUGIN_DAEMON_PORT:-5002}
   PLUGIN_DAEMON_KEY: ${PLUGIN_DAEMON_KEY:-lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi}
@@ -421,14 +421,10 @@ services:
       SENTRY_DSN: ${API_SENTRY_DSN:-}
       SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0}
       SENTRY_PROFILES_SAMPLE_RATE: ${API_SENTRY_PROFILES_SAMPLE_RATE:-1.0}
-      PLUGIN_API_KEY: ${PLUGIN_DAEMON_KEY:-lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi}
-      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}
-      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}}
     depends_on:
       - db
@@ -558,9 +554,9 @@ services:
       MAX_PLUGIN_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
       PPROF_ENABLED: ${PLUGIN_PPROF_ENABLED:-false}
       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}
-      PLUGIN_REMOTE_INSTALLING_PORT: ${PLUGIN_DEBUGGING_PORT:-5003}
+      DIFY_INNER_API_KEY: ${INNER_API_KEY_FOR_PLUGIN:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
+      PLUGIN_REMOTE_INSTALLING_HOST: ${PLUGIN_REMOTE_INSTALL_HOST:-0.0.0.0}
+      PLUGIN_REMOTE_INSTALLING_PORT: ${PLUGIN_REMOTE_INSTALL_PORT:-5003}
       PLUGIN_WORKING_PATH: ${PLUGIN_WORKING_PATH:-/app/storage/cwd}
     ports:
       - "${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}:${PLUGIN_DEBUGGING_PORT:-5003}"

docker/nginx/conf.d/default.conf.template

@@ -24,6 +24,11 @@ server {
       include proxy.conf;
     }
 
+    location /explore {
+      proxy_pass http://web:3000;
+      include proxy.conf;
+    }
+
     location /e {
       proxy_pass http://plugin_daemon:5002;
       include proxy.conf;

web/app/components/plugins/plugin-item/action.tsx

@@ -54,7 +54,9 @@ const Action: FC<Props> = ({
   const invalidateInstalledPluginList = useInvalidateInstalledPluginList()
 
   const handleFetchNewVersion = async () => {
-    const fetchedReleases = await fetchReleases(author, pluginName)
+    const owner = meta!.repo.split('/')[0] || author
+    const repo = meta!.repo.split('/')[1] || pluginName
+    const fetchedReleases = await fetchReleases(owner, repo)
     if (fetchedReleases.length === 0) return
     const { needUpdate, toastProps } = checkForUpdates(fetchedReleases, meta!.version)
     Toast.notify(toastProps)

web/package.json

@@ -9,7 +9,7 @@
     "dev": "NODE_OPTIONS='--inspect' next dev",
     "build": "next build",
     "start": "cp -r .next/static .next/standalone/.next/static && cp -r public .next/standalone/public && cross-env PORT=$npm_config_port HOSTNAME=$npm_config_host node .next/standalone/server.js",
-    "lint": "next lint",
+    "lint": "pnpm eslint",
     "fix": "next lint --fix",
     "eslint-fix": "eslint --fix",
     "prepare": "cd ../ && node -e \"if (process.env.NODE_ENV !== 'production'){process.exit(1)} \" || husky ./web/.husky",
@@ -27,6 +27,7 @@
     "@babel/runtime": "^7.22.3",
     "@dagrejs/dagre": "^1.1.4",
     "@emoji-mart/data": "^1.2.1",
+    "@eslint/compat": "^1.2.4",
     "@floating-ui/react": "^0.26.25",
     "@formatjs/intl-localematcher": "^0.5.6",
     "@headlessui/react": "^1.7.13",
@@ -86,14 +87,14 @@
     "react-error-boundary": "^4.1.2",
     "react-headless-pagination": "^1.1.6",
     "react-hook-form": "^7.53.1",
+    "react-hotkeys-hook": "^4.6.1",
     "react-i18next": "^15.1.0",
     "react-infinite-scroll-component": "^6.1.0",
     "react-markdown": "^9.0.1",
     "react-multi-email": "^1.0.25",
     "react-papaparse": "^4.4.0",
-    "react-slider": "^2.0.6",
-    "react-hotkeys-hook": "^4.6.1",
     "react-pdf-highlighter": "^8.0.0-rc.0",
+    "react-slider": "^2.0.6",
     "react-sortablejs": "^6.1.4",
     "react-syntax-highlighter": "^15.6.1",
     "react-tooltip": "5.8.3",
@@ -194,4 +195,4 @@
       "eslint --fix"
     ]
   }
-}
+}