datatailr 0.1.71__py3-none-any.whl → 0.1.72__py3-none-any.whl

datatailr/sbin/datatailr_run.py

@@ -93,11 +93,8 @@ def create_user_and_group() -> Tuple[str, str]:
         | stat.S_IXGRP
     )
 
-    if os.path.exists(f"/home/{user}"):
-        os.chmod(f"/home/{user}", permissions)
-
-    if os.path.exists(f"/home/{user}/tmp/.dt"):
-        os.chmod(f"/home/{user}/tmp/.dt", permissions)
+    os.makedirs(f"/home/{user}/tmp/.dt", exist_ok=True)
+    os.chmod(f"/home/{user}/tmp/.dt", permissions)
 
     return user, group
 

datatailr/scheduler/batch.py

@@ -294,7 +294,7 @@ class BatchJob:
             env = {
                 "DATATAILR_BATCH_ID": str(self.dag.id),
                 "DATATAILR_JOB_ID": str(self.__id),
-                "DATATAILR_JOB_NAME": self.name,
+                "DATATAILR_JOB_NAME": f"{self.dag.name}[{self.__id}]",
             }
             self.entrypoint(env=env)
         else:
@@ -479,10 +479,26 @@ class Batch(Job):
 
     def prepare_args(self) -> None:
         def arg_name(arg: Union[BatchJob, str]) -> str:
-            return arg.name if isinstance(arg, BatchJob) else arg
+            return f"{self.name}[{arg.id}]" if isinstance(arg, BatchJob) else arg
+
+        def adjust_mapping(mapping: Dict[str, str]) -> Dict[str, str]:
+            result = {}
+            for k, v in mapping.items():
+                if isinstance(v, BatchJob):
+                    result[k] = f"{self.name}[{v.id}]"
+                elif isinstance(v, str):
+                    job = self.get_job_by_name(v)
+                    if job is not None:
+                        result[k] = f"{self.name}[{job.id}]"
+                    else:
+                        result[k] = v
+                else:
+                    raise TypeError(
+                        f"Unsupported type in argument mapping: {type(v)} for key {k}"
+                    )
+            return result
 
         def merged(dst: dict[str, str], src: dict[str, str]) -> dict[str, str]:
-            # copy so we don't mutate the original mapping
             out = dict(dst)
             seen_vals = set(out.values())
             for k, v in src.items():
@@ -492,12 +508,12 @@ class Batch(Job):
             return out
 
         args = {
-            j.name: merged(
-                j.argument_mapping, {k: arg_name(v) for k, v in j.args.items()}
+            f"{self.name}[{j.id}]": merged(
+                adjust_mapping(j.argument_mapping),
+                {j.argument_mapping.get(k, k): arg_name(v) for k, v in j.args.items()},
             )
             for j in self.__jobs
         }
-
         __ARGUMENTS_CACHE__.add_arguments(self.id, args)
 
     def save(self) -> Tuple[bool, str]:

{datatailr-0.1.71.dist-info → datatailr-0.1.72.dist-info}/METADATA

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

{datatailr-0.1.71.dist-info → datatailr-0.1.72.dist-info}/RECORD

@@ -14,7 +14,7 @@ datatailr/build/__init__.py,sha256=_dA7b4L6wsaAFaSxUoYSJ1oaRqDHDMR20kqoCocSOss,4
 datatailr/build/image.py,sha256=YC8ML-l-sj6TcIBY-DCx_vaeI_7SmL9fPFhHnuxzRh0,5509
 datatailr/excel/__init__.py,sha256=wox5ltPeOYZcZoRDW4R6tJsfOjf-0WZM2_pGgltGjdo,682
 datatailr/excel/addin.py,sha256=at0S1cNHShCOCXAml1W2sJmJ5DdNroTN6Bp6KWnYZ94,6104
-datatailr/sbin/datatailr_run.py,sha256=MKNlI6YM1UvBwdk90YUYYQbrbAEdba5ZryFIbYT2CiE,10051
+datatailr/sbin/datatailr_run.py,sha256=m8FZLYYXw7LFrvZhBXKWaBL784EKz27Qk7Se0Vo-KVY,9967
 datatailr/sbin/datatailr_run_app.py,sha256=itF76XC2F4RK9s6bkoEppEiYwSLHK_5Jai3yvC-kFhY,1501
 datatailr/sbin/datatailr_run_batch.py,sha256=UWnp96j_G66R_Cape7Bb-rbK6UBLF7Y5_mTlWyGJAVQ,1818
 datatailr/sbin/datatailr_run_excel.py,sha256=BLWmvxpKEE_8vJhs8E4VWq07FOBof5tlow-AkIEXtHw,1470
@@ -22,14 +22,14 @@ datatailr/sbin/datatailr_run_service.py,sha256=DO9LGOpz3CVZOJJRHb4ac7AgY_mLbXHGa
 datatailr/scheduler/__init__.py,sha256=qydHYVtEP6SUWd2CQ6FRdTdRWNz3SbYPJy4FK_wOvMk,1772
 datatailr/scheduler/arguments_cache.py,sha256=00OE0DhobYteBOnirjulO1ltgGBRamAdCO168O3_Zes,6236
 datatailr/scheduler/base.py,sha256=WWi_VnDxev0GG6QolF3Wtj-p_JS5t2CN9VALYPl1OYo,16994
-datatailr/scheduler/batch.py,sha256=CQCH1wHhW1qx09J7iQNQleErJ4n0nssAbd6u9YS6FMY,17735
+datatailr/scheduler/batch.py,sha256=ZhEf3YkXf1_ieV5ivk4-me60ov9v5r9f9BdkJw84i_0,18475
 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.71.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
-datatailr-0.1.71.dist-info/METADATA,sha256=jtM6J7uHqGgQ_MHJBvKDuIdYAMvQ8T4XM16b0RyF09M,5146
-datatailr-0.1.71.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-datatailr-0.1.71.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
-datatailr-0.1.71.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
-datatailr-0.1.71.dist-info/RECORD,,
+datatailr-0.1.72.dist-info/licenses/LICENSE,sha256=ikKP4_O-UD_b8FuNdKmbzTb6odd0JX085ZW_FAPN3VI,1066
+datatailr-0.1.72.dist-info/METADATA,sha256=w-sZvCPuMwHr_mFMYq9xTMwg1i1TD3sZ4VGhroQL7aU,5146
+datatailr-0.1.72.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+datatailr-0.1.72.dist-info/entry_points.txt,sha256=YqXfk2At-olW4PUSRkqvy_O3Mbv7uTKCCPuAAiz3Qbg,312
+datatailr-0.1.72.dist-info/top_level.txt,sha256=75gntW0X_SKpqxLL6hAPipvpk28GAhJBvoyqN_HohWU,10
+datatailr-0.1.72.dist-info/RECORD,,