codeflowhub 0.2.3__tar.gz → 0.3.0__tar.gz

{codeflowhub-0.2.3 → codeflowhub-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeflowhub
-Version: 0.2.3
+Version: 0.3.0
 Summary: workflow development tools
 Author: creaddiscans
 Author-email: creaddiscans@gmail.com

{codeflowhub-0.2.3 → codeflowhub-0.3.0}/codeflowhub/flow.py

@@ -353,8 +353,8 @@ class FlowDecorator(BaseDecorator):
         """개별 task 결과를 run.json에 저장"""
         run_log = self._load_log_file()
         run_log[task_name] = {
-            'input': result,
-            'output': result
+            'input': self._strip_context(result),
+            'output': self._strip_context(result)
         }
         self._write_log_file(run_log)
 

{codeflowhub-0.2.3 → codeflowhub-0.3.0}/codeflowhub/service/airflow_exporter.py

@@ -283,6 +283,7 @@ base_volume_mounts = [
 
         tolerations_code = self._build_tolerations_code(task)
         node_selector_code = self._build_node_selector_code(task)
+        affinity_code = self._build_affinity_code(task)
         volume_mounts_code = self._build_volume_mounts_code(task)
         container_resources_code = self._build_container_resources_code(task)
         sidecars_code = self._build_sidecars_code(task)
@@ -304,7 +305,7 @@ base_volume_mounts = [
         operator_code = f'''    {task.name} = KubernetesPodOperator(
         **common,
         task_id='{task.name}',
-        image='{task_image}',{pool_code}{trigger_rule_code}{retries_code}{env_vars_code}{tolerations_code}{node_selector_code}{volume_mounts_code}{container_resources_code}{sidecars_code}
+        image='{task_image}',{pool_code}{trigger_rule_code}{retries_code}{env_vars_code}{tolerations_code}{node_selector_code}{affinity_code}{volume_mounts_code}{container_resources_code}{sidecars_code}
         arguments=[
             f\'\'\'{arguments}\'\'\'
         ],
@@ -361,6 +362,107 @@ base_volume_mounts = [
             return f"\n        node_selector={repr(task.node_selector)},"
         return ""
 
+    def _build_affinity_code(self, task):
+        """Affinity 코드 생성 (node_affinity 지원)
+
+        affinity dict는 K8s YAML 구조를 그대로 따르며, camelCase/snake_case 모두 허용.
+        예:
+            affinity={
+                'node_affinity': {
+                    'required_during_scheduling_ignored_during_execution': {
+                        'node_selector_terms': [
+                            {'match_expressions': [
+                                {'key': 'workload-type/spot', 'operator': 'In', 'values': ['true']}
+                            ]}
+                        ]
+                    },
+                    'preferred_during_scheduling_ignored_during_execution': [
+                        {'weight': 100, 'preference': {
+                            'match_expressions': [
+                                {'key': 'workload-type/spot', 'operator': 'In', 'values': ['true']}
+                            ]
+                        }}
+                    ]
+                }
+            }
+        """
+        if not (hasattr(task, 'affinity') and task.affinity):
+            return ""
+
+        aff = self._normalize_keys(task.affinity)
+        parts = []
+        if 'node_affinity' in aff:
+            node_aff_code = self._render_node_affinity(aff['node_affinity'])
+            if node_aff_code:
+                parts.append(f"node_affinity={node_aff_code}")
+
+        if not parts:
+            return ""
+
+        return f"\n        affinity=k8s.V1Affinity({', '.join(parts)}),"
+
+    def _render_node_affinity(self, node_aff):
+        """k8s.V1NodeAffinity(...) 코드 생성"""
+        na = self._normalize_keys(node_aff)
+        parts = []
+
+        if 'required_during_scheduling_ignored_during_execution' in na:
+            required = self._normalize_keys(na['required_during_scheduling_ignored_during_execution'])
+            terms = required.get('node_selector_terms', [])
+            terms_code = ', '.join(self._render_node_selector_term(t) for t in terms)
+            parts.append(
+                f"required_during_scheduling_ignored_during_execution="
+                f"k8s.V1NodeSelector(node_selector_terms=[{terms_code}])"
+            )
+
+        if 'preferred_during_scheduling_ignored_during_execution' in na:
+            prefs = na['preferred_during_scheduling_ignored_during_execution'] or []
+            pref_codes = []
+            for pref in prefs:
+                p = self._normalize_keys(pref)
+                weight = p.get('weight', 1)
+                preference = self._render_node_selector_term(p.get('preference', {}))
+                pref_codes.append(
+                    f"k8s.V1PreferredSchedulingTerm(weight={weight}, preference={preference})"
+                )
+            parts.append(
+                f"preferred_during_scheduling_ignored_during_execution=[{', '.join(pref_codes)}]"
+            )
+
+        return f"k8s.V1NodeAffinity({', '.join(parts)})"
+
+    def _render_node_selector_term(self, term):
+        """k8s.V1NodeSelectorTerm(...) 코드 생성"""
+        t = self._normalize_keys(term)
+        parts = []
+
+        for field_key, api_key in [('match_expressions', 'match_expressions'),
+                                   ('match_fields', 'match_fields')]:
+            if field_key in t:
+                req_codes = [self._render_node_selector_requirement(r) for r in t[field_key]]
+                parts.append(f"{api_key}=[{', '.join(req_codes)}]")
+
+        return f"k8s.V1NodeSelectorTerm({', '.join(parts)})"
+
+    def _render_node_selector_requirement(self, req):
+        """k8s.V1NodeSelectorRequirement(...) 코드 생성"""
+        r = self._normalize_keys(req)
+        req_parts = [f"key={repr(r['key'])}", f"operator={repr(r['operator'])}"]
+        if 'values' in r:
+            req_parts.append(f"values={repr(list(r['values']))}")
+        return f"k8s.V1NodeSelectorRequirement({', '.join(req_parts)})"
+
+    @staticmethod
+    def _normalize_keys(d):
+        """dict의 최상위 키를 camelCase → snake_case로 정규화"""
+        import re
+        if not isinstance(d, dict):
+            return d
+        return {
+            re.sub(r'([A-Z])', r'_\1', k).lower().lstrip('_'): v
+            for k, v in d.items()
+        }
+
     def _build_volume_mounts_code(self, task, include_base=True):
         """Volume mounts 코드 생성
 

{codeflowhub-0.2.3 → codeflowhub-0.3.0}/codeflowhub/task.py

@@ -13,11 +13,13 @@ class TaskDecorator(BaseDecorator):
     tolerations: list[Toleration]
     volume_mounts: list[VolumeMount]
     sidecars: list[SidecarContainer]
+    affinity: dict
 
     def __init__(self, *args, cpu='1', memory='1Gi', gpu=None, image=None,
                  node_selector=None, tolerations: list[Toleration] = None,
                  volume_mounts: list[VolumeMount] = None, pool: str = None,
-                 sidecars: list[SidecarContainer] = None, **kwargs):
+                 sidecars: list[SidecarContainer] = None, affinity: dict = None,
+                 **kwargs):
         super().__init__(*args, **kwargs)
         self.set_resource(cpu, memory, gpu)
         self.image = image
@@ -26,6 +28,7 @@ class TaskDecorator(BaseDecorator):
         self.volume_mounts = volume_mounts or []
         self.pool = pool
         self.sidecars = sidecars or []
+        self.affinity = affinity or {}
         self._is_flowhub_task = True
 
     def set_resource(self, cpu, memory, gpu):

{codeflowhub-0.2.3 → codeflowhub-0.3.0}/codeflowhub.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeflowhub
-Version: 0.2.3
+Version: 0.3.0
 Summary: workflow development tools
 Author: creaddiscans
 Author-email: creaddiscans@gmail.com

{codeflowhub-0.2.3 → codeflowhub-0.3.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='codeflowhub',
-    version='0.2.3',
+    version='0.3.0',
     description='workflow development tools',
     author='creaddiscans',
     author_email='creaddiscans@gmail.com',