datatailr 0.1.32__tar.gz → 0.1.34__tar.gz

{datatailr-0.1.32/src/datatailr.egg-info → datatailr-0.1.34}/PKG-INFO

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

{datatailr-0.1.32 → datatailr-0.1.34}/pyproject.toml

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

{datatailr-0.1.32 → datatailr-0.1.34}/src/datatailr/blob.py

@@ -98,10 +98,6 @@ 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:
-            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)
+            with open(temp_file.name, "w") as f:
+                f.write(blob)
             self.put_file(name, temp_file.name)

{datatailr-0.1.32 → datatailr-0.1.34}/src/datatailr/group.py

@@ -103,8 +103,8 @@ class Group:
 
     @staticmethod
     def add(name: str) -> Optional["Group"]:
-        new_group = __client__.add(name, json_enrichened=True)
-        return Group(new_group["name"]) if new_group else None
+        __client__.add(name)
+        return Group.get(name)
 
     @staticmethod
     def ls() -> list:

{datatailr-0.1.32 → datatailr-0.1.34}/src/datatailr/logging.py

@@ -10,7 +10,7 @@
 
 import logging
 import os
-import sys
+from logging import StreamHandler
 from logging.handlers import RotatingFileHandler
 from typing import Optional
 from datatailr import User
@@ -33,28 +33,6 @@ def get_log_level() -> int:
         return logging.INFO
 
 
-class MaxLevelFilter(logging.Filter):
-    """Allow only log records at or below a given level."""
-
-    def __init__(self, level):
-        super().__init__()
-        self.level = level
-
-    def filter(self, record: logging.LogRecord) -> bool:
-        return record.levelno <= self.level
-
-
-class MinLevelFilter(logging.Filter):
-    """Allow only log records at or above a given level."""
-
-    def __init__(self, level):
-        super().__init__()
-        self.level = level
-
-    def filter(self, record: logging.LogRecord) -> bool:
-        return record.levelno >= self.level
-
-
 tag = dt__Tag()
 node_name = tag.get("node_name") or "local"
 node_ip = tag.get("node_ip")
@@ -88,21 +66,12 @@ class DatatailrLogger:
         self.logger = logging.getLogger(name)
         self.logger.setLevel(log_level)
 
-        formatter = logging.Formatter(log_format)
-
-        # stdout handler (DEBUG/INFO only)
-        stdout_handler = logging.StreamHandler(sys.stdout)
-        stdout_handler.setLevel(logging.DEBUG)
-        stdout_handler.addFilter(MaxLevelFilter(logging.INFO))
-        stdout_handler.setFormatter(formatter)
-        self.logger.addHandler(stdout_handler)
-
-        # stderr handler (WARNING and above)
-        stderr_handler = logging.StreamHandler(sys.stderr)
-        stderr_handler.setLevel(logging.WARNING)
-        stderr_handler.addFilter(MinLevelFilter(logging.WARNING))
-        stderr_handler.setFormatter(formatter)
-        self.logger.addHandler(stderr_handler)
+        # Stream handler for stdout/stderr
+        stream_handler = StreamHandler()
+        stream_handler.setLevel(log_level)
+        stream_formatter = logging.Formatter(log_format)
+        stream_handler.setFormatter(stream_formatter)
+        self.logger.addHandler(stream_handler)
 
         # Optional file handler
         if log_file:
@@ -110,9 +79,9 @@ class DatatailrLogger:
                 log_file, maxBytes=10 * 1024 * 1024, backupCount=5
             )
             file_handler.setLevel(log_level)
-            file_handler.setFormatter(formatter)
+            file_formatter = logging.Formatter(log_format)
+            file_handler.setFormatter(file_formatter)
             self.logger.addHandler(file_handler)
-
         self.enable_opentelemetry()
 
     def get_logger(self):

{datatailr-0.1.32 → datatailr-0.1.34}/src/datatailr/scheduler/base.py

@@ -241,9 +241,6 @@ class Job:
         }
         if self.type != JobType.BATCH:
             job_dict["entrypoint"] = str(self.entrypoint) if self.entrypoint else None
-            job_dict["image"] = (self.image,)
-            job_dict["memory"] = (self.resources.memory,)
-            job_dict["cpu"] = self.resources.cpu
         return job_dict
 
     def from_dict(self, job_dict: dict):

{datatailr-0.1.32 → datatailr-0.1.34}/src/datatailr/scheduler/batch.py

@@ -459,7 +459,7 @@ class Batch(Job):
             return args
         return {}
 
-    def prepare_args(self) -> None:
+    def run(self) -> Tuple[bool, str]:
         def arg_name(arg: Union[BatchJob, str]) -> str:
             return arg.name if isinstance(arg, BatchJob) else arg
 
@@ -481,14 +481,6 @@ class Batch(Job):
         }
 
         __ARGUMENTS_CACHE__.add_arguments(self.id, args)
-
-    def save(self) -> Tuple[bool, str]:
-        self.prepare_args()
-        return super().save()
-
-    def run(self) -> Tuple[bool, str]:
-        self.prepare_args()
-
         if not self.__local_run and is_dt_installed():
             return super().run()
         else:

{datatailr-0.1.32 → datatailr-0.1.34/src/datatailr.egg-info}/PKG-INFO

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

{datatailr-0.1.32 → datatailr-0.1.34}/src/sbin/datatailr_run.py

@@ -32,7 +32,6 @@
 #     DATATAILR_JOB_ID - the unique identifier for the job.
 
 
-import subprocess
 import os
 import sys
 from typing import Tuple
@@ -43,7 +42,7 @@ logger = DatatailrLogger(os.path.abspath(__file__)).get_logger()
 
 if not is_dt_installed():
     logger.error("Datatailr is not installed.")
-    # sys.exit(1) # TODO: Uncomment after testing
+    sys.exit(1)
 
 
 def get_env_var(name: str, default: str | None = None) -> str:
@@ -81,32 +80,18 @@ def create_user_and_group() -> Tuple[str, str]:
     return user, group
 
 
-def run_command_as_user(command: str | list, user: str, env_vars: dict):
+def run_command_as_user(command: str, user: str, env_vars: dict):
     """
     Run a command as a specific user with the given environment variables.
     """
-    if isinstance(command, str):
-        command = command.split(" ")
-    env_vars = {
-        "PATH": get_env_var("PATH", ""),
-        "PYTHONPATH": get_env_var("PYTHONPATH", ""),
-    } | 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}")
-    except subprocess.CalledProcessError as e:
-        logger.error(f"Command failed with exit code {e.returncode}")
-        logger.error(f"stderr: {e.stderr}")
+    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}")
+    status = os.system(full_command)
+    if status != 0:
+        logger.error(f"Command failed with status {status / 256:g}")
         sys.exit(1)
 
 
@@ -114,11 +99,8 @@ def main():
     user, _ = create_user_and_group()
     job_type = get_env_var("DATATAILR_JOB_TYPE")
 
-    env = {
-        "DATATAILR_JOB_TYPE": job_type,
-        "DATATAILR_JOB_NAME": get_env_var("DATATAILR_JOB_NAME"),
-        "DATATAILR_JOB_ID": get_env_var("DATATAILR_JOB_ID"),
-    }
+    job_name = get_env_var("DATATAILR_JOB_NAME")
+    job_id = get_env_var("DATATAILR_JOB_ID")
 
     if job_type == "batch":
         run_id = get_env_var("DATATAILR_BATCH_RUN_ID")
@@ -127,49 +109,40 @@ 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":
-        command = [
-            "code-server",
-            "--auth=none",
-            "--bind-addr=0.0.0.0:8080",
-            f'--app-name="Datatailr IDE {get_env_var("DATATAILR_USER")}"',
-        ]
-        run_command_as_user(command, user, env)
-    elif job_type == "jupyter":
-        command = [
-            "jupyter-lab",
-            "--ip='*'",
-            "--port=8080",
-            "--no-browser",
-            "--NotebookApp.token=''",
-            "--NotebookApp.password=''",
-        ]
-        run_command_as_user(command, user, env)
+        pass
     else:
         raise ValueError(f"Unknown job type: {job_type}")
 

{datatailr-0.1.32 → datatailr-0.1.34}/src/sbin/datatailr_run_excel.py

@@ -21,14 +21,14 @@ logger = DatatailrLogger(os.path.abspath(__file__)).get_logger()
 def run():
     logger.info("Starting Datatailr excel add-in...")
     entrypoint = os.environ.get("DATATAILR_ENTRYPOINT")
-    hostname = os.environ.get("DATATAILR_HOST")
+    # hostname = os.environ.get("DATATAILR_HOST")
 
     if entrypoint is None:
         raise ValueError("Environment variable 'DATATAILR_ENTRYPOINT' is not set.")
 
-    if hostname is None:
-        raise ValueError("Environment variable 'DATATAILR_HOST' is not set.")
+    # if hostname is None:
+    #     raise ValueError("Environment variable 'DATATAILR_HOST' is not set.")
 
-    entrypoint = f'./dt-excel.sh -n -H "{hostname}" -p 8080 "{entrypoint}"'
+    # entrypoint = f'./dt-excel.sh -n -H "{hostname}" -p 8080 "{entrypoint}"'
     logger.info(f"Running entrypoint: {entrypoint}")
     subprocess.run(entrypoint, shell=True)