openbayes-cli 0.28.2__tar.gz → 0.28.3__tar.gz

{openbayes_cli-0.28.2 → openbayes_cli-0.28.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openbayes-cli
-Version: 0.28.2
+Version: 0.28.3
 Summary: A Python CLI for OpenBayes
 License: OpenBayes Public Source License
 Keywords: openbayes,cli,machine learning

{openbayes_cli-0.28.2 → openbayes_cli-0.28.3}/bayes/client/gear_client.py

@@ -1,7 +1,7 @@
 import json
 import sys
 from datetime import datetime
-from typing import List, Optional, Union, Tuple
+from typing import Any, List, Optional, Union, Tuple
 
 import requests
 from gql.transport.exceptions import TransportQueryError
@@ -61,6 +61,12 @@ class SourceCode(BaseModel):
     id: str
 
 
+class JobParameter(BaseModel):
+    name: str
+    value: Optional[Any] = None
+    isSecret: bool = False
+
+
 class Job(BaseModel):
     id: Optional[str] = None
     name: Optional[str] = None
@@ -77,6 +83,8 @@ class Job(BaseModel):
     dataBindings: Optional[List[Union[DataBinding, DatasetBinding, JobOutputBinding]]] = Field(default_factory=list)
     sourceCode: Optional[SourceCode] = None
     command: Optional[str] = None
+    rawCommand: Optional[str] = None
+    parameters: Optional[List[JobParameter]] = Field(default_factory=list)
     children: Optional[List['Job']] = Field(default_factory=list)
     batchParentId: Optional[str] = None
 
@@ -435,17 +443,24 @@ def get_job_by_id(client: BayesGQLClient, id, party_name):
           name
           id
         }
+        parameters {
+          name
+          value
+          isSecret
+        }
         ... on Task {
           sourceCode {
             id
           }
           command
+          rawCommand
         }
         ... on BatchTask {
           sourceCode {
             id
           }
           command
+          rawCommand
           size
           children {
             id

{openbayes_cli-0.28.2 → openbayes_cli-0.28.3}/bayes/client/job_run_client.py

@@ -1,9 +1,7 @@
 import json
 import sys
 from enum import Enum
-from typing import Tuple, Optional, List
-
-import pydantic
+from typing import Any, Dict, Tuple, Optional, List
 import typer
 from gql.transport.exceptions import TransportQueryError
 from pydantic import BaseModel, Field
@@ -53,6 +51,12 @@ class TagInput(BaseModel):
     name: Optional[str] = None
 
 
+class JobParameterInput(BaseModel):
+    name: str
+    value: Optional[Any] = None
+    isSecret: Optional[bool] = False
+
+
 class VariableInput(BaseModel):
     mode: str
     projectId: str
@@ -63,6 +67,7 @@ class VariableInput(BaseModel):
     newWorkspace: Optional[NewWorkspaceInput] = None
     newBatchWorkspace: Optional[BatchWorkSpace] = None
     dataBindings: Optional[List[DataBinding]] = None
+    parameters: Optional[List[JobParameterInput]] = None
     tagNames: Optional[List[TagInput]] = None
 
 
@@ -115,14 +120,30 @@ class CreateHypertuningInput(BaseModel):
     goal: str
     algorithm: str
     parameterSpecs: List[ParameterSpecInput]
+    parameters: Optional[List[JobParameterInput]] = None
 
 
-def build_command(command: str, parameters: dict) -> str:
+def build_job_parameters(parameters: Optional[Dict[str, Any]]) -> List[JobParameterInput]:
     if not parameters:
-        return command
-    else:
-        param_str = " ".join([f"--{k}={v}" for k, v in parameters.items()])
-        return f"{command} {param_str}"
+        return []
+
+    result: List[JobParameterInput] = []
+    for name, raw_value in parameters.items():
+        if isinstance(raw_value, dict) and (
+            "value" in raw_value or "isSecret" in raw_value or "is_secret" in raw_value
+        ):
+            result.append(
+                JobParameterInput(
+                    name=name,
+                    value=raw_value.get("value"),
+                    isSecret=bool(raw_value.get("is_secret", raw_value.get("isSecret", False))),
+                )
+            )
+            continue
+
+        result.append(JobParameterInput(name=name, value=raw_value, isSecret=False))
+
+    return result
 
 
 def get_graphql_binding_datasets(datasets: List[str]) -> List[DataBinding]:
@@ -164,6 +185,7 @@ def create(party_name, client: BayesGQLClient, mode, project_id, datasets: List[
         resource=resource
     )
     input_data.tagNames = [TagInput(name="BUSINESS_CHANNEL_ML")]
+    input_data.parameters = build_job_parameters(parameters)
 
     upper_mode = mode.upper()
     if upper_mode == DefaultJobModeTask or upper_mode == DefaultBatchJobModeTask:
@@ -171,14 +193,14 @@ def create(party_name, client: BayesGQLClient, mode, project_id, datasets: List[
             input_data.newBatchTask = BatchTask(
                 size=node_count,
                 code=code_id,
-                command=build_command(command, parameters)
+                command=command
             )
             input_data.mode = "BATCH_TASK"
         else:
             input_data.mode = "TASK"
             input_data.newTask = NewTaskInput(
                 code=code_id,
-                command=build_command(command, parameters)
+                command=command
             )
     elif upper_mode == DefaultJobModeWorkSpace or upper_mode == DefaultBatchJobModeWorkSpace:
         if node_count > 1:
@@ -289,11 +311,6 @@ class DataBindingInput(BaseModel):
     bindingAuth: Optional[BindingAuth] = None
 
 
-class JobParameterInput(BaseModel):
-    name: str
-    value: pydantic.Json
-
-
 class RestartWorkspaceInput(BaseModel):
     dataBindings: List[DataBindingInput]
     runtime: str
@@ -312,7 +329,8 @@ class RestartBatchWorkspaceInput(BaseModel):
 
 
 def create_hypertuning(party_name, client: BayesGQLClient, project_id, datasets, runtime, resource, code_id,
-                       command, hyper_tuning: HyperTuning):
+                       command, hyper_tuning: HyperTuning,
+                       parameters: Optional[Dict[str, Any]] = None):
     # 判断hyper_tuning的参数，不为空字符串和None
     if Utils.is_empty_or_none(hyper_tuning.hyperparameter_metric) or Utils.is_empty_or_none(
             hyper_tuning.algorithm) or Utils.is_empty_or_none(hyper_tuning.goal):
@@ -344,7 +362,8 @@ def create_hypertuning(party_name, client: BayesGQLClient, project_id, datasets,
         algorithm=hyper_tuning_algorithm,
         parameterSpecs=parameter_specs_input,
         sideMetrics=hyper_tuning.side_metrics,
-        parallelCount=max(DEFAULT_PARALLEL_COUNT, hyper_tuning.parallel_count)
+        parallelCount=max(DEFAULT_PARALLEL_COUNT, hyper_tuning.parallel_count),
+        parameters=build_job_parameters(parameters) or None,
     )
 
     if datasets and len(datasets) > 0:
@@ -436,20 +455,15 @@ def get_restart_job_graphql_dataBindings(dataBindings: List[str]) -> DataBinding
         if len(list_parts) == 2:
             name = list_parts[0]
             path = list_parts[1]
-
-            binding_type = "OUTPUT" if name.endswith("/output") else None
+            # bindingType 由服务器根据 name 是否以 "output" 结尾自动推导，无需客户端传递
             result.append(DataBindingInput(
                 name=name,
                 path=path,
                 bindingAuth=BindingAuthType.READ_ONLY,
-                bindingType=binding_type
             ))
         elif len(list_parts) == 3:
             name = list_parts[0]
             path = list_parts[1]
-
-            binding_type = "OUTPUT" if name.endswith("/output") else None
-
             auth = list_parts[2].upper()
             if auth == "RO" or auth == "READ_ONLY":
                 result.append(DataBindingInput(
@@ -488,7 +502,7 @@ def restart_workspace(client: BayesGQLClient, party_name, jid, runtime, resource
         dataBindings=get_restart_job_graphql_dataBindings(dataBindings) if dataBindings else []
     )
 
-    variables = {"userId": party_name, "jobId": jid, "input": input_data.model_dump()}
+    variables = {"userId": party_name, "jobId": jid, "input": input_data.model_dump(exclude_none=True)}
 
     try:
         response = client.exec(query, variables)
@@ -538,7 +552,7 @@ def restart_batch_workspace(client: BayesGQLClient, party_name, jid, runtime, re
         dataBindings=get_restart_job_graphql_dataBindings(dataBindings) if dataBindings else []
     )
 
-    variables = {"userId": party_name, "jobId": jid, "input": input_data.model_dump()}
+    variables = {"userId": party_name, "jobId": jid, "input": input_data.model_dump(exclude_none=True)}
 
     try:
         response = client.exec(query, variables)

{openbayes_cli-0.28.2 → openbayes_cli-0.28.3}/bayes/commands/gear.py

@@ -10,7 +10,7 @@ from bayes.model.file.openbayes_yaml import OpenBayesYamlSettings, FILE_NAME, DE
 from bayes.model.file.settings import BayesEnvConfig, BayesSettings
 from bayes.model.party import ModeEnum
 from bayes.usercases import auth_usecase, gear_usecase, open_usecase, resource_usecase, runtime_usecase, \
-    gear_logs_usecase, gear_download_usecese, gear_run_usecase, minio_storage_usecase
+    gear_logs_usecase, gear_download_usecese, gear_run_usecase, minio_storage_usecase, secret_parameter_usecase
 from bayes.utils import Utils
 
 app = typer.Typer()
@@ -218,22 +218,31 @@ def run(
         print("准备创建 task，执行命令不能为空")
         raise typer.Exit(code=1)
 
+    # 在上传源码前校验并解析 secret 参数
+    # source: env 写法会在此读取本地环境变量；若环境变量缺失则在此 fail-fast，不浪费上传时间
+    raw_parameters = yaml_settings.configuration.parameters if yaml_settings.configuration else {}
+    try:
+        resolved_parameters = secret_parameter_usecase.resolve_secret_parameters(raw_parameters)
+    except ValueError as e:
+        print(f"参数校验失败：{e}")
+        raise typer.Exit(code=1)
+
     # 根据模式设置 source_code_id
     if mode == ModeEnum.task or mode == ModeEnum.hypertuning:
         print("正在上传源代码...")
         source_code_id = minio_storage_usecase.upload_source_code(party_name, str(current_path), "TEMPORARY")
-        # source_code_id = minio_storage_usecase.upload_source_code(party_name, "/Users/haohao/test-cli2", "TEMPORARY")
         if source_code_id is None:
             print("源代码上传失败，无法继续创建容器")
             raise typer.Exit(code=1)
     else:
         # workspace 模式下设置为空字符串
         source_code_id = ""
-    
+
     print("正在向服务器请求创建容器...")
 
     frontend_value, job_id, err = gear_run_usecase.create(party_name, current_path, "", mode, yaml_settings.configuration,
-                                                    data, node, env, resource, source_code_id, task_command, message)
+                                                    data, node, env, resource, source_code_id, task_command, message,
+                                                    parameters_override=resolved_parameters)
 
     if err is not None and frontend_value == "":
         print(f"create err:{err}")
@@ -309,14 +318,12 @@ def restart(ctx: typer.Context,
             data: List[str] = typer.Option([], "-d", "--data", help="绑定数据"),
             env: str = typer.Option("", "-e", "--env", help="选择镜像"),
             resource: str = typer.Option("", "-r", "--resource", help="选择算力"),
-            follow: bool = typer.Option(False, "-f", "--follow", help="跟踪容器运行；task 模式会自动打印实时日志直到任务结束，workspace 进入运行后退出"),
+            follow: bool = typer.Option(False, "-f", "--follow", help="跟踪容器运行；workspace 进入运行后退出"),
             message: str = typer.Option("", "-m", "--message", help="执行描述"),
-            open_browser: bool = typer.Option(False, "-o", "--open", help="成功创建容器后，在浏览器打开"),
-            node: int = typer.Option(-1, "-n", "--node", help="指定运行节点数量"),
-            extra_args: Optional[List[str]] = typer.Argument(None, help="task command 额外参数")
+            open_browser: bool = typer.Option(False, "-o", "--open", help="成功重启后，在浏览器打开"),
             ):
     """
-    继续执行容器
+    重启 workspace 容器（仅支持 workspace / batch_workspace）
 
     用法：
         bayes gear restart [任务编码] [选项]
@@ -327,16 +334,20 @@ def restart(ctx: typer.Context,
 
         -e, --env string        选择镜像
 
-        -f, --follow            [可选] 跟踪容器运行；task 模式会自动打印实时日志直到任务结束，workspace 进入运行后退出
+        -f, --follow            [可选] 跟踪容器运行；workspace 进入运行后退出
 
         -h, --help              查看 restart 的帮助
 
         -m, --message string    执行描述
 
-        -o, --open              [可选] 继续执行容器后，在浏览器打开
+        -o, --open              [可选] 重启后，在浏览器打开
 
         -r, --resource string   选择算力
 
+    注意：
+        restart 仅支持 workspace / batch_workspace 类型。
+        如需重新执行 task，请在项目目录使用 `bayes gear run task`。
+
     """
     # 检查用户是否已登录
     login = auth_usecase.check_login()
@@ -360,17 +371,17 @@ def restart(ctx: typer.Context,
         print("请输入正确的任务编码")
         raise typer.Exit(code=1)
 
+    if not job.is_workspace():
+        print("错误：restart 仅支持 workspace / batch_workspace，不支持 task / batch_task。")
+        print("如需重新执行 task，请在项目目录使用 `bayes gear run task`。")
+        raise typer.Exit(code=1)
+
     project_name = job.project.name
     frontend_url = job.get_link_value("frontend")
     open_url = Utils.replace_last_id(frontend_url, job.id)
 
-    task_command = ""
-    if extra_args:
-        task_command = " ".join(extra_args)
-
     try:
-        new_frontend_value, job_id = gear_run_usecase.restart(id, party_name, data, env, resource, task_command, node,
-                                                              message)
+        new_frontend_value, job_id = gear_run_usecase.restart(id, party_name, data, env, resource)
     except Exception as e:
         print(f"e:{e}")
         print("重启失败")
@@ -378,22 +389,19 @@ def restart(ctx: typer.Context,
             print(f"打开网页 {open_url} 可查看容器 {project_name} 的详细信息")
         raise typer.Exit(code=1)
 
-    print("容器继续执行...")
-    if new_frontend_value is not None:
-        new_open_url = Utils.replace_last_id(new_frontend_value, job_id)
+    print("容器重启中...")
+    new_open_url = Utils.replace_last_id(new_frontend_value, job_id) if new_frontend_value else None
+    if new_open_url:
         print(f"打开网页 {new_open_url} 可查看容器 {project_name} 的详细信息")
 
     if message != "":
         gear_usecase.update_job_description(party_name, job_id, message)
 
-    if open_browser:
+    if open_browser and new_open_url:
         open_usecase.open_browser(new_open_url)
 
     if follow:
-        if job.is_workspace():
-            gear_usecase.follow_status(job_id, party_name, stop_with_running=True)
-        else:
-            gear_usecase.follow_logs_until_finished(job_id, party_name)
+        gear_usecase.follow_status(job_id, party_name, stop_with_running=True)
         gear_usecase.print_last_status(job_id, party_name)
 
 

{openbayes_cli-0.28.2 → openbayes_cli-0.28.3}/bayes/commands/hpc.py

@@ -10,7 +10,7 @@ from bayes.model.file.openbayes_yaml import OpenBayesYamlSettings, FILE_NAME, DE
 from bayes.model.file.settings import BayesEnvConfig, BayesSettings
 from bayes.model.party import ModeEnum
 from bayes.usercases import auth_usecase, gear_usecase, open_usecase, resource_usecase, runtime_usecase, \
-    gear_logs_usecase, gear_download_usecese, gear_run_usecase, minio_storage_usecase
+    gear_logs_usecase, gear_download_usecese, gear_run_usecase, minio_storage_usecase, secret_parameter_usecase
 from bayes.utils import Utils
 
 app = typer.Typer()
@@ -219,6 +219,15 @@ def run(
         print("准备创建 task，执行命令不能为空")
         raise typer.Exit(code=1)
 
+    # 在上传源码前校验并解析 secret 参数
+    # source: env 写法会在此读取本地环境变量；若环境变量缺失则在此 fail-fast，不浪费上传时间
+    raw_parameters = yaml_settings.configuration.parameters if yaml_settings.configuration else {}
+    try:
+        resolved_parameters = secret_parameter_usecase.resolve_secret_parameters(raw_parameters)
+    except ValueError as e:
+        print(f"参数校验失败：{e}")
+        raise typer.Exit(code=1)
+
     # 根据模式设置 source_code_id
     if mode == ModeEnum.task or mode == ModeEnum.hypertuning:
         print("正在上传源代码...")
@@ -236,7 +245,8 @@ def run(
     frontend_value, job_id, err = gear_run_usecase.create(party_name, current_path, "", mode,
                                                           yaml_settings.configuration,
                                                           data, node, env, resource, source_code_id, task_command,
-                                                          message)
+                                                          message,
+                                                          parameters_override=resolved_parameters)
 
     if err is not None and frontend_value == "":
         print(f"create err:{err}")
@@ -310,14 +320,12 @@ def restart(ctx: typer.Context,
             data: List[str] = typer.Option([], "-d", "--data", help="绑定数据"),
             env: str = typer.Option("", "-e", "--env", help="选择镜像"),
             resource: str = typer.Option("", "-r", "--resource", help="选择算力"),
-            follow: bool = typer.Option(False, "-f", "--follow", help="跟踪容器运行；task 模式会自动打印实时日志直到任务结束，workspace 进入运行后退出"),
+            follow: bool = typer.Option(False, "-f", "--follow", help="跟踪容器运行；workspace 进入运行后退出"),
             message: str = typer.Option("", "-m", "--message", help="执行描述"),
-            open_browser: bool = typer.Option(False, "-o", "--open", help="成功创建容器后，在浏览器打开"),
-            node: int = typer.Option(-1, "-n", "--node", help="指定运行节点数量"),
-            extra_args: Optional[List[str]] = typer.Argument(None, help="task command 额外参数")
+            open_browser: bool = typer.Option(False, "-o", "--open", help="成功重启后，在浏览器打开"),
             ):
     """
-    继续执行容器
+    重启 workspace 容器（仅支持 workspace / batch_workspace）
 
     用法：
         bayes hpc restart [任务编码] [选项]
@@ -328,16 +336,20 @@ def restart(ctx: typer.Context,
 
         -e, --env string        选择镜像
 
-        -f, --follow            [可选] 跟踪容器运行；task 模式会自动打印实时日志直到任务结束，workspace 进入运行后退出
+        -f, --follow            [可选] 跟踪容器运行；workspace 进入运行后退出
 
         -h, --help              查看 restart 的帮助
 
         -m, --message string    执行描述
 
-        -o, --open              [可选] 继续执行容器后，在浏览器打开
+        -o, --open              [可选] 重启后，在浏览器打开
 
         -r, --resource string   选择算力
 
+    注意：
+        restart 仅支持 workspace / batch_workspace 类型。
+        如需重新执行 task，请在项目目录使用 `bayes hpc run task`。
+
     """
     # 检查用户是否已登录
     login = auth_usecase.check_login()
@@ -361,17 +373,17 @@ def restart(ctx: typer.Context,
         print("请输入正确的任务编码")
         raise typer.Exit(code=1)
 
+    if not job.is_workspace():
+        print("错误：restart 仅支持 workspace / batch_workspace，不支持 task / batch_task。")
+        print("如需重新执行 task，请在项目目录使用 `bayes hpc run task`。")
+        raise typer.Exit(code=1)
+
     project_name = job.project.name
     frontend_url = job.get_link_value("frontend")
     open_url = Utils.replace_last_id(frontend_url, job.id)
 
-    task_command = ""
-    if extra_args:
-        task_command = " ".join(extra_args)
-
     try:
-        new_frontend_value, job_id = gear_run_usecase.restart(id, party_name, data, env, resource, task_command, node,
-                                                              message)
+        new_frontend_value, job_id = gear_run_usecase.restart(id, party_name, data, env, resource)
     except Exception as e:
         print(f"e:{e}")
         print("重启失败")
@@ -379,22 +391,19 @@ def restart(ctx: typer.Context,
             print(f"打开网页 {open_url} 可查看容器 {project_name} 的详细信息")
         raise typer.Exit(code=1)
 
-    print("容器继续执行...")
-    if new_frontend_value is not None:
-        new_open_url = Utils.replace_last_id(new_frontend_value, job_id)
+    print("容器重启中...")
+    new_open_url = Utils.replace_last_id(new_frontend_value, job_id) if new_frontend_value else None
+    if new_open_url:
         print(f"打开网页 {new_open_url} 可查看容器 {project_name} 的详细信息")
 
     if message != "":
         gear_usecase.update_job_description(party_name, job_id, message)
 
-    if open_browser:
+    if open_browser and new_open_url:
         open_usecase.open_browser(new_open_url)
 
     if follow:
-        if job.is_workspace():
-            gear_usecase.follow_status(job_id, party_name, stop_with_running=True)
-        else:
-            gear_usecase.follow_logs_until_finished(job_id, party_name)
+        gear_usecase.follow_status(job_id, party_name, stop_with_running=True)
         gear_usecase.print_last_status(job_id, party_name)
 
 

{openbayes_cli-0.28.2 → openbayes_cli-0.28.3}/bayes/templates/openbayes_zh-Hans.yaml

@@ -43,15 +43,22 @@ command: ""
 node: 1
 
 ## parameters
-#  支持 key / value 形式的参数，该参数会在容器执行时生成 openbayes_params.json 并补充在 command 参数后面
-#  样例如下：
+#  支持 key / value 形式的参数，会通过 createJob / restartJob 的 GraphQL `parameters` 字段提交给服务端。
+#  对于 task，非敏感参数会由服务端追加到 command 后面；敏感参数只会作为环境变量注入，不会出现在 command 中。
+#
+#  secret 参数支持通过本地环境变量注入，避免明文出现在文件里：
 #
 #    parameters:
-#      input: /input0
 #      epochs: 5
+#      HF_TOKEN:
+#        is_secret: true
+#        source: env        # 从本地环境变量读取
+#        env: HF_TOKEN      # 对应的环境变量名
+#
+#    运行前先在终端执行：export HF_TOKEN=hf_xxx
+#    CLI 会在上传源码前读取该变量，若变量不存在则立即报错退出。
 #
-#    在执行时会生成一个内容为 {"input": "/input0", "epochs": 5} 的 openbayes_params.json，
-#    并且会在执行命令后面追加 `--input=/input0 --epochs=5`
+#  workspace / batch workspace 重启时，CLI 会自动保留已有敏感参数。
 #
 parameters: {}
 

{openbayes_cli-0.28.2 → openbayes_cli-0.28.3}/bayes/usercases/gear_run_usecase.py

@@ -1,20 +1,32 @@
 import logging
 from typing import List, Tuple, Dict, Any, Optional
 
-import typer
-
 from bayes.client import job_run_client, gear_client
 from bayes.client.base import BayesGQLClient
 from bayes.error import Error
 from bayes.model.file.openbayes_yaml import OpenBayesYaml
 from bayes.model.file.settings import BayesEnvConfig, BayesSettings, TypeHyperTuning, DefaultJobModeWorkSpace, \
-    DefaultBatchJobModeWorkSpace, DefaultJobModeTask, DefaultBatchJobModeTask
+    DefaultBatchJobModeWorkSpace
 from bayes.model.party import ModeEnum
 from bayes.usercases import gear_usecase
 
 
+def _build_restart_parameters(job: gear_client.Job) -> List[job_run_client.JobParameterInput]:
+    result: List[job_run_client.JobParameterInput] = []
+    for parameter in job.parameters or []:
+        result.append(
+            job_run_client.JobParameterInput(
+                name=parameter.name,
+                value=None if parameter.isSecret else parameter.value,
+                isSecret=parameter.isSecret,
+            )
+        )
+    return result
+
+
 def create(party_name, directory, project_id, mode, yaml: OpenBayesYaml, datasets: List[str], node_count: int, runtime,
-           resource, code_id, command, message) -> Tuple[str, str, Exception]:
+           resource, code_id, command, message,
+           parameters_override: Optional[Dict[str, Any]] = None) -> Tuple[str, str, Exception]:
     if not project_id:
         project_id, _, project_name, err = gear_usecase.read(directory)
         if err:
@@ -40,7 +52,9 @@ def create(party_name, directory, project_id, mode, yaml: OpenBayesYaml, dataset
             node_count = 1
 
     parameters: Dict[str, Any] = {}
-    if yaml is not None and yaml.parameters is not None:
+    if parameters_override is not None:
+        parameters = parameters_override
+    elif yaml is not None and yaml.parameters is not None:
         parameters = yaml.parameters
 
     if code_id is None and (mode == ModeEnum.task or mode == ModeEnum.hypertuning):
@@ -56,7 +70,8 @@ def create(party_name, directory, project_id, mode, yaml: OpenBayesYaml, dataset
         try:
             hypertuning = job_run_client.create_hypertuning(party_name, gql_client, project_id, datasets, runtime,
                                                             resource,
-                                                            code_id, command, yaml.hyper_tuning)
+                                                            code_id, command, yaml.hyper_tuning,
+                                                            parameters=parameters)
             frontend_value = hypertuning.get_link_value("frontend")
             job_id = hypertuning.id
         except Exception as e:
@@ -79,13 +94,13 @@ def create(party_name, directory, project_id, mode, yaml: OpenBayesYaml, dataset
     return frontend_value, job_id, None
 
 
-def restart(jid, party_name, data, runtime, resource, task_command, nodeCount, message):
+def restart(jid, party_name, data, runtime, resource) -> Tuple[str, str]:
     default_env: Optional[BayesEnvConfig] = BayesSettings().default_env
     gql_client = BayesGQLClient(default_env.graphQL, default_env.token)
 
     job = gear_client.get_job_by_id(gql_client, jid, party_name)
     if job is None:
-        return None, f"job {jid} not found"
+        raise Error(f"job {jid} not found")
 
     mode = job.mode
 
@@ -97,30 +112,20 @@ def restart(jid, party_name, data, runtime, resource, task_command, nodeCount, m
     if resource == "":
         resource = job.resource.name
 
+    restart_parameters = _build_restart_parameters(job)
     frontend_value = ""
     job_id = ""
     if mode == DefaultJobModeWorkSpace:
-        job = job_run_client.restart_workspace(gql_client, party_name, jid, runtime, resource, data, [])
+        job = job_run_client.restart_workspace(
+            gql_client, party_name, jid, runtime, resource, data, restart_parameters
+        )
         frontend_value = job.get_link_value("frontend")
         job_id = job.id
     elif mode == DefaultBatchJobModeWorkSpace:
-        job = job_run_client.restart_batch_workspace(gql_client, party_name, jid, runtime, resource, data, [])
+        job = job_run_client.restart_batch_workspace(
+            gql_client, party_name, jid, runtime, resource, data, restart_parameters
+        )
         frontend_value = job.get_link_value("frontend")
         job_id = job.id
-    #     task 或者 batch task create
-    elif mode == DefaultJobModeTask or DefaultBatchJobModeTask:
-        if task_command == "" or task_command is None:
-            if job.command == "" or job.command is None:
-                print("task command 不能为空")
-                raise typer.Exit(code=1)
-            else:
-                task_command = job.command
-
-        if nodeCount == -1:
-            nodeCount = job.children_count()
-
-        frontend_value, job_id, _ = create(party_name, "", job.project.id, mode, None, data, nodeCount, runtime, resource, job.sourceCode.id, task_command, message)
 
     return frontend_value, job_id
-
-

openbayes_cli-0.28.3/bayes/usercases/secret_parameter_usecase.py

@@ -0,0 +1,110 @@
+import os
+from typing import Dict, Any, Optional
+
+import typer
+
+
+def resolve_secret_parameters(parameters: Optional[Dict[str, Any]]) -> Dict[str, Any]:
+    """
+    在源码上传前解析 openbayes.yaml 的 parameters 字段。
+
+    处理两类 secret 写法：
+    - 推荐写法：is_secret: true + source: env + env: VAR_NAME
+        → 从本地环境变量读取真实值，替换成 {value: <真实值>, is_secret: true}
+        → 若环境变量不存在或为空，立即抛出 ValueError（调用方应在上传前 fail-fast）
+    - 兼容写法：is_secret: true + value: <明文>
+        → 打印迁移提示，只含参数名，不含值，放行继续
+    - 非法组合（source + value 同时存在、非 secret 参数带 source 等）
+        → 立即抛出 ValueError
+
+    非 secret 的标量参数不做任何处理，直接透传。
+
+    Args:
+        parameters: openbayes.yaml 中解析出的 parameters 字典，可为 None
+
+    Returns:
+        解析后的参数字典，source: env 已替换为真实值
+
+    Raises:
+        ValueError: YAML 配置非法，或环境变量缺失/为空
+    """
+    if not parameters:
+        return parameters or {}
+
+    resolved: Dict[str, Any] = {}
+
+    for name, raw_value in parameters.items():
+        # 非 dict 的标量参数（普通非敏感参数），直接透传
+        if not isinstance(raw_value, dict):
+            resolved[name] = raw_value
+            continue
+
+        is_secret = bool(raw_value.get("is_secret", raw_value.get("isSecret", False)))
+        source = raw_value.get("source")
+        value = raw_value.get("value")
+        env_var_name = raw_value.get("env")
+
+        # 校验：source 只允许出现在 is_secret=true 的参数上
+        if source is not None and not is_secret:
+            raise ValueError(
+                f"参数 '{name}' 配置了 source 但 is_secret 不为 true，这是非法配置，"
+                f"请将 is_secret 设为 true 或移除 source 字段"
+            )
+
+        # 校验：source 与 value 互斥
+        if source is not None and value is not None:
+            raise ValueError(
+                f"参数 '{name}' 不能同时配置 source 和 value，"
+                f"推荐使用 source: env，移除 value 字段"
+            )
+
+        # 校验：v1 仅支持 source: env
+        if source is not None and source != "env":
+            raise ValueError(
+                f"参数 '{name}' 的 source 值 '{source}' 不受支持，目前只支持 source: env"
+            )
+
+        if source == "env":
+            # 推荐写法：从环境变量读取真实值
+            if not env_var_name:
+                raise ValueError(
+                    f"参数 '{name}' 配置了 source: env 但缺少 env 字段，"
+                    f"请补充 env: <环境变量名>"
+                )
+
+            actual_value = os.environ.get(env_var_name)
+            # 环境变量不存在或为空字符串，均视为失败
+            if not actual_value:
+                raise ValueError(
+                    f"参数 '{name}' 需要环境变量 '{env_var_name}'，但该变量不存在或为空，"
+                    f"请先执行 export {env_var_name}=<your_value>"
+                )
+
+            resolved[name] = {
+                "value": actual_value,
+                "is_secret": True,
+            }
+
+        elif is_secret and value is not None:
+            # 兼容旧写法：明文 secret，打印迁移提示，放行
+            sep = typer.style("─" * 52, fg=typer.colors.YELLOW)
+            title = typer.style(
+                f"⚠  警告：参数 '{name}' 的 secret 值以明文写入了 openbayes.yaml",
+                fg=typer.colors.YELLOW,
+                bold=True,
+            )
+            typer.echo(f"\n{sep}", err=True)
+            typer.echo(title, err=True)
+            typer.echo("   该文件可能随源码一起上传至服务端，建议改用环境变量方式：\n", err=True)
+            typer.echo(f"   {name}:", err=True)
+            typer.echo(f"     is_secret: true", err=True)
+            typer.echo(f"     source: env", err=True)
+            typer.echo(f"     env: {name}", err=True)
+            typer.echo(f"{sep}\n", err=True)
+            resolved[name] = raw_value
+
+        else:
+            # 其他 dict 形式参数（如只有 is_secret: true 但没有 value/source），直接透传
+            resolved[name] = raw_value
+
+    return resolved

{openbayes_cli-0.28.2 → openbayes_cli-0.28.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openbayes-cli"
-version = "0.28.2"
+version = "0.28.3"
 description = "A Python CLI for OpenBayes"
 authors = ["OpenBayes <dev@openbayes.com>"]
 readme = "README.md"