fluxqueue-cli 0.1.0b4__tar.gz → 0.1.1__tar.gz

{fluxqueue_cli-0.1.0b4 → fluxqueue_cli-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fluxqueue-cli
-Version: 0.1.0b4
+Version: 0.1.1
 Summary: A command-line tool for installing and running FluxQueue workers
 Author-Email: Giorgi Merebashvili <mereba2627@gmail.com>
 License-Expression: Apache-2.0
@@ -9,9 +9,7 @@ Requires-Python: <3.15,>=3.11
 Requires-Dist: typer>=0.17.0
 Requires-Dist: requests>=2.29.0
 Provides-Extra: dev
-Requires-Dist: black; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
-Requires-Dist: pdm; extra == "dev"
 Description-Content-Type: text/markdown
 
 ## FluxQueue CLI
@@ -34,7 +32,7 @@ fluxqueue worker install
 
 ## Starting a Worker
 
-To start a worker, provide the path to the module where your tasks are defined and exported:
+To start a worker, provide the path to the module where your tasks are exported:
 
 ```bash
 fluxqueue start --tasks-module-path src/tasks

{fluxqueue_cli-0.1.0b4 → fluxqueue_cli-0.1.1}/README.md

@@ -18,7 +18,7 @@ fluxqueue worker install
 
 ## Starting a Worker
 
-To start a worker, provide the path to the module where your tasks are defined and exported:
+To start a worker, provide the path to the module where your tasks are exported:
 
 ```bash
 fluxqueue start --tasks-module-path src/tasks

{fluxqueue_cli-0.1.0b4 → fluxqueue_cli-0.1.1}/pyproject.toml

@@ -21,26 +21,22 @@ dependencies = [
     "typer>=0.17.0",
     "requests>=2.29.0",
 ]
-version = "0.1.0b4"
+version = "0.1.1"
 
 [project.scripts]
 fluxqueue = "fluxqueue_cli.cli:app"
 
 [project.optional-dependencies]
 dev = [
-    "black",
     "ruff",
-    "pdm",
 ]
 
 [tool.pdm.version]
 source = "file"
 path = "src/fluxqueue_cli/__init__.py"
 
-[tool.black]
-line-length = 79
-include = "\\.pyi?$"
-preview = true
+[tool.ruff]
+line-length = 88
 
 [tool.ruff.lint]
 select = [

fluxqueue_cli-0.1.1/src/fluxqueue_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.1"

{fluxqueue_cli-0.1.0b4 → fluxqueue_cli-0.1.1}/src/fluxqueue_cli/cli.py

@@ -78,11 +78,21 @@ def start(
 @worker_app.command(name="install")
 def worker_install(
     version: Annotated[
+        str | None,
+        typer.Option(help="Version to install. If omitted, installs the latest."),
+    ] = None,
+    path: Annotated[
         str | None,
         typer.Option(
-            help="Version to install. If omitted, installs the latest."
+            help="Custom destination path. Otherwise installation will require sudo permissions."
         ),
     ] = None,
+    force: Annotated[
+        bool,
+        typer.Option(
+            help="In case of already installed worker in the destination path using this flag will force the installation."
+        ),
+    ] = False,
 ):
     """
     Download and install [bold]fluxqueue-worker[/bold].
@@ -95,16 +105,14 @@ def worker_install(
                 "Invalid version. Please use versions like: 0.1.0, 0.2.3"
             )
 
-    download_and_install(version)
+    download_and_install(version, path, force)
 
 
 @worker_app.command(name="update")
 def worker_update(
     version: Annotated[
         str | None,
-        typer.Option(
-            help="Version to update to. If omitted, updates to the latest."
-        ),
+        typer.Option(help="Version to update to. If omitted, updates to the latest."),
     ] = None,
     no_backup: Annotated[
         bool,

fluxqueue_cli-0.1.1/src/fluxqueue_cli/config.py

@@ -0,0 +1,18 @@
+import os
+import tomllib
+from pathlib import Path
+
+
+def get_fluxqueue_config():
+    toml_path = Path(os.getcwd()) / "pyproject.toml"
+
+    if not toml_path.exists():
+        return {}
+
+    try:
+        with open(toml_path, "rb") as f:
+            data = tomllib.load(f)
+        return data.get("tool", {}).get("fluxqueue_cli", {})
+
+    except (tomllib.TOMLDecodeError, PermissionError):
+        return {}

{fluxqueue_cli-0.1.0b4 → fluxqueue_cli-0.1.1}/src/fluxqueue_cli/worker.py

@@ -3,12 +3,15 @@ import platform
 import shutil
 import subprocess
 import sys
+import sysconfig
 import tarfile
 import tempfile
+import zipfile
 from pathlib import Path
 
 import requests
 
+from fluxqueue_cli.config import get_fluxqueue_config
 from fluxqueue_cli.exceptions import (
     AlreadyInstalledError,
     BinaryNotFoundError,
@@ -19,9 +22,14 @@ from fluxqueue_cli.exceptions import (
 
 REPO = "CCXLV/fluxqueue"
 BINARY_NAME = "fluxqueue-worker"
-INSTALL_DIR = "/usr/local/bin" if platform.system() != "Windows" else "C:\\bin"
+if platform.system() == "Windows":
+    user_profile = os.environ.get("USERPROFILE", os.path.expanduser("~"))
+    install_dir = os.path.join(user_profile, ".fluxqueue", "bin")
+    INSTALL_DIR = install_dir
+else:
+    INSTALL_DIR = "/usr/local/bin"
 
-# TODO: Refactor the headers since the token won't be needed when launched to public
+# TODO: Add startup wrapper support
 
 
 def start_worker(
@@ -32,6 +40,9 @@ def start_worker(
     queue: str,
     save_dead_tasks=False,
 ):
+    config = get_fluxqueue_config()
+    worker_path = config.get("worker_path", "fluxqueue-worker")
+
     # fmt: off
     arguments = [
         "--concurrency", str(concurrency),
@@ -44,18 +55,28 @@ def start_worker(
     if save_dead_tasks:
         arguments.append("--save-dead-tasks")
 
+    lib_dir = sysconfig.get_config_var("LIBDIR")
+    env = os.environ.copy()
+    if lib_dir:
+        current_ld = env.get("LD_LIBRARY_PATH", "")
+        env["LD_LIBRARY_PATH"] = f"{lib_dir}:{current_ld}" if current_ld else lib_dir
+
     subprocess.run(
-        ["fluxqueue-worker", *arguments],
+        [worker_path, *arguments],
         stdin=sys.stdin,
         stdout=sys.stdout,
         stderr=sys.stderr,
+        env=env,
     )
 
 
 def get_worker_version() -> str | None:
+    config = get_fluxqueue_config()
+    worker_path = config.get("worker_path", "fluxqueue-worker")
+
     try:
         result = subprocess.run(
-            ["fluxqueue-worker", "--version"],
+            [worker_path, "--version"],
             check=True,
             capture_output=True,
             text=True,
@@ -140,14 +161,11 @@ def download_worker_binary(version: str | None = None):
 
 
 def install_worker(
-    *, actual_file_name: str, temp_file_path: str, overwrite=False
+    *,
+    dest_path: Path,
+    actual_file_name: str,
+    temp_file_path: str,
 ):
-    dest_path = Path(INSTALL_DIR) / BINARY_NAME
-    if dest_path.exists() and not overwrite:
-        raise FileExistsError(
-            f"fluxqueue-worker is already installed at {dest_path}"
-        )
-
     # Linux
     if actual_file_name.endswith(".tar.gz"):
         with tarfile.open(temp_file_path, "r:gz") as tar:
@@ -161,27 +179,103 @@ def install_worker(
             except:
                 delete_installed_files(temp_file_path)
                 raise
-    # TODO: Implement Windows
+    # macOS + Windows
+    elif actual_file_name.endswith(".zip"):
+        with tempfile.TemporaryDirectory() as extract_temp_dir:
+            with zipfile.ZipFile(temp_file_path, "r") as zip_file:
+                zip_file.extractall(extract_temp_dir)
+
+            exe_name = (
+                f"{BINARY_NAME}.exe" if platform.system() == "Windows" else BINARY_NAME
+            )
+            found_binary = None
+
+            for root, _dirs, files in os.walk(extract_temp_dir):
+                if exe_name in files:
+                    found_binary = Path(root) / exe_name
+                    break
+
+            if not found_binary:
+                for root, _dirs, files in os.walk(extract_temp_dir):
+                    for file in files:
+                        if BINARY_NAME in file and (
+                            platform.system() != "Windows" or file.endswith(".exe")
+                        ):
+                            found_binary = Path(root) / file
+                            break
+                    if found_binary:
+                        break
+
+            if not found_binary:
+                try:
+                    os.remove(temp_file_path)
+                except PermissionError:
+                    raise PermissionError(
+                        f"Permission denied: Could not remove temporary file {temp_file_path}. "
+                        "Please remove it manually."
+                    ) from None
+                except OSError as e:
+                    if e.errno == 13:  # Permission denied (EACCES)
+                        raise PermissionError(
+                            f"Permission denied: Could not remove temporary file {temp_file_path}. "
+                            "Please remove it manually."
+                        ) from e
+                raise BinaryNotFoundError(
+                    f"Could not find {exe_name} in the downloaded archive."
+                )
+
+            dest_path.parent.mkdir(parents=True, exist_ok=True)
+            shutil.copy2(found_binary, dest_path)
+
+            if platform.system() != "Windows":
+                os.chmod(dest_path, 0o755)
+        try:
+            os.remove(temp_file_path)
+        except PermissionError:
+            raise PermissionError(
+                f"Permission denied: Could not remove temporary file {temp_file_path}. "
+                "Please remove it manually."
+            ) from None
+        except OSError as e:
+            if e.errno == 13:  # Permission denied (EACCES)
+                raise PermissionError(
+                    f"Permission denied: Could not remove temporary file {temp_file_path}. "
+                    "Please remove it manually."
+                ) from e
+            raise
     else:
         delete_installed_files(temp_file_path)
-        raise NotImplementedError(
-            "Only .tar.gz installation is implemented yet."
-        )
+        raise NotImplementedError("Only .tar.gz installation is implemented yet.")
+
+    print(f"Successfully installed {BINARY_NAME} to {dest_path}")
 
-    print(f"Successfully installed {BINARY_NAME} to {INSTALL_DIR}")
 
+def download_and_install(
+    version: str | None = None, custom_dest_path: str | None = None, force: bool = False
+):
+    dest_path = get_destination_path(custom_dest_path, force)
 
-def download_and_install(version: str | None = None):
-    if shutil.which("fluxqueue-worker"):
+    if not custom_dest_path and shutil.which("fluxqueue-worker"):
         raise AlreadyInstalledError(
             "fluxqueue-worker is already installed, use `fluxqueue worker update` command to update it."
         )
 
     temp_path, target_name = download_worker_binary(version)
-    install_worker(actual_file_name=target_name, temp_file_path=temp_path)
+    install_worker(
+        dest_path=dest_path,
+        actual_file_name=target_name,
+        temp_file_path=temp_path,
+    )
+
 
+def update_worker(
+    *,
+    version: str | None = None,
+    custom_dest_path: str | None = None,
+    no_backup: bool = False,
+):
+    dest_path = get_destination_path(custom_dest_path, no_backup)
 
-def update_worker(*, version: str | None = None, no_backup: bool = False):
     current_version = get_worker_version()
 
     if not current_version:
@@ -193,21 +287,37 @@ def update_worker(*, version: str | None = None, no_backup: bool = False):
     if version:
         print(f"Desired Version: {version}")
 
-    dest_path = os.path.join(INSTALL_DIR, BINARY_NAME)
+    backup_suffix = ".exe.backup" if platform.system() == "Windows" else ".backup"
+
     if not no_backup:
         new_name = os.path.join(
-            INSTALL_DIR, f"{BINARY_NAME}-{current_version}.backup"
+            INSTALL_DIR, f"{BINARY_NAME}-{current_version}{backup_suffix}"
         )
         os.rename(dest_path, new_name)
 
     temp_path, target_name = download_worker_binary(version)
     install_worker(
+        dest_path=dest_path,
         actual_file_name=target_name,
         temp_file_path=temp_path,
-        overwrite=no_backup,
     )
 
 
+def get_destination_path(custom_dest_path: str | None = None, force: bool = False):
+    dest_dir = Path(custom_dest_path) if custom_dest_path else Path(INSTALL_DIR)
+    if platform.system() == "Windows":
+        dest_path = dest_dir / f"{BINARY_NAME}.exe"
+    else:
+        dest_path = dest_dir / BINARY_NAME
+
+    if dest_path.exists() and not force:
+        raise FileExistsError(
+            f"fluxqueue-worker is already installed at {dest_path}. Use --force flag for forcing the installation."
+        )
+
+    return dest_path
+
+
 def delete_installed_files(temp_path: str):
     os.remove(BINARY_NAME)
     os.remove(temp_path)

fluxqueue_cli-0.1.0b4/src/fluxqueue_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.0b4"