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

datatailr/sbin/datatailr_run.py

@@ -85,11 +85,20 @@ 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()]

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/scheduler/arguments_cache.py

@@ -115,11 +115,10 @@ class ArgumentsCache:
         :param job: Name of the job.
         :param result: Result of the batch job.
         """
-        path = f"/tmp/datatailr/batch/results/{batch_run_id}/{job}.pkl"
+        path = f"/tmp/datatailr/batch/results/{batch_run_id}_{job}.pkl"
         if self.use_persistent_cache and isinstance(job, str):
             self._add_to_persistent_cache(path, result)
         else:
-            os.makedirs(os.path.dirname(path), exist_ok=True)
             with open(path, "wb") as f:
                 pickle.dump(result, f)
 
@@ -131,7 +130,7 @@ class ArgumentsCache:
         :param job: Name of the job.
         :return: Result of the batch job.
         """
-        path = f"/tmp/datatailr/batch/results/{batch_run_id}/{job}.pkl"
+        path = f"/tmp/datatailr/batch/results/{batch_run_id}_{job}.pkl"
         if self.use_persistent_cache and isinstance(job, str):
             return self._get_from_persistent_cache(path)
         else:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datatailr
-Version: 0.1.48
+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.48.dist-info → datatailr-0.1.49.dist-info}/RECORD

@@ -12,22 +12,22 @@ 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=z34l28CH8YTwQGusmJXlzgOtslOqL_whqeMzjEAZ3TA,6895
-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
 datatailr/scheduler/__init__.py,sha256=qydHYVtEP6SUWd2CQ6FRdTdRWNz3SbYPJy4FK_wOvMk,1772
-datatailr/scheduler/arguments_cache.py,sha256=dl8IG9RTLSrJUk6g0_LYolkcuqW-LF52wdLPhs07LRI,6076
+datatailr/scheduler/arguments_cache.py,sha256=3sKXg4_baeZNo8jvSGTFK6zT5RM1TKMpH-UVS1CLn20,6014
 datatailr/scheduler/base.py,sha256=pkLKhPS_CfgGMCb3Qqskg7JVQMLUe0hEFAcVhMj3jts,15108
 datatailr/scheduler/batch.py,sha256=-dRfHosZy1YWhKlrNZWtxA7tJ7MHvAm-NFen5mFxpUI,17604
 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.48.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
-datatailr-0.1.48.dist-info/METADATA,sha256=Y2UspGjKCTg09y8JkTppwCOjZ1k3CvP6vjAhdLtqJwc,5146
-datatailr-0.1.48.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-datatailr-0.1.48.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
-datatailr-0.1.48.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
-datatailr-0.1.48.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,,