konduktor-nightly 0.1.0.dev20250807105334__py3-none-any.whl → 0.1.0.dev20250808105243__py3-none-any.whl

konduktor/__init__.py

@@ -11,7 +11,7 @@ from konduktor.task import Task
 __all__ = ['launch', 'Resources', 'Task', 'Serving']
 
 # Replaced with the current commit when building the wheels.
-_KONDUKTOR_COMMIT_SHA = '4f9623300ec72edc8ddf6680cd6149cbfb038f47'
+_KONDUKTOR_COMMIT_SHA = '45add2e516f1b7bb1f16ed063e5af87b8e5609cf'
 os.makedirs(os.path.expanduser('~/.konduktor'), exist_ok=True)
 
 
@@ -45,5 +45,5 @@ def _get_git_commit():
 
 
 __commit__ = _get_git_commit()
-__version__ = '1.0.0.dev0.1.0.dev20250807105334'
+__version__ = '1.0.0.dev0.1.0.dev20250808105243'
 __root_dir__ = os.path.dirname(os.path.abspath(__file__))

konduktor/cli.py

@@ -653,6 +653,14 @@ def status(all_users: bool):
         'Default is 1000.'
     ),
 )
+@click.option(
+    '--node-rank',
+    '--node_rank',
+    '-N',
+    default=0,
+    type=int,
+    help='The node rank to tail logs from.',
+)
 @click.argument('job_id', type=str, nargs=1)
 # TODO(zhwu): support logs by job name
 def logs(
@@ -660,6 +668,7 @@ def logs(
     job_id: str,
     follow: bool,
     num_lines: int,
+    node_rank: int,
 ):
     # NOTE(dev): Keep the docstring consistent between the Python API and CLI.
     """Retrieve/tail the log of a job."""
@@ -689,7 +698,12 @@ def logs(
         'Logs are tailed from 1 hour ago, ' 'to see more logs, check Grafana.',
         fg='yellow',
     )
-    log_utils.tail_logs(job_id, follow=follow, num_logs=num_lines)
+    log_utils.tail_logs(
+        job_id,
+        worker_id=node_rank,
+        follow=follow,
+        num_logs=num_lines,
+    )
 
 
 @cli.command(cls=_DocumentedCodeCommand)
@@ -1483,7 +1497,11 @@ def serve_status(all_users: bool):
 
 
 def main():
-    return cli()
+    try:
+        return cli(standalone_mode=False)
+    except click.exceptions.Abort:
+        click.secho('Detaching...', fg='yellow', bold=True)
+        return
 
 
 if __name__ == '__main__':

konduktor/utils/log_utils.py

@@ -30,7 +30,7 @@ import requests
 import websockets
 
 from konduktor import config, logging
-from konduktor.utils import subprocess_utils
+from konduktor.utils import kubernetes_utils, subprocess_utils
 
 logger = logging.get_logger(__name__)
 
@@ -337,8 +337,13 @@ def tail_loki_logs_ws(
 
 
 def tail_vicky_logs(
-    job_name: str, worker_id: int = 0, num_logs: int = 1000, follow: bool = True
+    job_name: str,
+    worker_id: int = 0,
+    num_logs: int = 1000,
+    follow: bool = True,
 ):
+    context = kubernetes_utils.get_current_kube_config_context_name()
+    namespace = kubernetes_utils.get_kube_config_context_namespace(context)
     query: Dict[str, Any] = {}
     if num_logs > 5000:
         # TODO(asaiacai): we should not have a limit on the number of logs, but rather
@@ -365,8 +370,9 @@ def tail_vicky_logs(
         logger.debug(f'Vicky URL: {vicky_url}')
 
         query['query'] = (
-            'k8s.namespace.name: "default" AND '
-            f'batch.kubernetes.io/job-name: "{job_name}-workers-{worker_id}"'
+            f'k8s.namespace.name: "{namespace}" AND '
+            f'batch.kubernetes.io/job-name: "{job_name}-workers-0" AND '
+            f'batch.kubernetes.io/job-completion-index: "{worker_id}"'
         )
         query['start_offset'] = '1h'
 
@@ -406,7 +412,10 @@ def tail_vicky_logs(
 
 
 def tail_logs(
-    job_name: str, worker_id: int = 0, num_logs: int = 1000, follow: bool = True
+    job_name: str,
+    worker_id: int = 0,
+    num_logs: int = 1000,
+    follow: bool = True,
 ):
     logs_backend = config.get_nested(('logs', 'backend'), None)
     if logs_backend == LogBackend.VICTORIA:

{konduktor_nightly-0.1.0.dev20250807105334.dist-info → konduktor_nightly-0.1.0.dev20250808105243.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: konduktor-nightly
-Version: 0.1.0.dev20250807105334
+Version: 0.1.0.dev20250808105243
 Summary: GPU Cluster Health Management
 Author: Andrew Aikawa
 Author-email: asai@berkeley.edu

{konduktor_nightly-0.1.0.dev20250807105334.dist-info → konduktor_nightly-0.1.0.dev20250808105243.dist-info}/RECORD

@@ -1,4 +1,4 @@
-konduktor/__init__.py,sha256=q3tcNX556xQdRe2M42K9PxHx1wCiqql_aGIr3DTKpAk,1574
+konduktor/__init__.py,sha256=agpWvH79AhK6OerLHZEAQtdxWOaV_sshDBcCks8gWz0,1574
 konduktor/adaptors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 konduktor/adaptors/aws.py,sha256=s47Ra-GaqCQibzVfmD0pmwEWHif1EGO5opMbwkLxTCU,8244
 konduktor/adaptors/common.py,sha256=ZIqzjx77PIHUwpjfAQ1uX8B2aX78YMuGj4Bppd-MdyM,4183
@@ -13,7 +13,7 @@ konduktor/backends/jobset.py,sha256=OwgDog9nH-FoUmNU_H--C3U5jx70reTKL1l849M1k5A,
 konduktor/backends/jobset_utils.py,sha256=MRZf-Wcn084lnig0SfgXlF9Q3RyC7m7THeJQQlpdSw8,12931
 konduktor/backends/pod_utils.py,sha256=K0y2kRTzrmIWFbmyJSEMhw7gueiIFF7VAlXtaBMNHkM,15237
 konduktor/check.py,sha256=JennyWoaqSKhdyfUldd266KwVXTPJpcYQa4EED4a_BA,7569
-konduktor/cli.py,sha256=PRMOseG1v1qXj0-KbW7Hzsg5rVRfNZw1oykSJWHO_qA,45481
+konduktor/cli.py,sha256=NOJGSa7iakFpIcC6ny2uhGCugGNyku-U02rlvjgri5Q,45844
 konduktor/config.py,sha256=J50JxC6MsXMnlrJPXdDUMr38C89xvOO7mR8KJ6fyils,15520
 konduktor/constants.py,sha256=T3AeXXxuQHINW_bAWyztvDeS8r4g8kXBGIwIq13cys0,1814
 konduktor/controller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -90,15 +90,15 @@ konduktor/utils/env_options.py,sha256=T41Slzf4Mzl-n45CGXXqdy2fCrYhPNZQ7RP5vmnN4x
 konduktor/utils/exceptions.py,sha256=5IFnN5bIUSBJv4KRRrCepk5jyY9EG5vWWQqbjCmP3NU,6682
 konduktor/utils/kubernetes_enums.py,sha256=SabUueF6Bpzbpa57gyH5VB65xla2N9l8CZmAeYTfGmM,176
 konduktor/utils/kubernetes_utils.py,sha256=VG7qatUFyWHY-PCQ8fYWh2kn2TMwfg84cn-VkXdCwI8,26077
-konduktor/utils/log_utils.py,sha256=CC6McrURGIcM8R4ICBCmn_Y7oXbWh1fwl4__la6Zotw,16677
+konduktor/utils/log_utils.py,sha256=k4Qo0OlUZYQmLcbSD9tDWe6_Q5XcsLO_K8uVWjlTEU0,16938
 konduktor/utils/loki_utils.py,sha256=h2ZvZQr1nE_wXXsKsGMjhG2s2MXknNd4icydTR_ruKU,3539
 konduktor/utils/rich_utils.py,sha256=ycADW6Ij3wX3uT8ou7T8qxX519RxlkJivsLvUahQaJo,3583
 konduktor/utils/schemas.py,sha256=tBrKhnkfn9uKDYdlb4L2KgooW-muuhww7U8fu9zX-ms,18336
 konduktor/utils/subprocess_utils.py,sha256=WoFkoFhGecPR8-rF8WJxbIe-YtV94LXz9UG64SDhCY4,9448
 konduktor/utils/ux_utils.py,sha256=czCwiS1bDqgeKtzAJctczpLwFZzAse7WuozdvzEFYJ4,7437
 konduktor/utils/validator.py,sha256=5C1kE57Eyj1OPnAbvojqMNHHtf5fnl47FK_vEttd8aw,4331
-konduktor_nightly-0.1.0.dev20250807105334.dist-info/LICENSE,sha256=MuuqTZbHvmqXR_aNKAXzggdV45ANd3wQ5YI7tnpZhm0,6586
-konduktor_nightly-0.1.0.dev20250807105334.dist-info/METADATA,sha256=agt8lbfGconzOtVJBStu3_Q3AI1Pf5dANidlxA4TICQ,4247
-konduktor_nightly-0.1.0.dev20250807105334.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-konduktor_nightly-0.1.0.dev20250807105334.dist-info/entry_points.txt,sha256=k3nG5wDFIJhNqsZWrHk4d0irIB2Ns9s47cjRWYsTCT8,48
-konduktor_nightly-0.1.0.dev20250807105334.dist-info/RECORD,,
+konduktor_nightly-0.1.0.dev20250808105243.dist-info/LICENSE,sha256=MuuqTZbHvmqXR_aNKAXzggdV45ANd3wQ5YI7tnpZhm0,6586
+konduktor_nightly-0.1.0.dev20250808105243.dist-info/METADATA,sha256=oECwmID0juizuwdOYpPMrX0n8Er1lPAaXZaMYmCA7-Y,4247
+konduktor_nightly-0.1.0.dev20250808105243.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+konduktor_nightly-0.1.0.dev20250808105243.dist-info/entry_points.txt,sha256=k3nG5wDFIJhNqsZWrHk4d0irIB2Ns9s47cjRWYsTCT8,48
+konduktor_nightly-0.1.0.dev20250808105243.dist-info/RECORD,,