datatailr 0.1.23__tar.gz → 0.1.25__tar.gz

{datatailr-0.1.23/src/datatailr.egg-info → datatailr-0.1.25}/PKG-INFO

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

{datatailr-0.1.23 → datatailr-0.1.25}/pyproject.toml

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

{datatailr-0.1.23 → datatailr-0.1.25}/src/datatailr/blob.py

@@ -98,6 +98,10 @@ class Blob:
         # Since direct reading and writting of blobs is not implemented yet, we are using a temporary file.
         # This is a workaround to allow writing the blob content directly to the blob storage.
         with tempfile.NamedTemporaryFile(delete=True) as temp_file:
-            with open(temp_file.name, "w") as f:
-                f.write(blob)
+            if isinstance(blob, bytes):
+                with open(temp_file.name, "wb") as f:
+                    f.write(blob)
+            else:
+                with open(temp_file.name, "w") as f:
+                    f.write(blob)
             self.put_file(name, temp_file.name)

{datatailr-0.1.23 → datatailr-0.1.25}/src/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 range(len(module_parts) - 1):
-            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-0.1.23 → datatailr-0.1.25/src/datatailr.egg-info}/PKG-INFO

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

{datatailr-0.1.23 → datatailr-0.1.25}/src/sbin/datatailr_run.py

@@ -99,8 +99,11 @@ def main():
     user, _ = create_user_and_group()
     job_type = get_env_var("DATATAILR_JOB_TYPE")
 
-    job_name = get_env_var("DATATAILR_JOB_NAME")
-    job_id = get_env_var("DATATAILR_JOB_ID")
+    env = {
+        "DATATAILR_JOB_TYPE": job_type,
+        "DATATAILR_JOB_NAME": get_env_var("DATATAILR_JOB_NAME"),
+        "DATATAILR_JOB_ID": get_env_var("DATATAILR_JOB_ID"),
+    }
 
     if job_type == "batch":
         run_id = get_env_var("DATATAILR_BATCH_RUN_ID")
@@ -109,37 +112,30 @@ def main():
         env = {
             "DATATAILR_BATCH_RUN_ID": run_id,
             "DATATAILR_BATCH_ID": batch_id,
-            "DATATAILR_JOB_ID": job_id,
             "DATATAILR_BATCH_ENTRYPOINT": entrypoint,
-        }
+        } | env
         run_command_as_user("datatailr_run_batch", user, env)
     elif job_type == "service":
         port = get_env_var("DATATAILR_SERVICE_PORT")
         entrypoint = get_env_var("DATATAILR_ENTRYPOINT")
         env = {
-            "DATATAILR_JOB_NAME": job_name,
-            "DATATAILR_JOB_ID": job_id,
             "DATATAILR_ENTRYPOINT": entrypoint,
             "DATATAILR_SERVICE_PORT": port,
-        }
+        } | env
         run_command_as_user("datatailr_run_service", user, env)
     elif job_type == "app":
         entrypoint = get_env_var("DATATAILR_ENTRYPOINT")
         env = {
-            "DATATAILR_JOB_NAME": job_name,
-            "DATATAILR_JOB_ID": job_id,
             "DATATAILR_ENTRYPOINT": entrypoint,
-        }
+        } | env
         run_command_as_user("datatailr_run_app", user, env)
     elif job_type == "excel":
         host = get_env_var("DATATAILR_HOST")
         entrypoint = get_env_var("DATATAILR_ENTRYPOINT")
         env = {
-            "DATATAILR_JOB_NAME": job_name,
-            "DATATAILR_JOB_ID": job_id,
             "DATATAILR_ENTRYPOINT": entrypoint,
             "DATATAILR_HOST": host,
-        }
+        } | env
         run_command_as_user("datatailr_run_excel", user, env)
     elif job_type == "IDE":
         pass