tinyfan 0.2.5__tar.gz → 0.2.7__tar.gz

{tinyfan-0.2.5 → tinyfan-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tinyfan
-Version: 0.2.5
+Version: 0.2.7
 Summary: Tiny Argo Workflows python devkit
 Project-URL: Documentation, https://github.com/eunchuldev/tinyfan#readme
 Project-URL: Issues, https://github.com/eunchuldev/tinyfan/issues

{tinyfan-0.2.5 → tinyfan-0.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tinyfan"
-version = "0.2.5"
+version = "0.2.7"
 description = 'Tiny Argo Workflows python devkit'
 readme = "README.md"
 requires-python = ">=3.12"

{tinyfan-0.2.5 → tinyfan-0.2.7}/src/tinyfan/codegen.py

@@ -66,6 +66,10 @@ def import_all_submodules(location: str):
             importlib.import_module(name)
 
 
+def assetname2template(name: str):
+    return name.replace("_", "-")
+
+
 class AssetNode:
     asset: Asset
     refs: list[Config | ConfigValue | str | None]
@@ -106,7 +110,8 @@ class AssetNode:
                         DATETIME_ANNOTATION: "{{workflow.scheduledTime}}",
                     },
                     "parents": {
-                        p.asset.name: "{{tasks.%s.outputs.parameters.rundata}}" % p.asset.name for p in self.parents
+                        p.asset.name: "{{tasks.%s.outputs.parameters.rundata}}" % p.asset.name.replace("_", "-")
+                        for p in self.parents
                     },
                     "asset_name": self.asset.name,
                     "flow_name": self.asset.flow.name,
@@ -224,12 +229,11 @@ class AssetTree:
             root_location = get_root_path(list(self.nodes.values())[0].asset.func)
             source += embed(root_location)
             if not root_location.endswith(".py"):
-                source += "from {{inputs.parameters.module_name}} import {{inputs.parameters.asset_name}}\n"
+                source += """{{=join(map(fromJSON(inputs.parameters.moduledata), {"from " + .module + " import " + .name}), "\\n")}}\n"""
             source += "asset = {{inputs.parameters.asset_name}}.asset\n"
         else:
             source = (
-                "from {{inputs.parameters.module_name}}"
-                " import {{inputs.parameters.asset_name}}\n"
+                """{{=join(map(fromJSON(inputs.parameters.moduledata), {"from " + .module + " import " + .name}), "\\n")}}\n"""
                 "asset = {{inputs.parameters.asset_name}}.asset\n"
             )
         source += (
@@ -347,7 +351,9 @@ class AssetTree:
                                         ]
                                     }
                                 ),
-                                "synchronization": {"mutexes": [{"name": f"{self.flow.name}-{node.asset.name}"}]},
+                                "synchronization": {
+                                    "mutexes": [{"name": f"{self.flow.name}-{node.asset.name.replace('_', '-')}"}]
+                                },
                                 "inputs": {
                                     "parameters": [
                                         {
@@ -359,7 +365,7 @@ class AssetTree:
                                             "value": "{{= nil }}",
                                         },
                                         {
-                                            "name": "module_name",
+                                            "name": "moduledata",
                                             "value": "{{= nil }}",
                                         },
                                     ]
@@ -399,8 +405,22 @@ class AssetTree:
                                                         "value": node.asset.name,
                                                     },
                                                     {
-                                                        "name": "module_name",
-                                                        "value": node.asset_module_name(),
+                                                        "name": "moduledata",
+                                                        "value": json.dumps(
+                                                            [
+                                                                {
+                                                                    "module": node.asset_module_name(),
+                                                                    "name": node.asset.name,
+                                                                },
+                                                                *(
+                                                                    {
+                                                                        "module": p.asset_module_name(),
+                                                                        "name": p.asset.name,
+                                                                    }
+                                                                    for p in node.parents
+                                                                ),
+                                                            ]
+                                                        ),
                                                     },
                                                 ]
                                             },

{tinyfan-0.2.5 → tinyfan-0.2.7}/src/tinyfan/flow.py

@@ -81,7 +81,7 @@ class Asset(Generic[Ret, UMeta, StoreIdx]):
         for name, prundata in parent_flowrundatas.items():
             parent = self.flow.assets[name]
             index = prundata.get("store_entry_idx", None)
-            data = parent.store.retrieve(index, source_rundata=prundata, target_rundata=rundata)
+            data = index and parent.store.retrieve(index, source_rundata=prundata, target_rundata=rundata)
             if name in func_param_names:
                 params[name] = data
         ret = self.func(**params)

{tinyfan-0.2.5 → tinyfan-0.2.7}/uv.lock

@@ -784,7 +784,7 @@ wheels = [
 
 [[package]]
 name = "tinyfan"
-version = "0.2.5"
+version = "0.2.7"
 source = { editable = "." }
 dependencies = [
     { name = "croniter" },