tinyfan 0.1.2__tar.gz → 0.1.3__tar.gz

{tinyfan-0.1.2 → tinyfan-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tinyfan
-Version: 0.1.2
+Version: 0.1.3
 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.1.2 → tinyfan-0.1.3}/pyproject.toml

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

{tinyfan-0.1.2 → tinyfan-0.1.3}/src/tinyfan/codegen.py

@@ -13,7 +13,7 @@ import datetime
 import croniter
 from .argo_typing import ScriptTemplate
 from .utils.embed import embed
-from .utils.merge import deepmerge
+from .utils.merge import deepmerge, dropnone
 from .config import CLI_CONFIG_STATE, Config, ConfigValue, ConfigMapKeyRef, ConfigMapRef, SecretKeyRef, SecretRef
 from .flowrundata import FlowRunData
 
@@ -171,6 +171,7 @@ class AssetTree:
         self,
         embedded: bool = True,
         container: ScriptTemplate = {},
+        serviceAccountName: str | None = None,
     ) -> str:
         if len(self.nodes) == 0:
             return ""
@@ -227,6 +228,7 @@ class AssetTree:
                     "timezone": tz,
                     "workflowSpec": {
                         "entrypoint": "flow",
+                        **dropnone({"serviceAccountName": serviceAccountName or self.flow.serviceAccountName}),
                         "podSpecPatch": yaml_dump(
                             {
                                 "containers": [
@@ -249,6 +251,7 @@ class AssetTree:
                         "templates": [
                             {
                                 "name": node.asset.name.replace("_", "-"),
+                                **dropnone({"serviceAccountName": node.asset.serviceAccountName}),
                                 "script": deepmerge(
                                     {
                                         "image": DEFAULT_IMAGE,
@@ -391,15 +394,20 @@ def codegen(
     location: str | None = None,
     embedded: bool = False,
     container: ScriptTemplate = {},
+    serviceAccountName: str | None = None,
 ) -> str:
     """Generate argocd workflow resource as yaml from tinyfan definitions"""
     CLI_CONFIG_STATE.codegen = True
     if flow:
-        result = AssetTree(flow).compile(embedded, container)
+        result = AssetTree(flow).compile(embedded, container, serviceAccountName)
     elif location:
         import_all_submodules(location)
-        result = "\n---\n".join(AssetTree(flow).compile(embedded, container) for flow in FLOW_REGISTER.values())
+        result = "\n---\n".join(
+            AssetTree(flow).compile(embedded, container, serviceAccountName) for flow in FLOW_REGISTER.values()
+        )
     else:
-        result = "\n---\n".join(AssetTree(flow).compile(embedded, container) for flow in FLOW_REGISTER.values())
+        result = "\n---\n".join(
+            AssetTree(flow).compile(embedded, container, serviceAccountName) for flow in FLOW_REGISTER.values()
+        )
     CLI_CONFIG_STATE.codegen = False
     return result

{tinyfan-0.1.2 → tinyfan-0.1.3}/src/tinyfan/flow.py

@@ -22,6 +22,7 @@ class Flow:
     assets: dict[str, "Asset[Any, Any, Any]"] = field(default_factory=dict)
     resources: dict[str, ResourceBase] | None = None
     container: ScriptTemplate | None = None
+    serviceAccountName: str | None = None
     store: StoreBase = field(default_factory=NaiveStore)
     configs: dict[str, Config | ConfigValue | str | None] = field(default_factory=dict)
 
@@ -48,6 +49,7 @@ class Asset(Generic[Ret, UMeta, StoreIdx]):
     depends: str | None = None
     name: str = field(init=False)
     container: ScriptTemplate | None = None
+    serviceAccountName: str | None = None
 
     def __post_init__(self):
         self.name = self.func.__name__
@@ -110,6 +112,7 @@ def asset(
     tz: str | None = None,
     metadata: UMeta | None = None,
     container: ScriptTemplate | None = None,
+    serviceAccountName: str | None = None,
 ) -> Callable[..., AssetFunc[Ret, UMeta, StoreIdx]]:
     def wrapper(func: Callable[..., Ret]) -> AssetFunc[Ret, UMeta, StoreIdx]:
         asset = Asset[Ret, UMeta, StoreIdx](
@@ -121,6 +124,7 @@ def asset(
             tz=tz or flow.tz,
             metadata=metadata,
             container=container,
+            serviceAccountName=serviceAccountName,
         )
         return AssetFunc(func, asset)
 

{tinyfan-0.1.2 → tinyfan-0.1.3}/src/tinyfan/utils/merge.py

@@ -15,3 +15,13 @@ def deepmerge(dict1: T, dict2: T, *args: T) -> T:
     for arg in args:
         deepmerge(dict1, arg)
     return dict1
+
+
+def dropnone(d: dict) -> dict:
+    dropping = []
+    for k in d:
+        if d[k] is None:
+            dropping.append(k)
+    for k in dropping:
+        del d[k]
+    return d

{tinyfan-0.1.2 → tinyfan-0.1.3}/uv.lock

@@ -774,7 +774,7 @@ wheels = [
 
 [[package]]
 name = "tinyfan"
-version = "0.1.2"
+version = "0.1.3"
 source = { editable = "." }
 dependencies = [
     { name = "croniter" },