q8s 0.11.0.dev2__tar.gz → 0.11.2__tar.gz

{q8s-0.11.0.dev2 → q8s-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: q8s
-Version: 0.11.0.dev2
+Version: 0.11.2
 Summary: Kernel extension for executing quantum programs in simulators on q8s clusters
 Author-email: Vlad Stirbu <vstirbu@gmail.com>
 License:                                  Apache License
@@ -229,6 +229,7 @@ Requires-Dist: python-dotenv==1.0.1
 Requires-Dist: pyyaml==6.0.2
 Requires-Dist: typer>=0.15.4
 Requires-Dist: GitPython>=3.1.43
+Requires-Dist: python-dxf>=12.1.1
 Provides-Extra: benchmark
 Requires-Dist: pandas; extra == "benchmark"
 Requires-Dist: testbook; extra == "benchmark"

{q8s-0.11.0.dev2 → q8s-0.11.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "q8s"
-version = "0.11.0-dev2"
+version = "0.11.2"
 description = "Kernel extension for executing quantum programs in simulators on q8s clusters"
 authors = [{ name = "Vlad Stirbu", email = "vstirbu@gmail.com" }]
 readme = "README.md"
@@ -27,6 +27,7 @@ dependencies = [
   "pyyaml==6.0.2",
   "typer>=0.15.4",
   "GitPython>=3.1.43",
+  "python-dxf>=12.1.1",
 ]
 requires-python = ">= 3.10"
 

{q8s-0.11.0.dev2 → q8s-0.11.2}/src/q8s/__init__.py

@@ -1 +1,3 @@
 """A Python kernel for Jupyter that uses Kubernetes to execute code."""
+
+from .kernel import Q8sKernel  # noqa: F401

{q8s-0.11.0.dev2 → q8s-0.11.2}/src/q8s/bakefile.py

@@ -46,7 +46,7 @@ class Bakefile:
         self,
         name: str,
         tags: list[str],
-        platforms: list[BuildPlatform],
+        platforms: list[BuildPlatform | str],
     ):
         bake_target = BakeTargetName(name)
 

{q8s-0.11.0.dev2 → q8s-0.11.2}/src/q8s/execution.py

@@ -5,7 +5,10 @@ import string
 from json import JSONEncoder, loads
 
 import pluggy
+import requests
 from dotenv import dotenv_values
+from dxf import DXF
+from dxf.exceptions import DXFUnauthorizedError
 from kubernetes import client, config, watch
 from rich.progress import Progress
 
@@ -24,6 +27,78 @@ def load_env():
     return env
 
 
+class ContainerImageValidator:
+    """
+    Validate that a container image exists in its registry.
+
+    The image reference should be in the format:
+    - 'user/repo:tag' for Docker Hub images
+    - 'registry.com/user/repo:tag' for images in other registries
+
+    Primarily, the image URL values are generated by `q8sctl build --init`
+    command and stored in the `.q8s_cache/images` file. Images are built in CI pipelines.
+
+    Args:
+        image: Container image reference (e.g., 'user/repo:tag' or 'registry.com/user/repo:tag')
+        registry_pat: Optional personal access token for registry authentication
+
+    Returns:
+        True if the image exists and is accessible
+
+    Raises:
+        ValueError: If the image is invalid, not found, or authentication fails
+    """
+
+    @staticmethod
+    def validate(image: str, registry_pat: str | None = None) -> bool:
+        if not image:
+            raise ValueError("Container image must be a non-empty string")
+
+        segments = image.split("/")
+        if len(segments) < 2:
+            raise ValueError(f"Invalid container image reference: {image}")
+
+        if len(segments) == 3:
+            registry_host = segments[0]
+            repo_part = "/".join(segments[1:])
+            username = segments[1]
+        else:
+            registry_host = "registry-1.docker.io"
+            repo_part = "/".join(segments)
+            username = segments[0]
+
+        if ":" in repo_part:
+            repository, tag = repo_part.split(":", 1)
+        else:
+            repository, tag = repo_part, "latest"
+
+        try:
+            dxf = DXF(registry_host, repo=repository)
+
+            if registry_pat:
+                dxf.authenticate(
+                    username=username,
+                    password=registry_pat,
+                    actions=["pull"],
+                )
+
+            dxf.get_alias(tag)
+
+        except DXFUnauthorizedError:
+            raise ValueError(f"Container image '{image}' requires authentication")
+        except requests.exceptions.HTTPError as e:
+            if e.response is not None and hasattr(e.response, "status_code"):
+                if e.response.status_code == 403:
+                    raise ValueError(
+                        f"Container image '{image}' requires authentication; invalid registry PAT"
+                    )
+                elif e.response.status_code == 404:
+                    raise ValueError(f"Container image '{image}' not found")
+            raise ValueError(f"Error validating container image '{image}': {str(e)}")
+
+        return True
+
+
 class K8sContext:
     container_image: str | None = None
     registry_pat: str | None = None
@@ -74,6 +149,8 @@ class K8sContext:
         return "".join(random.choices(string.ascii_lowercase + string.digits, k=6))
 
     def set_container_image(self, image: str):
+        ContainerImageValidator.validate(image, self.registry_pat)
+
         self.container_image = image
 
     def set_registry_pat(self, pat: str):

{q8s-0.11.0.dev2 → q8s-0.11.2}/src/q8s.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: q8s
-Version: 0.11.0.dev2
+Version: 0.11.2
 Summary: Kernel extension for executing quantum programs in simulators on q8s clusters
 Author-email: Vlad Stirbu <vstirbu@gmail.com>
 License:                                  Apache License
@@ -229,6 +229,7 @@ Requires-Dist: python-dotenv==1.0.1
 Requires-Dist: pyyaml==6.0.2
 Requires-Dist: typer>=0.15.4
 Requires-Dist: GitPython>=3.1.43
+Requires-Dist: python-dxf>=12.1.1
 Provides-Extra: benchmark
 Requires-Dist: pandas; extra == "benchmark"
 Requires-Dist: testbook; extra == "benchmark"

{q8s-0.11.0.dev2 → q8s-0.11.2}/src/q8s.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ src/q8s/plugins/utils/__init__.py
 src/q8s/plugins/utils/git_info.py
 tests/test_backend.py
 tests/test_bakefile.py
+tests/test_execution.py
 tests/test_git_info.py
 tests/test_job_plugin.py
 tests/test_job_template_spec.py

{q8s-0.11.0.dev2 → q8s-0.11.2}/src/q8s.egg-info/requires.txt

@@ -7,6 +7,7 @@ python-dotenv==1.0.1
 pyyaml==6.0.2
 typer>=0.15.4
 GitPython>=3.1.43
+python-dxf>=12.1.1
 
 [benchmark]
 pandas

q8s-0.11.2/tests/test_execution.py

@@ -0,0 +1,103 @@
+import unittest
+from unittest.mock import patch
+
+import requests
+from dxf.exceptions import DXFUnauthorizedError
+
+from q8s.execution import ContainerImageValidator
+
+
+class MockResponse:
+    def __init__(self, status_code):
+        self.status_code = status_code
+
+
+class TestContainerImageValidator(unittest.TestCase):
+
+    @patch("q8s.execution.DXF")
+    def test_validate_dockerhub_success_without_pat(self, MockDXF):
+        instance = MockDXF.return_value
+
+        result = ContainerImageValidator.validate("user/repo:tag")
+
+        self.assertTrue(result)
+        MockDXF.assert_called_once_with("registry-1.docker.io", repo="user/repo")
+        instance.authenticate.assert_not_called()
+        instance.get_alias.assert_called_once_with("tag")
+
+    @patch("q8s.execution.DXF")
+    def test_validate_custom_registry_with_pat_authenticate_called(self, MockDXF):
+        instance = MockDXF.return_value
+
+        result = ContainerImageValidator.validate(
+            "myregistry.com/user/repo:tag", registry_pat="token123"
+        )
+
+        self.assertTrue(result)
+        MockDXF.assert_called_once_with("myregistry.com", repo="user/repo")
+        instance.authenticate.assert_called_once_with(
+            username="user", password="token123", actions=["pull"]
+        )
+        instance.get_alias.assert_called_once_with("tag")
+
+    @patch("q8s.execution.DXF")
+    def test_validate_uses_latest_tag_by_default(self, MockDXF):
+        instance = MockDXF.return_value
+
+        result = ContainerImageValidator.validate("user/repo")
+
+        self.assertTrue(result)
+        MockDXF.assert_called_once_with("registry-1.docker.io", repo="user/repo")
+        instance.get_alias.assert_called_once_with("latest")
+
+    @patch("q8s.execution.DXF")
+    def test_validate_unauthorized_raises_value_error(self, MockDXF):
+        instance = MockDXF.return_value
+        instance.get_alias.side_effect = DXFUnauthorizedError()
+
+        with self.assertRaises(ValueError) as ctx:
+            ContainerImageValidator.validate("user/repo:tag")
+
+        self.assertIn("requires authentication", str(ctx.exception))
+
+    @patch("q8s.execution.DXF")
+    def test_validate_http_403_invalid_pat(self, MockDXF):
+        instance = MockDXF.return_value
+
+        http_error = requests.exceptions.HTTPError()
+
+        http_error.response = MockResponse(403)
+        instance.get_alias.side_effect = http_error
+
+        with self.assertRaises(ValueError) as ctx:
+            ContainerImageValidator.validate("user/repo:tag", registry_pat="badpat")
+
+        self.assertIn("invalid registry PAT", str(ctx.exception))
+
+    @patch("q8s.execution.DXF")
+    def test_validate_http_404_not_found(self, MockDXF):
+        instance = MockDXF.return_value
+
+        http_error = requests.exceptions.HTTPError()
+
+        http_error.response = MockResponse(404)
+        instance.get_alias.side_effect = http_error
+
+        with self.assertRaises(ValueError) as ctx:
+            ContainerImageValidator.validate("user/repo:missing")
+
+        self.assertIn("not found", str(ctx.exception))
+
+    def test_validate_empty_image_raises(self):
+        with self.assertRaises(ValueError):
+            ContainerImageValidator.validate("")
+
+    @patch("q8s.execution.DXF")
+    def test_validate_invalid_reference_raises(self, MockDXF):
+        with self.assertRaises(ValueError) as ctx:
+            ContainerImageValidator.validate("invalidimage")
+            self.assertIn("Invalid container image reference", str(ctx.exception))
+
+
+if __name__ == "__main__":
+    unittest.main()

{q8s-0.11.0.dev2 → q8s-0.11.2}/src/q8s/cli.py

@@ -141,8 +141,8 @@ def execute(
     ) as progress:
         k8s_context = K8sContext(kubeconfig.as_posix(), progress=progress)
         k8s_context.set_target(target)
-        k8s_context.set_container_image(image)
         k8s_context.set_registry_pat(registry_pat)
+        k8s_context.set_container_image(image)
 
         workload = Workload.from_entry_script(entry_script=file)
         workload.set_args(args or [])

{q8s-0.11.0.dev2 → q8s-0.11.2}/src/q8s/kernel.py

@@ -58,8 +58,8 @@ class Q8sKernel(Kernel):
                 expand=True,
             ),
         )
-        self.k8s_context.set_container_image(self.docker_image)
         self.k8s_context.set_registry_pat(os.environ.get("REGISTRY_PAT", None))
+        self.k8s_context.set_container_image(self.docker_image)
 
         logging.info("q8s kernel started")
         logging.info(f"docker image: {self.docker_image}")