pipen-cli-gbatch 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

pipen_cli_gbatch/__init__.py

@@ -79,7 +79,7 @@ from pipen.cli import CLIPlugin
 from pipen.scheduler import GbatchScheduler
 from pipen_poplog import LogsPopulator
 
-__version__ = "0.1.0"
+__version__ = "0.1.2"
 __all__ = ("CliGbatchPlugin", "CliGbatchDaemon")
 MOUNTED_CWD = "/mnt/disks/.cwd"
 
@@ -200,6 +200,10 @@ class CliGbatchDaemon:
             target: The target mount path inside the container.
         """
         mount = self.config.get("mount", [])
+        if not isinstance(mount, (list, tuple, set)):
+            mount = [mount]
+        else:
+            mount = list(mount)
         # mount the workdir
         mount.append(f"{source}:{target}")
 
@@ -617,30 +621,45 @@ class XquteCliGbatchPlugin:  # pragma: no cover
             scheduler: The scheduler instance.
             job: The job that started.
         """
-        logger.info("Job is picked up by Google Batch, pulling stdout/stderr...")
+        logger.info("Job is picked up by Google Batch, pulling stdout/stderr ...")
         if not self.stdout_file:
             self.stdout_populator.logfile = scheduler.workdir.joinpath(
                 "0", "job.stdout"
             )
         elif not self.stdout_file.exists():
-            await asyncio.sleep(3)  # wait a bit for the file to be created
+            logger.warning(f"Running logs file not found: {self.stdout_file}")
+            logger.warning("  Waiting for it to be created ...")
+            i = 0
+            while not self.stdout_file.exists():
+                await asyncio.sleep(3)
+                i += 1
+                if i >= 20:
+                    break
+
             if not self.stdout_file.exists():
-                logger.warning(f"Running logs not found: {self.stdout_file}")
                 logger.warning(
-                    "Make sure pipen-log2file plugin is enabled for your pipeline."
+                    "  Still not found, falling back to pull logs from daemon ..."
+                )
+                logger.warning(
+                    "  Make sure pipen-log2file plugin is enabled for your pipeline."
                 )
-                logger.warning("Falling back to pull logs from daemon...")
                 self.stdout_populator.logfile = scheduler.workdir.joinpath(
                     "0", "job.stdout"
                 )
             else:
+                logger.info("  Found the running logs, pulling ...")
                 self.stdout_populator.logfile = (
                     self.stdout_file.resolve()
                     if self.stdout_file.is_symlink()
                     else self.stdout_file
                 )
         else:
-            self.stdout_populator.logfile = self.stdout_file
+            self.stdout_populator.logfile = (
+                self.stdout_file.resolve()
+                if self.stdout_file.is_symlink()
+                else self.stdout_file
+            )
+
         self.stderr_populator.logfile = scheduler.workdir.joinpath("0", "job.stderr")
 
     @plugin.impl

{pipen_cli_gbatch-0.1.0.dist-info → pipen_cli_gbatch-0.1.2.dist-info}/METADATA

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

pipen_cli_gbatch-0.1.2.dist-info/RECORD

@@ -0,0 +1,6 @@
+pipen_cli_gbatch/__init__.py,sha256=ubJcMPSaCBqYB8oirsVZ9ML5nfB2OOkkSu5TLVnDfTQ,32826
+pipen_cli_gbatch/daemon_args.toml,sha256=XrCDwTaJ7xPgGLtZev4qikjrZWqixdE8tqSsFnIvmjc,7381
+pipen_cli_gbatch-0.1.2.dist-info/METADATA,sha256=vIp0W23BlYCi7ghS-SX-OdpBIMdXDRDXD3GmfHA-IM0,11301
+pipen_cli_gbatch-0.1.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pipen_cli_gbatch-0.1.2.dist-info/entry_points.txt,sha256=Z9NLeCpRo-rb8wss5mB5TBcG-_RbdlPA49b8Ma5pvQA,57
+pipen_cli_gbatch-0.1.2.dist-info/RECORD,,

pipen_cli_gbatch-0.1.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-pipen_cli_gbatch/__init__.py,sha256=e2nJIiWPFzlzNAbOxzTanCtXg0oot28HrxHpH7KGyxI,32264
-pipen_cli_gbatch/daemon_args.toml,sha256=XrCDwTaJ7xPgGLtZev4qikjrZWqixdE8tqSsFnIvmjc,7381
-pipen_cli_gbatch-0.1.0.dist-info/METADATA,sha256=sNcCQTI7p7ibwuWIFT-SQo8RT-gLbjlE8TO2Bv592Q0,11301
-pipen_cli_gbatch-0.1.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-pipen_cli_gbatch-0.1.0.dist-info/entry_points.txt,sha256=Z9NLeCpRo-rb8wss5mB5TBcG-_RbdlPA49b8Ma5pvQA,57
-pipen_cli_gbatch-0.1.0.dist-info/RECORD,,