datatailr 0.1.56__tar.gz → 0.1.58__tar.gz

{datatailr-0.1.56/src/datatailr.egg-info → datatailr-0.1.58}/PKG-INFO

@@ -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 → datatailr-0.1.58}/pyproject.toml

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

datatailr-0.1.56/src/datatailr/excel.py → datatailr-0.1.58/src/datatailr/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-0.1.56 → datatailr-0.1.58}/src/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 → datatailr-0.1.58/src/datatailr.egg-info}/PKG-INFO

@@ -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 → datatailr-0.1.58}/src/datatailr.egg-info/SOURCES.txt

@@ -7,7 +7,6 @@ src/datatailr/acl.py
 src/datatailr/blob.py
 src/datatailr/dt_json.py
 src/datatailr/errors.py
-src/datatailr/excel.py
 src/datatailr/group.py
 src/datatailr/logging.py
 src/datatailr/user.py
@@ -22,6 +21,7 @@ src/datatailr.egg-info/requires.txt
 src/datatailr.egg-info/top_level.txt
 src/datatailr/build/__init__.py
 src/datatailr/build/image.py
+src/datatailr/excel/__init__.py
 src/datatailr/scheduler/__init__.py
 src/datatailr/scheduler/arguments_cache.py
 src/datatailr/scheduler/base.py

{datatailr-0.1.56 → datatailr-0.1.58}/src/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",