fluidattacks_batch_client 0.2.0__tar.gz → 0.2.2__tar.gz

{fluidattacks_batch_client-0.2.0 → fluidattacks_batch_client-0.2.2}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: fluidattacks_batch_client
-Version: 0.2.0
+Version: 0.2.2
 Summary: AWS batch python client
 Author-email: Engineering Team <development@fluidattacks.com>
 Requires-Python: >=3.11
 Requires-Dist: click >=8.1.8, <9.0.0
 Requires-Dist: boto3 >=1.42.32, <2.0.0
-Requires-Dist: fa_purity >=2.5.0, <3.0.0
+Requires-Dist: fa-purity >=2.5.0, <3.0.0
+Requires-Dist: mypy-boto3-batch >=1.39.0, <2.0.0

fluidattacks_batch_client-0.2.2/build/default.nix

@@ -0,0 +1,27 @@
+{
+  nixpkgs,
+  builders,
+  scripts,
+  src,
+}:
+let
+  build_bin =
+    bundle:
+    nixpkgs.writeShellApplication {
+      name = "batch-client";
+      runtimeInputs = [
+        bundle.env.runtime
+        nixpkgs.sops
+      ];
+      text = ''
+        batch-client "''${@}"
+      '';
+    };
+in
+{
+  inherit src;
+  root_path = "observes/common/batch-client";
+  module_name = "fluidattacks_batch_client";
+  pypi_token_var = "BATCH_CLIENT_TOKEN";
+  override = bundle: bundle // { bin = build_bin bundle; };
+}

{fluidattacks_batch_client-0.2.0 → fluidattacks_batch_client-0.2.2}/fluidattacks_batch_client/__init__.py

@@ -5,5 +5,5 @@ from fa_purity import (
     Unsafe,
 )
 
-__version__ = "0.2.0"
+__version__ = "0.2.2"
 Unsafe.compute(setup_logger(__name__))

{fluidattacks_batch_client-0.2.0 → fluidattacks_batch_client-0.2.2}/fluidattacks_batch_client/_cli.py

@@ -38,25 +38,26 @@ from typing import (
 )
 import logging
 from . import _utils
+from pathlib import Path
 
 LOG = logging.getLogger(__name__)
 
 _T = TypeVar("_T")
 
 
-def _read_file(file_path: str, transform: Callable[[IO[str]], _T]) -> Cmd[_T]:
+def _read_file(file_path: Path, transform: Callable[[IO[str]], _T]) -> Cmd[_T]:
     def _action() -> _T:
-        with open(file_path, "r", encoding="utf-8") as file:
+        with file_path.open("r", encoding="utf-8") as file:
             return transform(file)
 
     return Cmd.wrap_impure(_action)
 
 
-def _decode_json(file_path: str) -> Cmd[ResultE[JsonObj]]:
+def _decode_json(file_path: Path) -> Cmd[ResultE[JsonObj]]:
     return _read_file(file_path, UnfoldedFactory.load)
 
 
-def _decode_json_list(file_path: str) -> Cmd[ResultE[FrozenList[JsonObj]]]:
+def _decode_json_list(file_path: Path) -> Cmd[ResultE[FrozenList[JsonObj]]]:
     return _read_file(
         file_path,
         lambda file: JsonValueFactory.load(file).bind(
@@ -66,13 +67,18 @@ def _decode_json_list(file_path: str) -> Cmd[ResultE[FrozenList[JsonObj]]]:
 
 
 @click.command()
-@click.option("--job", required=True, help="json encoded str defining a JobRequest")
+@click.option(
+    "--job",
+    required=True,
+    type=click.Path(exists=True, dir_okay=False, path_type=Path),
+    help="json encoded file defining a JobRequest",
+)
 @click.option("--allow-duplicates", is_flag=True)
 @click.option("--args-in-name", is_flag=True)
 @click.option("--dry-run", is_flag=True)
 @click.argument("args", nargs=-1)  # additional args to append into the job command
 def submit_job(
-    job: str,
+    job: Path,
     allow_duplicates: bool,
     args_in_name: bool,
     dry_run: bool,
@@ -113,11 +119,14 @@ def submit_job(
 
 @click.command()
 @click.option(
-    "--pipeline", required=True, help="json encoded str defining a JobRequest"
+    "--pipeline",
+    required=True,
+    type=click.Path(exists=True, dir_okay=False, path_type=Path),
+    help="file encoding a list of JobRequest i.e. list of jsons",
 )
 @click.option("--dry-run", is_flag=True)
 def submit_pipeline(
-    pipeline: str,
+    pipeline: Path,
     dry_run: bool,
 ) -> NoReturn:
     def _execute(job_pipeline: JobPipeline) -> Cmd[UnitType]:

{fluidattacks_batch_client-0.2.0 → fluidattacks_batch_client-0.2.2}/pyproject.toml

@@ -5,7 +5,8 @@ requires-python = ">=3.11"
 dependencies = [
     "click >=8.1.8, <9.0.0",
     "boto3 >=1.42.32, <2.0.0",
-    "fa_purity >=2.5.0, <3.0.0",
+    "fa-purity >=2.5.0, <3.0.0",
+    "mypy-boto3-batch >=1.39.0, <2.0.0",
 ]
 description = "AWS batch python client"
 dynamic = ["version"]
@@ -20,7 +21,6 @@ build-backend = "flit_core.buildapi"
 [dependency-groups]
 dev = [
     "boto3-stubs >=1.39.3, <2.0.0",
-    "mypy-boto3-batch >=1.39.0, <2.0.0",
     "types-Deprecated >=1.3.1.20251101, <2.0.0",
     "arch-lint >=5.0.0, <6.0.0",
     "mypy >=1.18.2, <2.0.0",

fluidattacks_batch_client-0.2.0/build/default.nix

@@ -1,13 +0,0 @@
-{
-  nixpkgs,
-  builders,
-  scripts,
-  src,
-}:
-{
-  inherit src;
-  root_path = "observes/common/batch-client";
-  module_name = "fluidattacks_batch_client";
-  pypi_token_var = "BATCH_CLIENT_TOKEN";
-  override = b: b;
-}

{fluidattacks_batch_client-0.2.0 → fluidattacks_batch_client-0.2.2}/uv.lock

@@ -215,6 +215,7 @@ dependencies = [
     { name = "boto3" },
     { name = "click" },
     { name = "fa-purity" },
+    { name = "mypy-boto3-batch" },
 ]
 
 [package.dev-dependencies]
@@ -222,7 +223,6 @@ dev = [
     { name = "arch-lint" },
     { name = "boto3-stubs" },
     { name = "mypy" },
-    { name = "mypy-boto3-batch" },
     { name = "pytest" },
     { name = "pytest-cov" },
     { name = "ruff" },
@@ -234,6 +234,7 @@ requires-dist = [
     { name = "boto3", specifier = ">=1.42.32,<2.0.0" },
     { name = "click", specifier = ">=8.1.8,<9.0.0" },
     { name = "fa-purity", specifier = ">=2.5.0,<3.0.0" },
+    { name = "mypy-boto3-batch", specifier = ">=1.39.0,<2.0.0" },
 ]
 
 [package.metadata.requires-dev]
@@ -241,7 +242,6 @@ dev = [
     { name = "arch-lint", specifier = ">=5.0.0,<6.0.0" },
     { name = "boto3-stubs", specifier = ">=1.39.3,<2.0.0" },
     { name = "mypy", specifier = ">=1.18.2,<2.0.0" },
-    { name = "mypy-boto3-batch", specifier = ">=1.39.0,<2.0.0" },
     { name = "pytest", specifier = ">=8.4.2,<9.0.0" },
     { name = "pytest-cov", specifier = ">=7.0.0,<8.0.0" },
     { name = "ruff", specifier = ">=0.14.1,<1.0.0" },