openbayes-cli 0.26.0__tar.gz → 0.26.1__tar.gz

{openbayes_cli-0.26.0 → openbayes_cli-0.26.1}/PKG-INFO

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

{openbayes_cli-0.26.0 → openbayes_cli-0.26.1}/bayes/client/gear_client.py

@@ -106,6 +106,11 @@ class Job(BaseModel):
     def is_finished(self) -> bool:
         return self.status in {"SUCCEEDED", "CANCELLED", "FAILED"}
 
+    def is_workspace(self) -> bool:
+        # API 返回的 mode 形如 "WORKSPACE" / "BATCH_WORKSPACE" / "TASK" / "BATCH_TASK"。
+        # workspace 进入 RUNNING 后会持续保持运行，是 follow 的合理终点；其它模式会跑完后进入 finished。
+        return bool(self.mode) and "WORKSPACE" in self.mode.upper()
+
     def get_job_dataBindings(self) -> List[str]:
         datasets = []
         for binding in self.dataBindings or []:

{openbayes_cli-0.26.0 → openbayes_cli-0.26.1}/bayes/commands/gear.py

@@ -124,7 +124,7 @@ def run(
         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="运行容器的状态跟踪"),
+        follow: bool = typer.Option(False, "-f", "--follow", help="跟踪容器运行；task 模式会自动打印实时日志直到任务结束，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="指定运行节点数量"),
@@ -142,7 +142,7 @@ def run(
 
         -e, --env string        选择镜像
 
-        -f, --follow            [可选] 运行容器的状态跟踪
+        -f, --follow            [可选] 跟踪容器运行；task 模式会自动打印实时日志直到任务结束，workspace 进入运行后退出
 
         -h, --help              查看 run 的帮助
 
@@ -249,7 +249,12 @@ def run(
     gear_settings.update_jid(str(current_path), job_id)
 
     if follow and mode != ModeEnum.hypertuning:
-        gear_usecase.follow_status(job_id, party_name, True)
+        if mode == ModeEnum.workspace:
+            # workspace 进入 RUNNING 即视为就绪
+            gear_usecase.follow_status(job_id, party_name, stop_with_running=True)
+        else:
+            # task 等到 RUNNING 后切换为日志流，跟随直到任务结束
+            gear_usecase.follow_logs_until_finished(job_id, party_name)
         gear_usecase.print_last_status(job_id, party_name)
 
 
@@ -304,7 +309,7 @@ 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="运行容器的状态跟踪"),
+            follow: bool = typer.Option(False, "-f", "--follow", help="跟踪容器运行；task 模式会自动打印实时日志直到任务结束，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="指定运行节点数量"),
@@ -322,7 +327,7 @@ def restart(ctx: typer.Context,
 
         -e, --env string        选择镜像
 
-        -f, --follow            [可选] 继续执行容器的状态跟踪
+        -f, --follow            [可选] 跟踪容器运行；task 模式会自动打印实时日志直到任务结束，workspace 进入运行后退出
 
         -h, --help              查看 restart 的帮助
 
@@ -385,7 +390,10 @@ def restart(ctx: typer.Context,
         open_usecase.open_browser(new_open_url)
 
     if follow:
-        gear_usecase.follow_status(job_id, party_name, True)
+        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.print_last_status(job_id, party_name)
 
 
@@ -448,7 +456,8 @@ def stop(ctx: typer.Context,
             open_usecase.open_browser(link_value)
 
     if follow:
-        gear_usecase.follow_status(id, party_name, True)
+        # 等待容器真正进入终止态（CANCELLED / FAILED / SUCCEEDED），否则中途的 RUNNING 会让跟踪过早退出。
+        gear_usecase.follow_status(id, party_name, False)
         gear_usecase.print_last_status(id, party_name)
 
 

{openbayes_cli-0.26.0 → openbayes_cli-0.26.1}/bayes/commands/hpc.py

@@ -125,7 +125,7 @@ def run(
         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="运行容器的状态跟踪"),
+        follow: bool = typer.Option(False, "-f", "--follow", help="跟踪容器运行；task 模式会自动打印实时日志直到任务结束，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="指定运行节点数量"),
@@ -143,7 +143,7 @@ def run(
 
         -e, --env string        选择镜像
 
-        -f, --follow            [可选] 运行容器的状态跟踪
+        -f, --follow            [可选] 跟踪容器运行；task 模式会自动打印实时日志直到任务结束，workspace 进入运行后退出
 
         -h, --help              查看 run 的帮助
 
@@ -252,7 +252,10 @@ def run(
     gear_settings.update_jid(str(current_path), job_id)
 
     if follow and mode != ModeEnum.hypertuning:
-        gear_usecase.follow_status(job_id, party_name, True)
+        if mode == ModeEnum.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.print_last_status(job_id, party_name)
 
 
@@ -307,7 +310,7 @@ 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="运行容器的状态跟踪"),
+            follow: bool = typer.Option(False, "-f", "--follow", help="跟踪容器运行；task 模式会自动打印实时日志直到任务结束，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="指定运行节点数量"),
@@ -325,7 +328,7 @@ def restart(ctx: typer.Context,
 
         -e, --env string        选择镜像
 
-        -f, --follow            [可选] 继续执行容器的状态跟踪
+        -f, --follow            [可选] 跟踪容器运行；task 模式会自动打印实时日志直到任务结束，workspace 进入运行后退出
 
         -h, --help              查看 restart 的帮助
 
@@ -388,7 +391,10 @@ def restart(ctx: typer.Context,
         open_usecase.open_browser(new_open_url)
 
     if follow:
-        gear_usecase.follow_status(job_id, party_name, True)
+        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.print_last_status(job_id, party_name)
 
 
@@ -452,7 +458,8 @@ def stop(ctx: typer.Context,
             open_usecase.open_browser(link_value)
 
     if follow:
-        gear_usecase.follow_status(id, party_name, True)
+        # 等待容器真正进入终止态（CANCELLED / FAILED / SUCCEEDED），否则中途的 RUNNING 会让跟踪过早退出。
+        gear_usecase.follow_status(id, party_name, False)
         gear_usecase.print_last_status(id, party_name)
 
 

{openbayes_cli-0.26.0 → openbayes_cli-0.26.1}/bayes/usercases/gear_usecase.py

@@ -26,7 +26,7 @@ from bayes.model.file.openbayes_gear import (
 )
 from bayes.model.file.openbayes_ignore import OpenBayesIgnoreSettings
 from bayes.model.file.settings import BayesEnvConfig, BayesSettings
-from bayes.usercases import dataset_version_usecase
+from bayes.usercases import dataset_version_usecase, gear_logs_usecase
 from bayes.usercases.org_usecase import display_table
 from bayes.utils import Utils
 
@@ -194,6 +194,54 @@ def follow_status(id, party_name, stop_with_running):
                 time.sleep(0.1)
 
 
+def follow_logs_until_finished(id, party_name):
+    """先等容器进入 RUNNING（或直接 finished），再切换到日志流跟随直到容器结束。
+
+    日志流不可用时降级为单纯的状态轮询，保证 -f 至少跟到 finished。
+    """
+    follow_status(id, party_name, stop_with_running=True)
+
+    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, id, party_name)
+    if job is None or job.is_finished():
+        return
+
+    historical = gear_logs_usecase.get_logs(id, party_name)
+    if historical:
+        print(historical)
+
+    ws, error = gear_logs_usecase.get_logs_follow(id, party_name)
+    if error is not None or ws is None:
+        # 拿不到日志流就退化成轮询状态，仍然跟到任务结束
+        follow_status(id, party_name, stop_with_running=False)
+        return
+
+    print("已连接到日志流，按 Ctrl+C 停止跟踪...")
+    log_stream_closed = False
+    try:
+        while True:
+            data, err = gear_logs_usecase.receive_logs(ws, id)
+            if err is not None:
+                print(err)
+                log_stream_closed = True
+                break
+            if data:
+                print(data)
+    except KeyboardInterrupt:
+        print("\n已停止日志跟踪")
+    finally:
+        try:
+            ws.close()
+        except Exception:
+            pass
+
+    # 日志流自然结束后，job 状态需要几秒才上报为 finished；这里轮询一下，
+    # 让调用方的 print_last_status 拿到正确的最终状态。Ctrl+C 提前退出则跳过。
+    if log_stream_closed:
+        follow_status(id, party_name, stop_with_running=False)
+
+
 def print_last_status(id, party_name):
     default_env: Optional[BayesEnvConfig] = BayesSettings().default_env
     gql_client = BayesGQLClient(default_env.graphQL, default_env.token)

{openbayes_cli-0.26.0 → openbayes_cli-0.26.1}/pyproject.toml

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