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

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/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/sbin/datatailr_run.py

@@ -75,11 +75,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 = (
@@ -93,11 +97,8 @@ def create_user_and_group() -> Tuple[str, str]:
         | stat.S_IXGRP
     )
 
-    if os.path.exists(f"/home/{user}"):
-        os.chmod(f"/home/{user}", permissions)
-
-    if os.path.exists(f"/home/{user}/tmp/.dt"):
-        os.chmod(f"/home/{user}/tmp/.dt", permissions)
+    os.makedirs(f"/home/{user}/tmp/.dt", exist_ok=True)
+    os.chmod(f"/home/{user}/tmp/.dt", permissions)
 
     return user, group
 
@@ -231,21 +232,17 @@ def main():
         } | env
         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=''",

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)

datatailr/scheduler/batch.py

@@ -294,7 +294,7 @@ class BatchJob:
             env = {
                 "DATATAILR_BATCH_ID": str(self.dag.id),
                 "DATATAILR_JOB_ID": str(self.__id),
-                "DATATAILR_JOB_NAME": self.name,
+                "DATATAILR_JOB_NAME": f"{self.dag.name}[{self.__id}]",
             }
             self.entrypoint(env=env)
         else:
@@ -479,10 +479,26 @@ class Batch(Job):
 
     def prepare_args(self) -> None:
         def arg_name(arg: Union[BatchJob, str]) -> str:
-            return arg.name if isinstance(arg, BatchJob) else arg
+            return f"{self.name}[{arg.id}]" if isinstance(arg, BatchJob) else arg
+
+        def adjust_mapping(mapping: Dict[str, str]) -> Dict[str, str]:
+            result = {}
+            for k, v in mapping.items():
+                if isinstance(v, BatchJob):
+                    result[k] = f"{self.name}[{v.id}]"
+                elif isinstance(v, str):
+                    job = self.get_job_by_name(v)
+                    if job is not None:
+                        result[k] = f"{self.name}[{job.id}]"
+                    else:
+                        result[k] = v
+                else:
+                    raise TypeError(
+                        f"Unsupported type in argument mapping: {type(v)} for key {k}"
+                    )
+            return result
 
         def merged(dst: dict[str, str], src: dict[str, str]) -> dict[str, str]:
-            # copy so we don't mutate the original mapping
             out = dict(dst)
             seen_vals = set(out.values())
             for k, v in src.items():
@@ -492,12 +508,12 @@ class Batch(Job):
             return out
 
         args = {
-            j.name: merged(
-                j.argument_mapping, {k: arg_name(v) for k, v in j.args.items()}
+            f"{self.name}[{j.id}]": merged(
+                adjust_mapping(j.argument_mapping),
+                {j.argument_mapping.get(k, k): arg_name(v) for k, v in j.args.items()},
             )
             for j in self.__jobs
         }
-
         __ARGUMENTS_CACHE__.add_arguments(self.id, args)
 
     def save(self) -> Tuple[bool, str]:

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

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

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

@@ -13,23 +13,24 @@ datatailr/wrapper.py,sha256=45RrMeYIFFWJAtOlQZRe1fT9daeq4vFlj6nIajbewEY,8080
 datatailr/build/__init__.py,sha256=_dA7b4L6wsaAFaSxUoYSJ1oaRqDHDMR20kqoCocSOss,487
 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=at0S1cNHShCOCXAml1W2sJmJ5DdNroTN6Bp6KWnYZ94,6104
-datatailr/sbin/datatailr_run.py,sha256=MKNlI6YM1UvBwdk90YUYYQbrbAEdba5ZryFIbYT2CiE,10051
+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_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=WWi_VnDxev0GG6QolF3Wtj-p_JS5t2CN9VALYPl1OYo,16994
-datatailr/scheduler/batch.py,sha256=CQCH1wHhW1qx09J7iQNQleErJ4n0nssAbd6u9YS6FMY,17735
+datatailr/scheduler/base.py,sha256=GlTsp2Qcoy14DTfLSPhiFFBRE_cMfz_uA_ASQSx4tL0,17038
+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.71.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
-datatailr-0.1.71.dist-info/METADATA,sha256=jtM6J7uHqGgQ_MHJBvKDuIdYAMvQ8T4XM16b0RyF09M,5146
-datatailr-0.1.71.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-datatailr-0.1.71.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
-datatailr-0.1.71.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
-datatailr-0.1.71.dist-info/RECORD,,
+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,,