tinyfan 0.2.6__tar.gz → 0.2.8__tar.gz

{tinyfan-0.2.6 → tinyfan-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tinyfan
-Version: 0.2.6
+Version: 0.2.8
 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.6 → tinyfan-0.2.8}/examples/getting-started.py

@@ -9,9 +9,16 @@ def target() -> str:
     return "world"
 
 
+@tinyfan.asset(
+    schedule="*/1 * * * *",
+)
+def target2() -> str:
+    return "earth"
+
+
 @tinyfan.asset()
-def greeting(target: str):
-    print("hello " + target)
+def greeting(target: str, target2: str):
+    print("hello " + target, "hello " + target2)
 
 
 @tinyfan.asset(

{tinyfan-0.2.6 → tinyfan-0.2.8}/pyproject.toml

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

{tinyfan-0.2.6 → tinyfan-0.2.8}/src/tinyfan/codegen.py

@@ -229,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"""
             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"""
                 "asset = {{inputs.parameters.asset_name}}.asset\n"
             )
         source += (
@@ -263,23 +262,28 @@ class AssetTree:
                     "workflowSpec": {
                         "entrypoint": "flow",
                         **dropnone({"serviceAccountName": serviceAccountName or self.flow.serviceAccountName}),
-                        "podSpecPatch": yaml_dump(
+                        **dropnone(
                             {
-                                "containers": [
-                                    deepmerge(
-                                        {
-                                            "name": "main",
-                                            "env": [
+                                "podSpecPatch": (container or self.flow.container)
+                                and yaml_dump(
+                                    {
+                                        "containers": [
+                                            deepmerge(
                                                 {
-                                                    "name": "TINYFAN_SOURCE",
-                                                    "value": source,
-                                                }
-                                            ],
-                                        },
-                                        container or {},
-                                        self.flow.container or {},
-                                    )
-                                ]
+                                                    "name": "main",
+                                                    "env": [
+                                                        {
+                                                            "name": "TINYFAN_SOURCE",
+                                                            "value": source,
+                                                        }
+                                                    ],
+                                                },
+                                                container or {},
+                                                self.flow.container or {},
+                                            )
+                                        ]
+                                    }
+                                )
                             }
                         ),
                         "templates": [
@@ -340,16 +344,21 @@ class AssetTree:
                                     self.flow.container or {},
                                     node.asset.container or {},
                                 ),
-                                "podSpecPatch": yaml_dump(
+                                **dropnone(
                                     {
-                                        "containers": [
-                                            deepmerge(
-                                                {
-                                                    "name": "main",
-                                                },
-                                                node.asset.container or {},
-                                            )
-                                        ]
+                                        "podSpecPatch": node.asset.container
+                                        and yaml_dump(
+                                            {
+                                                "containers": [
+                                                    deepmerge(
+                                                        {
+                                                            "name": "main",
+                                                        },
+                                                        node.asset.container,
+                                                    )
+                                                ]
+                                            }
+                                        ),
                                     }
                                 ),
                                 "synchronization": {
@@ -366,7 +375,7 @@ class AssetTree:
                                             "value": "{{= nil }}",
                                         },
                                         {
-                                            "name": "module_name",
+                                            "name": "moduledata",
                                             "value": "{{= nil }}",
                                         },
                                     ]
@@ -406,8 +415,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.6 → tinyfan-0.2.8}/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.6 → tinyfan-0.2.8}/uv.lock

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