q8s 0.8.0__tar.gz → 0.8.0.dev2__tar.gz

{q8s-0.8.0 → q8s-0.8.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: q8s
-Version: 0.8.0
+Version: 0.8.0.dev2
 Summary: Kernel extension for executing quantum programs in simulators on q8s clusters
 Author-email: Vlad Stirbu <vstirbu@gmail.com>
 License:                                  Apache License

{q8s-0.8.0 → q8s-0.8.0.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "q8s"
-version = "0.8.0"
+version = "0.8.0.dev2"
 description = "Kernel extension for executing quantum programs in simulators on q8s clusters"
 authors = [{ name = "Vlad Stirbu", email = "vstirbu@gmail.com" }]
 readme = "README.md"

{q8s-0.8.0 → q8s-0.8.0.dev2}/q8s/cli.py

@@ -16,22 +16,6 @@ from q8s.workload import Workload
 app = typer.Typer()
 
 
-@app.command()
-def init(
-    images: Annotated[
-        bool, typer.Option(help="Initialize images cache if build in a CI pipeline")
-    ] = False,
-):
-    project = Project()
-    project.init_cache()
-
-    if images:
-        project.images_from_ci()
-        project.update_images_cache()
-
-    print(f"Project {project.name} initialized")
-
-
 @app.command()
 def build(
     init: Annotated[bool, typer.Option(help="Initialize project")] = False,

{q8s-0.8.0 → q8s-0.8.0.dev2}/q8s/plugins/cpu_job.py

@@ -25,14 +25,13 @@ class CPUJobTemplatePlugin:
 
         volume_name = f"app-volume-{name}"
 
-        env_var = list(env)
         if workload.is_src_project:
-            env_var.append(client.V1EnvVar(name="PYTHONPATH", value=f"{WORKSPACE}/src"))
+            env.append(client.V1EnvVar(name="PYTHONPATH", value=f"{WORKSPACE}/src"))
 
         container = client.V1Container(
             name="quantum-routine",
             image=container_image,
-            env=env_var,
+            env=env,
             command=["python"],
             args=(
                 ["-m", workload.entry_module] + workload.args

{q8s-0.8.0 → q8s-0.8.0.dev2}/q8s/plugins/cuda_job.py

@@ -31,14 +31,13 @@ class CUDAJobTemplatePlugin:
 
         volume_name = f"app-volume-{name}"
 
-        env_var = list(env)
         if workload.is_src_project:
-            env_var.append(client.V1EnvVar(name="PYTHONPATH", value=f"{WORKSPACE}/src"))
+            env.append(client.V1EnvVar(name="PYTHONPATH", value=f"{WORKSPACE}/src"))
 
         container = client.V1Container(
             name="quantum-routine",
             image=container_image,
-            env=env_var,
+            env=env,
             command=["python"],
             args=(
                 ["-m", workload.entry_module] + workload.args

{q8s-0.8.0 → q8s-0.8.0.dev2}/q8s/project.py

@@ -1,4 +1,3 @@
-import configparser
 from dataclasses import dataclass
 from datetime import datetime
 from pathlib import Path
@@ -44,7 +43,7 @@ def _read_stream_lines(stream, progress, silent, is_error: bool = False):
     """
     while True:
         line = stream.readline()
-        if line == "":
+        if line == '':
             break
         if not silent:
             if is_error:
@@ -97,7 +96,6 @@ class Q8SDocker:
     username: str
     registry: Optional[str]
 
-
 @dataclass
 class Q8SProject:
     name: str
@@ -114,11 +112,9 @@ class CacheNotBuiltException(Exception):
 class ProjectNotFoundException(Exception):
     pass
 
-
 class ProjectInvalidConfigurationException(Exception):
     pass
 
-
 class Project:
     name: str
     __path: str
@@ -219,15 +215,14 @@ class Project:
             stderr=STDOUT,
             bufsize=1,
             universal_newlines=True,
-            encoding="utf-8",  # force UTF-8 decoding
-            errors="replace",  # avoid crashing on bad bytes
+            encoding="utf-8",   # force UTF-8 decoding
+            errors="replace",   # avoid crashing on bad bytes
         )
 
         if sys.platform == "win32":
             # Windows-safe: read line by line instead of using selectors
             _handle_subprocess_output(build_process, progress, silent)
         else:
-
             def handle_output(stream, mask):
                 # Because the process' output is line buffered, there's only ever one
                 # line to read when this function is called
@@ -275,8 +270,8 @@ class Project:
             stderr=STDOUT,
             bufsize=1,
             universal_newlines=True,
-            encoding="utf-8",  # force UTF-8 decoding
-            errors="replace",  # avoid crashing on bad bytes
+            encoding="utf-8",   # force UTF-8 decoding
+            errors="replace",   # avoid crashing on bad bytes
         )
 
         if sys.platform == "win32":
@@ -284,7 +279,6 @@ class Project:
             _handle_subprocess_output(push_process, progress, silent)
 
         else:
-
             def handle_output(stream, mask):
                 # Because the process' output is line buffered, there's only ever one
                 # line to read when this function is called
@@ -312,19 +306,11 @@ class Project:
         else:
             progress.advance(task)
 
-    def images_from_ci(self):
-        """
-        Images are build in a CI pipeline.
-        """
-        for target in self.configuration.targets.keys():
-            self.__images[target] = self.__image_name(target)
-
     def update_images_cache(self):
         """
         Update the images cache
         """
         with open(join(self.__path, ".q8s_cache", "images"), "w") as f:
-            print(f"# This file is autogenerated by q8sctl\n", file=f)
             yaml.dump(self.__images, f)
 
     def clear_cache(self):
@@ -339,7 +325,7 @@ class Project:
 
     def __image_name(self, target: str):
         registry = self.configuration.docker.registry
-        username = self.__docker_login().lower()
+        username = self.__docker_login()
 
         # Build image name based on available information
         if registry and username:
@@ -402,15 +388,6 @@ class Project:
             file=f,
         )
         print(f"LABEL org.opencontainers.image.title={self.name}", file=f)
-
-        url = self.__get_project_url()
-
-        if url is not None:
-            print(
-                f"LABEL org.opencontainers.image.source={url.strip()}",
-                file=f,
-            )
-
         print("", file=f)
 
         print(f"WORKDIR {WORKSPACE}", file=f)
@@ -422,20 +399,3 @@ class Project:
             raise Exception(f"Target {target} not found")
 
         return getattr(self.configuration.targets, target)
-
-    def __get_project_url(self) -> Optional[str]:
-        """
-        Get the project URL from setup.cfg if available
-        """
-        cfg_path = Path(self.__path) / "setup.cfg"
-        if not cfg_path.exists():
-            return None
-
-        config = configparser.ConfigParser()
-        config.read(cfg_path)
-
-        url = config.get("metadata", "url", fallback=None)
-        if url is not None:
-            return url.strip()
-
-        return None

{q8s-0.8.0 → q8s-0.8.0.dev2}/q8s/workload.py

@@ -7,34 +7,34 @@ from .multifiles import collect_imported_files
 
 class Workload:
     """
-    Represents a multifile workload consisting of an entry script and its imported files
+    Represents a mutifile workload consisting of an entry script and its imported files
     """
 
-    def __init__(self, entry_script: Path | str = None, code: str = None):
-        self.__pyproject_root: Path | None = None
-        self.__args: list[str] = []
+    __pyproject_root: Path | None = None
+    __args: list[str] = []
 
+    def __init__(self, entry_script: Path | str = None, code: str = None):
         if entry_script is not None:
 
-            self.__entry_script = Path(os.path.abspath(entry_script))
-
-            if self.__detect_and_set_src_layout():
+            if self.__is_src_layout():
+                self.__entry_script = Path(os.path.abspath(entry_script))
                 self.__base_path = self.__pyproject_root
 
                 self.__files = collect_imported_files(
                     self.__entry_script, is_project=True
                 )
+
             else:
+                self.__entry_script = Path(os.path.abspath(entry_script))
                 self.__base_path = self.__entry_script.parent
 
                 self.__files = collect_imported_files(
                     self.__entry_script, is_project=False
                 )
 
-            self.__data = {}
-            for f in self.__files:
-                with open(f, "r", encoding="utf-8") as file:
-                    self.__data[self.__path_mapping(f)] = file.read()
+            self.__data = {
+                self.__path_mapping(f): open(f, "r").read() for f in self.__files
+            }
 
         elif code is not None:
             self.__entry_script = Path(os.path.abspath("main.py"))
@@ -86,7 +86,7 @@ class Workload:
         """
         Entry script module name
         """
-        return self.entry_script.replace(os.path.sep, ".")[:-3]  # strip .py
+        return self.entry_script.replace("/", ".")[:-3]  # strip .py
 
     @property
     def data(self) -> dict[str, str]:
@@ -127,7 +127,7 @@ class Workload:
         """
         return self.__relative_path(file).replace("/", "__")
 
-    def __find_pyproject_root(self) -> Path | None:
+    def __pyproject_root(self, start: Path | None = None) -> Path | None:
         """
         Find the project root by looking for setup.cfg or pyproject.toml
         """
@@ -140,11 +140,11 @@ class Workload:
 
         return None
 
-    def __detect_and_set_src_layout(self) -> bool:
+    def __is_src_layout(self) -> bool:
         """
         Determine if the project uses a src/ layout
         """
-        root = self.__find_pyproject_root()
+        root = self.__pyproject_root()
 
         if root is None:
             return False

{q8s-0.8.0 → q8s-0.8.0.dev2}/q8s.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: q8s
-Version: 0.8.0
+Version: 0.8.0.dev2
 Summary: Kernel extension for executing quantum programs in simulators on q8s clusters
 Author-email: Vlad Stirbu <vstirbu@gmail.com>
 License:                                  Apache License