konduktor-nightly 0.1.0.dev20250810104857__tar.gz → 0.1.0.dev20250812105102__tar.gz

{konduktor_nightly-0.1.0.dev20250810104857 → konduktor_nightly-0.1.0.dev20250812105102}/PKG-INFO

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

{konduktor_nightly-0.1.0.dev20250810104857 → konduktor_nightly-0.1.0.dev20250812105102}/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 = '0f0b36c3a67aa7c60d6cb33240631b7c8ccaed03'
+_KONDUKTOR_COMMIT_SHA = 'f4ba2084fac1c1030245b475323f4f3a57fd3fa3'
 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.dev20250810104857'
+__version__ = '1.0.0.dev0.1.0.dev20250812105102'
 __root_dir__ = os.path.dirname(os.path.abspath(__file__))

{konduktor_nightly-0.1.0.dev20250810104857 → konduktor_nightly-0.1.0.dev20250812105102}/konduktor/backends/constants.py

@@ -8,6 +8,7 @@ USERID_LABEL = 'trainy.ai/user-id'
 USER_LABEL = 'trainy.ai/username'
 ACCELERATOR_LABEL = 'trainy.ai/accelerator'
 NUM_ACCELERATORS_LABEL = 'trainy.ai/num-accelerators'
+MAX_EXECUTION_TIME_LABEL = 'kueue.x-k8s.io/max-exec-time-seconds'
 
 # Start/stop/status related labels
 STOP_USERID_LABEL = 'trainy.ai/stop-userid'

{konduktor_nightly-0.1.0.dev20250810104857 → konduktor_nightly-0.1.0.dev20250812105102}/konduktor/backends/jobset.py

@@ -176,7 +176,7 @@ class JobsetBackend(backend.Backend):
         context = kubernetes_utils.get_current_kube_config_context_name()
         namespace = kubernetes_utils.get_kube_config_context_namespace(context)
         # TODO(asaiacai): need to set env variables in pod
-        jobset_utils.create_jobset(
+        jobset_response = jobset_utils.create_jobset(
             namespace,
             task,
             pod_spec['kubernetes']['pod_config'],
@@ -192,9 +192,10 @@ class JobsetBackend(backend.Backend):
                 ):
                     _wait_for_jobset_start(namespace, task.name)
                 try:
+                    assert jobset_response is not None
                     log_thread = threading.Thread(
                         target=log_utils.tail_logs,
-                        args=(task.name,),
+                        args=(jobset_response,),
                         daemon=True,
                     )
                     logger.info('streaming logs...')

{konduktor_nightly-0.1.0.dev20250810104857 → konduktor_nightly-0.1.0.dev20250812105102}/konduktor/backends/jobset_utils.py

@@ -39,6 +39,7 @@ JOBSET_USERID_LABEL = backend_constants.USERID_LABEL
 JOBSET_USER_LABEL = backend_constants.USER_LABEL
 JOBSET_ACCELERATOR_LABEL = backend_constants.ACCELERATOR_LABEL
 JOBSET_NUM_ACCELERATORS_LABEL = backend_constants.NUM_ACCELERATORS_LABEL
+JOBSET_MAX_EXECUTION_TIME_LABEL = backend_constants.MAX_EXECUTION_TIME_LABEL
 
 SECRET_BASENAME_LABEL = backend_constants.SECRET_BASENAME_LABEL
 
@@ -48,6 +49,7 @@ _JOBSET_METADATA_LABELS = {
     'jobset_user_label': JOBSET_USER_LABEL,
     'jobset_accelerator_label': JOBSET_ACCELERATOR_LABEL,
     'jobset_num_accelerators_label': JOBSET_NUM_ACCELERATORS_LABEL,
+    'jobset_max_execution_time_label': JOBSET_MAX_EXECUTION_TIME_LABEL,
 }
 
 
@@ -79,6 +81,7 @@ def create_jobset(
     assert task.resources is not None, 'Task resources are undefined'
     accelerator_type = task.resources.get_accelerator_type() or 'None'
     num_accelerators = task.resources.get_accelerator_count() or 0
+    labels = task.resources.labels if task.resources.labels else {}
     with tempfile.NamedTemporaryFile() as temp:
         common_utils.fill_template(
             'jobset.yaml.j2',
@@ -91,6 +94,7 @@ def create_jobset(
                 'num_accelerators': num_accelerators,
                 'completions': task.resources.get_completions(),
                 'max_restarts': task.resources.get_max_restarts(),
+                'max_execution_time': labels.get('maxRunDurationSeconds', None),
                 **_JOBSET_METADATA_LABELS,
             },
             temp.name,
@@ -232,8 +236,12 @@ def stop_jobset(namespace: str, job_name: str) -> Optional[Dict[str, Any]]:
             'spec': {'suspend': True},
             'metadata': {
                 'annotations': {
-                    backend_constants.STOP_USERID_LABEL: common_utils.user_and_hostname_hash(),
-                    backend_constants.STOP_USERNAME_LABEL: common_utils.get_cleaned_username(),
+                    backend_constants.STOP_USERID_LABEL: (
+                        common_utils.user_and_hostname_hash()
+                    ),
+                    backend_constants.STOP_USERNAME_LABEL: (
+                        common_utils.get_cleaned_username()
+                    ),
                 }
             },
         }
@@ -426,6 +434,36 @@ def _parse_timestamp_filter(timestamp_str: str) -> datetime:
     )
 
 
+def _format_timestamp(timestamp: str) -> str:
+    """Format timestamp as MM/DD/YY HH:MMAM/PM in local timezone"""
+    # Parse UTC timestamp and convert to local time
+    dt_utc = datetime.strptime(timestamp, '%Y-%m-%dT%H:%M:%SZ').replace(
+        tzinfo=timezone.utc
+    )
+    dt_local = dt_utc.astimezone()  # Convert to local timezone
+    return dt_local.strftime('%m/%d/%y %I:%M%p')
+
+
+def _get_job_start_time(job: Dict[str, Any]) -> str:
+    for condition in job['status']['conditions']:
+        if condition['reason'] == 'ResumeJobs':
+            return condition.get('lastTransitionTime', '')
+    return '-'
+
+
+def _get_end_time_from_conditions(job: Dict[str, Any]) -> str:
+    """Extract end time from JobSet conditions (Completed or Failed)"""
+    conditions = job.get('status', {}).get('conditions', [])
+    for condition in conditions:
+        # Look for terminal conditions with status=True
+        if (
+            condition.get('type') in ['Completed', 'Failed']
+            and condition.get('status') == 'True'
+        ):
+            return condition.get('lastTransitionTime', '')
+    return '-'
+
+
 def show_status_table(
     namespace: str,
     all_users: bool,
@@ -519,15 +557,6 @@ def show_status_table(
         result = f'{days_str}{hours_str}{minutes_str}{seconds_str}'
         return result if result else '<1 minute', delta
 
-    def _format_timestamp(timestamp: str) -> str:
-        """Format timestamp as MM/DD/YY HH:MMAM/PM in local timezone"""
-        # Parse UTC timestamp and convert to local time
-        dt_utc = datetime.strptime(timestamp, '%Y-%m-%dT%H:%M:%SZ').replace(
-            tzinfo=timezone.utc
-        )
-        dt_local = dt_utc.astimezone()  # Convert to local timezone
-        return dt_local.strftime('%m/%d/%y %I:%M%p')
-
     def _get_resources(job: Dict[str, Any]) -> str:
         num_pods = int(
             job['spec']['replicatedJobs'][0]['template']['spec']['parallelism']
@@ -587,25 +616,17 @@ def show_status_table(
             if before_dt and job_creation_time >= before_dt:
                 continue
         # Get start time
-        start_time = _format_timestamp(job['metadata']['creationTimestamp'])
+        start_time = _get_job_start_time(job)
+        if start_time != '-':
+            start_time = _format_timestamp(start_time)
 
         # Get submitted time (how long ago)
         submitted_time, _ = _get_time_delta(job['metadata']['creationTimestamp'])
 
         # Get end time (from JobSet conditions)
-        def _get_end_time_from_conditions(job: Dict[str, Any]) -> str:
-            """Extract end time from JobSet conditions (Completed or Failed)"""
-            conditions = job.get('status', {}).get('conditions', [])
-            for condition in conditions:
-                # Look for terminal conditions with status=True
-                if (
-                    condition.get('type') in ['Completed', 'Failed']
-                    and condition.get('status') == 'True'
-                ):
-                    return _format_timestamp(condition.get('lastTransitionTime', ''))
-            return '-'
-
         end_time = _get_end_time_from_conditions(job)
+        if end_time != '-':
+            end_time = _format_timestamp(end_time)
 
         if all_users:
             rows.append(

{konduktor_nightly-0.1.0.dev20250810104857 → konduktor_nightly-0.1.0.dev20250812105102}/konduktor/cli.py

@@ -732,7 +732,7 @@ def logs(
     # Verify the job exists before attempting to tail logs
     # TODO(asaiacai): unify the 404 logic under jobset_utils
     try:
-        jobset_utils.get_jobset(namespace, job_id)
+        jobset_response = jobset_utils.get_jobset(namespace, job_id)
     except jobset_utils.JobNotFoundError:
         raise click.UsageError(
             f"Job '{job_id}' not found in namespace "
@@ -741,12 +741,9 @@ def logs(
             f'{colorama.Style.RESET_ALL}.'
         )
 
-    click.secho(
-        'Logs are tailed from 1 hour ago, ' 'to see more logs, check Grafana.',
-        fg='yellow',
-    )
+    assert isinstance(jobset_response, dict), f'jobset_response: {jobset_response}'
     log_utils.tail_logs(
-        job_id,
+        jobset_response,
         worker_id=node_rank,
         follow=follow,
         num_logs=num_lines,
@@ -855,16 +852,23 @@ def launch(
             'Serving information detected. Use '
             '`konduktor serve launch` instead for serving.'
         )
+    try:
+        _launch_with_confirm(
+            task,
+            dryrun=dryrun,
+            detach_run=detach_run,
+            no_confirm=yes,
+            serving=bool(task.serving),
+        )
+    except KeyboardInterrupt:
+        click.secho(
+            f'Detaching... manage your job {task.name} with the following commands:',
+            fg='yellow',
+            bold=True,
+        )
 
-    job_name = _launch_with_confirm(
-        task,
-        dryrun=dryrun,
-        detach_run=detach_run,
-        no_confirm=yes,
-        serving=bool(task.serving),
-    )
     click.secho(
-        ux_utils.command_hint_messages(ux_utils.CommandHintType.JOB, job_name),
+        ux_utils.command_hint_messages(ux_utils.CommandHintType.JOB, task.name),
         fg='green',
         bold=True,
     )
@@ -1139,6 +1143,12 @@ def stop(
     for job in track(jobs, description='Suspending job(s)...'):
         jobset_utils.stop_jobset(namespace, job)
 
+    click.secho(
+        ux_utils.command_hint_messages(ux_utils.CommandHintType.JOB_STOP, jobs),
+        fg='green',
+        bold=True,
+    )
+
 
 @cli.command(cls=_DocumentedCodeCommand)
 @click.argument(
@@ -1836,7 +1846,7 @@ def main():
         return cli(standalone_mode=False)
     except click.exceptions.Abort:
         click.secho('Detaching...', fg='yellow', bold=True)
-        return
+        return None
 
 
 if __name__ == '__main__':

{konduktor_nightly-0.1.0.dev20250810104857 → konduktor_nightly-0.1.0.dev20250812105102}/konduktor/logging.py

@@ -75,12 +75,14 @@ def get_logger(name: str):
     fh.setFormatter(FORMATTER)
     logger.addHandler(fh)
 
-    # --- Console logging: DEBUG level only if KONDUKTOR_DEBUG=1 ---
+    # --- Console logging: INFO level by default, DEBUG if KONDUKTOR_DEBUG=1 ---
+    ch = logging.StreamHandler()
     if os.environ.get('KONDUKTOR_DEBUG') == '1':
-        ch = logging.StreamHandler()
         ch.setLevel(logging.DEBUG)
-        ch.setFormatter(FORMATTER)
-        logger.addHandler(ch)
+    else:
+        ch.setLevel(logging.INFO)
+    ch.setFormatter(FORMATTER)
+    logger.addHandler(ch)
 
     logger.propagate = False
     return logger

{konduktor_nightly-0.1.0.dev20250810104857 → konduktor_nightly-0.1.0.dev20250812105102}/konduktor/templates/jobset.yaml.j2

@@ -11,6 +11,9 @@ jobset:
       {{ jobset_accelerator_label }}: "{{ accelerator_type }}"
       {{ jobset_num_accelerators_label }}: "{{ num_accelerators }}"
       {% endif %}
+      {% if max_execution_time %}
+      {{ jobset_max_execution_time_label }}: "{{ max_execution_time }}"
+      {% endif %}
       trainy.ai/konduktor-managed: "true"
       parent: "trainy"
     annotations: {}

{konduktor_nightly-0.1.0.dev20250810104857 → konduktor_nightly-0.1.0.dev20250812105102}/konduktor/utils/log_utils.py

@@ -337,45 +337,51 @@ def tail_loki_logs_ws(
 
 
 def tail_vicky_logs(
-    job_name: str,
+    jobset_response: Dict[str, Any],
     worker_id: int = 0,
-    num_logs: int = 1000,
+    num_logs: int = -1,
     follow: bool = True,
 ):
+    job_name = jobset_response['metadata']['name']
     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
-        # let the user specify any number of lines, and we can print the last N lines.
-        # this can be done in chunks. Potentially, we can query range
-        # until we reach the end of the log and then invoke tail again.
-        # Also include checks that the job is running/ever ran.
-        raise ValueError('num_logs must be less than or equal to 5000')
-    logger.info('ignoring num_logs argument for VictoriaLogs')
     vicky_svc = kr8s.objects.Service.get(
         'vls-victoria-logs-single-server', namespace='victoria-logs'
     )
+
+    if num_logs == -1:
+        query = {}
+    else:
+        assert num_logs > 0, f'num_logs must be greater than 0, got {num_logs}'
+        query = {'limit': num_logs}
+    if follow:
+        logger.info(
+            'No end time found, tailing logs from 1 hour ago. '
+            'If logs come up empty, there might be logs just earlier '
+            'than the past hour, check Grafana or use:\n'
+            f'{colorama.Style.BRIGHT}{colorama.Fore.YELLOW}'
+            f'`konduktor tail --no-follow {job_name}`'
+            f'{colorama.Style.RESET_ALL}'
+        )
+        query['start_offset'] = '1h'
+    query['query'] = (
+        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}"'
+    )
+
     with kr8s.portforward.PortForward(
         vicky_svc, VICKY_REMOTE_PORT, local_port='auto'
     ) as port:
         if follow:
             timeout = INFINITY
             vicky_url = f'http://localhost:{port}/select/logsql/tail'
-            query = {}
         else:
             vicky_url = f'http://localhost:{port}/select/logsql/query'
-            query = {'limit': num_logs}
             timeout = 1
         logger.debug(f'Vicky URL: {vicky_url}')
 
-        query['query'] = (
-            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'
-
         try:
             logger.debug(f'Making request to {vicky_url} with query: {query}')
             with requests.post(
@@ -412,16 +418,17 @@ def tail_vicky_logs(
 
 
 def tail_logs(
-    job_name: str,
+    jobset_response: Dict[str, Any],
     worker_id: int = 0,
     num_logs: int = 1000,
     follow: bool = True,
 ):
+    job_name = jobset_response['metadata']['name']
     logs_backend = config.get_nested(('logs', 'backend'), None)
     if logs_backend == LogBackend.VICTORIA:
-        tail_vicky_logs(job_name, worker_id, num_logs, follow)
+        tail_vicky_logs(jobset_response, worker_id, num_logs, follow)
     elif logs_backend == LogBackend.LOKI:
         tail_loki_logs_ws(job_name, worker_id, num_logs, follow)
     else:
         logger.info('Defaulting to VictoriaLogs')
-        tail_vicky_logs(job_name, worker_id, num_logs, follow)
+        tail_vicky_logs(jobset_response, worker_id, num_logs, follow)

{konduktor_nightly-0.1.0.dev20250810104857 → konduktor_nightly-0.1.0.dev20250812105102}/konduktor/utils/ux_utils.py

@@ -6,7 +6,7 @@ import os
 import sys
 import traceback
 import typing
-from typing import Callable, Optional, Union
+from typing import Callable, List, Optional, Union
 
 import colorama
 import rich.console as rich_console
@@ -196,27 +196,41 @@ def spinner_message(
 
 class CommandHintType(enum.Enum):
     JOB = 'JOB'
+    JOB_STOP = 'JOB_STOP'
 
 
-def command_hint_messages(hint_type: CommandHintType, job_id: str) -> str:
+def command_hint_messages(
+    hint_type: CommandHintType,
+    job_id: Union[str, List[str]],
+) -> str:
     """Gets the command hint messages for the given job id."""
+    hint_str = '\n📋 Useful Commands'
     if hint_type == CommandHintType.JOB:
         job_hint_str = (
             f'\nJob ID: {job_id}'
-            f'\n{INDENT_SYMBOL}To cancel the job:\t\t'
-            f'{BOLD}konduktor down {job_id} {RESET_BOLD}'
             f'\n{INDENT_SYMBOL}To stream job logs:\t\t'
             f'{BOLD}konduktor logs {job_id} {RESET_BOLD}'
             f'\n{INDENT_SYMBOL}To list all jobs:\t\t'
             f'{BOLD}konduktor status{RESET_BOLD}'
+            f'\n{INDENT_SYMBOL}To suspend the job:\t\t'
+            f'{BOLD}konduktor stop {job_id} {RESET_BOLD}'
+            f'\n{INDENT_SYMBOL}{colorama.Fore.RED}To delete the job:\t\t'
+            f'{BOLD}konduktor down {job_id} {RESET_BOLD}{colorama.Style.RESET_ALL}'
         )
-        hint_str = '\n📋 Useful Commands'
         hint_str += f'{job_hint_str}'
-        if config.get_nested(('tailscale', 'secret_name'), None) is not None:
-            hint_str += (
-                f'\n{INDENT_SYMBOL}To tailscale ssh:\t\t'
-                f'{BOLD}ssh root@{job_id}-workers-0-0 {RESET_BOLD}'
-            )
-        return hint_str
+    elif hint_type == CommandHintType.JOB_STOP:
+        assert isinstance(job_id, list), 'job_id must be a list of strings'
+        job_ids_str = ' '.join(job_id)
+        hint_str += (
+            f'\n{INDENT_SYMBOL}To resume the following jobs:\t\t'
+            f'{BOLD}konduktor start {job_ids_str} {RESET_BOLD}'
+        )
     else:
         raise ValueError(f'Invalid hint type: {hint_type}')
+
+    if config.get_nested(('tailscale', 'secret_name'), None) is not None:
+        hint_str += (
+            f'\n{INDENT_SYMBOL}To tailscale ssh:\t\t'
+            f'{BOLD}ssh root@{job_id}-workers-0-0 {RESET_BOLD}'
+        )
+    return hint_str

{konduktor_nightly-0.1.0.dev20250810104857 → konduktor_nightly-0.1.0.dev20250812105102}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "konduktor-nightly"
-version = "0.1.0.dev20250810104857"
+version = "0.1.0.dev20250812105102"
 description = "GPU Cluster Health Management"
 packages = [
     {include = "konduktor"}