datatailr 0.1.16__py3-none-any.whl → 0.1.18__py3-none-any.whl

datatailr/build/image.py

@@ -10,6 +10,7 @@
 
 import json
 import os
+import re
 from typing import Optional
 
 from datatailr import ACL, User
@@ -25,6 +26,7 @@ class Image:
     def __init__(
         self,
         acl: Optional[ACL] = None,
+        python_version: str = "3.12",
         python_requirements: str | list[str] = "",
         build_script_pre: str = "",
         build_script_post: str = "",
@@ -33,69 +35,103 @@ class Image:
         path_to_repo: Optional[str] = None,
         path_to_module: Optional[str] = None,
     ):
-        if acl is None:
-            signed_user = User.signed_user()
-            if signed_user is None:
-                raise ValueError(
-                    "ACL cannot be None. Please provide a valid ACL or ensure a user is signed in."
-                )
-        elif not isinstance(acl, ACL):
-            raise TypeError("acl must be an instance of ACL.")
-        self.acl = acl or ACL(signed_user)
-
-        if isinstance(python_requirements, str) and os.path.isfile(python_requirements):
-            with open(python_requirements, "r") as f:
-                python_requirements = f.read()
-        elif isinstance(python_requirements, list):
-            python_requirements = "\n".join(python_requirements)
-        if not isinstance(python_requirements, str):
+        self.python_version = python_version
+        self.acl = acl
+        self.python_requirements = python_requirements
+        self.build_script_pre = build_script_pre
+        self.build_script_post = build_script_post
+        self.branch_name = branch_name
+        self.commit_hash = commit_hash
+        self.path_to_repo = path_to_repo
+        self.path_to_module = path_to_module
+
+    def __repr__(self):
+        return f"Image(acl={self.acl},)"
+
+    @property
+    def python_version(self):
+        return self._python_version
+
+    @python_version.setter
+    def python_version(self, value: str):
+        if not isinstance(value, str):
+            raise TypeError("python_version must be a string.")
+        if not re.match(r"^\d+\.\d+(\.\d+)?$", value):
+            raise ValueError("Invalid python_version format. Expected format: X.Y[.Z]")
+        self._python_version = value
+
+    @property
+    def python_requirements(self):
+        return self._python_requirements
+
+    @python_requirements.setter
+    def python_requirements(self, value: str | list[str]):
+        if isinstance(value, str) and os.path.isfile(value):
+            with open(value, "r") as f:
+                value = f.read()
+        elif isinstance(value, list):
+            value = "\n".join(value)
+        if not isinstance(value, str):
             raise TypeError(
                 "python_requirements must be a string or a file path to a requirements file."
             )
-        self.python_requirements = python_requirements
+        self._python_requirements = value
+
+    @property
+    def build_script_pre(self):
+        return self._build_script_pre
 
-        if os.path.isfile(build_script_pre):
-            with open(build_script_pre, "r") as f:
-                build_script_pre = f.read()
-        if not isinstance(build_script_pre, str):
+    @build_script_pre.setter
+    def build_script_pre(self, value: str):
+        if not isinstance(value, str):
             raise TypeError(
                 "build_script_pre must be a string or a file path to a script file."
             )
-        self.build_script_pre = build_script_pre
+        if os.path.isfile(value):
+            with open(value, "r") as f:
+                value = f.read()
+        self._build_script_pre = value
+
+    @property
+    def build_script_post(self):
+        return self._build_script_post
 
-        if os.path.isfile(build_script_post):
-            with open(build_script_post, "r") as f:
-                build_script_post = f.read()
-        if not isinstance(build_script_post, str):
+    @build_script_post.setter
+    def build_script_post(self, value: str):
+        if not isinstance(value, str):
             raise TypeError(
                 "build_script_post must be a string or a file path to a script file."
             )
-        self.build_script_post = build_script_post
-        self.branch_name = branch_name
-        self.commit_hash = commit_hash
-        self.path_to_repo = path_to_repo
-        self.path_to_module = path_to_module
+        if os.path.isfile(value):
+            with open(value, "r") as f:
+                value = f.read()
+        self._build_script_post = value
 
-    def __repr__(self):
-        return f"Image(acl={self.acl},)"
+    @property
+    def acl(self):
+        return self._acl
+
+    @acl.setter
+    def acl(self, value: Optional[ACL]):
+        if value is None:
+            signed_user = User.signed_user()
+            if signed_user is None:
+                raise ValueError(
+                    "ACL cannot be None. Please provide a valid ACL or ensure a user is signed in."
+                )
+        elif not isinstance(value, ACL):
+            raise TypeError("acl must be an instance of ACL.")
+        self._acl = value or ACL(signed_user)
 
     def update(self, **kwargs):
         for key, value in kwargs.items():
-            if key == "acl" and not isinstance(value, ACL):
-                raise TypeError("acl must be an instance of ACL.")
-            elif key == "python_requirements" and not isinstance(value, str):
-                raise TypeError("python_requirements must be a string.")
-            elif key == "build_script_pre" and not isinstance(value, str):
-                raise TypeError("build_script_pre must be a string.")
-            elif key == "build_script_post" and not isinstance(value, str):
-                raise TypeError("build_script_post must be a string.")
-            elif (
+            if (
                 key in ["branch_name", "commit_hash", "path_to_repo", "path_to_module"]
                 and value is not None
                 and not isinstance(value, str)
             ):
                 raise TypeError(f"{key} must be a string or None.")
-            if key not in self.__dict__:
+            if not hasattr(self, key):
                 raise AttributeError(
                     f"'{self.__class__.__name__}' object has no attribute '{key}'"
                 )
@@ -107,6 +143,7 @@ class Image:
         """
         return {
             "acl": self.acl.to_dict(),
+            "python_version": self.python_version,
             "python_requirements": self.python_requirements,
             "build_script_pre": self.build_script_pre,
             "build_script_post": self.build_script_post,

datatailr/sbin/datatailr_run.py

@@ -82,6 +82,7 @@ def run_command_as_user(command: str, user: str, env_vars: dict):
     Run a command as a specific user with the given environment variables.
     """
     env_vars.update({"PATH": get_env_var("PATH")})
+    env_vars.update({"PYTHONPATH": get_env_var("PYTHONPATH")})
     env_vars_str = " ".join(f"{key}='{value}'" for key, value in env_vars.items())
     full_command = f"sudo -u {user} {env_vars_str} {command}"
     logger.debug(f"Running command: {full_command}")
@@ -89,6 +90,7 @@ def run_command_as_user(command: str, user: str, env_vars: dict):
 
 
 def main():
+    logger.info(f"Env inside datatailr_run.py: {os.environ}")
     user, _ = create_user_and_group()
     job_type = get_env_var("DATATAILR_JOB_TYPE")
 

datatailr/sbin/datatailr_run_batch.py

@@ -19,6 +19,7 @@ logger = DatatailrLogger(os.path.abspath(__file__)).get_logger()
 
 
 def run():
+    logger.info(f"Env inside datatailr_run.py run(): {os.environ}")
     logger.info("Running Datatailr batch job")
     entry_point = os.environ.get("DATATAILR_BATCH_ENTRYPOINT")
     batch_run_id = os.environ.get("DATATAILR_BATCH_RUN_ID")

datatailr/scheduler/base.py

@@ -133,8 +133,9 @@ class Job:
         environment: Optional[Environment] = Environment.DEV,
         image: Optional[Image] = None,
         run_as: Optional[Union[str, User]] = None,
-        resources: Resources = Resources(memory="100m", cpu=1),
+        resources: Resources = Resources(memory="128m", cpu=0.25),
         acl: Optional[ACL] = None,
+        python_version: str = "3.12",
         python_requirements: str = "",
         build_script_pre: str = "",
         build_script_post: str = "",
@@ -167,6 +168,7 @@ class Job:
         if image is None:
             image = Image(
                 acl=self.acl,
+                python_version=python_version,
                 python_requirements=python_requirements,
                 build_script_pre=build_script_pre,
                 build_script_post=build_script_post,
@@ -223,6 +225,8 @@ class Job:
             if isinstance(self.run_as, User)
             else self.run_as,
             "acl": self.acl.to_dict(),
+            "memory": self.resources.memory,
+            "cpu": self.resources.cpu,
         }
         if self.type != JobType.BATCH:
             job_dict["entrypoint"] = str(self.entrypoint) if self.entrypoint else None

datatailr/scheduler/schedule.py

@@ -105,7 +105,7 @@ class Schedule:
         match = re.match(r"^(.*?)\s*\((.*?)\)$", result)
         if match:
             cron_expression, schedule_expression = match.groups()
-            self.cron_expression = cron_expression.strip()
+            self.cron_expression = "0 " + cron_expression.strip()
             self.schedule_expression = schedule_expression.strip()
         self.__is_set__ = True
 

{datatailr-0.1.16.dist-info → datatailr-0.1.18.dist-info}/METADATA

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

{datatailr-0.1.16.dist-info → datatailr-0.1.18.dist-info}/RECORD

@@ -10,23 +10,23 @@ 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=xeYKPR6usg0pqJNpbhsYI8t_BB2iWxhY0KBNTWqpb_Q,4939
-datatailr/sbin/datatailr_run.py,sha256=xJ5pZ_lEu_-d9liaCy6uO1Y01fg-Gotg66TCv36nSio,6115
+datatailr/build/image.py,sha256=YC8ML-l-sj6TcIBY-DCx_vaeI_7SmL9fPFhHnuxzRh0,5509
+datatailr/sbin/datatailr_run.py,sha256=OU2YTpi4bCRZ0WNMzHN1zzqvt5sh45Az2IGF-OSgp7A,6240
 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_batch.py,sha256=u6b4v-sBDNBuvlVL-iey97dNvlsYaGyEKfG0SPnhpgU,1886
 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=CydYR9o2pqfa4KsPTA1mJSBN-0YF47Q6AmODm4zAJQ4,6254
-datatailr/scheduler/base.py,sha256=9E4zmX7-gn8Ozz5iPAy1hlxEfPxUlw9UCNMHAULw9AY,14068
+datatailr/scheduler/base.py,sha256=XZexeOGWHOSI0babRB8XCvAnL3fAQSXYWRfj7srMAkk,14240
 datatailr/scheduler/batch.py,sha256=77iUufBqRBau9Ku4IivLOKqh-lknclEak8jg2YhsX3c,16437
 datatailr/scheduler/batch_decorator.py,sha256=LqL1bsupWLn-YEQUvFJYae7R3ogrL5-VodyiiScrkRw,5806
 datatailr/scheduler/constants.py,sha256=5WWTsfwZ_BA8gVDOTa2AQX9DJ0NzfaWgtY3vrODS2-8,606
-datatailr/scheduler/schedule.py,sha256=vzXaBBKMVJeCGD0VxsRPeW80sYReJ83XxWzDHVgLibY,3734
+datatailr/scheduler/schedule.py,sha256=0XJJen2nL1xplRs0Xbjwgq3T-0bFCOrJzkSALdio998,3741
 datatailr/scheduler/utils.py,sha256=up6oR2iwe6G52LkvgfO394xchXgCYNjOMGRQW3e8PQk,1082
-datatailr-0.1.16.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
-datatailr-0.1.16.dist-info/METADATA,sha256=7hw00HobS04PC5ahDWilCsthIl42Ie6STtdd4x9mpxk,5146
-datatailr-0.1.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-datatailr-0.1.16.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
-datatailr-0.1.16.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
-datatailr-0.1.16.dist-info/RECORD,,
+datatailr-0.1.18.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
+datatailr-0.1.18.dist-info/METADATA,sha256=q1VzkHtrMYwcuwyBEi3iZkIbOVtLdIMaR2uF5lmPOQ4,5146
+datatailr-0.1.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+datatailr-0.1.18.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
+datatailr-0.1.18.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
+datatailr-0.1.18.dist-info/RECORD,,