datatailr 0.1.47__tar.gz → 0.1.49__tar.gz

{datatailr-0.1.47/src/datatailr.egg-info → datatailr-0.1.49}/PKG-INFO

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

{datatailr-0.1.47 → datatailr-0.1.49}/pyproject.toml

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

{datatailr-0.1.47 → datatailr-0.1.49/src/datatailr.egg-info}/PKG-INFO

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

{datatailr-0.1.47 → datatailr-0.1.49}/src/sbin/datatailr_run.py

@@ -85,25 +85,31 @@ 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:
+        # make this empty string once file creation is merged into build/Dockerfile
+        python_site = (
+            "/opt/cpython-3.12.11-linux-x86_64-gnu/lib/python3.12/site-packages"
+        )
+
     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,
     } | env_vars
 
     env_kv = [f"{k}={v}" for k, v in env_vars.items()]
     argv = ["sudo", "-u", user, "env", *env_kv, "bash", "-lc", command]
 
     try:
-        result = subprocess.run(
-            argv,
-            check=True,  # raises if returncode != 0
-            capture_output=True,
-            text=True,
-        )
-        logger.info(f"stdout: {result.stdout}")
-        logger.debug(f"stderr: {result.stderr}")
+        proc = subprocess.Popen(argv)
+        returncode = proc.wait()
+        if returncode != 0:
+            logger.error(f"Command failed with exit code {returncode}")
+            sys.exit(returncode)
     except subprocess.CalledProcessError as e:
         logger.error(f"Command failed with exit code {e.returncode}")
         logger.error(f"stderr: {e.stderr}")

{datatailr-0.1.47 → datatailr-0.1.49}/src/sbin/datatailr_run_app.py

@@ -13,7 +13,8 @@
 import os
 import sys
 import runpy
-from importlib.resources import files
+import inspect
+import importlib
 
 from datatailr.logging import DatatailrLogger
 
@@ -29,9 +30,12 @@ def run():
             "Environment variable 'DATATAILR_ENTRYPOINT' is not in the format 'module_name:file_name'."
         )
 
-    module_name, file_name = entrypoint.split(":")
+    module_name, func_name = entrypoint.split(":")
 
-    script = files(module_name).joinpath(file_name)
+    # consider using ast
+    module = importlib.import_module(module_name)
+    function = getattr(module, func_name)
+    script = inspect.getfile(function)
     sys.argv = ["streamlit", "run", str(script), *sys.argv[1:]]
     logger.info(f"Running entrypoint: {entrypoint}")
     runpy.run_module("streamlit", run_name="__main__")