konduktor-nightly 0.1.0.dev20250616105058__tar.gz → 0.1.0.dev20250616211921__tar.gz

{konduktor_nightly-0.1.0.dev20250616105058 → konduktor_nightly-0.1.0.dev20250616211921}/PKG-INFO

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

{konduktor_nightly-0.1.0.dev20250616105058 → konduktor_nightly-0.1.0.dev20250616211921}/konduktor/__init__.py

@@ -14,7 +14,7 @@ __all__ = [
 ]
 
 # Replaced with the current commit when building the wheels.
-_KONDUKTOR_COMMIT_SHA = '703fd488ab698fa7ea8f92841bdc19fcdca49f92'
+_KONDUKTOR_COMMIT_SHA = '92109aa0f4a3a82ded90f33f6fe089392057ed96'
 os.makedirs(os.path.expanduser('~/.konduktor'), exist_ok=True)
 
 
@@ -48,5 +48,5 @@ def _get_git_commit():
 
 
 __commit__ = _get_git_commit()
-__version__ = '1.0.0.dev0.1.0.dev20250616105058'
+__version__ = '1.0.0.dev0.1.0.dev20250616211921'
 __root_dir__ = os.path.dirname(os.path.abspath(__file__))

{konduktor_nightly-0.1.0.dev20250616105058 → konduktor_nightly-0.1.0.dev20250616211921}/konduktor/backends/jobset_utils.py

@@ -24,6 +24,7 @@ from konduktor.utils import (
     kubernetes_utils,
     log_utils,
     ux_utils,
+    validator,
 )
 
 if typing.TYPE_CHECKING:
@@ -270,9 +271,9 @@ def create_pod_spec(task: 'konduktor.Task') -> Dict[str, Any]:
         env_map.values()
     )
 
-    # TODO(asaiacai): have some schema validations. see
-    # https://github.com/skypilot-org/skypilot/pull/4466
-    # TODO(asaiacai): where can we include policies for the pod spec.
+    # validate pod spec using json schema
+    # schema: https://github.com/instrumenta/kubernetes-json-schema/blob/master/v1.9.8-standalone-strict/podspec.json
+    validator.validate_pod_spec(pod_config['kubernetes']['pod_config']['spec'])
 
     return pod_config
 
@@ -310,7 +311,9 @@ def create_jobset(
             temp.name,
         )
         jobset_spec = common_utils.read_yaml(temp.name)
-        jobset_spec['jobset']['metadata']['labels'].update(**task.resources.labels)
+        jobset_spec['jobset']['metadata']['labels'].update(
+            **(task.resources.labels or {})
+        )
         assert task.resources.labels is not None
         maxRunDurationSeconds = task.resources.labels.get('maxRunDurationSeconds', None)
         if not maxRunDurationSeconds:

konduktor_nightly-0.1.0.dev20250616211921/konduktor/utils/validator.py

@@ -0,0 +1,74 @@
+"""This module contains a custom validator for the JSON Schema specification.
+
+The main motivation behind extending the existing JSON Schema validator is to
+allow for case-insensitive enum matching since this is currently not supported
+by the JSON Schema specification.
+"""
+
+import json
+import time
+from pathlib import Path
+
+import jsonschema
+import requests
+from colorama import Fore, Style
+
+SCHEMA_VERSION = 'v1.9.8-standalone-strict'
+SCHEMA_URL = f'https://raw.githubusercontent.com/instrumenta/kubernetes-json-schema/master/{SCHEMA_VERSION}/podspec.json'
+SCHEMA_CACHE_PATH = Path.home() / '.konduktor/schemas/podspec.json'
+CACHE_MAX_AGE_SECONDS = 86400  # 24 hours
+
+
+def case_insensitive_enum(validator, enums, instance, schema):
+    del validator, schema  # Unused.
+    if instance.lower() not in [enum.lower() for enum in enums]:
+        yield jsonschema.ValidationError(f'{instance!r} is not one of {enums!r}')
+
+
+SchemaValidator = jsonschema.validators.extend(
+    jsonschema.Draft7Validator,
+    validators={'case_insensitive_enum': case_insensitive_enum},
+)
+
+
+def get_cached_schema() -> dict:
+    # Check if schema file exists and is fresh
+    if SCHEMA_CACHE_PATH.exists():
+        age = time.time() - SCHEMA_CACHE_PATH.stat().st_mtime
+        # if old
+        if age < CACHE_MAX_AGE_SECONDS:
+            with open(SCHEMA_CACHE_PATH, 'r') as f:
+                return json.load(f)
+
+    # Download schema
+    resp = requests.get(SCHEMA_URL)
+    resp.raise_for_status()
+
+    SCHEMA_CACHE_PATH.parent.mkdir(parents=True, exist_ok=True)
+    with open(SCHEMA_CACHE_PATH, 'w') as f:
+        f.write(resp.text)
+
+    return resp.json()
+
+
+def validate_pod_spec(pod_spec: dict) -> None:
+    schema = get_cached_schema()
+
+    validator = jsonschema.Draft7Validator(schema)
+    errors = sorted(validator.iter_errors(pod_spec), key=lambda e: e.path)
+
+    if not errors:
+        return
+
+    formatted = [
+        f'{Fore.RED}- {error.message}'
+        + (f" at path: {' → '.join(str(p) for p in error.path)}" if error.path else '')
+        + Style.RESET_ALL
+        for error in errors
+    ]
+
+    raise ValueError(
+        f'\n{Fore.RED}Invalid k8s pod spec/config: \
+        {Style.RESET_ALL}\n'
+        + '\n'.join(formatted)
+    )

{konduktor_nightly-0.1.0.dev20250616105058 → konduktor_nightly-0.1.0.dev20250616211921}/pyproject.toml

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

konduktor_nightly-0.1.0.dev20250616105058/konduktor/utils/validator.py

@@ -1,20 +0,0 @@
-"""This module contains a custom validator for the JSON Schema specification.
-
-The main motivation behind extending the existing JSON Schema validator is to
-allow for case-insensitive enum matching since this is currently not supported
-by the JSON Schema specification.
-"""
-
-import jsonschema
-
-
-def case_insensitive_enum(validator, enums, instance, schema):
-    del validator, schema  # Unused.
-    if instance.lower() not in [enum.lower() for enum in enums]:
-        yield jsonschema.ValidationError(f'{instance!r} is not one of {enums!r}')
-
-
-SchemaValidator = jsonschema.validators.extend(
-    jsonschema.Draft7Validator,
-    validators={'case_insensitive_enum': case_insensitive_enum},
-)