datatailr 0.1.47__py3-none-any.whl → 0.1.49__py3-none-any.whl

datatailr/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/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__")

{datatailr-0.1.47.dist-info → datatailr-0.1.49.dist-info}/METADATA

@@ -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.dist-info → datatailr-0.1.49.dist-info}/RECORD

@@ -12,8 +12,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=00p2S0PuTaSssOOlWJ0sQYPrilWJSZSvT8XgrokRNi8,6958
-datatailr/sbin/datatailr_run_app.py,sha256=AOkutzv4DeKfWZs-ZBciAMKnK4A05SfkVf1ZJnSSFwA,1231
+datatailr/sbin/datatailr_run.py,sha256=jgMBIRLYTcCdvSIe77wrdf8XIbadn0hE0REs8sMc6dY,7274
+datatailr/sbin/datatailr_run_app.py,sha256=pYiofYG13R6YIiN81n7MNn5_mLdZM9vuFJH-RjdvtRM,1329
 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
 datatailr/sbin/datatailr_run_service.py,sha256=R8eNLN2SGnMtyfLy3vq9isUHr3dRzeBqESTquNK9Iho,1156
@@ -25,9 +25,9 @@ datatailr/scheduler/batch_decorator.py,sha256=LqL1bsupWLn-YEQUvFJYae7R3ogrL5-Vod
 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.47.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
-datatailr-0.1.47.dist-info/METADATA,sha256=PeY8ab-r3eJ5OMnLKwxuzlDqLREMVDg5uR7lbQ3WTOo,5146
-datatailr-0.1.47.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-datatailr-0.1.47.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
-datatailr-0.1.47.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
-datatailr-0.1.47.dist-info/RECORD,,
+datatailr-0.1.49.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
+datatailr-0.1.49.dist-info/METADATA,sha256=BcUo34as2Gig3d9sFeqCEZwXSJ7tH5E8KxaNytJfqQI,5146
+datatailr-0.1.49.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+datatailr-0.1.49.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
+datatailr-0.1.49.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
+datatailr-0.1.49.dist-info/RECORD,,