From a8845d9c94d4d14c32340bea0d1ccd21f7b9b015 Mon Sep 17 00:00:00 2001 From: Daniel Loureiro Date: Sun, 23 Feb 2025 19:15:03 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=84=20refactor:=20rename=20"model"?= =?UTF-8?q?=20to=20"target"=20in=20ActAsFactory=20library?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update all references from "model" to "target" for clarity - Ensure consistency across the ActAsFactory library --- .../bases/pipeline_factory.py | 2 +- .../core/support/act_as_factory/__init__.py | 4 ++-- .../support/act_as_factory/act_as_factory.py | 20 +++++++++---------- .../act_as_factory_interface.py | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/_api/core/plugins/_05_with_pipeline_factory/bases/pipeline_factory.py b/src/_api/core/plugins/_05_with_pipeline_factory/bases/pipeline_factory.py index 89146ae..e3a491c 100644 --- a/src/_api/core/plugins/_05_with_pipeline_factory/bases/pipeline_factory.py +++ b/src/_api/core/plugins/_05_with_pipeline_factory/bases/pipeline_factory.py @@ -54,7 +54,7 @@ def _add_item(self, item: StageClassOrInstance) -> Self: return self._set_items(self.stages + (item,)) # ActAsFactory - def _get_model_class(self) -> type[TPipeline]: + def _get_target_class(self) -> type[TPipeline]: if self.pipeline_class is None: raise ValueError("Pipeline class not set in factory.") diff --git a/src/_api/core/support/act_as_factory/__init__.py b/src/_api/core/support/act_as_factory/__init__.py index d49b1e5..3fb1ae8 100644 --- a/src/_api/core/support/act_as_factory/__init__.py +++ b/src/_api/core/support/act_as_factory/__init__.py @@ -1,8 +1,8 @@ from .act_as_factory import ActAsFactory -from .act_as_factory_interface import ActAsFactoryInterface, TModel +from .act_as_factory_interface import ActAsFactoryInterface, T_target __all__ = ( "ActAsFactory", "ActAsFactoryInterface", - "TModel", + "T_target", ) diff --git a/src/_api/core/support/act_as_factory/act_as_factory.py b/src/_api/core/support/act_as_factory/act_as_factory.py index 7ddf6d7..2a67419 100644 --- a/src/_api/core/support/act_as_factory/act_as_factory.py +++ b/src/_api/core/support/act_as_factory/act_as_factory.py @@ -1,24 +1,24 @@ from abc import abstractmethod from typing import Any, Optional -from .act_as_factory_interface import ActAsFactoryInterface, TModel +from .act_as_factory_interface import ActAsFactoryInterface, T_target -class ActAsFactory(ActAsFactoryInterface[TModel]): - # set the class here or in `_get_model_class` - _model_class: Optional[type[TModel]] = None +class ActAsFactory(ActAsFactoryInterface[T_target]): + # set the class here or in `_get_target_class` + _target_class: Optional[type[T_target]] = None @abstractmethod def _definition(self) -> dict[str, Any]: pass - def _get_model_class(self) -> type[TModel]: - if self._model_class is None: - raise ValueError("Factory _model_class not set") + def _get_target_class(self) -> type[T_target]: + if self._target_class is None: + raise ValueError("Factory _target_class not set") - return self._model_class + return self._target_class - def make(self) -> TModel: - instance_class = self._get_model_class() + def make(self) -> T_target: + instance_class = self._get_target_class() return instance_class(**self._definition()) diff --git a/src/_api/core/support/act_as_factory/act_as_factory_interface.py b/src/_api/core/support/act_as_factory/act_as_factory_interface.py index d36f1a2..581a386 100644 --- a/src/_api/core/support/act_as_factory/act_as_factory_interface.py +++ b/src/_api/core/support/act_as_factory/act_as_factory_interface.py @@ -1,13 +1,13 @@ from abc import abstractmethod from typing import Any, Protocol, TypeVar -TModel = TypeVar("TModel", infer_variance=True) +T_target = TypeVar("T_target", infer_variance=True) -class ActAsFactoryInterface(Protocol[TModel]): +class ActAsFactoryInterface(Protocol[T_target]): @abstractmethod def _definition(self) -> dict[str, Any]: ... - def _get_model_class(self) -> type[TModel]: ... + def _get_target_class(self) -> type[T_target]: ... def make(self) -> Any: ... From 72a86307c64875a0744f8e147190007a8b083ad2 Mon Sep 17 00:00:00 2001 From: Daniel Loureiro Date: Fri, 28 Feb 2025 09:04:38 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=9A=9A=20chore:=20rename=20"bridges"?= =?UTF-8?q?=20folders=20to=20"=5Fbridges"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Prepend underscore to match revised spec2 naming convention - Update references accordingly --- .../{bridges => _bridges}/__init__.py | 0 .../{bridges => _bridges}/pipeline_interface.py | 0 .../{bridges => _bridges}/stage_callable.py | 0 .../{bridges => _bridges}/types.py | 0 .../mixins/pipeline_interface_mixin.py | 4 ++-- .../_02_with_pipeline_as_list/mixins/pipeline_mixin.py | 2 +- .../{bridges => _bridges}/__init__.py | 0 .../{bridges => _bridges}/stage_interface.py | 0 .../{bridges => _bridges}/types.py | 0 .../mixins/stage_interface_mixin.py | 4 ++-- .../_03_with_stage_as_callable/mixins/stage_mixin.py | 2 +- .../{bridges => _bridges}/__init__.py | 0 .../{bridges => _bridges}/pipeline_interface.py | 0 .../{bridges => _bridges}/stage_callable.py | 0 .../{bridges => _bridges}/types.py | 0 .../mixins/pipeline_interface_mixin.py | 4 ++-- .../mixins/pipeline_mixin.py | 2 +- .../{bridges => _bridges}/__init__.py | 0 .../{bridges => _bridges}/pipeline_interface.py | 0 .../{bridges => _bridges}/stage_callable.py | 0 .../{bridges => _bridges}/types.py | 0 .../bases/pipeline_factory.py | 4 ++-- .../bases/pipeline_factory_interface.py | 4 ++-- .../{bridges => _bridges}/__init__.py | 0 .../pipeline_factory_interface.py | 4 ++-- .../{bridges => _bridges}/pipeline_interface.py | 0 .../{bridges => _bridges}/stage_callable.py | 0 .../{bridges => _bridges}/types.py | 0 .../_06_with_pipeline_processor/bases/processor.py | 4 ++-- .../bases/processor_interface.py | 4 ++-- .../mixins/pipeline_factory_interface_mixin.py | 10 +++++----- .../mixins/pipeline_factory_mixin.py | 6 +++--- .../mixins/pipeline_interface_mixin.py | 10 +++++----- .../mixins/pipeline_mixin.py | 6 +++--- .../{bridges => _bridges}/__init__.py | 0 .../{bridges => _bridges}/pipeline_interface.py | 0 .../{bridges => _bridges}/stage_interface.py | 0 .../{bridges => _bridges}/types.py | 0 .../mixins/pipeline_interface_mixin.py | 6 +++--- .../mixins/pipeline_mixin.py | 2 +- .../{bridges => _bridges}/__init__.py | 0 .../{bridges => _bridges}/pipeline.py | 0 .../pipeline_factory_interface.py | 0 .../{bridges => _bridges}/pipeline_interface.py | 0 .../{bridges => _bridges}/processor.py | 0 .../{bridges => _bridges}/processor_interface.py | 0 .../{bridges => _bridges}/stage_callable.py | 0 .../{bridges => _bridges}/types.py | 0 .../bases/processors/chained_processor.py | 6 +++--- .../bases/processors/chained_processor_interface.py | 6 +++--- .../mixins/pipeline_factory_interface_mixin.py | 4 ++-- .../mixins/pipeline_factory_mixin.py | 2 +- .../mixins/pipeline_interface_mixin.py | 4 ++-- .../mixins/pipeline_mixin.py | 10 +++++----- 54 files changed, 55 insertions(+), 55 deletions(-) rename src/_api/core/plugins/_02_with_pipeline_as_list/{bridges => _bridges}/__init__.py (100%) rename src/_api/core/plugins/_02_with_pipeline_as_list/{bridges => _bridges}/pipeline_interface.py (100%) rename src/_api/core/plugins/_02_with_pipeline_as_list/{bridges => _bridges}/stage_callable.py (100%) rename src/_api/core/plugins/_02_with_pipeline_as_list/{bridges => _bridges}/types.py (100%) rename src/_api/core/plugins/_03_with_stage_as_callable/{bridges => _bridges}/__init__.py (100%) rename src/_api/core/plugins/_03_with_stage_as_callable/{bridges => _bridges}/stage_interface.py (100%) rename src/_api/core/plugins/_03_with_stage_as_callable/{bridges => _bridges}/types.py (100%) rename src/_api/core/plugins/_04_with_pipeline_declared_stages/{bridges => _bridges}/__init__.py (100%) rename src/_api/core/plugins/_04_with_pipeline_declared_stages/{bridges => _bridges}/pipeline_interface.py (100%) rename src/_api/core/plugins/_04_with_pipeline_declared_stages/{bridges => _bridges}/stage_callable.py (100%) rename src/_api/core/plugins/_04_with_pipeline_declared_stages/{bridges => _bridges}/types.py (100%) rename src/_api/core/plugins/_05_with_pipeline_factory/{bridges => _bridges}/__init__.py (100%) rename src/_api/core/plugins/_05_with_pipeline_factory/{bridges => _bridges}/pipeline_interface.py (100%) rename src/_api/core/plugins/_05_with_pipeline_factory/{bridges => _bridges}/stage_callable.py (100%) rename src/_api/core/plugins/_05_with_pipeline_factory/{bridges => _bridges}/types.py (100%) rename src/_api/core/plugins/_06_with_pipeline_processor/{bridges => _bridges}/__init__.py (100%) rename src/_api/core/plugins/_06_with_pipeline_processor/{bridges => _bridges}/pipeline_factory_interface.py (75%) rename src/_api/core/plugins/_06_with_pipeline_processor/{bridges => _bridges}/pipeline_interface.py (100%) rename src/_api/core/plugins/_06_with_pipeline_processor/{bridges => _bridges}/stage_callable.py (100%) rename src/_api/core/plugins/_06_with_pipeline_processor/{bridges => _bridges}/types.py (100%) rename src/_api/core/plugins/_08_with_pipeline_as_stage/{bridges => _bridges}/__init__.py (100%) rename src/_api/core/plugins/_08_with_pipeline_as_stage/{bridges => _bridges}/pipeline_interface.py (100%) rename src/_api/core/plugins/_08_with_pipeline_as_stage/{bridges => _bridges}/stage_interface.py (100%) rename src/_api/core/plugins/_08_with_pipeline_as_stage/{bridges => _bridges}/types.py (100%) rename src/_api/core/plugins/_99_with_pipeline_default_processor/{bridges => _bridges}/__init__.py (100%) rename src/_api/core/plugins/_99_with_pipeline_default_processor/{bridges => _bridges}/pipeline.py (100%) rename src/_api/core/plugins/_99_with_pipeline_default_processor/{bridges => _bridges}/pipeline_factory_interface.py (100%) rename src/_api/core/plugins/_99_with_pipeline_default_processor/{bridges => _bridges}/pipeline_interface.py (100%) rename src/_api/core/plugins/_99_with_pipeline_default_processor/{bridges => _bridges}/processor.py (100%) rename src/_api/core/plugins/_99_with_pipeline_default_processor/{bridges => _bridges}/processor_interface.py (100%) rename src/_api/core/plugins/_99_with_pipeline_default_processor/{bridges => _bridges}/stage_callable.py (100%) rename src/_api/core/plugins/_99_with_pipeline_default_processor/{bridges => _bridges}/types.py (100%) diff --git a/src/_api/core/plugins/_02_with_pipeline_as_list/bridges/__init__.py b/src/_api/core/plugins/_02_with_pipeline_as_list/_bridges/__init__.py similarity index 100% rename from src/_api/core/plugins/_02_with_pipeline_as_list/bridges/__init__.py rename to src/_api/core/plugins/_02_with_pipeline_as_list/_bridges/__init__.py diff --git a/src/_api/core/plugins/_02_with_pipeline_as_list/bridges/pipeline_interface.py b/src/_api/core/plugins/_02_with_pipeline_as_list/_bridges/pipeline_interface.py similarity index 100% rename from src/_api/core/plugins/_02_with_pipeline_as_list/bridges/pipeline_interface.py rename to src/_api/core/plugins/_02_with_pipeline_as_list/_bridges/pipeline_interface.py diff --git a/src/_api/core/plugins/_02_with_pipeline_as_list/bridges/stage_callable.py b/src/_api/core/plugins/_02_with_pipeline_as_list/_bridges/stage_callable.py similarity index 100% rename from src/_api/core/plugins/_02_with_pipeline_as_list/bridges/stage_callable.py rename to src/_api/core/plugins/_02_with_pipeline_as_list/_bridges/stage_callable.py diff --git a/src/_api/core/plugins/_02_with_pipeline_as_list/bridges/types.py b/src/_api/core/plugins/_02_with_pipeline_as_list/_bridges/types.py similarity index 100% rename from src/_api/core/plugins/_02_with_pipeline_as_list/bridges/types.py rename to src/_api/core/plugins/_02_with_pipeline_as_list/_bridges/types.py diff --git a/src/_api/core/plugins/_02_with_pipeline_as_list/mixins/pipeline_interface_mixin.py b/src/_api/core/plugins/_02_with_pipeline_as_list/mixins/pipeline_interface_mixin.py index fabc106..0626abd 100644 --- a/src/_api/core/plugins/_02_with_pipeline_as_list/mixins/pipeline_interface_mixin.py +++ b/src/_api/core/plugins/_02_with_pipeline_as_list/mixins/pipeline_interface_mixin.py @@ -4,10 +4,10 @@ from ....support.act_as_list import ActAsListInterface # extends: self-bridge -from ..bridges.pipeline_interface import PipelineInterface +from .._bridges.pipeline_interface import PipelineInterface # uses: bridge interface -from ..bridges.stage_callable import ( +from .._bridges.stage_callable import ( StageInstance, StageInstanceCollection, ) diff --git a/src/_api/core/plugins/_02_with_pipeline_as_list/mixins/pipeline_mixin.py b/src/_api/core/plugins/_02_with_pipeline_as_list/mixins/pipeline_mixin.py index d253e63..e37e751 100644 --- a/src/_api/core/plugins/_02_with_pipeline_as_list/mixins/pipeline_mixin.py +++ b/src/_api/core/plugins/_02_with_pipeline_as_list/mixins/pipeline_mixin.py @@ -5,7 +5,7 @@ from ....support.act_as_list import ActAsList # uses: bridge interfaces -from ..bridges.stage_callable import StageInstance, StageInstanceCollection +from .._bridges.stage_callable import StageInstance, StageInstanceCollection # implements: self-interface from .pipeline_interface_mixin import PipelineInterfaceMixin as ImplementsInterface diff --git a/src/_api/core/plugins/_03_with_stage_as_callable/bridges/__init__.py b/src/_api/core/plugins/_03_with_stage_as_callable/_bridges/__init__.py similarity index 100% rename from src/_api/core/plugins/_03_with_stage_as_callable/bridges/__init__.py rename to src/_api/core/plugins/_03_with_stage_as_callable/_bridges/__init__.py diff --git a/src/_api/core/plugins/_03_with_stage_as_callable/bridges/stage_interface.py b/src/_api/core/plugins/_03_with_stage_as_callable/_bridges/stage_interface.py similarity index 100% rename from src/_api/core/plugins/_03_with_stage_as_callable/bridges/stage_interface.py rename to src/_api/core/plugins/_03_with_stage_as_callable/_bridges/stage_interface.py diff --git a/src/_api/core/plugins/_03_with_stage_as_callable/bridges/types.py b/src/_api/core/plugins/_03_with_stage_as_callable/_bridges/types.py similarity index 100% rename from src/_api/core/plugins/_03_with_stage_as_callable/bridges/types.py rename to src/_api/core/plugins/_03_with_stage_as_callable/_bridges/types.py diff --git a/src/_api/core/plugins/_03_with_stage_as_callable/mixins/stage_interface_mixin.py b/src/_api/core/plugins/_03_with_stage_as_callable/mixins/stage_interface_mixin.py index f6cea33..2e2ac59 100644 --- a/src/_api/core/plugins/_03_with_stage_as_callable/mixins/stage_interface_mixin.py +++ b/src/_api/core/plugins/_03_with_stage_as_callable/mixins/stage_interface_mixin.py @@ -2,10 +2,10 @@ from typing import Any, Protocol # extends: self-bridge -from ..bridges.stage_interface import StageInterface +from .._bridges.stage_interface import StageInterface # uses: bridge -from ..bridges.types import T_in, T_out +from .._bridges.types import T_in, T_out class StageInterfaceMixin( diff --git a/src/_api/core/plugins/_03_with_stage_as_callable/mixins/stage_mixin.py b/src/_api/core/plugins/_03_with_stage_as_callable/mixins/stage_mixin.py index d79cf46..da29515 100644 --- a/src/_api/core/plugins/_03_with_stage_as_callable/mixins/stage_mixin.py +++ b/src/_api/core/plugins/_03_with_stage_as_callable/mixins/stage_mixin.py @@ -2,7 +2,7 @@ from typing import Any # uses: bridge -from ..bridges.types import T_in, T_out +from .._bridges.types import T_in, T_out # implements: self-interface from .stage_interface_mixin import StageInterfaceMixin as ImplementsInterface diff --git a/src/_api/core/plugins/_04_with_pipeline_declared_stages/bridges/__init__.py b/src/_api/core/plugins/_04_with_pipeline_declared_stages/_bridges/__init__.py similarity index 100% rename from src/_api/core/plugins/_04_with_pipeline_declared_stages/bridges/__init__.py rename to src/_api/core/plugins/_04_with_pipeline_declared_stages/_bridges/__init__.py diff --git a/src/_api/core/plugins/_04_with_pipeline_declared_stages/bridges/pipeline_interface.py b/src/_api/core/plugins/_04_with_pipeline_declared_stages/_bridges/pipeline_interface.py similarity index 100% rename from src/_api/core/plugins/_04_with_pipeline_declared_stages/bridges/pipeline_interface.py rename to src/_api/core/plugins/_04_with_pipeline_declared_stages/_bridges/pipeline_interface.py diff --git a/src/_api/core/plugins/_04_with_pipeline_declared_stages/bridges/stage_callable.py b/src/_api/core/plugins/_04_with_pipeline_declared_stages/_bridges/stage_callable.py similarity index 100% rename from src/_api/core/plugins/_04_with_pipeline_declared_stages/bridges/stage_callable.py rename to src/_api/core/plugins/_04_with_pipeline_declared_stages/_bridges/stage_callable.py diff --git a/src/_api/core/plugins/_04_with_pipeline_declared_stages/bridges/types.py b/src/_api/core/plugins/_04_with_pipeline_declared_stages/_bridges/types.py similarity index 100% rename from src/_api/core/plugins/_04_with_pipeline_declared_stages/bridges/types.py rename to src/_api/core/plugins/_04_with_pipeline_declared_stages/_bridges/types.py diff --git a/src/_api/core/plugins/_04_with_pipeline_declared_stages/mixins/pipeline_interface_mixin.py b/src/_api/core/plugins/_04_with_pipeline_declared_stages/mixins/pipeline_interface_mixin.py index 543b643..fbd1957 100644 --- a/src/_api/core/plugins/_04_with_pipeline_declared_stages/mixins/pipeline_interface_mixin.py +++ b/src/_api/core/plugins/_04_with_pipeline_declared_stages/mixins/pipeline_interface_mixin.py @@ -1,10 +1,10 @@ from typing import Any, Optional, Protocol, Self # extends: self-bridge -from ..bridges.pipeline_interface import PipelineInterface +from .._bridges.pipeline_interface import PipelineInterface # uses: bridge interface -from ..bridges.stage_callable import StageCollection +from .._bridges.stage_callable import StageCollection class PipelineInterfaceMixin( diff --git a/src/_api/core/plugins/_04_with_pipeline_declared_stages/mixins/pipeline_mixin.py b/src/_api/core/plugins/_04_with_pipeline_declared_stages/mixins/pipeline_mixin.py index a6d4732..9569de3 100644 --- a/src/_api/core/plugins/_04_with_pipeline_declared_stages/mixins/pipeline_mixin.py +++ b/src/_api/core/plugins/_04_with_pipeline_declared_stages/mixins/pipeline_mixin.py @@ -2,7 +2,7 @@ from typing import Any, Optional, Self # uses: bridge interface -from ..bridges.stage_callable import StageCollection +from .._bridges.stage_callable import StageCollection # implements: self-interface from .pipeline_interface_mixin import PipelineInterfaceMixin as ImplementsInterface diff --git a/src/_api/core/plugins/_05_with_pipeline_factory/bridges/__init__.py b/src/_api/core/plugins/_05_with_pipeline_factory/_bridges/__init__.py similarity index 100% rename from src/_api/core/plugins/_05_with_pipeline_factory/bridges/__init__.py rename to src/_api/core/plugins/_05_with_pipeline_factory/_bridges/__init__.py diff --git a/src/_api/core/plugins/_05_with_pipeline_factory/bridges/pipeline_interface.py b/src/_api/core/plugins/_05_with_pipeline_factory/_bridges/pipeline_interface.py similarity index 100% rename from src/_api/core/plugins/_05_with_pipeline_factory/bridges/pipeline_interface.py rename to src/_api/core/plugins/_05_with_pipeline_factory/_bridges/pipeline_interface.py diff --git a/src/_api/core/plugins/_05_with_pipeline_factory/bridges/stage_callable.py b/src/_api/core/plugins/_05_with_pipeline_factory/_bridges/stage_callable.py similarity index 100% rename from src/_api/core/plugins/_05_with_pipeline_factory/bridges/stage_callable.py rename to src/_api/core/plugins/_05_with_pipeline_factory/_bridges/stage_callable.py diff --git a/src/_api/core/plugins/_05_with_pipeline_factory/bridges/types.py b/src/_api/core/plugins/_05_with_pipeline_factory/_bridges/types.py similarity index 100% rename from src/_api/core/plugins/_05_with_pipeline_factory/bridges/types.py rename to src/_api/core/plugins/_05_with_pipeline_factory/_bridges/types.py diff --git a/src/_api/core/plugins/_05_with_pipeline_factory/bases/pipeline_factory.py b/src/_api/core/plugins/_05_with_pipeline_factory/bases/pipeline_factory.py index e3a491c..51ae2b4 100644 --- a/src/_api/core/plugins/_05_with_pipeline_factory/bases/pipeline_factory.py +++ b/src/_api/core/plugins/_05_with_pipeline_factory/bases/pipeline_factory.py @@ -3,10 +3,10 @@ # extends: 3rd-party concrete from ....support.act_as_factory import ActAsFactory from ....support.act_as_list import ActAsList -from ..bridges.pipeline_interface import TPipeline +from .._bridges.pipeline_interface import TPipeline # uses: bridge interfaces -from ..bridges.stage_callable import StageClassOrInstance, StageCollection +from .._bridges.stage_callable import StageClassOrInstance, StageCollection # implements: self-interface from .pipeline_factory_interface import PipelineFactoryInterface as ImplementsInterface diff --git a/src/_api/core/plugins/_05_with_pipeline_factory/bases/pipeline_factory_interface.py b/src/_api/core/plugins/_05_with_pipeline_factory/bases/pipeline_factory_interface.py index 83456ec..c2e40ba 100644 --- a/src/_api/core/plugins/_05_with_pipeline_factory/bases/pipeline_factory_interface.py +++ b/src/_api/core/plugins/_05_with_pipeline_factory/bases/pipeline_factory_interface.py @@ -5,8 +5,8 @@ from ....support.act_as_list import ActAsListInterface # uses: bridge interface -from ..bridges.pipeline_interface import TPipeline -from ..bridges.stage_callable import StageClassOrInstance, StageCollection +from .._bridges.pipeline_interface import TPipeline +from .._bridges.stage_callable import StageClassOrInstance, StageCollection class PipelineFactoryInterface( diff --git a/src/_api/core/plugins/_06_with_pipeline_processor/bridges/__init__.py b/src/_api/core/plugins/_06_with_pipeline_processor/_bridges/__init__.py similarity index 100% rename from src/_api/core/plugins/_06_with_pipeline_processor/bridges/__init__.py rename to src/_api/core/plugins/_06_with_pipeline_processor/_bridges/__init__.py diff --git a/src/_api/core/plugins/_06_with_pipeline_processor/bridges/pipeline_factory_interface.py b/src/_api/core/plugins/_06_with_pipeline_processor/_bridges/pipeline_factory_interface.py similarity index 75% rename from src/_api/core/plugins/_06_with_pipeline_processor/bridges/pipeline_factory_interface.py rename to src/_api/core/plugins/_06_with_pipeline_processor/_bridges/pipeline_factory_interface.py index 8d187a9..7242e29 100644 --- a/src/_api/core/plugins/_06_with_pipeline_processor/bridges/pipeline_factory_interface.py +++ b/src/_api/core/plugins/_06_with_pipeline_processor/_bridges/pipeline_factory_interface.py @@ -4,10 +4,10 @@ from ..._05_with_pipeline_factory import ( PipelineFactoryInterface as PipelineFactoryBaseInterface, ) -from ..bridges.pipeline_interface import PipelineInterface +from .._bridges.pipeline_interface import PipelineInterface # uses: bridge interface -from ..bridges.types import T_in, T_out +from .._bridges.types import T_in, T_out class PipelineFactoryInterface( diff --git a/src/_api/core/plugins/_06_with_pipeline_processor/bridges/pipeline_interface.py b/src/_api/core/plugins/_06_with_pipeline_processor/_bridges/pipeline_interface.py similarity index 100% rename from src/_api/core/plugins/_06_with_pipeline_processor/bridges/pipeline_interface.py rename to src/_api/core/plugins/_06_with_pipeline_processor/_bridges/pipeline_interface.py diff --git a/src/_api/core/plugins/_06_with_pipeline_processor/bridges/stage_callable.py b/src/_api/core/plugins/_06_with_pipeline_processor/_bridges/stage_callable.py similarity index 100% rename from src/_api/core/plugins/_06_with_pipeline_processor/bridges/stage_callable.py rename to src/_api/core/plugins/_06_with_pipeline_processor/_bridges/stage_callable.py diff --git a/src/_api/core/plugins/_06_with_pipeline_processor/bridges/types.py b/src/_api/core/plugins/_06_with_pipeline_processor/_bridges/types.py similarity index 100% rename from src/_api/core/plugins/_06_with_pipeline_processor/bridges/types.py rename to src/_api/core/plugins/_06_with_pipeline_processor/_bridges/types.py diff --git a/src/_api/core/plugins/_06_with_pipeline_processor/bases/processor.py b/src/_api/core/plugins/_06_with_pipeline_processor/bases/processor.py index 132d796..ae415ed 100644 --- a/src/_api/core/plugins/_06_with_pipeline_processor/bases/processor.py +++ b/src/_api/core/plugins/_06_with_pipeline_processor/bases/processor.py @@ -6,8 +6,8 @@ from ....support.has_call_async import HasCallAsync # uses: bridge interface -from ..bridges.stage_callable import StageInstance, StageInstanceCollection -from ..bridges.types import T_in, T_out +from .._bridges.stage_callable import StageInstance, StageInstanceCollection +from .._bridges.types import T_in, T_out # implements: self-interface from .processor_interface import ProcessorInterface as ImplementsInterface diff --git a/src/_api/core/plugins/_06_with_pipeline_processor/bases/processor_interface.py b/src/_api/core/plugins/_06_with_pipeline_processor/bases/processor_interface.py index 188a6f4..a1df16b 100644 --- a/src/_api/core/plugins/_06_with_pipeline_processor/bases/processor_interface.py +++ b/src/_api/core/plugins/_06_with_pipeline_processor/bases/processor_interface.py @@ -6,8 +6,8 @@ from ....support.has_call_async import HasCallAsyncInterface # uses: bridge interface -from ..bridges.stage_callable import StageInstance, StageInstanceCollection -from ..bridges.types import T_in, T_out +from .._bridges.stage_callable import StageInstance, StageInstanceCollection +from .._bridges.types import T_in, T_out class ProcessorInterface( diff --git a/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_factory_interface_mixin.py b/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_factory_interface_mixin.py index a80c642..2887c0c 100644 --- a/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_factory_interface_mixin.py +++ b/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_factory_interface_mixin.py @@ -1,13 +1,13 @@ from typing import Any, Optional, Protocol, Self -# uses: local base -from ..bases.processor_interface import ProcessorInterface - # extends: self-bridge -from ..bridges.pipeline_factory_interface import PipelineFactoryInterface +from .._bridges.pipeline_factory_interface import PipelineFactoryInterface # uses: bridge interface -from ..bridges.types import T_in, T_out +from .._bridges.types import T_in, T_out + +# uses: local base +from ..bases.processor_interface import ProcessorInterface class PipelineFactoryInterfaceMixin( diff --git a/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_factory_mixin.py b/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_factory_mixin.py index 9fe65c0..8a2a722 100644 --- a/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_factory_mixin.py +++ b/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_factory_mixin.py @@ -1,11 +1,11 @@ from typing import Any, Generic, Optional, Self +# uses: bridge interface +from .._bridges.types import T_in, T_out + # uses: local base from ..bases.processor_interface import ProcessorInterface -# uses: bridge interface -from ..bridges.types import T_in, T_out - # implements: self-interface from .pipeline_factory_interface_mixin import ( PipelineFactoryInterfaceMixin as ImplementsInterface, diff --git a/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_interface_mixin.py b/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_interface_mixin.py index 38dcdf2..8a776e4 100644 --- a/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_interface_mixin.py +++ b/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_interface_mixin.py @@ -1,13 +1,13 @@ from typing import Any, Optional, Protocol, Self -# uses: local base -from ..bases.processor_interface import ProcessorInterface - # extends: self-bridge -from ..bridges.pipeline_interface import PipelineInterface +from .._bridges.pipeline_interface import PipelineInterface # uses: bridge interface -from ..bridges.types import T_in, T_out +from .._bridges.types import T_in, T_out + +# uses: local base +from ..bases.processor_interface import ProcessorInterface class PipelineInterfaceMixin( diff --git a/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_mixin.py b/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_mixin.py index f07372d..78342b2 100644 --- a/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_mixin.py +++ b/src/_api/core/plugins/_06_with_pipeline_processor/mixins/pipeline_mixin.py @@ -1,11 +1,11 @@ from typing import Any, Generic, Optional, Self +# uses: bridge interface +from .._bridges.types import T_in, T_out + # uses: local base from ..bases.processor_interface import ProcessorInterface -# uses: bridge interface -from ..bridges.types import T_in, T_out - # implements: self-interface from .pipeline_interface_mixin import PipelineInterfaceMixin as ImplementsInterface diff --git a/src/_api/core/plugins/_08_with_pipeline_as_stage/bridges/__init__.py b/src/_api/core/plugins/_08_with_pipeline_as_stage/_bridges/__init__.py similarity index 100% rename from src/_api/core/plugins/_08_with_pipeline_as_stage/bridges/__init__.py rename to src/_api/core/plugins/_08_with_pipeline_as_stage/_bridges/__init__.py diff --git a/src/_api/core/plugins/_08_with_pipeline_as_stage/bridges/pipeline_interface.py b/src/_api/core/plugins/_08_with_pipeline_as_stage/_bridges/pipeline_interface.py similarity index 100% rename from src/_api/core/plugins/_08_with_pipeline_as_stage/bridges/pipeline_interface.py rename to src/_api/core/plugins/_08_with_pipeline_as_stage/_bridges/pipeline_interface.py diff --git a/src/_api/core/plugins/_08_with_pipeline_as_stage/bridges/stage_interface.py b/src/_api/core/plugins/_08_with_pipeline_as_stage/_bridges/stage_interface.py similarity index 100% rename from src/_api/core/plugins/_08_with_pipeline_as_stage/bridges/stage_interface.py rename to src/_api/core/plugins/_08_with_pipeline_as_stage/_bridges/stage_interface.py diff --git a/src/_api/core/plugins/_08_with_pipeline_as_stage/bridges/types.py b/src/_api/core/plugins/_08_with_pipeline_as_stage/_bridges/types.py similarity index 100% rename from src/_api/core/plugins/_08_with_pipeline_as_stage/bridges/types.py rename to src/_api/core/plugins/_08_with_pipeline_as_stage/_bridges/types.py diff --git a/src/_api/core/plugins/_08_with_pipeline_as_stage/mixins/pipeline_interface_mixin.py b/src/_api/core/plugins/_08_with_pipeline_as_stage/mixins/pipeline_interface_mixin.py index 8b3ea57..c76b4d3 100644 --- a/src/_api/core/plugins/_08_with_pipeline_as_stage/mixins/pipeline_interface_mixin.py +++ b/src/_api/core/plugins/_08_with_pipeline_as_stage/mixins/pipeline_interface_mixin.py @@ -1,13 +1,13 @@ from typing import Protocol # extends: self-bridge -from ..bridges.pipeline_interface import PipelineInterface +from .._bridges.pipeline_interface import PipelineInterface # extends: bridge interface -from ..bridges.stage_interface import StageInterface +from .._bridges.stage_interface import StageInterface # uses: bridge interface -from ..bridges.types import T_in, T_out +from .._bridges.types import T_in, T_out class PipelineInterfaceMixin( diff --git a/src/_api/core/plugins/_08_with_pipeline_as_stage/mixins/pipeline_mixin.py b/src/_api/core/plugins/_08_with_pipeline_as_stage/mixins/pipeline_mixin.py index ddc4def..ae4a1ec 100644 --- a/src/_api/core/plugins/_08_with_pipeline_as_stage/mixins/pipeline_mixin.py +++ b/src/_api/core/plugins/_08_with_pipeline_as_stage/mixins/pipeline_mixin.py @@ -2,7 +2,7 @@ from typing import Any # uses: bridge interface -from ..bridges.types import T_in, T_out +from .._bridges.types import T_in, T_out # implements: self-interface from .pipeline_interface_mixin import PipelineInterfaceMixin as ImplementsInterface diff --git a/src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/__init__.py b/src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/__init__.py similarity index 100% rename from src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/__init__.py rename to src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/__init__.py diff --git a/src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/pipeline.py b/src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/pipeline.py similarity index 100% rename from src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/pipeline.py rename to src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/pipeline.py diff --git a/src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/pipeline_factory_interface.py b/src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/pipeline_factory_interface.py similarity index 100% rename from src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/pipeline_factory_interface.py rename to src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/pipeline_factory_interface.py diff --git a/src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/pipeline_interface.py b/src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/pipeline_interface.py similarity index 100% rename from src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/pipeline_interface.py rename to src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/pipeline_interface.py diff --git a/src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/processor.py b/src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/processor.py similarity index 100% rename from src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/processor.py rename to src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/processor.py diff --git a/src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/processor_interface.py b/src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/processor_interface.py similarity index 100% rename from src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/processor_interface.py rename to src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/processor_interface.py diff --git a/src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/stage_callable.py b/src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/stage_callable.py similarity index 100% rename from src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/stage_callable.py rename to src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/stage_callable.py diff --git a/src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/types.py b/src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/types.py similarity index 100% rename from src/_api/core/plugins/_99_with_pipeline_default_processor/bridges/types.py rename to src/_api/core/plugins/_99_with_pipeline_default_processor/_bridges/types.py diff --git a/src/_api/core/plugins/_99_with_pipeline_default_processor/bases/processors/chained_processor.py b/src/_api/core/plugins/_99_with_pipeline_default_processor/bases/processors/chained_processor.py index e0e1101..ade10dc 100644 --- a/src/_api/core/plugins/_99_with_pipeline_default_processor/bases/processors/chained_processor.py +++ b/src/_api/core/plugins/_99_with_pipeline_default_processor/bases/processors/chained_processor.py @@ -1,11 +1,11 @@ from typing import Any, cast # extends: "3rd-party" concrete -from ...bridges.processor import Processor +from ..._bridges.processor import Processor # uses: bridge interface -from ...bridges.stage_callable import StageInstanceCollection -from ...bridges.types import T_in, T_out +from ..._bridges.stage_callable import StageInstanceCollection +from ..._bridges.types import T_in, T_out # implements: self-interface from .chained_processor_interface import ( diff --git a/src/_api/core/plugins/_99_with_pipeline_default_processor/bases/processors/chained_processor_interface.py b/src/_api/core/plugins/_99_with_pipeline_default_processor/bases/processors/chained_processor_interface.py index 3622403..ffb6f0e 100644 --- a/src/_api/core/plugins/_99_with_pipeline_default_processor/bases/processors/chained_processor_interface.py +++ b/src/_api/core/plugins/_99_with_pipeline_default_processor/bases/processors/chained_processor_interface.py @@ -1,11 +1,11 @@ from typing import Any, Protocol # extends: "3rd-party" interface -from ...bridges.processor_interface import ProcessorInterface +from ..._bridges.processor_interface import ProcessorInterface # uses: bridge interface -from ...bridges.stage_callable import StageInstanceCollection -from ...bridges.types import T_in, T_out +from ..._bridges.stage_callable import StageInstanceCollection +from ..._bridges.types import T_in, T_out class ChainedProcessorInterface( diff --git a/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_factory_interface_mixin.py b/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_factory_interface_mixin.py index c65e03f..9ee6ac5 100644 --- a/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_factory_interface_mixin.py +++ b/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_factory_interface_mixin.py @@ -1,10 +1,10 @@ from typing import Protocol # extends: self-bridge -from ..bridges.pipeline_factory_interface import PipelineFactoryInterface +from .._bridges.pipeline_factory_interface import PipelineFactoryInterface # uses: bridge interface -from ..bridges.types import T_in, T_out +from .._bridges.types import T_in, T_out class PipelineFactoryInterfaceMixin( diff --git a/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_factory_mixin.py b/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_factory_mixin.py index 475feb1..e1e282a 100644 --- a/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_factory_mixin.py +++ b/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_factory_mixin.py @@ -1,7 +1,7 @@ from typing import Generic # uses: bridge interface -from ..bridges.types import T_in, T_out +from .._bridges.types import T_in, T_out # implements: self-interface from .pipeline_factory_interface_mixin import ( diff --git a/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_interface_mixin.py b/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_interface_mixin.py index e2a3956..54d9668 100644 --- a/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_interface_mixin.py +++ b/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_interface_mixin.py @@ -1,10 +1,10 @@ from typing import Protocol # extends: self-bridge -from ..bridges.pipeline_interface import PipelineInterface +from .._bridges.pipeline_interface import PipelineInterface # uses: bridge interface -from ..bridges.types import T_in, T_out +from .._bridges.types import T_in, T_out class PipelineInterfaceMixin( diff --git a/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_mixin.py b/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_mixin.py index b051c45..b9d1394 100644 --- a/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_mixin.py +++ b/src/_api/core/plugins/_99_with_pipeline_default_processor/mixins/pipeline_mixin.py @@ -1,13 +1,13 @@ from abc import ABC -# uses: base concrete -from ..bases.processors.chained_processor import ChainedProcessor - # extends: self-bridge concrete -from ..bridges.pipeline import Pipeline +from .._bridges.pipeline import Pipeline # uses: bridge interface -from ..bridges.types import T_in, T_out +from .._bridges.types import T_in, T_out + +# uses: base concrete +from ..bases.processors.chained_processor import ChainedProcessor # implements: self-interface from .pipeline_interface_mixin import PipelineInterfaceMixin as ImplementsInterface