datatailr 0.1.22__py3-none-any.whl → 0.1.24__py3-none-any.whl

datatailr/sbin/datatailr_run.py

@@ -36,10 +36,14 @@ import os
 import sys
 from typing import Tuple
 from datatailr.logging import DatatailrLogger
-
+from datatailr.utils import is_dt_installed
 
 logger = DatatailrLogger(os.path.abspath(__file__)).get_logger()
 
+if not is_dt_installed():
+    logger.error("Datatailr is not installed.")
+    sys.exit(1)
+
 
 def get_env_var(name: str, default: str | None = None) -> str:
     """

datatailr/scheduler/arguments_cache.py

@@ -28,11 +28,9 @@ from typing import Any, Dict, Optional
 
 from datatailr import is_dt_installed, Blob
 from datatailr.errors import DatatailrError
-from datatailr.logging import DatatailrLogger
 
 
 __BLOB_STORAGE__ = Blob()
-logger = DatatailrLogger(__name__).get_logger()
 
 
 class CacheNotFoundError(DatatailrError):
@@ -81,9 +79,6 @@ class ArgumentsCache:
         :param job_name: Name of the job.
         :return: Dictionary of arguments.
         """
-        logger.info(
-            f"Retrieving arguments for {batch_id=}, {job=}, {batch_run_id=}, {self.use_persistent_cache=}"
-        )
         path = f"/tmp/datatailr/batch/arguments/{batch_id}.pkl"
         if self.use_persistent_cache and isinstance(job, str):
             try:
@@ -121,9 +116,6 @@ class ArgumentsCache:
         :param result: Result of the batch job.
         """
         path = f"/tmp/datatailr/batch/results/{batch_run_id}_{job}.pkl"
-        logger.info(
-            f"Adding result for {batch_run_id=}, {job=}, {result=}, {self.use_persistent_cache=}"
-        )
         if self.use_persistent_cache and isinstance(job, str):
             self._add_to_persistent_cache(path, result)
         else:
@@ -160,7 +152,6 @@ class ArgumentsCache:
 
         """
         path = path.replace("/tmp/", "")
-        logger.info(f"Adding arguments to persistent cache for {path=}")
         __BLOB_STORAGE__.put_blob(path, json.dumps(blob))
 
     def _get_from_persistent_cache(self, path: str) -> Any:
@@ -170,6 +161,5 @@ class ArgumentsCache:
         :param path: Path in the Blob storage where the blob is stored.
         """
         path = path.replace("/tmp/", "")
-        logger.info(f"Retrieving arguments from persistent cache for {path=}")
         data = __BLOB_STORAGE__.get_blob(path)
         return json.loads(data)

datatailr/scheduler/base.py

@@ -96,13 +96,20 @@ class EntryPoint:
         # Find the absolute path to the repository and then the relative path to the module.
         # This will be used in the creation of the code 'bundle' when building the image.
         module_spec = importlib.util.find_spec(func.__module__)
-        if module_spec is not None and module_spec.origin is not None:
-            package_root = module_spec.origin
+        if not module_spec:
+            raise RepoValidationError(f"Cannot find spec for {self.module_name}")
+        # Resolve the filesystem directory of the top package for module_name
+        if module_spec.submodule_search_locations:
+            # It's a package; get its directory
+            package_root = os.path.abspath(
+                next(iter(module_spec.submodule_search_locations))
+            )
+        elif module_spec.origin:
+            # It's a module; use its containing directory
+            package_root = os.path.abspath(os.path.dirname(module_spec.origin))
         else:
-            package_root = "."
-        module_parts = self.module_name.split(".")
-        for _ in module_parts:
-            package_root = os.path.dirname(package_root)
+            raise RepoValidationError(f"Cannot resolve path for {self.module_name}")
+
         path_to_repo = run_shell_command(
             f"cd {package_root} && git rev-parse --show-toplevel"
         )[0]

datatailr/user.py

@@ -177,6 +177,7 @@ class User:
                 email=email,
                 primary_group=primary_group,
                 system=is_system_user,
+                json_enrichened=True,
             )
         else:
             new_user = __client__.add(
@@ -187,9 +188,10 @@ class User:
                 password=password,
                 primary_group=primary_group,
                 system=is_system_user,
+                json_enrichened=True,
             )
 
-        return new_user
+        return User(new_user["name"]) if new_user else None
 
     @staticmethod
     def exists(name: str) -> bool:

{datatailr-0.1.22.dist-info → datatailr-0.1.24.dist-info}/METADATA

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

{datatailr-0.1.22.dist-info → datatailr-0.1.24.dist-info}/RECORD

@@ -6,28 +6,28 @@ datatailr/errors.py,sha256=p_e4ao3sFEfz1g4LvEDqw6bVzHJPJSINLjJ8H6_PqOo,751
 datatailr/excel.py,sha256=7_13VFHrjHlIAEeTaGQIlq4ycJvzRo-TvkP_KRBELGs,425
 datatailr/group.py,sha256=ExsrkqUooAfFLWKvnkp1ZxisSJD1yCp9TKqoCXDCwhs,4360
 datatailr/logging.py,sha256=4Rsx3wf2tAr1334E2goBjhC877RwbUNaFgBlh902vU4,3270
-datatailr/user.py,sha256=THAHiHgcr6MGoF2EuFEUfPh-zRT4E_WhG6eoVNBNeKo,6624
+datatailr/user.py,sha256=tjIMbQ-tb2yFhgLBl_eTb47kKiy-RoM3KtYS3zmJiwc,6736
 datatailr/utils.py,sha256=mqnnERMyHNAuAgFY4Ry4O4yW0ZjCRtJbjfI5fXVqt2s,1524
 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=l3xoX_Ex-U7vXCiH343D3SQnqP6BY-xIx5qB6iES5ns,5996
+datatailr/sbin/datatailr_run.py,sha256=EiFhAHsgBVtRIhzdbswa01HztUL0CGg0p2h_u80IrBk,6130
 datatailr/sbin/datatailr_run_app.py,sha256=AOkutzv4DeKfWZs-ZBciAMKnK4A05SfkVf1ZJnSSFwA,1231
 datatailr/sbin/datatailr_run_batch.py,sha256=UWnp96j_G66R_Cape7Bb-rbK6UBLF7Y5_mTlWyGJAVQ,1818
 datatailr/sbin/datatailr_run_excel.py,sha256=Gr_QZgqJrwgRVD9_o4v-2tbvU-QMvNHL7xUvFGhftFc,1163
 datatailr/sbin/datatailr_run_service.py,sha256=R8eNLN2SGnMtyfLy3vq9isUHr3dRzeBqESTquNK9Iho,1156
 datatailr/scheduler/__init__.py,sha256=qydHYVtEP6SUWd2CQ6FRdTdRWNz3SbYPJy4FK_wOvMk,1772
-datatailr/scheduler/arguments_cache.py,sha256=ct9CiUF3IDB5S7dsQWFarc8yQXa6X8xvRrKjJ1zYKhM,6527
-datatailr/scheduler/base.py,sha256=4K39tQPpYnrhf2PmFWlcp0xkH2qEwhkfflt8qpWhxnQ,14633
+datatailr/scheduler/arguments_cache.py,sha256=3sKXg4_baeZNo8jvSGTFK6zT5RM1TKMpH-UVS1CLn20,6014
+datatailr/scheduler/base.py,sha256=cOTtXOloxjfJknWr3W1VEbpwGB5llrDreCot7Zv1Hkk,15015
 datatailr/scheduler/batch.py,sha256=JBSiFNwv2X2BkBocz7ddVmwND6MFds978f0Ok5f8aUc,16782
 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.22.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
-datatailr-0.1.22.dist-info/METADATA,sha256=KplXEwrUeqWjlRjkyN3NenplmPDlWPNzUsmCxbkD83Q,5146
-datatailr-0.1.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-datatailr-0.1.22.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
-datatailr-0.1.22.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
-datatailr-0.1.22.dist-info/RECORD,,
+datatailr-0.1.24.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
+datatailr-0.1.24.dist-info/METADATA,sha256=1J1Cn8HJ1FeZs8PRADqYfqmY3kPioKXhOD2yiMihVXI,5146
+datatailr-0.1.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+datatailr-0.1.24.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
+datatailr-0.1.24.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
+datatailr-0.1.24.dist-info/RECORD,,