pipen-cli-gbatch 0.0.5__py3-none-any.whl → 0.0.7__py3-none-any.whl

pipen_cli_gbatch/__init__.py

@@ -79,8 +79,9 @@ from pipen.cli import CLIPlugin
 from pipen.scheduler import GbatchScheduler
 from pipen_poplog import LogsPopulator
 
-__version__ = "0.0.5"
+__version__ = "0.0.7"
 __all__ = ("CliGbatchPlugin", "CliGbatchDaemon")
+MOUNTED_CWD = "/mnt/disks/.cwd"
 
 
 class CliGbatchDaemon:
@@ -115,6 +116,17 @@ class CliGbatchDaemon:
         else:
             self.config = Diot(config)
 
+        self.mount_as_cwd = self.config.pop("mount_as_cwd", None)
+        if self.mount_as_cwd:
+            if self.config.cwd:
+                print(
+                    "\033[1;4mError\033[0m: --mount-as-cwd cannot be used with "
+                    "--cwd at the same time.\n"
+                )
+                sys.exit(1)
+            self.config.cwd = MOUNTED_CWD
+            self._add_mount(self.mount_as_cwd, MOUNTED_CWD)
+
         self.config.prescript = self.config.get("prescript", None) or ""
         self.config.postscript = self.config.get("postscript", None) or ""
         if "labels" in self.config and isinstance(self.config.labels, list):
@@ -201,6 +213,11 @@ class CliGbatchDaemon:
         Raises:
             SystemExit: If workdir is not a valid Google Storage bucket path.
         """
+        command_name = self._get_arg_from_command("name") or self.config["name"]
+        from_mount_as_cwd = self.mount_as_cwd and not self.config.workdir
+        if from_mount_as_cwd:
+            self.config.workdir = f"{self.mount_as_cwd}/.pipen/{command_name}"
+
         command_workdir = self._get_arg_from_command("workdir")
         workdir = self.config.get("workdir", None) or command_workdir
 
@@ -212,11 +229,14 @@ class CliGbatchDaemon:
             sys.exit(1)
 
         self.config["workdir"] = workdir
-        # If command workdir is different from config workdir, we need to mount it
-        self._add_mount(workdir, GbatchScheduler.MOUNTED_METADIR)
+        if from_mount_as_cwd:  # already mounted
+            self._replace_arg_in_command("workdir", f"{MOUNTED_CWD}/.pipen")
+        else:
+            # If command workdir is different from config workdir, we need to mount it
+            self._add_mount(workdir, GbatchScheduler.MOUNTED_METADIR)
 
-        # replace --workdir value with the mounted workdir in the command
-        self._replace_arg_in_command("workdir", GbatchScheduler.MOUNTED_METADIR)
+            # replace --workdir value with the mounted workdir in the command
+            self._replace_arg_in_command("workdir", GbatchScheduler.MOUNTED_METADIR)
 
     def _handle_outdir(self):
         """Handle output directory configuration and mounting.
@@ -227,8 +247,22 @@ class CliGbatchDaemon:
         command_outdir = self._get_arg_from_command("outdir")
 
         if command_outdir:
-            self._add_mount(command_outdir, GbatchScheduler.MOUNTED_OUTDIR)
-            self._replace_arg_in_command("outdir", GbatchScheduler.MOUNTED_OUTDIR)
+            coudir = AnyPath(command_outdir)
+            if (
+                not isinstance(coudir, GSPath)
+                and not coudir.is_absolute()
+                and self.mount_as_cwd
+            ):
+                self._replace_arg_in_command("outdir", f"{MOUNTED_CWD}/{coudir}")
+            else:
+                self._add_mount(command_outdir, GbatchScheduler.MOUNTED_OUTDIR)
+                self._replace_arg_in_command("outdir", GbatchScheduler.MOUNTED_OUTDIR)
+        elif self.mount_as_cwd:
+            command_name = self._get_arg_from_command("name") or self.config.name
+            self._replace_arg_in_command(
+                "outdir",
+                f"{MOUNTED_CWD}/{command_name}-output",
+            )
 
     def _infer_name(self):
         """Infer the daemon name from configuration or command arguments.
@@ -303,6 +337,7 @@ class CliGbatchDaemon:
                     "version",
                     "loglevel",
                     "mounts",
+                    "mount_as_cwd",
                     "plain",
                 )
             },
@@ -333,6 +368,7 @@ class CliGbatchDaemon:
                 "version",
                 "loglevel",
                 "mounts",
+                "mount_as_cwd",
                 "plain",
             ):
                 continue
@@ -483,11 +519,17 @@ class CliGbatchDaemon:
         logger.setLevel(self.config.loglevel.upper())
 
         if not self.config.plain:
+            self._infer_name()
             self._handle_workdir()
             self._handle_outdir()
-            self._infer_name()
             self._infer_jobname_prefix()
         else:
+            if "name" not in self.config or not self.config.name:
+                self.config["name"] = "PipenCliGbatchDaemon"
+
+            if not self.config.workdir and self.mount_as_cwd:
+                self.config.workdir = f"{self.mount_as_cwd}/.pipen"
+
             if not self.config.workdir or not isinstance(
                 AnyPath(self.config.workdir),
                 GSPath,
@@ -498,8 +540,6 @@ class CliGbatchDaemon:
                 )
                 sys.exit(1)
 
-            if "name" not in self.config or not self.config.name:
-                self.config["name"] = "PipenCliGbatchDaemon"
 
     async def run(self):  # pragma: no cover
         """Execute the daemon pipeline based on configuration.
@@ -804,22 +844,6 @@ class CliGbatchPlugin(CLIPlugin):  # pragma: no cover
 
             setattr(known_parsed, key, val)
 
-        mount_as_cwd = getattr(known_parsed, "mount_as_cwd", None)
-        cwd = getattr(known_parsed, "cwd", None)
-        delattr(known_parsed, "mount_as_cwd")
-        if mount_as_cwd and cwd:
-            print(
-                "\033[1;4mError\033[0m: --mount-as-cwd and --cwd "
-                "cannot be used together.\n"
-            )
-            sys.exit(1)
-
-        mount = getattr(known_parsed, "mount", None) or []
-        if mount_as_cwd:
-            mount.append(f"{mount_as_cwd}:/mnt/disks/.cwd")
-            setattr(known_parsed, "mount", mount)
-            setattr(known_parsed, "cwd", "/mnt/disks/.cwd")
-
         return known_parsed
 
     def exec_command(self, args: Namespace) -> None:

pipen_cli_gbatch/daemon_args.toml

@@ -133,7 +133,9 @@ flags = ["--mount-as-cwd"]
 type = "str"
 help = """The directory to mount as the current working directory of the command.
 This is a shortcut for `--mount <cloudpath>:/mnt/disks/.cwd --cwd /mnt/disks/.cwd`.
-The <cloudpath> must be a Google Storage Bucket path (gs://...).
+The <cloudpath> must be a Google Storage Bucket path (gs://...). When this option is used,
+and `--workdir` is not provided, the workdir will be set to `<cloudpath>/.pipen/<command_name>`,
+where <command_name> is the name of the command (or the value of `--name` if provided).
 """
 
 [[groups.arguments]]

{pipen_cli_gbatch-0.0.5.dist-info → pipen_cli_gbatch-0.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pipen-cli-gbatch
-Version: 0.0.5
+Version: 0.0.7
 Summary: A pipen cli plugin to run command via Google Cloud Batch
 License: MIT
 Author: pwwang

pipen_cli_gbatch-0.0.7.dist-info/RECORD

@@ -0,0 +1,6 @@
+pipen_cli_gbatch/__init__.py,sha256=xiYBNz3z3Eu8vmFECPFpOt1EE501T_gZx_iPUDajCd4,31309
+pipen_cli_gbatch/daemon_args.toml,sha256=XrCDwTaJ7xPgGLtZev4qikjrZWqixdE8tqSsFnIvmjc,7381
+pipen_cli_gbatch-0.0.7.dist-info/METADATA,sha256=pxmFaIpwMG6GU4wZF_1EBqtWa9l44KI-m1Lhi3TI1Dw,11301
+pipen_cli_gbatch-0.0.7.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pipen_cli_gbatch-0.0.7.dist-info/entry_points.txt,sha256=Z9NLeCpRo-rb8wss5mB5TBcG-_RbdlPA49b8Ma5pvQA,57
+pipen_cli_gbatch-0.0.7.dist-info/RECORD,,

pipen_cli_gbatch-0.0.5.dist-info/RECORD

@@ -1,6 +0,0 @@
-pipen_cli_gbatch/__init__.py,sha256=2LBMKrJyLLGIjYbquvMyerJYXoD9WJzYgrLEM9yNwEE,30280
-pipen_cli_gbatch/daemon_args.toml,sha256=Yqty1vsNTUQKf411tFTExE1dGM5OHGYcI7ANQm0N-CQ,7170
-pipen_cli_gbatch-0.0.5.dist-info/METADATA,sha256=tD81_KwxU8f-H-AFV7hAAPDj_H8ay7zdG-u93Ezgfmc,11301
-pipen_cli_gbatch-0.0.5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-pipen_cli_gbatch-0.0.5.dist-info/entry_points.txt,sha256=Z9NLeCpRo-rb8wss5mB5TBcG-_RbdlPA49b8Ma5pvQA,57
-pipen_cli_gbatch-0.0.5.dist-info/RECORD,,