datatailr 0.1.72__tar.gz → 0.1.74__tar.gz

{datatailr-0.1.72/src/datatailr.egg-info → datatailr-0.1.74}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datatailr
-Version: 0.1.72
+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.72 → datatailr-0.1.74}/pyproject.toml

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

{datatailr-0.1.72 → datatailr-0.1.74}/src/datatailr/excel/addin.py

@@ -13,7 +13,11 @@ import importlib
 import subprocess
 import inspect
 import numpy as np
-from dt.excel_base import Addin as AddinBase, Queue  # type: ignore
+
+try:
+    from dt.excel_base import Addin as AddinBase, Queue  # type: ignore
+except ImportError as e:
+    from datatailr.excel.stubs import AddinBase, Queue
 
 
 def __progress__(queue, stop):
@@ -107,7 +111,9 @@ class Addin(AddinBase):
             signature = inspect.signature(func)
 
             def wrapper(*args, **kwargs):
-                id = args[0]
+                # TODO: check whether it's possible to use a kwarg instead so that a decorated function can
+                # be called directly from python code without requiring positional argument for _id
+                _id = args[0]
 
                 for arg in signature.parameters.values():
                     if streaming and arg.name == "queue":
@@ -121,7 +127,7 @@ class Addin(AddinBase):
                             "excel/python/dt/excel.py: Got argument of wrong type, expected %s or numpy.ndarray, got %s"
                             % (arg.annotation, type(kwargs[arg.name]))
                         )
-
+                queue = Queue(self.name.lower() + "." + func.__name__, _id)
                 if not streaming:
                     if not progressbar:
                         result = func(**kwargs)
@@ -132,7 +138,7 @@ class Addin(AddinBase):
                     from threading import Event, Thread
 
                     error = None
-                    queue = Queue(self.name.lower() + "." + func.__name__, id)
+
                     stop = Event()
                     thread = Thread(target=__progress__, args=(queue, stop))
                     thread.start()
@@ -149,9 +155,8 @@ class Addin(AddinBase):
                     else:
                         queue.push(result)
                     return
-
                 try:
-                    func(Queue(self.name.lower() + "." + func.__name__, id), **kwargs)
+                    func(queue, **kwargs)
                 except Exception as exception:
                     queue.error(str(exception))
 

datatailr-0.1.74/src/datatailr/excel/stubs.py

@@ -0,0 +1,37 @@
+"""
+Copyright (c) 2025 - Datatailr Inc.
+All Rights Reserved.
+
+This file is part of Datatailr and subject to the terms and conditions
+defined in 'LICENSE.txt'. Unauthorized copying and/or distribution
+of this file, in parts or full, via any medium is strictly prohibited.
+"""
+
+
+class AddinBase:
+    def __init__(self, name, *args, **kwargs):
+        self.name = name
+
+    def decorator_impl(
+        self,
+        signature,
+        wrapper,
+        func_name,
+        description,
+        help,
+        volatile,
+        streaming,
+    ):
+        pass
+
+
+class Queue:
+    def __init__(self, name, _id):
+        self.name = name
+        self.id = _id
+
+    def push(self, value):
+        print(f"Queue {self.name} ({self.id}): {value}")
+
+    def error(self, message):
+        print(f"Queue {self.name} ({self.id}) Error: {message}")

{datatailr-0.1.72 → datatailr-0.1.74}/src/datatailr/scheduler/base.py

@@ -245,6 +245,7 @@ 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)
@@ -293,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"
@@ -300,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"
             )
@@ -308,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.72 → datatailr-0.1.74/src/datatailr.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datatailr
-Version: 0.1.72
+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.72 → datatailr-0.1.74}/src/datatailr.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ src/datatailr/build/__init__.py
 src/datatailr/build/image.py
 src/datatailr/excel/__init__.py
 src/datatailr/excel/addin.py
+src/datatailr/excel/stubs.py
 src/datatailr/scheduler/__init__.py
 src/datatailr/scheduler/arguments_cache.py
 src/datatailr/scheduler/base.py

{datatailr-0.1.72 → datatailr-0.1.74}/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:
@@ -75,11 +76,15 @@ def create_user_and_group() -> Tuple[str, str]:
     gid = get_env_var("DATATAILR_GID")
 
     # Create group if it does not exist
+    # -o: allow to create a group with a non-unique GID
     os.system(f"getent group {group} || groupadd {group} -g {gid} -o")
 
     # 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
     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 -M {user} -u {uid} -o"
     )
 
     permissions = (
@@ -201,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")
@@ -209,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 = {
@@ -226,23 +230,19 @@ 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":
-        # Set a custom PS1 for the IDE terminal: 17:38|user@my-ide/~/dir/path:$
-        env["PS1"] = (
-            r"""\[\e[2m\]\A\[\e[0m\]|\[\e[38;5;40m\]\u\[\e[92m\]@${DATATAILR_JOB_NAME:-datatailr}\[\e[0m\]/\[\e[94;1m\]\w\[\e[0m\]\$"""
-        )
         os.makedirs("/opt/datatailr/var/log", exist_ok=True)
         ide_command = [
             "code-server",
             "--auth=none",
-            "--bind-addr=0.0.0.0:9090",
+            "--bind-addr=127.0.0.1:9090",
             f'--app-name="Datatailr IDE {get_env_var("DATATAILR_USER")}"',
         ]
         job_name = get_env_var("DATATAILR_JOB_NAME")
         jupyter_command = [
             "jupyter-lab",
-            "--ip='*'",
+            "--ip='127.0.0.1'",
             "--port=7070",
             "--no-browser",
             "--NotebookApp.token=''",
@@ -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)