pypeline-runner 1.18.1__py3-none-any.whl → 1.19.0__py3-none-any.whl

pypeline/__init__.py

@@ -1 +1 @@
-__version__ = "1.18.1"
+__version__ = "1.19.0"

pypeline/pypeline.py

@@ -5,6 +5,8 @@ from typing import (
     Generic,
     List,
     Optional,
+    OrderedDict,
+    Tuple,
     Type,
 )
 
@@ -14,7 +16,7 @@ from py_app_dev.core.runnable import Executor
 
 from .domain.artifacts import ProjectArtifactsLocator
 from .domain.execution_context import ExecutionContext
-from .domain.pipeline import PipelineConfig, PipelineLoader, PipelineStep, PipelineStepConfig, PipelineStepReference, StepClassFactory, TExecutionContext
+from .domain.pipeline import PipelineConfig, PipelineConfigIterator, PipelineLoader, PipelineStep, PipelineStepConfig, PipelineStepReference, StepClassFactory, TExecutionContext
 
 
 class RunCommandClassFactory(StepClassFactory[PipelineStep[TExecutionContext]]):
@@ -116,45 +118,77 @@ class PipelineScheduler(Generic[TExecutionContext]):
         self.logger = logger.bind()
 
     def get_steps_to_run(self, step_names: Optional[List[str]] = None, single: bool = False) -> List[PipelineStepReference[PipelineStep[TExecutionContext]]]:
-        return self.filter_steps_references(self.create_pipeline_loader(self.pipeline, self.project_root_dir).load_steps_references(), step_names, single)
+        return self.create_pipeline_loader(self.filter_steps(self.pipeline, step_names, single), self.project_root_dir).load_steps_references()
 
     @staticmethod
-    def filter_steps_references(
-        steps_references: List[PipelineStepReference[PipelineStep[TExecutionContext]]],
-        step_names: Optional[List[str]],
-        single: Optional[bool],
-    ) -> List[PipelineStepReference[PipelineStep[TExecutionContext]]]:
+    def filter_steps(pipeline_config: PipelineConfig, step_names: Optional[List[str]], single: bool) -> PipelineConfig:
+        """
+        Filters the pipeline steps based on the provided step names.
+
+        If no step names are provided, all steps are returned.
+        When `single` is True, only the named steps are returned, otherwise all steps up to the last named step are returned.
+        """
         if not step_names:
-            return steps_references
+            return pipeline_config
 
         step_names_set = set(step_names)
-        filtered_steps = []
-        found_steps = set()
-
-        if single:
-            # Include only the explicitly named steps, preserving order
-            filtered_steps = [step for step in steps_references if step.name in step_names_set]
-            found_steps = {step.name for step in filtered_steps}
-        else:
-            # Include all steps until the last explicitly named step is found
-            for step in steps_references:
-                filtered_steps.append(step)
-                if step.name in step_names_set:
-                    found_steps.add(step.name)
-                    if found_steps == step_names_set:
-                        # Once all named steps have been found, stop here
-                        break
-            else:
-                # If loop completes without finding all named steps
-                missing_steps = step_names_set - found_steps
-                raise UserNotificationException(f"Steps not found in pipeline configuration: {', '.join(missing_steps)}")
+        filtered_groups: List[Tuple[Optional[str], List[PipelineStepConfig]]] = []
+        found_steps: set[str] = set()
+
+        for group_name, steps_config in PipelineConfigIterator(pipeline_config):
+            filtered_steps = PipelineScheduler._filter_steps_in_group(steps_config, step_names_set, single, found_steps)
+
+            if filtered_steps:
+                filtered_groups.append((group_name, filtered_steps))
+
+            if not single and found_steps == step_names_set:
+                break
 
         missing_steps = step_names_set - found_steps
         if missing_steps:
             raise UserNotificationException(f"Steps not found in pipeline configuration: {', '.join(missing_steps)}")
 
+        return PipelineScheduler._create_pipeline_config_from_groups(filtered_groups)
+
+    @staticmethod
+    def _filter_steps_in_group(steps_config: List[PipelineStepConfig], step_names_set: set[str], single: bool, found_steps: set[str]) -> List[PipelineStepConfig]:
+        """Filter steps within a single group."""
+        filtered_steps = []
+
+        for step_config in steps_config:
+            step_name = step_config.class_name or step_config.step
+
+            if single:
+                if step_name in step_names_set:
+                    filtered_steps.append(step_config)
+                    found_steps.add(step_name)
+            else:
+                filtered_steps.append(step_config)
+                if step_name in step_names_set:
+                    found_steps.add(step_name)
+                    if found_steps == step_names_set:
+                        break
+
         return filtered_steps
 
+    @staticmethod
+    def _create_pipeline_config_from_groups(groups: List[Tuple[Optional[str], List[PipelineStepConfig]]]) -> PipelineConfig:
+        """Create a PipelineConfig from filtered groups."""
+        if not groups:
+            return []
+
+        # If all groups have None as group_name, return a simple list
+        if all(group_name is None for group_name, _ in groups):
+            return [step for _, steps in groups for step in steps]
+
+        # Otherwise, return an OrderedDict
+        result: OrderedDict[str, List[PipelineStepConfig]] = OrderedDict()
+        for group_name, steps in groups:
+            if group_name is not None:
+                result[group_name] = steps
+
+        return result
+
     @staticmethod
     def create_pipeline_loader(pipeline: PipelineConfig, project_root_dir: Path) -> PipelineLoader[PipelineStep[TExecutionContext]]:
         return PipelineLoader[PipelineStep[TExecutionContext]](pipeline, project_root_dir, RunCommandClassFactory())

{pypeline_runner-1.18.1.dist-info → pypeline_runner-1.19.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pypeline-runner
-Version: 1.18.1
+Version: 1.19.0
 Summary: Configure and execute pipelines with Python (similar to GitHub workflows or Jenkins pipelines).
 License: MIT
 Author: cuinixam
@@ -20,6 +20,7 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: py-app-dev (>=2.10,<3.0)
 Requires-Dist: pyyaml (>=6.0,<7.0)
 Requires-Dist: typer (>=0,<1)
+Requires-Dist: west (>=1.0,<2.0)
 Project-URL: Bug Tracker, https://github.com/cuinixam/pypeline/issues
 Project-URL: Changelog, https://github.com/cuinixam/pypeline/blob/main/CHANGELOG.md
 Project-URL: Documentation, https://pypeline-runner.readthedocs.io

{pypeline_runner-1.18.1.dist-info → pypeline_runner-1.19.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pypeline/__init__.py,sha256=54sMzEOXJ7W27qoPLWPsPwh5bgkt77XwgZJbxjD5qB8,23
+pypeline/__init__.py,sha256=RI6iseDSL_qMxFcIV0RKnzR3fZIvguxQK4eA_v0LVwc,23
 pypeline/__run.py,sha256=TCdaX05Qm3g8T4QYryKB25Xxf0L5Km7hFOHe1mK9vI0,350
 pypeline/bootstrap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypeline/bootstrap/run.py,sha256=pi9Kyordk4-Hwz8BsLpOTNu-hJV4imPgOrjPSr9_qRA,16446
@@ -19,14 +19,14 @@ pypeline/kickstart/templates/project/steps/my_step.py,sha256=b-JEwF9EyF4G6lgvkk3
 pypeline/kickstart/templates/project/west.yaml,sha256=ZfVym7M4yzzC-Nm0vESdhqNYs6EaJuMQWGJBht_i0b4,188
 pypeline/main.py,sha256=2mC2BDB1OWIXhaijBXG6Y1vfT8_yMZ4Dj55w5u7g7-w,4158
 pypeline/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pypeline/pypeline.py,sha256=-mquLfFlEvESk-HORhvjRMESIzdlVAgBLPjwUDOPLqg,7452
+pypeline/pypeline.py,sha256=mDKUnTuMDw8l-kSDJCHRNbn6zrxAfXhAIAqc5HyHd5M,8758
 pypeline/steps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypeline/steps/create_venv.py,sha256=ioL59vC1GbEk_EpUFMRRkWXk8W7z7QCEV-zgcho_lSg,6292
 pypeline/steps/env_setup_script.py,sha256=u08A6pvMccFQbcnU0xruFvpU30PbDrttnbOjl1gDqog,2340
 pypeline/steps/scoop_install.py,sha256=DDXBD-5TVaT-u6Yf7A85uWoCgBVmLvj9nPGrZ8OQCz0,3853
 pypeline/steps/west_install.py,sha256=hPyr28ksdKsQ0tv0gMNytzupgk1IgjN9CpmaBdX5zps,1947
-pypeline_runner-1.18.1.dist-info/LICENSE,sha256=sKxdoqSmW9ezvPvt0ZGJbneyA0SBcm0GiqzTv2jN230,1066
-pypeline_runner-1.18.1.dist-info/METADATA,sha256=NsuwVs3Z1fw7CffO2EpdNKlOGvjjMRN3llZl1CuCO7Q,7553
-pypeline_runner-1.18.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pypeline_runner-1.18.1.dist-info/entry_points.txt,sha256=pe1u0uuhPI_yeQ0KjEw6jK-EvQfPcZwBSajgbAdKz1o,47
-pypeline_runner-1.18.1.dist-info/RECORD,,
+pypeline_runner-1.19.0.dist-info/LICENSE,sha256=sKxdoqSmW9ezvPvt0ZGJbneyA0SBcm0GiqzTv2jN230,1066
+pypeline_runner-1.19.0.dist-info/METADATA,sha256=xM_xPlG5nNTZXIqKWSpZAkdKM6gnIpj_UDpt7ICH1w8,7586
+pypeline_runner-1.19.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pypeline_runner-1.19.0.dist-info/entry_points.txt,sha256=pe1u0uuhPI_yeQ0KjEw6jK-EvQfPcZwBSajgbAdKz1o,47
+pypeline_runner-1.19.0.dist-info/RECORD,,