datatailr 0.1.73__py3-none-any.whl → 0.1.74__py3-none-any.whl

datatailr/sbin/datatailr_run.py

@@ -35,6 +35,7 @@
 import concurrent.futures
 import subprocess
 import os
+import sys
 import stat
 import shlex
 import sysconfig
@@ -46,7 +47,7 @@ logger = DatatailrLogger(os.path.abspath(__file__)).get_logger()
 
 if not is_dt_installed():
     logger.error("Datatailr is not installed.")
-    # sys.exit(1) # TODO: Uncomment after testing
+    sys.exit(1)
 
 
 def get_env_var(name: str, default: str | None = None) -> str:
@@ -205,7 +206,7 @@ def main():
             "DATATAILR_BATCH_ID": batch_id,
             "DATATAILR_BATCH_ENTRYPOINT": entrypoint,
         } | env
-        run_single_command_non_blocking("datatailr_run_batch", user, env)
+        return run_single_command_non_blocking("datatailr_run_batch", user, env)
     elif job_type == "service":
         port = get_env_var("DATATAILR_SERVICE_PORT", 8080)
         entrypoint = get_env_var("DATATAILR_ENTRYPOINT")
@@ -213,16 +214,15 @@ def main():
             "DATATAILR_ENTRYPOINT": entrypoint,
             "DATATAILR_SERVICE_PORT": port,
         } | env
-        run_single_command_non_blocking("datatailr_run_service", user, env)
+        return run_single_command_non_blocking("datatailr_run_service", user, env)
     elif job_type == "app":
         entrypoint = get_env_var("DATATAILR_ENTRYPOINT")
         env = {
             "DATATAILR_ENTRYPOINT": entrypoint,
         } | env
-        run_single_command_non_blocking("datatailr_run_app", user, env)
+        return run_single_command_non_blocking("datatailr_run_app", user, env)
     elif job_type == "excel":
         host = get_env_var("DATATAILR_HOST", "")
-        local = get_env_var("DATATAILR_LOCAL", "")
         entrypoint = get_env_var("DATATAILR_ENTRYPOINT")
         local = get_env_var("DATATAILR_LOCAL", False)
         env = {
@@ -230,7 +230,7 @@ def main():
             "DATATAILR_HOST": host,
             "DATATAILR_LOCAL": local,
         } | env
-        run_single_command_non_blocking("datatailr_run_excel", user, env)
+        return run_single_command_non_blocking("datatailr_run_excel", user, env)
     elif job_type == "workspace":
         os.makedirs("/opt/datatailr/var/log", exist_ok=True)
         ide_command = [
@@ -251,7 +251,7 @@ def main():
             f"--ServerApp.static_url_prefix=/workspace/{job_name}/jupyter/static/",
             f"--ServerApp.root_dir=/home/{user}",
         ]
-        run_commands_in_parallel(
+        return run_commands_in_parallel(
             [ide_command, jupyter_command], user, env, ["code-server", "jupyter"]
         )
 
@@ -262,8 +262,9 @@ def main():
 if __name__ == "__main__":
     try:
         logger.debug("Starting job execution...")
-        main()
-        logger.debug("Job executed successfully.")
+        rc = main()
+        logger.debug(f"Job executed successfully, with code {rc}")
+        raise SystemExit(rc)
     except Exception as e:
         logger.error(f"Error during job execution: {e}")
-        raise
+        raise SystemExit(1)

datatailr/scheduler/base.py

@@ -294,6 +294,7 @@ class Job:
         Returns a tuple of (branch: str, commit_hash: str).
         """
         path_to_repo = self.image.path_to_repo or "."
+        branch_name, local_commit, return_code = "unknown", "unknown", None
         try:
             local_commit = run_shell_command(
                 f"cd {path_to_repo} && git rev-parse HEAD"
@@ -301,6 +302,13 @@ class Job:
             branch_name = run_shell_command(
                 f"cd {path_to_repo} && git rev-parse --abbrev-ref HEAD"
             )[0]
+
+            if (
+                os.getenv("DATATAILR_ALLOW_UNSAFE_SCHEDULING", "false").lower()
+                == "true"
+            ):
+                return branch_name, local_commit
+
             return_code = run_shell_command(
                 f"cd {path_to_repo} && git diff --exit-code"
             )
@@ -309,15 +317,11 @@ class Job:
                 logger.warning(
                     "Git is not installed or not found in PATH. Repository validation is not possible."
                 )
-                branch_name, local_commit, return_code = "unknown", "unknown", None
             else:
                 raise RepoValidationError(
                     f"Error accessing git repository at {path_to_repo}: {e}"
                 ) from e
 
-        if os.getenv("DATATAILR_ALLOW_UNSAFE_SCHEDULING", "false").lower() == "true":
-            return branch_name, local_commit
-
         is_committed = return_code is not None and return_code[1] == 0
 
         if not is_committed:

{datatailr-0.1.73.dist-info → datatailr-0.1.74.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datatailr
-Version: 0.1.73
+Version: 0.1.74
 Summary: Ready-to-Use Platform That Drives Business Insights
 Author-email: Datatailr <info@datatailr.com>
 License-Expression: MIT

{datatailr-0.1.73.dist-info → datatailr-0.1.74.dist-info}/RECORD

@@ -15,22 +15,22 @@ datatailr/build/image.py,sha256=YC8ML-l-sj6TcIBY-DCx_vaeI_7SmL9fPFhHnuxzRh0,5509
 datatailr/excel/__init__.py,sha256=wox5ltPeOYZcZoRDW4R6tJsfOjf-0WZM2_pGgltGjdo,682
 datatailr/excel/addin.py,sha256=3UiA7z71ewnEvLSTbcJdPNGWf-uYbeSt_3vbgN42h4E,6354
 datatailr/excel/stubs.py,sha256=RU0Y6PWKRAtK-tgBP5uWrWYW-L3TIGRJwcUUhkA5yxU,830
-datatailr/sbin/datatailr_run.py,sha256=qKMTKjJWX8bOc8GLAvTUR7ZL056-amLvXdAncqJMAEU,9962
+datatailr/sbin/datatailr_run.py,sha256=Tno239IHIJ0TkAmpfVUEbuZSDElJCLoH5MUvvvgyIRo,9987
 datatailr/sbin/datatailr_run_app.py,sha256=itF76XC2F4RK9s6bkoEppEiYwSLHK_5Jai3yvC-kFhY,1501
 datatailr/sbin/datatailr_run_batch.py,sha256=UWnp96j_G66R_Cape7Bb-rbK6UBLF7Y5_mTlWyGJAVQ,1818
 datatailr/sbin/datatailr_run_excel.py,sha256=BLWmvxpKEE_8vJhs8E4VWq07FOBof5tlow-AkIEXtHw,1470
 datatailr/sbin/datatailr_run_service.py,sha256=DO9LGOpz3CVZOJJRHb4ac7AgY_mLbXHGadSyVCeIknc,1212
 datatailr/scheduler/__init__.py,sha256=qydHYVtEP6SUWd2CQ6FRdTdRWNz3SbYPJy4FK_wOvMk,1772
 datatailr/scheduler/arguments_cache.py,sha256=00OE0DhobYteBOnirjulO1ltgGBRamAdCO168O3_Zes,6236
-datatailr/scheduler/base.py,sha256=GlTsp2Qcoy14DTfLSPhiFFBRE_cMfz_uA_ASQSx4tL0,17038
+datatailr/scheduler/base.py,sha256=GFbX6uDvFWzkjeNyGLQAFDwcNixjzjvKuZVNTVtU1Os,17087
 datatailr/scheduler/batch.py,sha256=ZhEf3YkXf1_ieV5ivk4-me60ov9v5r9f9BdkJw84i_0,18475
 datatailr/scheduler/batch_decorator.py,sha256=LqL1bsupWLn-YEQUvFJYae7R3ogrL5-VodyiiScrkRw,5806
 datatailr/scheduler/constants.py,sha256=5WWTsfwZ_BA8gVDOTa2AQX9DJ0NzfaWgtY3vrODS2-8,606
 datatailr/scheduler/schedule.py,sha256=0XJJen2nL1xplRs0Xbjwgq3T-0bFCOrJzkSALdio998,3741
 datatailr/scheduler/utils.py,sha256=up6oR2iwe6G52LkvgfO394xchXgCYNjOMGRQW3e8PQk,1082
-datatailr-0.1.73.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
-datatailr-0.1.73.dist-info/METADATA,sha256=gl76JiXGJXes-34NGbHzW0Jmauiohad2CaQuvvpWon0,5146
-datatailr-0.1.73.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-datatailr-0.1.73.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
-datatailr-0.1.73.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
-datatailr-0.1.73.dist-info/RECORD,,
+datatailr-0.1.74.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
+datatailr-0.1.74.dist-info/METADATA,sha256=EhvMz-_Z4xQM9aG7BrpYvApBHugjb40dv3SkvfwesFE,5146
+datatailr-0.1.74.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+datatailr-0.1.74.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
+datatailr-0.1.74.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
+datatailr-0.1.74.dist-info/RECORD,,