This is an automated email from the ASF dual-hosted git repository.
zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new e8098ac3b8 [Fix-15961] [UI] Rename pythonCommand to pythonLauncher in
pytorch task. (#16495)
e8098ac3b8 is described below
commit e8098ac3b8a5bec9f699daf82e41139ce8408712
Author: cncws <1031616...@qq.com>
AuthorDate: Sun Aug 25 08:38:00 2024 +0800
[Fix-15961] [UI] Rename pythonCommand to pythonLauncher in pytorch task.
(#16495)
---
dolphinscheduler-ui/src/locales/en_US/project.ts | 4 ++--
dolphinscheduler-ui/src/locales/zh_CN/project.ts | 4 ++--
.../projects/task/components/node/fields/use-pytorch.ts | 12 ++++++------
.../src/views/projects/task/components/node/format-data.ts | 2 +-
.../views/projects/task/components/node/tasks/use-pytorch.ts | 2 +-
.../src/views/projects/task/components/node/types.ts | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dolphinscheduler-ui/src/locales/en_US/project.ts
b/dolphinscheduler-ui/src/locales/en_US/project.ts
index a04c9084f2..c80beb0e57 100644
--- a/dolphinscheduler-ui/src/locales/en_US/project.ts
+++ b/dolphinscheduler-ui/src/locales/en_US/project.ts
@@ -875,8 +875,8 @@ export default {
pytorch_other_params: 'Show More Configurations',
pytorch_python_path: 'Project Path',
pytorch_is_create_environment: 'Create An Environment Or Not',
- pytorch_python_command: 'Python Command Path',
- pytorch_python_command_tips: 'If empty，will be set $PYTHON_LAUNCHER',
+ pytorch_python_launcher: 'Python Executable Path',
+ pytorch_python_launcher_tips: 'If empty，will be set $PYTHON_LAUNCHER',
pytorch_python_env_tool: 'Python Environment Manager Tool',
pytorch_requirements: 'Requirement File',
pytorch_conda_python_version: 'Python Version',
diff --git a/dolphinscheduler-ui/src/locales/zh_CN/project.ts
b/dolphinscheduler-ui/src/locales/zh_CN/project.ts
index eee2045446..434dbec3a3 100644
--- a/dolphinscheduler-ui/src/locales/zh_CN/project.ts
+++ b/dolphinscheduler-ui/src/locales/zh_CN/project.ts
@@ -847,8 +847,8 @@ export default {
pytorch_other_params: '展开更多配置',
pytorch_python_path: 'python项目地址',
pytorch_is_create_environment: '是否创建新环境',
- pytorch_python_command: 'python命令路径',
- pytorch_python_command_tips: '若为空，则使用$PYTHON_LAUNCHER',
+ pytorch_python_launcher: 'python解释器路径',
+ pytorch_python_launcher_tips: '若为空，则使用$PYTHON_LAUNCHER',
pytorch_python_env_tool: 'python环境管理工具',
pytorch_requirements: '依赖文件',
pytorch_conda_python_version: 'python版本',
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-pytorch.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-pytorch.ts
index 7eeebab581..c0fda45a27 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-pytorch.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-pytorch.ts
@@ -26,7 +26,7 @@ export function usePytorch(model: { [field: string]: any }):
IJsonItem[] {
const isCreateEnvironmentSpan = ref(0)
const pythonPathSpan = ref(0)
const pythonEnvToolSpan = ref(0)
- const pythonCommandSpan = ref(0)
+ const pythonLauncherSpan = ref(0)
const requirementsSpan = ref(0)
const condaPythonVersionSpan = ref(0)
@@ -46,7 +46,7 @@ export function usePytorch(model: { [field: string]: any }):
IJsonItem[] {
isCreateEnvironmentSpan.value = model.otherParams ? 12 : 0
pythonPathSpan.value = model.otherParams ? 24 : 0
pythonEnvToolSpan.value = model.showCreateEnvironment ? 12 : 0
- pythonCommandSpan.value =
+ pythonLauncherSpan.value =
~model.showCreateEnvironment & model.otherParams ? 12 : 0
requirementsSpan.value = model.showCreateEnvironment ? 24 : 0
condaPythonVersionSpan.value = model.showCreateConda ? 24 : 0
@@ -93,11 +93,11 @@ export function usePytorch(model: { [field: string]: any
}): IJsonItem[] {
},
{
type: 'input',
- field: 'pythonCommand',
- name: t('project.node.pytorch_python_command'),
- span: pythonCommandSpan,
+ field: 'pythonLauncher',
+ name: t('project.node.pytorch_python_launcher'),
+ span: pythonLauncherSpan,
props: {
- placeholder: t('project.node.pytorch_python_command_tips')
+ placeholder: t('project.node.pytorch_python_launcher_tips')
}
},
{
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts
index 56dc9b1dfc..e803ca5160 100644
--- a/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts
+++ b/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts
@@ -420,7 +420,7 @@ export function formatParams(data: INodeData): {
taskParams.scriptParams = data.scriptParams
taskParams.pythonPath = data.pythonPath
taskParams.isCreateEnvironment = data.isCreateEnvironment
- taskParams.pythonCommand = data.pythonCommand
+ taskParams.pythonLauncher = data.pythonLauncher
taskParams.pythonEnvTool = data.pythonEnvTool
taskParams.requirements = data.requirements
taskParams.condaPythonVersion = data.condaPythonVersion
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-pytorch.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-pytorch.ts
index ca0776aa38..2c005700f6 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-pytorch.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-pytorch.ts
@@ -45,7 +45,7 @@ export function usePytorch({
timeout: 30,
timeoutNotifyStrategy: ['WARN'],
pythonEnvTool: 'conda',
- pythonCommand: '${PYTHON_LAUNCHER}',
+ pythonLauncher: '${PYTHON_LAUNCHER}',
condaPythonVersion: '3.7',
requirements: 'requirements.txt',
pythonPath: '.'
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/types.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/types.ts
index 95991a7799..a6b9bda8b4 100644
--- a/dolphinscheduler-ui/src/views/projects/task/components/node/types.ts
+++ b/dolphinscheduler-ui/src/views/projects/task/components/node/types.ts
@@ -433,7 +433,7 @@ interface ITaskParams {
scriptParams?: string
pythonPath?: string
isCreateEnvironment?: string
- pythonCommand?: string
+ pythonLauncher?: string
pythonEnvTool?: string
requirements?: string
condaPythonVersion?: string
