datatailr 0.1.63__tar.gz → 0.1.65__tar.gz

{datatailr-0.1.63/src/datatailr.egg-info → datatailr-0.1.65}/PKG-INFO

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

{datatailr-0.1.63 → datatailr-0.1.65}/pyproject.toml

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

{datatailr-0.1.63 → datatailr-0.1.65}/src/datatailr/wrapper.py

@@ -33,13 +33,14 @@ else:
 
 def type_map(arg_type):
     mapping = {
-        "String": "str",
+        "string": "str",
         "file": "str",
         "boolean": "bool",
         "int": "int",
+        "integer": "int",
         "float": "float",
     }
-    return mapping.get(arg_type, "str")
+    return mapping.get(arg_type.lower(), "str")
 
 
 def add_quotes(arg):

{datatailr-0.1.63 → datatailr-0.1.65/src/datatailr.egg-info}/PKG-INFO

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

{datatailr-0.1.63 → datatailr-0.1.65}/src/sbin/datatailr_run.py

@@ -30,8 +30,6 @@
 #     DATATAILR_BATCH_RUN_ID - the unique identifier for the batch run.
 #     DATATAILR_BATCH_ID - the unique identifier for the batch.
 #     DATATAILR_JOB_ID - the unique identifier for the job.
-# Important:
-#     Python environment is installed and managed by uv and all installed scripts (datatailr_run, datatailr_run_excel, jupyter etc.) should be invoked with `uv run`.
 
 
 import subprocess
@@ -92,13 +90,6 @@ def run_command_as_user(command: str | list, user: str, env_vars: dict):
         command = command.split(" ")
 
     python_libdir = sysconfig.get_config_var("LIBDIR")
-    python_scripts_dir = sysconfig.get_path("scripts")
-
-    python_path = get_env_var("PYTHONPATH", "")
-    if python_path:
-        python_path = python_path + ":" + python_scripts_dir
-    else:
-        python_path = python_scripts_dir
 
     ld_library_path = get_env_var("LD_LIBRARY_PATH", "")
     if ld_library_path:
@@ -108,7 +99,7 @@ def run_command_as_user(command: str | list, user: str, env_vars: dict):
 
     env_vars = {
         "PATH": get_env_var("PATH", ""),
-        "PYTHONPATH": python_path,
+        "PYTHONPATH": get_env_var("PYTHONPATH", ""),
         "LD_LIBRARY_PATH": python_libdir,
     } | env_vars
 
@@ -172,27 +163,24 @@ def main():
             "DATATAILR_LOCAL": local,
         } | env
         run_command_as_user("datatailr_run_excel", user, env)
-    elif job_type == "ide":
-        command = [
+    elif job_type == "workspace":
+        ide_command = [
             "code-server",
             "--auth=none",
-            "--bind-addr=0.0.0.0:8080",
+            "--bind-addr=0.0.0.0:9090",
             f'--app-name="Datatailr IDE {get_env_var("DATATAILR_USER")}"',
         ]
-        run_command_as_user(command, user, env)
-    elif job_type == "jupyter":
-        command = [
-            "uv",
-            "run",
-            "jupyter",
-            "lab",
+        jupyter_command = [
+            "jupyter-lab",
             "--ip='*'",
-            "--port=8080",
+            "--port=7070",
             "--no-browser",
             "--NotebookApp.token=''",
             "--NotebookApp.password=''",
         ]
-        run_command_as_user(command, user, env)
+        # TODO: run both commands in parallel
+        run_command_as_user(ide_command, user, env)
+
     else:
         raise ValueError(f"Unknown job type: {job_type}")