Unify plugin endpoint configuration for api and worker: An alternativ…

…e solution to PR langgenius#13214 (langgenius#13239)
alexcodelf · Feb 6, 2025 · beebba0 · beebba0
1 parent 4e27d82
commit beebba0
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 19 deletions.
diff --git a/api/.env.example b/api/.env.example
@@ -422,8 +422,7 @@ POSITION_PROVIDER_INCLUDES=
 POSITION_PROVIDER_EXCLUDES=
 
 # Plugin configuration
-PLUGIN_API_KEY=lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi
-PLUGIN_API_URL=http://127.0.0.1:5002
+PLUGIN_DAEMON_KEY=lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi
 PLUGIN_DAEMON_URL=http://127.0.0.1:5002
 PLUGIN_REMOTE_INSTALL_PORT=5003
 PLUGIN_REMOTE_INSTALL_HOST=localhost

diff --git a/api/configs/feature/__init__.py b/api/configs/feature/__init__.py
@@ -144,7 +144,7 @@ class PluginConfig(BaseSettings):
         default="http://localhost:5002",
     )
 
-    PLUGIN_API_KEY: str = Field(
+    PLUGIN_DAEMON_KEY: str = Field(
         description="Plugin API key",
         default="plugin-api-key",
     )

diff --git a/api/controllers/inner_api/wraps.py b/api/controllers/inner_api/wraps.py
@@ -65,7 +65,7 @@ def decorated(*args, **kwargs):
 def plugin_inner_api_only(view):
     @wraps(view)
     def decorated(*args, **kwargs):
-        if not dify_config.PLUGIN_API_KEY:
+        if not dify_config.PLUGIN_DAEMON_KEY:
             abort(404)
 
         # get header 'X-Inner-Api-Key'

diff --git a/api/core/plugin/manager/base.py b/api/core/plugin/manager/base.py
@@ -30,7 +30,7 @@
 )
 
 plugin_daemon_inner_api_baseurl = dify_config.PLUGIN_DAEMON_URL
-plugin_daemon_inner_api_key = dify_config.PLUGIN_API_KEY
+plugin_daemon_inner_api_key = dify_config.PLUGIN_DAEMON_KEY
 
 T = TypeVar("T", bound=(BaseModel | dict | list | bool | str))
 

diff --git a/api/pytest.ini b/api/pytest.ini
@@ -7,7 +7,7 @@ env =
     CODE_EXECUTION_API_KEY = dify-sandbox
     CODE_EXECUTION_ENDPOINT = http://127.0.0.1:8194
     CODE_MAX_STRING_LENGTH = 80000
-    PLUGIN_API_KEY=lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi
+    PLUGIN_DAEMON_KEY=lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi
     PLUGIN_DAEMON_URL=http://127.0.0.1:5002
     PLUGIN_MAX_PACKAGE_SIZE=15728640
     INNER_API_KEY_FOR_PLUGIN=QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1

diff --git a/api/tests/integration_tests/.env.example b/api/tests/integration_tests/.env.example
@@ -85,7 +85,7 @@ VOLC_EMBEDDING_ENDPOINT_ID=
 ZHINAO_API_KEY=
 
 # Plugin configuration
-PLUGIN_API_KEY=
+PLUGIN_DAEMON_KEY=
 PLUGIN_DAEMON_URL=
 INNER_API_KEY=
 

diff --git a/dev/pytest/pytest_config_tests.py b/dev/pytest/pytest_config_tests.py
@@ -20,8 +20,8 @@
     "OCI_ENDPOINT",
     "OCI_REGION",
     "OCI_SECRET_KEY",
-    "PLUGIN_API_KEY",
-    "PLUGIN_API_URL",
+    "PLUGIN_DAEMON_KEY",
+    "PLUGIN_DAEMON_URL",
     "PLUGIN_REMOTE_INSTALL_HOST",
     "PLUGIN_REMOTE_INSTALL_PORT",
     "REDIS_DB",
@@ -66,8 +66,8 @@
     "PGVECTO_RS_PASSWORD",
     "PGVECTO_RS_PORT",
     "PGVECTO_RS_USER",
-    "PLUGIN_API_KEY",
-    "PLUGIN_API_URL",
+    "PLUGIN_DAEMON_KEY",
+    "PLUGIN_DAEMON_URL",
     "PLUGIN_REMOTE_INSTALL_HOST",
     "PLUGIN_REMOTE_INSTALL_PORT",
     "RESPECT_XFORWARD_HEADERS_ENABLED",

diff --git a/docker/docker-compose-template.yaml b/docker/docker-compose-template.yaml
@@ -12,8 +12,6 @@ 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}
     depends_on:
@@ -39,8 +37,6 @@ 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}
     depends_on:

diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
@@ -420,8 +420,6 @@ 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}
     depends_on:
@@ -447,8 +445,6 @@ 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}
     depends_on: