chore: 纳入本地 Dify 1.19.0 源码及品牌与免登改动
演示目录只保留可重建的源码。运行密钥、数据卷、依赖和带口令的本地配置不进入仓库。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
60158935f4
commit
6519682885
15831 files changed
+3063428
No files matched your search
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
+49
@@ -0,0 +1,49 @@
|
||||
from textwrap import dedent
|
||||
|
||||
from flask import Flask
|
||||
|
||||
from .test_utils import CodeExecutorTestMixin
|
||||
|
||||
|
||||
class TestJavaScriptCodeExecutor(CodeExecutorTestMixin):
|
||||
"""Test class for JavaScript code executor functionality."""
|
||||
|
||||
def test_javascript_plain(self, flask_app_with_containers: Flask):
|
||||
"""Test basic JavaScript code execution with console.log output"""
|
||||
code_executor, code_language = self.code_executor_imports
|
||||
|
||||
code = 'console.log("Hello World")'
|
||||
result_message = code_executor.execute_code(language=code_language.JAVASCRIPT, preload="", code=code)
|
||||
assert result_message == "Hello World\n"
|
||||
|
||||
def test_javascript_json(self, flask_app_with_containers: Flask):
|
||||
"""Test JavaScript code execution with JSON output"""
|
||||
code_executor, code_language = self.code_executor_imports
|
||||
|
||||
code = dedent("""
|
||||
obj = {'Hello': 'World'}
|
||||
console.log(JSON.stringify(obj))
|
||||
""")
|
||||
result = code_executor.execute_code(language=code_language.JAVASCRIPT, preload="", code=code)
|
||||
assert result == '{"Hello":"World"}\n'
|
||||
|
||||
def test_javascript_with_code_template(self, flask_app_with_containers: Flask):
|
||||
"""Test JavaScript workflow code template execution with inputs"""
|
||||
code_executor, code_language = self.code_executor_imports
|
||||
javascript_code_provider, _ = self.javascript_imports
|
||||
|
||||
result = code_executor.execute_workflow_code_template(
|
||||
language=code_language.JAVASCRIPT,
|
||||
code=javascript_code_provider.get_default_code(),
|
||||
inputs={"arg1": "Hello", "arg2": "World"},
|
||||
)
|
||||
assert result == {"result": "HelloWorld"}
|
||||
|
||||
def test_javascript_get_runner_script(self, flask_app_with_containers: Flask):
|
||||
"""Test JavaScript template transformer runner script generation"""
|
||||
_, node_js_template_transformer = self.javascript_imports
|
||||
|
||||
runner_script = node_js_template_transformer.get_runner_script()
|
||||
assert runner_script.count(node_js_template_transformer._code_placeholder) == 1
|
||||
assert runner_script.count(node_js_template_transformer._inputs_placeholder) == 1
|
||||
assert runner_script.count(node_js_template_transformer._result_tag) == 2
|
||||
+76
@@ -0,0 +1,76 @@
|
||||
import base64
|
||||
|
||||
from flask import Flask
|
||||
|
||||
from .test_utils import CodeExecutorTestMixin
|
||||
|
||||
|
||||
class TestJinja2CodeExecutor(CodeExecutorTestMixin):
|
||||
"""Test class for Jinja2 code executor functionality."""
|
||||
|
||||
def test_jinja2(self, flask_app_with_containers: Flask):
|
||||
"""Test basic Jinja2 template execution with variable substitution"""
|
||||
code_executor, code_language = self.code_executor_imports
|
||||
_, jinja2_template_transformer = self.jinja2_imports
|
||||
|
||||
template = "Hello {{template}}"
|
||||
# Template must be base64 encoded to match the new safe embedding approach
|
||||
template_b64 = base64.b64encode(template.encode("utf-8")).decode("utf-8")
|
||||
inputs = base64.b64encode(b'{"template": "World"}').decode("utf-8")
|
||||
code = (
|
||||
jinja2_template_transformer.get_runner_script()
|
||||
.replace(jinja2_template_transformer._template_b64_placeholder, template_b64)
|
||||
.replace(jinja2_template_transformer._inputs_placeholder, inputs)
|
||||
)
|
||||
result = code_executor.execute_code(
|
||||
language=code_language.JINJA2, preload=jinja2_template_transformer.get_preload_script(), code=code
|
||||
)
|
||||
assert result == "<<RESULT>>Hello World<<RESULT>>\n"
|
||||
|
||||
def test_jinja2_with_code_template(self, flask_app_with_containers: Flask):
|
||||
"""Test Jinja2 workflow code template execution with inputs"""
|
||||
code_executor, code_language = self.code_executor_imports
|
||||
|
||||
result = code_executor.execute_workflow_code_template(
|
||||
language=code_language.JINJA2, code="Hello {{template}}", inputs={"template": "World"}
|
||||
)
|
||||
assert result == {"result": "Hello World"}
|
||||
|
||||
def test_jinja2_get_runner_script(self, flask_app_with_containers: Flask):
|
||||
"""Test Jinja2 template transformer runner script generation"""
|
||||
_, jinja2_template_transformer = self.jinja2_imports
|
||||
|
||||
runner_script = jinja2_template_transformer.get_runner_script()
|
||||
assert runner_script.count(jinja2_template_transformer._template_b64_placeholder) == 1
|
||||
assert runner_script.count(jinja2_template_transformer._inputs_placeholder) == 1
|
||||
assert runner_script.count(jinja2_template_transformer._result_tag) == 2
|
||||
|
||||
def test_jinja2_template_with_special_characters(self, flask_app_with_containers: Flask):
|
||||
"""
|
||||
Test that templates with special characters (quotes, newlines) render correctly.
|
||||
This is a regression test for issue #26818 where textarea pre-fill values
|
||||
containing special characters would break template rendering.
|
||||
"""
|
||||
code_executor, code_language = self.code_executor_imports
|
||||
|
||||
# Template with triple quotes, single quotes, double quotes, and newlines
|
||||
template = """<html>
|
||||
<body>
|
||||
<input value="{{ task.get('Task ID', '') }}"/>
|
||||
<textarea>{{ task.get('Issues', 'No issues reported') }}</textarea>
|
||||
<p>Status: "{{ status }}"</p>
|
||||
<pre>'''code block'''</pre>
|
||||
</body>
|
||||
</html>"""
|
||||
inputs = {"task": {"Task ID": "TASK-123", "Issues": "Line 1\nLine 2\nLine 3"}, "status": "completed"}
|
||||
|
||||
result = code_executor.execute_workflow_code_template(
|
||||
language=code_language.JINJA2, code=template, inputs=inputs
|
||||
)
|
||||
|
||||
# Verify the template rendered correctly with all special characters
|
||||
output = result["result"]
|
||||
assert 'value="TASK-123"' in output
|
||||
assert "<textarea>Line 1\nLine 2\nLine 3</textarea>" in output
|
||||
assert 'Status: "completed"' in output
|
||||
assert "'''code block'''" in output
|
||||
+49
@@ -0,0 +1,49 @@
|
||||
from textwrap import dedent
|
||||
|
||||
from flask import Flask
|
||||
|
||||
from .test_utils import CodeExecutorTestMixin
|
||||
|
||||
|
||||
class TestPython3CodeExecutor(CodeExecutorTestMixin):
|
||||
"""Test class for Python3 code executor functionality."""
|
||||
|
||||
def test_python3_plain(self, flask_app_with_containers: Flask):
|
||||
"""Test basic Python3 code execution with print output"""
|
||||
code_executor, code_language = self.code_executor_imports
|
||||
|
||||
code = 'print("Hello World")'
|
||||
result = code_executor.execute_code(language=code_language.PYTHON3, preload="", code=code)
|
||||
assert result == "Hello World\n"
|
||||
|
||||
def test_python3_json(self, flask_app_with_containers: Flask):
|
||||
"""Test Python3 code execution with JSON output"""
|
||||
code_executor, code_language = self.code_executor_imports
|
||||
|
||||
code = dedent("""
|
||||
import json
|
||||
print(json.dumps({'Hello': 'World'}))
|
||||
""")
|
||||
result = code_executor.execute_code(language=code_language.PYTHON3, preload="", code=code)
|
||||
assert result == '{"Hello": "World"}\n'
|
||||
|
||||
def test_python3_with_code_template(self, flask_app_with_containers: Flask):
|
||||
"""Test Python3 workflow code template execution with inputs"""
|
||||
code_executor, code_language = self.code_executor_imports
|
||||
python3_code_provider, _ = self.python3_imports
|
||||
|
||||
result = code_executor.execute_workflow_code_template(
|
||||
language=code_language.PYTHON3,
|
||||
code=python3_code_provider.get_default_code(),
|
||||
inputs={"arg1": "Hello", "arg2": "World"},
|
||||
)
|
||||
assert result == {"result": "HelloWorld"}
|
||||
|
||||
def test_python3_get_runner_script(self, flask_app_with_containers: Flask):
|
||||
"""Test Python3 template transformer runner script generation"""
|
||||
_, python3_template_transformer = self.python3_imports
|
||||
|
||||
runner_script = python3_template_transformer.get_runner_script()
|
||||
assert runner_script.count(python3_template_transformer._code_placeholder) == 1
|
||||
assert runner_script.count(python3_template_transformer._inputs_placeholder) == 1
|
||||
assert runner_script.count(python3_template_transformer._result_tag) == 2
|
||||
+115
@@ -0,0 +1,115 @@
|
||||
"""
|
||||
Test utilities for code executor integration tests.
|
||||
|
||||
This module provides lazy import functions to avoid module loading issues
|
||||
that occur when modules are imported before the flask_app_with_containers fixture
|
||||
has set up the proper environment variables and configuration.
|
||||
"""
|
||||
|
||||
import importlib
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
if TYPE_CHECKING:
|
||||
pass
|
||||
|
||||
|
||||
def force_reload_code_executor():
|
||||
"""
|
||||
Force reload the code_executor module to reinitialize code_execution_endpoint_url.
|
||||
|
||||
This function should be called after setting up environment variables
|
||||
to ensure the code_execution_endpoint_url is initialized with the correct value.
|
||||
"""
|
||||
try:
|
||||
import core.helper.code_executor.code_executor
|
||||
|
||||
importlib.reload(core.helper.code_executor.code_executor)
|
||||
except Exception as e:
|
||||
# Log the error but don't fail the test
|
||||
print(f"Warning: Failed to reload code_executor module: {e}")
|
||||
|
||||
|
||||
def get_code_executor_imports():
|
||||
"""
|
||||
Lazy import function for core CodeExecutor classes.
|
||||
|
||||
Returns:
|
||||
tuple: (CodeExecutor, CodeLanguage) classes
|
||||
"""
|
||||
from core.helper.code_executor.code_executor import CodeExecutor, CodeLanguage
|
||||
|
||||
return CodeExecutor, CodeLanguage
|
||||
|
||||
|
||||
def get_javascript_imports():
|
||||
"""
|
||||
Lazy import function for JavaScript-specific modules.
|
||||
|
||||
Returns:
|
||||
tuple: (JavascriptCodeProvider, NodeJsTemplateTransformer) classes
|
||||
"""
|
||||
from core.helper.code_executor.javascript.javascript_code_provider import JavascriptCodeProvider
|
||||
from core.helper.code_executor.javascript.javascript_transformer import NodeJsTemplateTransformer
|
||||
|
||||
return JavascriptCodeProvider, NodeJsTemplateTransformer
|
||||
|
||||
|
||||
def get_python3_imports():
|
||||
"""
|
||||
Lazy import function for Python3-specific modules.
|
||||
|
||||
Returns:
|
||||
tuple: (Python3CodeProvider, Python3TemplateTransformer) classes
|
||||
"""
|
||||
from core.helper.code_executor.python3.python3_code_provider import Python3CodeProvider
|
||||
from core.helper.code_executor.python3.python3_transformer import Python3TemplateTransformer
|
||||
|
||||
return Python3CodeProvider, Python3TemplateTransformer
|
||||
|
||||
|
||||
def get_jinja2_imports():
|
||||
"""
|
||||
Lazy import function for Jinja2-specific modules.
|
||||
|
||||
Returns:
|
||||
tuple: (None, Jinja2TemplateTransformer) classes
|
||||
"""
|
||||
from core.helper.code_executor.jinja2.jinja2_transformer import Jinja2TemplateTransformer
|
||||
|
||||
return None, Jinja2TemplateTransformer
|
||||
|
||||
|
||||
class CodeExecutorTestMixin:
|
||||
"""
|
||||
Mixin class providing lazy import methods for code executor tests.
|
||||
|
||||
This mixin helps avoid module loading issues by deferring imports
|
||||
until after the flask_app_with_containers fixture has set up the environment.
|
||||
"""
|
||||
|
||||
def setup_method(self):
|
||||
"""
|
||||
Setup method called before each test method.
|
||||
Force reload the code_executor module to ensure fresh initialization.
|
||||
"""
|
||||
force_reload_code_executor()
|
||||
|
||||
@property
|
||||
def code_executor_imports(self):
|
||||
"""Property to get CodeExecutor and CodeLanguage classes."""
|
||||
return get_code_executor_imports()
|
||||
|
||||
@property
|
||||
def javascript_imports(self):
|
||||
"""Property to get JavaScript-specific classes."""
|
||||
return get_javascript_imports()
|
||||
|
||||
@property
|
||||
def python3_imports(self):
|
||||
"""Property to get Python3-specific classes."""
|
||||
return get_python3_imports()
|
||||
|
||||
@property
|
||||
def jinja2_imports(self):
|
||||
"""Property to get Jinja2-specific classes."""
|
||||
return get_jinja2_imports()
|
||||
Reference in new issue
Block a user