datatailr 0.1.73__tar.gz → 0.1.75__tar.gz

{datatailr-0.1.73/src/datatailr.egg-info → datatailr-0.1.75}/PKG-INFO

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

{datatailr-0.1.73 → datatailr-0.1.75}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "datatailr"
-version = "0.1.73"
+version = "0.1.75"
 description = "Ready-to-Use Platform That Drives Business Insights"
 readme = "README.md"
 requires-python = ">=3.9"

{datatailr-0.1.73 → datatailr-0.1.75}/src/datatailr/scheduler/base.py

@@ -245,7 +245,6 @@ class Job:
         if self.type == JobType.EXCEL:
             if "DATATAILR_LOCAL" not in self.__env_vars:
                 self.__env_vars.update({"DATATAILR_LOCAL": "false"})
-            job_dict["per_user_job"] = True
         if self.type != JobType.BATCH:
             job_dict["entrypoint"] = str(self.entrypoint) if self.entrypoint else None
             job_dict["env"] = dict_to_env_vars(self.__env_vars)
@@ -294,6 +293,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 +301,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 +316,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 → datatailr-0.1.75/src/datatailr.egg-info}/PKG-INFO

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

{datatailr-0.1.73 → datatailr-0.1.75}/src/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:
@@ -80,10 +81,10 @@ def create_user_and_group() -> Tuple[str, str]:
 
     # Create user if it does not exist
     # -s /bin/bash: set the shell to bash
-    # -M: do not create home directory (it is already created on the NFS volume)
     # -o: allow to create a user with a non-unique UID
+    # -m: create the home directory for the group - .bashrc file is located in build/.bashrc and copied to /etc/skel/ during image build
     os.system(
-        f"getent passwd {user} || useradd -g {group} -s /bin/bash -M {user} -u {uid} -o"
+        f"getent passwd {user} || useradd -g {group} -s /bin/bash -u {uid} -o -m {user}"
     )
 
     permissions = (
@@ -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)