mirror/cube-studio
2
0
Fork 0
mirror of https://github.com/tencentmusic/cube-studio.git synced 2024-11-27 05:33:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

镜像调试时支持使用用户参数配置的工作目录

Browse Source
This commit is contained in:
data-infra 2024-06-29 13:14:57 +08:00
parent 785b9d65e5
commit 4db7a28d01
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
myapp/views/view_task.py
View File

@ -110,7 +110,7 @@ class Task_ModelView_Base():
), ),
"volume_mount": StringField( "volume_mount": StringField(
label= _('挂载'), label= _('挂载'),
description= _('外部挂载，格式:$pvc_name1(pvc):/$container_path1,$hostpath1(hostpath):/$container_path2,4G(memory):/dev/shm,注意pvc会自动挂载对应目录下的个人rtx子目录'), description= _('外部挂载，格式:$pvc_name1(pvc):/$container_path1,$hostpath1(hostpath):/$container_path2,4G(memory):/dev/shm,注意pvc会自动挂载对应目录下的个人username子目录'),
widget=BS3TextFieldWidget(), widget=BS3TextFieldWidget(),
default='kubeflow-user-workspace(pvc):/mnt,kubeflow-archives(pvc):/archives' default='kubeflow-user-workspace(pvc):/mnt,kubeflow-archives(pvc):/archives'
), ),
@ -534,6 +534,7 @@ class Task_ModelView_Base():
k8s_client.create_debug_pod(namespace, k8s_client.create_debug_pod(namespace,
name=pod_name, name=pod_name,
labels={"pipeline": task.pipeline.name, 'task': task.name, 'user': g.user.username, 'run-id': run_id, 'pod-type': "task"}, labels={"pipeline": task.pipeline.name, 'task': task.name, 'user': g.user.username, 'run-id': run_id, 'pod-type': "task"},
annotations={'project':task.pipeline.project.name},
command=command, command=command,
args=new_args, args=new_args,
volume_mount=volume_mount, volume_mount=volume_mount,
@ -560,7 +561,7 @@ class Task_ModelView_Base():
# 逻辑节点不能进行调试 # 逻辑节点不能进行调试
if task.job_template.name == conf.get('LOGICAL_JOB'): if task.job_template.name == conf.get('LOGICAL_JOB'):
message = _('当前任务类型不允许进行调试') message = __('当前任务类型不允许进行调试')
flash(message, 'warning') flash(message, 'warning')
return self.response(400, **{"status": 1, "result": {}, "message": message}) return self.response(400, **{"status": 1, "result": {}, "message": message})
@ -568,7 +569,7 @@ class Task_ModelView_Base():
if task.job_template.name != conf.get('CUSTOMIZE_JOB'): if task.job_template.name != conf.get('CUSTOMIZE_JOB'):
# 模板创建者可以调试模板 # 模板创建者可以调试模板
if not g.user.is_admin() and task.job_template.created_by.username != g.user.username: if not g.user.is_admin() and task.job_template.created_by.username != g.user.username:
message = _('仅管理员或当前任务模板创建者，可启动debug模式') message = __('仅管理员或当前任务模板创建者，可启动debug模式')
flash(message, 'warning') flash(message, 'warning')
return self.response(400, **{"status": 1, "result": {}, "message": message}) return self.response(400, **{"status": 1, "result": {}, "message": message})
@ -601,6 +602,13 @@ class Task_ModelView_Base():
image = json.loads(task.args)['--image'] image = json.loads(task.args)['--image']
if json.loads(task.args).get('images',''): if json.loads(task.args).get('images',''):
image = json.loads(task.args)['images'] image = json.loads(task.args)['images']
working_dir = None
if json.loads(task.args).get('workdir', ''):
working_dir = json.loads(task.args)['workdir']
if json.loads(task.args).get('--workdir', ''):
working_dir = json.loads(task.args)['--workdir']
if json.loads(task.args).get('-working_dir', ''):
working_dir = json.loads(task.args)['--working_dir']
if not pod or pod['status'] != 'Running': if not pod or pod['status'] != 'Running':
run_id = "debug-" + str(uuid.uuid4().hex) run_id = "debug-" + str(uuid.uuid4().hex)
@ -613,7 +621,7 @@ class Task_ModelView_Base():
namespace=namespace, namespace=namespace,
pod_name=pod_name, pod_name=pod_name,
image=image, image=image,
working_dir=None, working_dir=working_dir,
command=command, command=command,
args=None args=None
) )
@ -821,7 +829,7 @@ class Task_ModelView_Base():
def clear_task(self, task_id): def clear_task(self, task_id):
task = db.session.query(Task).filter_by(id=task_id).first() task = db.session.query(Task).filter_by(id=task_id).first()
self.delete_task_run(task) self.delete_task_run(task)
flash(__("删除完成"), category='success') # flash(__("删除完成"), category='success')
# self.update_redirect() # self.update_redirect()
return redirect('/pipeline_modelview/api/web/%s' % str(task.pipeline.id)) return redirect('/pipeline_modelview/api/web/%s' % str(task.pipeline.id))