datatailr 0.1.54__tar.gz → 0.1.56__tar.gz

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

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

{datatailr-0.1.54 → datatailr-0.1.56}/pyproject.toml

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

{datatailr-0.1.54 → datatailr-0.1.56}/src/datatailr/excel.py

@@ -1,5 +1,6 @@
 try:
-    from dt.excel import Addin  # type: ignore
+    from dt.excel import Addin  # noqa: F401
+    from dt.excel import Queue  # noqa: F401
 except ImportError:
 
     class DummyAddin:

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

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

{datatailr-0.1.54 → datatailr-0.1.56}/src/sbin/datatailr_run.py

@@ -30,8 +30,6 @@
 #     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
@@ -88,13 +86,19 @@ 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", ""),
+        "PYTHONPATH": get_env_var("PYTHONPATH", "") + ":" + python_site,
         "LD_LIBRARY_PATH": get_env_var("LD_LIBRARY_PATH", "") + ":" + python_libdir,
     } | env_vars
 
@@ -132,7 +136,7 @@ def main():
             "DATATAILR_BATCH_ID": batch_id,
             "DATATAILR_BATCH_ENTRYPOINT": entrypoint,
         } | env
-        run_command_as_user("uv run datatailr_run_batch", user, env)
+        run_command_as_user("datatailr_run_batch", user, env)
     elif job_type == "service":
         port = get_env_var("DATATAILR_SERVICE_PORT", 8080)
         entrypoint = get_env_var("DATATAILR_ENTRYPOINT")
@@ -140,13 +144,13 @@ def main():
             "DATATAILR_ENTRYPOINT": entrypoint,
             "DATATAILR_SERVICE_PORT": port,
         } | env
-        run_command_as_user("uv run datatailr_run_service", user, env)
+        run_command_as_user("datatailr_run_service", user, env)
     elif job_type == "app":
         entrypoint = get_env_var("DATATAILR_ENTRYPOINT")
         env = {
             "DATATAILR_ENTRYPOINT": entrypoint,
         } | env
-        run_command_as_user("uv run datatailr_run_app", user, env)
+        run_command_as_user("datatailr_run_app", user, env)
     elif job_type == "excel":
         host = get_env_var("DATATAILR_HOST", "")
         local = get_env_var("DATATAILR_LOCAL", "")
@@ -157,7 +161,7 @@ def main():
             "DATATAILR_HOST": host,
             "DATATAILR_LOCAL": local,
         } | env
-        run_command_as_user("uv run datatailr_run_excel", user, env)
+        run_command_as_user("datatailr_run_excel", user, env)
     elif job_type == "ide":
         command = [
             "code-server",
@@ -168,10 +172,7 @@ def main():
         run_command_as_user(command, user, env)
     elif job_type == "jupyter":
         command = [
-            "uv",
-            "run",
-            "jupyter",
-            "lab",
+            "jupyter-lab",
             "--ip='*'",
             "--port=8080",
             "--no-browser",