q8s 0.7.0__tar.gz → 0.8.0.dev2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: q8s
-Version: 0.7.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
@@ -234,6 +234,10 @@ Dynamic: license-file
 
 # q8s
 
+[![PyPI version](https://img.shields.io/pypi/v/q8s.svg)](https://pypi.org/project/q8s/)
+[![Python versions](https://img.shields.io/pypi/pyversions/q8s.svg)](https://pypi.org/project/q8s/)
+[![PyPI Downloads](https://static.pepy.tech/personalized-badge/q8s?period=total&units=INTERNATIONAL_SYSTEM&left_color=GREY&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/q8s)
+
 Toolset for executing quantum jobs on [Qubernetes](https://www.qubernetes.dev).
 
 ## Installation

{q8s-0.7.0 → q8s-0.8.0.dev2}/README.md

@@ -1,5 +1,9 @@
 # q8s
 
+[![PyPI version](https://img.shields.io/pypi/v/q8s.svg)](https://pypi.org/project/q8s/)
+[![Python versions](https://img.shields.io/pypi/pyversions/q8s.svg)](https://pypi.org/project/q8s/)
+[![PyPI Downloads](https://static.pepy.tech/personalized-badge/q8s?period=total&units=INTERNATIONAL_SYSTEM&left_color=GREY&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/q8s)
+
 Toolset for executing quantum jobs on [Qubernetes](https://www.qubernetes.dev).
 
 ## Installation

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

@@ -1,6 +1,6 @@
 [project]
 name = "q8s"
-version = "0.7.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.7.0 → q8s-0.8.0.dev2}/q8s/cli.py

@@ -71,7 +71,12 @@ def build(
     project.update_images_cache()
 
 
-@app.command()
+@app.command(
+    context_settings={
+        "allow_extra_args": True,
+        "ignore_unknown_options": True,
+    }
+)
 def execute(
     file: Annotated[Path, typer.Argument(help="Python file to be executed")],
     target: Annotated[
@@ -88,6 +93,7 @@ def execute(
             envvar="REGISTRY_PAT",
         ),
     ] = None,
+    args: Annotated[list[str], typer.Argument(help="Additional arguments")] = None,
 ):
     project = Project()
 
@@ -117,6 +123,7 @@ def execute(
         k8s_context.set_registry_pat(registry_pat)
 
         workload = Workload.from_entry_script(entry_script=file)
+        workload.set_args(args or [])
 
         output, stream_name = k8s_context.execute_workload(workload=workload)
 

{q8s-0.7.0 → q8s-0.8.0.dev2}/q8s/execution.py

@@ -136,7 +136,7 @@ class K8sContext:
         self.__progress.console.print("Job created")
 
         self.__create_config_map_object_from_workload(job, workload=workload)
-        self.__progress.console.print("Application code created")
+        self.__progress.console.print("Application code attached")
         self.__create_environment_secret()
         self.__progress.console.print("Environment variables created")
 

{q8s-0.7.0 → q8s-0.8.0.dev2}/q8s/multifiles.py

@@ -9,16 +9,17 @@ GLOBAL = getattr(sys, "base_prefix", sys.prefix)
 LOCAL = sys.prefix
 
 
-def _resolve_spec(modname: str, package: str | None = None):
-    cwd = os.getcwd()
-    sys.path.insert(0, cwd)
+def _resolve_spec(modname: str, package: str | None = None, is_project: bool = False):
+    """Resolve a module spec, temporarily adjusting sys.path for project layout."""
+    cwd = Path(os.getcwd()) / "src" if is_project else Path(os.getcwd())
+    sys.path.insert(0, str(cwd))
 
     try:
         return importlib.util.find_spec(modname, package=package)
     except Exception:
         return None
     finally:
-        sys.path.remove(cwd)
+        sys.path.remove(str(cwd))
 
 
 def _spec_origin_files(spec: ModuleSpec):
@@ -106,7 +107,9 @@ def pkg_name_for_file(fpath: Path | str):
     return ".".join(reversed(parts)) if parts else None
 
 
-def collect_imported_files(entry_script: str | Path):
+def collect_imported_files(
+    entry_script: str | Path, is_project: bool = True
+) -> set[Path]:
     """
     Return a set of file paths transitively imported by entry_script
     except pip-installed and global interpreter packages.
@@ -136,7 +139,7 @@ def collect_imported_files(entry_script: str | Path):
                 continue
 
             # Explore the resolved module/package
-            spec = _resolve_spec(target)
+            spec = _resolve_spec(target, is_project=is_project)
             if not spec:
                 continue
 

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

@@ -16,10 +16,7 @@ class CPUJobTemplatePlugin:
         registry_credentials_secret_name: str,
         container_image: str,
         workload: Workload,
-        env: Dict[
-            str,
-            str | None,
-        ],
+        env: list[client.V1EnvVar],
         target: Target,
     ) -> client.V1PodTemplateSpec:
 
@@ -28,12 +25,19 @@ class CPUJobTemplatePlugin:
 
         volume_name = f"app-volume-{name}"
 
+        if workload.is_src_project:
+            env.append(client.V1EnvVar(name="PYTHONPATH", value=f"{WORKSPACE}/src"))
+
         container = client.V1Container(
             name="quantum-routine",
             image=container_image,
             env=env,
             command=["python"],
-            args=[f"{WORKSPACE}/{workload.entry_script}"],
+            args=(
+                ["-m", workload.entry_module] + workload.args
+                if workload.is_src_project
+                else [f"{WORKSPACE}/{workload.entry_script}"] + workload.args
+            ),
             image_pull_policy="Always",
             volume_mounts=[
                 client.V1VolumeMount(

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

@@ -22,10 +22,7 @@ class CUDAJobTemplatePlugin:
         registry_credentials_secret_name: str,
         container_image: str,
         workload: Workload,
-        env: Dict[
-            str,
-            str | None,
-        ],
+        env: list[client.V1EnvVar],
         target: Target,
     ) -> client.V1PodTemplateSpec:
 
@@ -34,12 +31,19 @@ class CUDAJobTemplatePlugin:
 
         volume_name = f"app-volume-{name}"
 
+        if workload.is_src_project:
+            env.append(client.V1EnvVar(name="PYTHONPATH", value=f"{WORKSPACE}/src"))
+
         container = client.V1Container(
             name="quantum-routine",
             image=container_image,
             env=env,
             command=["python"],
-            args=[f"{WORKSPACE}/{workload.entry_script}"],
+            args=(
+                ["-m", workload.entry_module] + workload.args
+                if workload.is_src_project
+                else [f"{WORKSPACE}/{workload.entry_script}"] + workload.args
+            ),
             image_pull_policy="Always",
             resources=(
                 client.V1ResourceRequirements(

{q8s-0.7.0 → q8s-0.8.0.dev2}/q8s/plugins/job_template_spec.py

@@ -34,10 +34,7 @@ class JobTemplatePluginSpec:
         registry_credentials_secret_name: str,
         container_image: str,
         workload: Workload,
-        env: Dict[
-            str,
-            str | None,
-        ],
+        env: list[client.V1EnvVar],
         target: Target,
     ) -> client.V1PodTemplateSpec:
         return None

q8s-0.8.0.dev2/q8s/workload.py

@@ -0,0 +1,167 @@
+from pathlib import Path
+import configparser
+import os
+
+from .multifiles import collect_imported_files
+
+
+class Workload:
+    """
+    Represents a mutifile workload consisting of an entry script and its imported files
+    """
+
+    __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:
+
+            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 = {
+                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"))
+            self.__base_path = os.getcwd()
+            self.__files = [Path(self.__entry_script)]
+
+            self.__data = {self.__path_mapping(self.__entry_script): code}
+
+        else:
+            raise ValueError("Either entry_script or code must be provided.")
+
+    @classmethod
+    def from_code(cls, code: str):
+        """
+        Create a Workload from code string
+        """
+        return cls(code=code)
+
+    @classmethod
+    def from_entry_script(cls, entry_script: Path | str):
+        """
+        Create a Workload from an entry script file path
+        """
+        return cls(entry_script=entry_script)
+
+    @property
+    def files(self) -> list[Path]:
+        """
+        List of all files in the workload
+        """
+        return self.__files
+
+    @property
+    def entry_script(self) -> Path:
+        """
+        Entry script path relative to base path
+        """
+        return self.__relative_path(self.__entry_script)
+
+    @property
+    def is_src_project(self) -> bool:
+        """
+        Whether the project uses a src/ layout
+        """
+        return self.__pyproject_root is not None
+
+    @property
+    def entry_module(self) -> str:
+        """
+        Entry script module name
+        """
+        return self.entry_script.replace("/", ".")[:-3]  # strip .py
+
+    @property
+    def data(self) -> dict[str, str]:
+        """
+        Dictionary mapping file paths to their contents
+        """
+        return self.__data
+
+    @property
+    def mappings(self):
+        """
+        Dictionary mapping relative file paths to their unique path mappings
+        """
+        return {self.__path_mapping(f): self.__relative_path(f) for f in self.__files}
+
+    @property
+    def args(self) -> list[str]:
+        """
+        Additional arguments for the workload
+        """
+        return self.__args
+
+    def set_args(self, args: list[str]) -> None:
+        """
+        Set additional arguments for the workload
+        """
+        self.__args = args
+
+    def __relative_path(self, file: Path | str) -> str:
+        """
+        Get the relative path of a file with respect to the base path
+        """
+        return os.path.relpath(os.path.abspath(file), self.__base_path)
+
+    def __path_mapping(self, file: Path | str) -> str:
+        """
+        Get the unique path mapping for a file
+        """
+        return self.__relative_path(file).replace("/", "__")
+
+    def __pyproject_root(self, start: Path | None = None) -> Path | None:
+        """
+        Find the project root by looking for setup.cfg or pyproject.toml
+        """
+
+        if (
+            Path(os.path.join(os.getcwd(), "setup.cfg")).exists()
+            or Path(os.path.join(os.getcwd(), "pyproject.toml")).exists()
+        ):
+            return Path(os.getcwd()).resolve()
+
+        return None
+
+    def __is_src_layout(self) -> bool:
+        """
+        Determine if the project uses a src/ layout
+        """
+        root = self.__pyproject_root()
+
+        if root is None:
+            return False
+
+        cfg_path = root / "setup.cfg"
+        if not cfg_path.exists():
+            return False
+
+        config = configparser.ConfigParser()
+        config.read(cfg_path)
+
+        # Very simple heuristic: [options.packages.find] where = src
+        if config.has_section("options.packages.find"):
+            where = config.get("options.packages.find", "where", fallback="").strip()
+            if where == "src":
+                self.__pyproject_root = root
+                return True
+
+        # You could add similar checks for pyproject.toml if you use that
+        return False

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: q8s
-Version: 0.7.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
@@ -234,6 +234,10 @@ Dynamic: license-file
 
 # q8s
 
+[![PyPI version](https://img.shields.io/pypi/v/q8s.svg)](https://pypi.org/project/q8s/)
+[![Python versions](https://img.shields.io/pypi/pyversions/q8s.svg)](https://pypi.org/project/q8s/)
+[![PyPI Downloads](https://static.pepy.tech/personalized-badge/q8s?period=total&units=INTERNATIONAL_SYSTEM&left_color=GREY&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/q8s)
+
 Toolset for executing quantum jobs on [Qubernetes](https://www.qubernetes.dev).
 
 ## Installation

q8s-0.7.0/q8s/workload.py

@@ -1,82 +0,0 @@
-from pathlib import Path
-import os
-
-from .multifiles import collect_imported_files
-
-
-class Workload:
-    """
-    Represents a mutifile workload consisting of an entry script and its imported files
-    """
-
-    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))
-            self.__base_path = self.__entry_script.parent
-
-            self.__files = collect_imported_files(self.__entry_script)
-            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"))
-            self.__base_path = os.getcwd()
-            self.__files = [Path(self.__entry_script)]
-
-            self.__data = {self.__path_mapping(self.__entry_script): code}
-        else:
-            raise ValueError("Either entry_script or code must be provided.")
-
-    @classmethod
-    def from_code(cls, code: str):
-        """
-        Create a Workload from code string
-        """
-        return cls(code=code)
-
-    @classmethod
-    def from_entry_script(cls, entry_script: Path | str):
-        """
-        Create a Workload from an entry script file path
-        """
-        return cls(entry_script=entry_script)
-
-    @property
-    def files(self) -> list[Path]:
-        """
-        List of all files in the workload
-        """
-        return self.__files
-
-    @property
-    def entry_script(self) -> Path:
-        """
-        Entry script path relative to base path
-        """
-        return self.__relative_path(self.__entry_script)
-
-    @property
-    def data(self) -> dict[str, str]:
-        """
-        Dictionary mapping file paths to their contents
-        """
-        return self.__data
-
-    @property
-    def mappings(self):
-        """
-        Dictionary mapping relative file paths to their unique path mappings
-        """
-        return {self.__path_mapping(f): self.__relative_path(f) for f in self.__files}
-
-    def __relative_path(self, file: Path | str) -> str:
-        """
-        Get the relative path of a file with respect to the base path
-        """
-        return os.path.relpath(os.path.abspath(file), self.__base_path)
-
-    def __path_mapping(self, file: Path | str) -> str:
-        """
-        Get the unique path mapping for a file
-        """
-        return self.__relative_path(file).replace("/", "__")