datatailr 0.1.44__py3-none-any.whl → 0.1.46__py3-none-any.whl

datatailr/sbin/datatailr_run.py

@@ -38,10 +38,8 @@ import sys
 from typing import Tuple
 from datatailr.logging import DatatailrLogger
 from datatailr.utils import is_dt_installed
-from datatailr import __version__
 
 logger = DatatailrLogger(os.path.abspath(__file__)).get_logger()
-logger.info(f"Datatailr version: {__version__}")
 
 if not is_dt_installed():
     logger.error("Datatailr is not installed.")
@@ -87,15 +85,15 @@ def run_command_as_user(command: str | list, user: str, env_vars: dict):
     """
     Run a command as a specific user with the given environment variables.
     """
-    if isinstance(command, str):
-        command = command.split(" ")
+    if isinstance(command, list):
+        command = " ".join(command)
     env_vars = {
         "PATH": get_env_var("PATH", ""),
         "PYTHONPATH": get_env_var("PYTHONPATH", ""),
     } | env_vars
 
     env_kv = [f"{k}={v}" for k, v in env_vars.items()]
-    argv = ["sudo", "-u", user, "env", *env_kv, "bash", "-lc", *command]
+    argv = ["sudo", "-u", user, "env", *env_kv, "bash", "-lc", command]
 
     try:
         result = subprocess.run(
@@ -149,9 +147,11 @@ def main():
     elif job_type == "excel":
         host = get_env_var("DATATAILR_HOST", "")
         entrypoint = get_env_var("DATATAILR_ENTRYPOINT")
+        local = get_env_var("DATATAILR_LOCAL", False)
         env = {
             "DATATAILR_ENTRYPOINT": entrypoint,
             "DATATAILR_HOST": host,
+            "DATATAILR_LOCAL": local,
         } | env
         run_command_as_user("datatailr_run_excel", user, env)
     elif job_type == "ide":

datatailr/sbin/datatailr_run_excel.py

@@ -20,15 +20,21 @@ logger = DatatailrLogger(os.path.abspath(__file__)).get_logger()
 
 def run():
     logger.info("Starting Datatailr excel add-in...")
-    entrypoint = os.environ.get("DATATAILR_ENTRYPOINT")
-    # hostname = os.environ.get("DATATAILR_HOST")
 
+    entrypoint = os.environ.get("DATATAILR_ENTRYPOINT")
     if entrypoint is None:
         raise ValueError("Environment variable 'DATATAILR_ENTRYPOINT' is not set.")
 
-    # if hostname is None:
-    #     raise ValueError("Environment variable 'DATATAILR_HOST' is not set.")
-
-    # entrypoint = f'./dt-excel.sh -n -H "{hostname}" -p 8080 "{entrypoint}"'
+    local = os.environ.get("DATATAILR_LOCAL", False) in ("1", "true", "True", "TRUE")
+    if local:
+        hostname = "localhost.excel.datatailr.com"
+        local_flag = "-l"
+    else:
+        hostname = os.environ.get("DATATAILR_HOST")
+        if hostname is None:
+            raise ValueError("Environment variable 'DATATAILR_HOST' is not set.")
+        local_flag = ""
+
+    entrypoint = f'/opt/datatailr/bin/dt-excel.sh -n -H "{hostname}" {local_flag} -p 8080 -w 8000 {entrypoint}'
     logger.info(f"Running entrypoint: {entrypoint}")
     subprocess.run(entrypoint, shell=True)

datatailr/scheduler/arguments_cache.py

@@ -161,8 +161,5 @@ class ArgumentsCache:
         :param path: Path in the Blob storage where the blob is stored.
         """
         path = path.replace("/tmp/", "")
-        try:
-            data = __BLOB_STORAGE__.get_blob(path)
-        except RuntimeError as e:
-            raise RuntimeError(f"Failed to retrieve blob from path {path}: {str(e)}")
+        data = __BLOB_STORAGE__.get_blob(path)
         return json.loads(data)

datatailr/scheduler/batch_decorator.py

@@ -78,18 +78,13 @@ def batch_decorator(memory: str = DEFAULT_TASK_MEMORY, cpu: float = DEFAULT_TASK
                                 [None] * (len(all_function_args) - len(final_args))
                             )
                         final_args[all_function_args.index(name)] = value
-                job_name = os.getenv("DATATAILR_JOB_NAME", func.__name__)
-                run_id = os.getenv("DATATAILR_BATCH_RUN_ID")
                 try:
                     final_kwargs = __ARGUMENTS_CACHE__.get_arguments(
                         dag_id(func),
-                        job_name,
-                        run_id,
-                    )
-                except CacheNotFoundError as e:
-                    print(
-                        f"Cache not found for job {job_name} with run id {run_id}. Using provided arguments. Error: {e}"
+                        os.getenv("DATATAILR_JOB_NAME", func.__name__),
+                        os.getenv("DATATAILR_BATCH_RUN_ID"),
                     )
+                except CacheNotFoundError:
                     final_kwargs = kwargs
 
                 if varargs is not None and varkw is None:
@@ -101,7 +96,6 @@ def batch_decorator(memory: str = DEFAULT_TASK_MEMORY, cpu: float = DEFAULT_TASK
                 if len(final_args) == len(parameters.keys()):
                     for i, arg_name in enumerate(parameters.keys()):
                         final_args[i] = final_kwargs.pop(arg_name, final_args[i])
-                print(f"{final_args=}, {final_kwargs=}, {args=}, {kwargs=}")
                 result = func(*final_args, **final_kwargs)
                 __ARGUMENTS_CACHE__.add_result(
                     batch_run_id(),

{datatailr-0.1.44.dist-info → datatailr-0.1.46.dist-info}/METADATA

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

{datatailr-0.1.44.dist-info → datatailr-0.1.46.dist-info}/RECORD

@@ -12,22 +12,22 @@ datatailr/version.py,sha256=N9K8ZxlwFFSz8XSgbgaTWZY4k2J0JKfj698nZ_O2pIU,536
 datatailr/wrapper.py,sha256=K9ZD76cWey_ikA6C5sKejwRaYBDln4QMg-RcoRGiuFc,7991
 datatailr/build/__init__.py,sha256=_dA7b4L6wsaAFaSxUoYSJ1oaRqDHDMR20kqoCocSOss,487
 datatailr/build/image.py,sha256=YC8ML-l-sj6TcIBY-DCx_vaeI_7SmL9fPFhHnuxzRh0,5509
-datatailr/sbin/datatailr_run.py,sha256=qBntRCsQefUQhm5CDKcMnhwWntj8ICSbo1ycrzEfhZc,6950
+datatailr/sbin/datatailr_run.py,sha256=00p2S0PuTaSssOOlWJ0sQYPrilWJSZSvT8XgrokRNi8,6958
 datatailr/sbin/datatailr_run_app.py,sha256=AOkutzv4DeKfWZs-ZBciAMKnK4A05SfkVf1ZJnSSFwA,1231
 datatailr/sbin/datatailr_run_batch.py,sha256=UWnp96j_G66R_Cape7Bb-rbK6UBLF7Y5_mTlWyGJAVQ,1818
-datatailr/sbin/datatailr_run_excel.py,sha256=_uke80tRw07PsGSqAhbYrfw43KZX-v3dHXq_HsSmnV0,1171
+datatailr/sbin/datatailr_run_excel.py,sha256=MY2XH-T5bWABR23C_15eLhjaxggGRgjRhA-ByS6CtMc,1422
 datatailr/sbin/datatailr_run_service.py,sha256=R8eNLN2SGnMtyfLy3vq9isUHr3dRzeBqESTquNK9Iho,1156
 datatailr/scheduler/__init__.py,sha256=qydHYVtEP6SUWd2CQ6FRdTdRWNz3SbYPJy4FK_wOvMk,1772
-datatailr/scheduler/arguments_cache.py,sha256=zPBAX_hojbcuruDin1RTxnjdvtJ4EBhc1sjUb0QALCA,6151
+datatailr/scheduler/arguments_cache.py,sha256=3sKXg4_baeZNo8jvSGTFK6zT5RM1TKMpH-UVS1CLn20,6014
 datatailr/scheduler/base.py,sha256=z4y2bvY3darDzxt-t69RI1WiKCKoYxX-Jg71iL9q1Fk,14760
 datatailr/scheduler/batch.py,sha256=2bWcWwcoQjfoJCKIFgoc4L_aCq8nR2v34ri6EMsy0LE,16947
-datatailr/scheduler/batch_decorator.py,sha256=cw1SduBtecatlQ4c6B1SiJEvqBHwd9pgVnEFpi3UNQY,6126
+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.44.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
-datatailr-0.1.44.dist-info/METADATA,sha256=qgRgfs-YJEY1hU8Py5EIfXJcLnQ99Fe20eh0tnHKKKc,5146
-datatailr-0.1.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-datatailr-0.1.44.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
-datatailr-0.1.44.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
-datatailr-0.1.44.dist-info/RECORD,,
+datatailr-0.1.46.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
+datatailr-0.1.46.dist-info/METADATA,sha256=oCdHVq2uUS9GzQEsGCOTpinFMsGITonQpu52MbkrKQ8,5146
+datatailr-0.1.46.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+datatailr-0.1.46.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
+datatailr-0.1.46.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
+datatailr-0.1.46.dist-info/RECORD,,