datatailr 0.1.56__py3-none-any.whl → 0.1.58__py3-none-any.whl

datatailr/{excel.py → excel/__init__.py}

@@ -1,6 +1,8 @@
+# type: ignore
+
 try:
-    from dt.excel import Addin  # noqa: F401
-    from dt.excel import Queue  # noqa: F401
+    from dt.excel import Addin
+    from dt.excel import Queue
 except ImportError:
 
     class DummyAddin:
@@ -17,4 +19,15 @@ except ImportError:
         def run(self):
             pass
 
+    class DummyQueue:
+        def __init__(self) -> None:
+            pass
+
+        def push(self, value) -> None:
+            pass
+
     Addin = DummyAddin
+    Queue = DummyQueue
+
+
+__all__ = ["Addin", "Queue"]

datatailr/sbin/datatailr_run.py

@@ -30,6 +30,8 @@
 #     DATATAILR_BATCH_RUN_ID - the unique identifier for the batch run.
 #     DATATAILR_BATCH_ID - the unique identifier for the batch.
 #     DATATAILR_JOB_ID - the unique identifier for the job.
+# Important:
+#     Python environment is installed and managed by uv and all installed scripts (datatailr_run, datatailr_run_excel, jupyter etc.) should be invoked with `uv run`.
 
 
 import subprocess
@@ -86,19 +88,13 @@ 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 os.path.isfile("/etc/python-site-location"):
-        with open("/etc/python-site-location") as f:
-            python_site = f.read().rstrip()
-    else:
-        python_site = ""
-    
     python_libdir = sysconfig.get_config_var("LIBDIR")
 
     if isinstance(command, list):
         command = " ".join(command)
     env_vars = {
         "PATH": get_env_var("PATH", ""),
-        "PYTHONPATH": get_env_var("PYTHONPATH", "") + ":" + python_site,
+        "PYTHONPATH": get_env_var("PYTHONPATH", ""),
         "LD_LIBRARY_PATH": get_env_var("LD_LIBRARY_PATH", "") + ":" + python_libdir,
     } | env_vars
 
@@ -136,7 +132,7 @@ def main():
             "DATATAILR_BATCH_ID": batch_id,
             "DATATAILR_BATCH_ENTRYPOINT": entrypoint,
         } | env
-        run_command_as_user("datatailr_run_batch", user, env)
+        run_command_as_user("uv run datatailr_run_batch", user, env)
     elif job_type == "service":
         port = get_env_var("DATATAILR_SERVICE_PORT", 8080)
         entrypoint = get_env_var("DATATAILR_ENTRYPOINT")
@@ -144,13 +140,13 @@ def main():
             "DATATAILR_ENTRYPOINT": entrypoint,
             "DATATAILR_SERVICE_PORT": port,
         } | env
-        run_command_as_user("datatailr_run_service", user, env)
+        run_command_as_user("uv run datatailr_run_service", user, env)
     elif job_type == "app":
         entrypoint = get_env_var("DATATAILR_ENTRYPOINT")
         env = {
             "DATATAILR_ENTRYPOINT": entrypoint,
         } | env
-        run_command_as_user("datatailr_run_app", user, env)
+        run_command_as_user("uv run datatailr_run_app", user, env)
     elif job_type == "excel":
         host = get_env_var("DATATAILR_HOST", "")
         local = get_env_var("DATATAILR_LOCAL", "")
@@ -161,7 +157,7 @@ def main():
             "DATATAILR_HOST": host,
             "DATATAILR_LOCAL": local,
         } | env
-        run_command_as_user("datatailr_run_excel", user, env)
+        run_command_as_user("uv run datatailr_run_excel", user, env)
     elif job_type == "ide":
         command = [
             "code-server",
@@ -172,7 +168,10 @@ def main():
         run_command_as_user(command, user, env)
     elif job_type == "jupyter":
         command = [
-            "jupyter-lab",
+            "uv",
+            "run",
+            "jupyter",
+            "lab",
             "--ip='*'",
             "--port=8080",
             "--no-browser",

datatailr/scheduler/batch.py

@@ -317,6 +317,7 @@ class Batch(Job):
         run_as: Optional[Union[str, User]] = None,
         resources: Resources = Resources(memory="100m", cpu=1),
         acl: Optional[ACL] = None,
+        python_version: str = "3.12",
         local_run: bool = False,
         python_requirements: str = "",
         build_script_pre: str = "",
@@ -330,6 +331,7 @@ class Batch(Job):
             run_as=run_as,
             resources=resources,
             acl=acl,
+            python_version=python_version,
             python_requirements=python_requirements,
             build_script_pre=build_script_pre,
             build_script_post=build_script_post,

{datatailr-0.1.56.dist-info → datatailr-0.1.58.dist-info}/METADATA

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

{datatailr-0.1.56.dist-info → datatailr-0.1.58.dist-info}/RECORD

@@ -3,7 +3,6 @@ datatailr/acl.py,sha256=tlDy6VlHinSy5W1FbVxcNQNi7FliWUXy3ssIbzaPp28,4157
 datatailr/blob.py,sha256=9lKZKm4eRKVE4_t2zy3hh6Z_Ov4iaTA3-tJFjnQKezg,3313
 datatailr/dt_json.py,sha256=3xmTqDBk68oPl2UW8UVOYPaBw4lAsVg6nDLwcen5nuo,2252
 datatailr/errors.py,sha256=p_e4ao3sFEfz1g4LvEDqw6bVzHJPJSINLjJ8H6_PqOo,751
-datatailr/excel.py,sha256=r59mL80PKkLNAeXA-Hi48z8rvzhaJMq5Xkf8AQPSNYk,468
 datatailr/group.py,sha256=AC0nCA44eEWZCJCq2klPqkFg_995mS3C_wu5uSFFLtU,4426
 datatailr/logging.py,sha256=msr0vzIaOtXmKjxsPpMw0Zl7jX9C_W0IuUwNjmqhhcA,4146
 datatailr/user.py,sha256=tjIMbQ-tb2yFhgLBl_eTb47kKiy-RoM3KtYS3zmJiwc,6736
@@ -12,7 +11,8 @@ 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=RyHmG_PfZR7DPR5SHVr-YuPB1uk9SmKs2LL-sY8cmzI,7319
+datatailr/excel/__init__.py,sha256=OmDPlt25cUb8SnHiA4aILi2JHzIAXIo4D0uZltCQRjc,643
+datatailr/sbin/datatailr_run.py,sha256=3MKXKm_S1jZI8t6g4vFIyKYpKjJFefIZVCHghkDSCDU,7369
 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=MY2XH-T5bWABR23C_15eLhjaxggGRgjRhA-ByS6CtMc,1422
@@ -20,14 +20,14 @@ datatailr/sbin/datatailr_run_service.py,sha256=DO9LGOpz3CVZOJJRHb4ac7AgY_mLbXHGa
 datatailr/scheduler/__init__.py,sha256=qydHYVtEP6SUWd2CQ6FRdTdRWNz3SbYPJy4FK_wOvMk,1772
 datatailr/scheduler/arguments_cache.py,sha256=dl8IG9RTLSrJUk6g0_LYolkcuqW-LF52wdLPhs07LRI,6076
 datatailr/scheduler/base.py,sha256=0EN9YUiBgyYMzdsf4KFpNiQWTlCuV3NgCiauFHlYPbQ,15838
-datatailr/scheduler/batch.py,sha256=-dRfHosZy1YWhKlrNZWtxA7tJ7MHvAm-NFen5mFxpUI,17604
+datatailr/scheduler/batch.py,sha256=SBh9_G8WhQ8IkJw8NLjZ_HPbn5glIyDMQCrpaxd90Ko,17685
 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.56.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
-datatailr-0.1.56.dist-info/METADATA,sha256=mtG80M_whb3EH7UCBp-nakqKP3C0r2EpWjzVSUwEEbo,5146
-datatailr-0.1.56.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-datatailr-0.1.56.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
-datatailr-0.1.56.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
-datatailr-0.1.56.dist-info/RECORD,,
+datatailr-0.1.58.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
+datatailr-0.1.58.dist-info/METADATA,sha256=PA6gJA2OTuFFuPUBz_4ZALiotpmRGlyYuF6YxMhXouY,5146
+datatailr-0.1.58.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+datatailr-0.1.58.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
+datatailr-0.1.58.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
+datatailr-0.1.58.dist-info/RECORD,,