tinyfan 0.2.7__tar.gz → 0.2.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tinyfan
-Version: 0.2.7
+Version: 0.2.9
 Summary: Tiny Argo Workflows python devkit
 Project-URL: Documentation, https://github.com/eunchuldev/tinyfan#readme
 Project-URL: Issues, https://github.com/eunchuldev/tinyfan/issues
@@ -14,9 +14,9 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Typing :: Typed
 Requires-Python: >=3.12
-Requires-Dist: croniter>=3.0.3
-Requires-Dist: pyyaml>=6.0.2
-Requires-Dist: typer-slim>=0.15.1
+Requires-Dist: croniter>=6.0.0
+Requires-Dist: pyyaml>=6.0.3
+Requires-Dist: typer-slim>=0.20.0
 Provides-Extra: all
 Requires-Dist: google-cloud-bigquery[pandas]; extra == 'all'
 Requires-Dist: google-cloud-storage; extra == 'all'
@@ -40,6 +40,7 @@ Requires-Dist: pytest>=8.3.3; extra == 'dev'
 Requires-Dist: ruff; extra == 'dev'
 Requires-Dist: types-croniter; extra == 'dev'
 Requires-Dist: types-jsonschema; extra == 'dev'
+Requires-Dist: types-networkx; extra == 'dev'
 Requires-Dist: types-pyyaml; extra == 'dev'
 Provides-Extra: gcs
 Requires-Dist: google-cloud-storage; extra == 'gcs'
@@ -99,7 +100,7 @@ def greeting(world: str):
 ```shell
 # Apply the changes to argo workflow
 
-tinyfan template main.py | kubectl apply -f -
+tinyfan main.py | kubectl apply -f -
 ```
 
 # Real World Example (still tiny though!)

{tinyfan-0.2.7 → tinyfan-0.2.9}/README.md

@@ -47,7 +47,7 @@ def greeting(world: str):
 ```shell
 # Apply the changes to argo workflow
 
-tinyfan template main.py | kubectl apply -f -
+tinyfan main.py | kubectl apply -f -
 ```
 
 # Real World Example (still tiny though!)

{tinyfan-0.2.7 → tinyfan-0.2.9}/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.7 → tinyfan-0.2.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tinyfan"
-version = "0.2.7"
+version = "0.2.9"
 description = 'Tiny Argo Workflows python devkit'
 readme = "README.md"
 requires-python = ">=3.12"
@@ -14,7 +14,7 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
   "Typing :: Typed",
 ]
-dependencies = ["croniter>=3.0.3", "pyyaml>=6.0.2", "typer-slim>=0.15.1"]
+dependencies = ["croniter>=6.0.0", "pyyaml>=6.0.3", "typer-slim>=0.20.0"]
 
 [project.scripts]
 tinyfan = "tinyfan.cli:main"
@@ -34,6 +34,7 @@ dev = [
   "types-PyYAML",
   "types-jsonschema",
   "types-croniter",
+  "types-networkx",
   "tinyfan[all]",
 ]
 

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

@@ -229,11 +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 += """{{=join(map(fromJSON(inputs.parameters.moduledata), {"from " + .module + " import " + .name}), "\\n")}}\n"""
+                source += """{{=join(map(fromJSON(inputs.parameters.moduledata), {"from " + .module + " import " + .name}), ";")}}\n"""
             source += "asset = {{inputs.parameters.asset_name}}.asset\n"
         else:
             source = (
-                """{{=join(map(fromJSON(inputs.parameters.moduledata), {"from " + .module + " import " + .name}), "\\n")}}\n"""
+                """{{=join(map(fromJSON(inputs.parameters.moduledata), {"from " + .module + " import " + .name}), ";")}}\n"""
                 "asset = {{inputs.parameters.asset_name}}.asset\n"
             )
         source += (
@@ -257,28 +257,33 @@ class AssetTree:
                     "generateName": f"""{self.flow.name}-{encode_schedule_to_k8sname(tz, schedule)}-""",
                 },
                 "spec": {
-                    "schedule": schedule,
+                    "schedules": [schedule],
                     "timezone": tz,
                     "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": [
@@ -339,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": {