diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c6c7fe3..0b11c26 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -45,9 +45,6 @@ "python.analysis.diagnosticMode": "workspace", "python.analysis.importFormat": "relative", "python.analysis.autoImportCompletions": true, - "python.analysis.diagnosticSeverityOverrides": { - "reportMissingImports": "none" - }, "python.analysis.extraPaths": [ "${containerWorkspaceFolder}/src" ], diff --git a/src/thecodecrate_pipeline/__init__.py b/src/thecodecrate_pipeline/__init__.py index 01ceb52..4f3448c 100644 --- a/src/thecodecrate_pipeline/__init__.py +++ b/src/thecodecrate_pipeline/__init__.py @@ -1,64 +1,64 @@ -from .classes.pipeline_factory import PipelineFactory -from .classes.pipeline_factory_interface import PipelineFactoryInterface -from .classes.pipeline import Pipeline -from .classes.pipeline_interface import PipelineInterface -from .classes.processor import Processor -from .classes.processor_interface import ProcessorInterface -from .classes.stage import Stage -from .classes.stage_interface import StageInterface -from .classes.types import T_in, T_out -from .processors.chained_processor.chained_pipeline import ChainedPipeline -from .processors.chained_processor.chained_processor import ChainedProcessor -from .processors.interruptible_processor.interruptible_processor import ( - InterruptibleProcessor, -) -from .processors.interruptible_processor.interruptible_pipeline import ( - InterruptiblePipeline, -) -from .partials.with_base.stage_callable import StageCallable -from .partials.with_base.pipeline import Pipeline as WithPipelineBase -from .partials.with_base.pipeline_interface import ( +from .core.final.pipeline import Pipeline +from .core.final.pipeline_factory import PipelineFactory +from .core.final.pipeline_factory_interface import PipelineFactoryInterface +from .core.final.pipeline_interface import PipelineInterface +from .core.final.processor import Processor +from .core.final.processor_interface import ProcessorInterface +from .core.final.stage import Stage +from .core.final.stage_interface import StageInterface +from .core.final.types import T_in, T_out +from .core.partials.step01_base.pipeline import Pipeline as WithPipelineBase +from .core.partials.step01_base.pipeline_interface import ( PipelineInterface as WithPipelineBaseInterface, ) -from .partials.with_base.stage import Stage as WithStageBase -from .partials.with_base.stage_interface import ( +from .core.partials.step01_base.stage import Stage as WithStageBase +from .core.partials.step01_base.stage_callable import ( + StageCallable, + StageClassOrInstance, + StageCollection, + StageInstance, + StageInstanceCollection, +) +from .core.partials.step01_base.stage_interface import ( StageInterface as WithStageBaseInterface, ) -from .partials.with_pipeline_as_list.pipeline_mixin import ( +from .core.partials.step02_pipeline_as_list.pipeline_interface_mixin import ( + PipelineInterfaceMixin as WithPipelineAsListInterface, +) +from .core.partials.step02_pipeline_as_list.pipeline_mixin import ( PipelineMixin as WithPipelineAsList, ) -from .partials.with_pipeline_as_list.pipeline_interface_mixin import ( - PipelineInterfaceMixin as WithPipelineAsListInterface, +from .core.partials.step03_stage_as_callable.stage_interface_mixin import ( + StageInterfaceMixin as WithStageAsCallableInterface, ) -from .partials.with_pipeline_processor.pipeline_mixin import ( - PipelineMixin as WithPipelineProcessor, +from .core.partials.step03_stage_as_callable.stage_mixin import ( + StageMixin as WithStageAsCallable, ) -from .partials.with_pipeline_processor.pipeline_interface_mixin import ( +from .core.partials.step06_pipeline_processor.pipeline_interface_mixin import ( PipelineInterfaceMixin as WithPipelineProcessorInterface, ) -from .partials.with_pipeline_processor.processor import ( +from .core.partials.step06_pipeline_processor.pipeline_mixin import ( + PipelineMixin as WithPipelineProcessor, +) +from .core.partials.step06_pipeline_processor.processor import ( Processor as WithProcessorBase, ) -from .partials.with_pipeline_processor.processor_interface import ( +from .core.partials.step06_pipeline_processor.processor_interface import ( ProcessorInterface as WithProcessorBaseInterface, ) -from .partials.with_pipeline_as_stage.pipeline_mixin import ( - PipelineMixin as WithPipelineAsStage, -) -from .partials.with_pipeline_as_stage.pipeline_interface_mixin import ( +from .core.partials.step07_pipeline_as_stage.pipeline_interface_mixin import ( PipelineInterfaceMixin as WithPipelineAsStageInterface, ) -from .partials.with_base.stage_callable import ( - StageInstance, - StageInstanceCollection, - StageClassOrInstance, - StageCollection, +from .core.partials.step07_pipeline_as_stage.pipeline_mixin import ( + PipelineMixin as WithPipelineAsStage, ) -from .partials.with_stage_as_callable.stage_mixin import ( - StageMixin as WithStageAsCallable, +from .processors.chained_processor.chained_pipeline import ChainedPipeline +from .processors.chained_processor.chained_processor import ChainedProcessor +from .processors.interruptible_processor.interruptible_pipeline import ( + InterruptiblePipeline, ) -from .partials.with_stage_as_callable.stage_interface_mixin import ( - StageInterfaceMixin as WithStageAsCallableInterface, +from .processors.interruptible_processor.interruptible_processor import ( + InterruptibleProcessor, ) # Version of the package diff --git a/src/thecodecrate_pipeline/classes/types.py b/src/thecodecrate_pipeline/classes/types.py deleted file mode 100644 index 4c1793a..0000000 --- a/src/thecodecrate_pipeline/classes/types.py +++ /dev/null @@ -1,6 +0,0 @@ -from ..partials.with_base.types import T_in, T_out - -__all__ = [ - "T_in", - "T_out", -] diff --git a/src/thecodecrate_pipeline/classes/pipeline.py b/src/thecodecrate_pipeline/core/final/pipeline.py similarity index 59% rename from src/thecodecrate_pipeline/classes/pipeline.py rename to src/thecodecrate_pipeline/core/final/pipeline.py index 7affe2a..21df7e3 100644 --- a/src/thecodecrate_pipeline/classes/pipeline.py +++ b/src/thecodecrate_pipeline/core/final/pipeline.py @@ -1,23 +1,23 @@ -from .pipeline_interface import ( - PipelineInterface as ImplementsPipelineInterface, -) -from ..processors.chained_processor.chained_processor import ChainedProcessor -from ..partials.with_base.types import T_in, T_out -from ..partials.with_base.pipeline import ( +from ...processors.chained_processor.chained_processor import ChainedProcessor +from ..partials.step01_base.pipeline import ( Pipeline as WithPipelineBaseConcern, ) -from ..partials.with_pipeline_as_list.pipeline_mixin import ( +from ..partials.step01_base.types import T_in, T_out +from ..partials.step02_pipeline_as_list.pipeline_mixin import ( PipelineMixin as WithPipelineAsListConcern, ) -from ..partials.with_pipeline_declared_stages.pipeline_mixin import ( +from ..partials.step04_pipeline_declared_stages.pipeline_mixin import ( PipelineMixin as WithPipelineDeclaredStagesConcern, ) -from ..partials.with_pipeline_processor.pipeline_mixin import ( +from ..partials.step06_pipeline_processor.pipeline_mixin import ( PipelineMixin as WithPipelineProcessorConcern, ) -from ..partials.with_pipeline_as_stage.pipeline_mixin import ( +from ..partials.step07_pipeline_as_stage.pipeline_mixin import ( PipelineMixin as WithPipelineAsStageConcern, ) +from .pipeline_interface import ( + PipelineInterface as ImplementsPipelineInterface, +) class Pipeline( diff --git a/src/thecodecrate_pipeline/classes/pipeline_factory.py b/src/thecodecrate_pipeline/core/final/pipeline_factory.py similarity index 71% rename from src/thecodecrate_pipeline/classes/pipeline_factory.py rename to src/thecodecrate_pipeline/core/final/pipeline_factory.py index 5817c8f..638dad0 100644 --- a/src/thecodecrate_pipeline/classes/pipeline_factory.py +++ b/src/thecodecrate_pipeline/core/final/pipeline_factory.py @@ -1,16 +1,16 @@ from typing import Generic -from .pipeline import Pipeline -from ..partials.with_base.types import T_in, T_out -from ..partials.with_pipeline_factory.pipeline_factory import ( +from ..partials.step01_base.types import T_in, T_out +from ..partials.step05_pipeline_factory.pipeline_factory import ( PipelineFactory as WithPipelineFactoryBaseConcern, ) +from ..partials.step06_pipeline_processor.pipeline_factory_mixin import ( + PipelineFactoryMixin as WithProcessorConcern, +) +from .pipeline import Pipeline from .pipeline_factory_interface import ( PipelineFactoryInterface as ImplementsPipelineFactoryInterface, ) -from ..partials.with_pipeline_processor.pipeline_factory_mixin import ( - PipelineFactoryMixin as WithProcessorConcern, -) class PipelineFactory( diff --git a/src/thecodecrate_pipeline/classes/pipeline_factory_interface.py b/src/thecodecrate_pipeline/core/final/pipeline_factory_interface.py similarity index 55% rename from src/thecodecrate_pipeline/classes/pipeline_factory_interface.py rename to src/thecodecrate_pipeline/core/final/pipeline_factory_interface.py index 36ba9b9..ac772ac 100644 --- a/src/thecodecrate_pipeline/classes/pipeline_factory_interface.py +++ b/src/thecodecrate_pipeline/core/final/pipeline_factory_interface.py @@ -1,10 +1,10 @@ from typing import Protocol -from ..partials.with_base.pipeline_interface import PipelineInterface -from ..partials.with_pipeline_factory.pipeline_factory_interface import ( +from ..partials.step01_base.pipeline_interface import PipelineInterface +from ..partials.step05_pipeline_factory.pipeline_factory_interface import ( PipelineFactoryInterface as WithPipelineFactoryBaseInterface, ) -from ..partials.with_pipeline_processor.pipeline_factory_interface_mixin import ( # noqa +from ..partials.step06_pipeline_processor.pipeline_factory_interface_mixin import ( # noqa PipelineFactoryInterfaceMixin as WithProcessorInterface, ) diff --git a/src/thecodecrate_pipeline/classes/pipeline_interface.py b/src/thecodecrate_pipeline/core/final/pipeline_interface.py similarity index 60% rename from src/thecodecrate_pipeline/classes/pipeline_interface.py rename to src/thecodecrate_pipeline/core/final/pipeline_interface.py index 4e5e7fb..a57596c 100644 --- a/src/thecodecrate_pipeline/classes/pipeline_interface.py +++ b/src/thecodecrate_pipeline/core/final/pipeline_interface.py @@ -1,19 +1,19 @@ from typing import Protocol -from ..partials.with_base.types import T_in, T_out -from ..partials.with_base.pipeline_interface import ( +from ..partials.step01_base.pipeline_interface import ( PipelineInterface as WithPipelineBaseInterface, ) -from ..partials.with_pipeline_as_list.pipeline_interface_mixin import ( +from ..partials.step01_base.types import T_in, T_out +from ..partials.step02_pipeline_as_list.pipeline_interface_mixin import ( PipelineInterfaceMixin as WithPipelineAsListInterface, ) -from ..partials.with_pipeline_declared_stages.pipeline_interface_mixin import ( +from ..partials.step04_pipeline_declared_stages.pipeline_interface_mixin import ( PipelineInterfaceMixin as WithPipelineDeclaredStagesInterface, ) -from ..partials.with_pipeline_processor.pipeline_interface_mixin import ( +from ..partials.step06_pipeline_processor.pipeline_interface_mixin import ( PipelineInterfaceMixin as WithPipelineProcessorInterface, ) -from ..partials.with_pipeline_as_stage.pipeline_interface_mixin import ( +from ..partials.step07_pipeline_as_stage.pipeline_interface_mixin import ( PipelineInterfaceMixin as WithPipelineAsStageInterface, ) diff --git a/src/thecodecrate_pipeline/classes/processor.py b/src/thecodecrate_pipeline/core/final/processor.py similarity index 71% rename from src/thecodecrate_pipeline/classes/processor.py rename to src/thecodecrate_pipeline/core/final/processor.py index 9b3f108..c68b0ee 100644 --- a/src/thecodecrate_pipeline/classes/processor.py +++ b/src/thecodecrate_pipeline/core/final/processor.py @@ -1,12 +1,12 @@ from abc import ABC +from ..partials.step01_base.types import T_in, T_out +from ..partials.step06_pipeline_processor.processor import ( + Processor as WithProcessorBaseConcern, +) from .processor_interface import ( ProcessorInterface as ImplementsProcessorInterface, ) -from ..partials.with_base.types import T_in, T_out -from ..partials.with_pipeline_processor.processor import ( - Processor as WithProcessorBaseConcern, -) class Processor( diff --git a/src/thecodecrate_pipeline/classes/processor_interface.py b/src/thecodecrate_pipeline/core/final/processor_interface.py similarity index 61% rename from src/thecodecrate_pipeline/classes/processor_interface.py rename to src/thecodecrate_pipeline/core/final/processor_interface.py index df04742..707d75b 100644 --- a/src/thecodecrate_pipeline/classes/processor_interface.py +++ b/src/thecodecrate_pipeline/core/final/processor_interface.py @@ -1,7 +1,7 @@ from typing import Protocol -from ..partials.with_base.types import T_in, T_out -from ..partials.with_pipeline_processor.processor_interface import ( +from ..partials.step01_base.types import T_in, T_out +from ..partials.step06_pipeline_processor.processor_interface import ( ProcessorInterface as WithProcessorBaseInterface, ) diff --git a/src/thecodecrate_pipeline/classes/stage.py b/src/thecodecrate_pipeline/core/final/stage.py similarity index 66% rename from src/thecodecrate_pipeline/classes/stage.py rename to src/thecodecrate_pipeline/core/final/stage.py index d35ad23..1fc10c4 100644 --- a/src/thecodecrate_pipeline/classes/stage.py +++ b/src/thecodecrate_pipeline/core/final/stage.py @@ -1,13 +1,13 @@ from abc import ABC -from .stage_interface import StageInterface as ImplementsStageInterface -from ..partials.with_base.types import T_in, T_out -from ..partials.with_base.stage import ( +from ..partials.step01_base.stage import ( Stage as WithStageBaseConcern, ) -from ..partials.with_stage_as_callable.stage_mixin import ( +from ..partials.step01_base.types import T_in, T_out +from ..partials.step03_stage_as_callable.stage_mixin import ( StageMixin as WithStageAsCallableConcern, ) +from .stage_interface import StageInterface as ImplementsStageInterface class Stage( diff --git a/src/thecodecrate_pipeline/classes/stage_callable.py b/src/thecodecrate_pipeline/core/final/stage_callable.py similarity index 70% rename from src/thecodecrate_pipeline/classes/stage_callable.py rename to src/thecodecrate_pipeline/core/final/stage_callable.py index 2dec739..f39f63d 100644 --- a/src/thecodecrate_pipeline/classes/stage_callable.py +++ b/src/thecodecrate_pipeline/core/final/stage_callable.py @@ -1,12 +1,14 @@ from typing import Protocol -from ..partials.with_base.types import T_in, T_out -from ..partials.with_base.stage_callable import ( +from ..partials.step01_base.stage_callable import ( StageCallable as WithStageCallableBase, +) +from ..partials.step01_base.stage_callable import ( + StageClassOrInstance, StageCollection, StageInstanceCollection, - StageClassOrInstance, ) +from ..partials.step01_base.types import T_in, T_out class StageCallable( diff --git a/src/thecodecrate_pipeline/classes/stage_interface.py b/src/thecodecrate_pipeline/core/final/stage_interface.py similarity index 60% rename from src/thecodecrate_pipeline/classes/stage_interface.py rename to src/thecodecrate_pipeline/core/final/stage_interface.py index 8218aac..31ce02d 100644 --- a/src/thecodecrate_pipeline/classes/stage_interface.py +++ b/src/thecodecrate_pipeline/core/final/stage_interface.py @@ -1,10 +1,10 @@ from typing import Protocol -from ..partials.with_base.types import T_in, T_out -from ..partials.with_base.stage_interface import ( +from ..partials.step01_base.stage_interface import ( StageInterface as WithStageBaseInterface, ) -from ..partials.with_stage_as_callable.stage_interface_mixin import ( +from ..partials.step01_base.types import T_in, T_out +from ..partials.step03_stage_as_callable.stage_interface_mixin import ( StageInterfaceMixin as WithStageAsCallableInterface, ) diff --git a/src/thecodecrate_pipeline/core/final/types.py b/src/thecodecrate_pipeline/core/final/types.py new file mode 100644 index 0000000..d497bf0 --- /dev/null +++ b/src/thecodecrate_pipeline/core/final/types.py @@ -0,0 +1,6 @@ +from ..partials.step01_base.types import T_in, T_out + +__all__ = [ + "T_in", + "T_out", +] diff --git a/src/thecodecrate_pipeline/partials/with_base/pipeline.py b/src/thecodecrate_pipeline/core/partials/step01_base/pipeline.py similarity index 100% rename from src/thecodecrate_pipeline/partials/with_base/pipeline.py rename to src/thecodecrate_pipeline/core/partials/step01_base/pipeline.py diff --git a/src/thecodecrate_pipeline/partials/with_base/pipeline_interface.py b/src/thecodecrate_pipeline/core/partials/step01_base/pipeline_interface.py similarity index 100% rename from src/thecodecrate_pipeline/partials/with_base/pipeline_interface.py rename to src/thecodecrate_pipeline/core/partials/step01_base/pipeline_interface.py diff --git a/src/thecodecrate_pipeline/partials/with_base/stage.py b/src/thecodecrate_pipeline/core/partials/step01_base/stage.py similarity index 100% rename from src/thecodecrate_pipeline/partials/with_base/stage.py rename to src/thecodecrate_pipeline/core/partials/step01_base/stage.py diff --git a/src/thecodecrate_pipeline/partials/with_base/stage_callable.py b/src/thecodecrate_pipeline/core/partials/step01_base/stage_callable.py similarity index 100% rename from src/thecodecrate_pipeline/partials/with_base/stage_callable.py rename to src/thecodecrate_pipeline/core/partials/step01_base/stage_callable.py diff --git a/src/thecodecrate_pipeline/partials/with_base/stage_interface.py b/src/thecodecrate_pipeline/core/partials/step01_base/stage_interface.py similarity index 100% rename from src/thecodecrate_pipeline/partials/with_base/stage_interface.py rename to src/thecodecrate_pipeline/core/partials/step01_base/stage_interface.py diff --git a/src/thecodecrate_pipeline/partials/with_base/types.py b/src/thecodecrate_pipeline/core/partials/step01_base/types.py similarity index 100% rename from src/thecodecrate_pipeline/partials/with_base/types.py rename to src/thecodecrate_pipeline/core/partials/step01_base/types.py diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_as_list/pipeline_interface_mixin.py b/src/thecodecrate_pipeline/core/partials/step02_pipeline_as_list/pipeline_interface_mixin.py similarity index 81% rename from src/thecodecrate_pipeline/partials/with_pipeline_as_list/pipeline_interface_mixin.py rename to src/thecodecrate_pipeline/core/partials/step02_pipeline_as_list/pipeline_interface_mixin.py index aa5f364..c81dd91 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_as_list/pipeline_interface_mixin.py +++ b/src/thecodecrate_pipeline/core/partials/step02_pipeline_as_list/pipeline_interface_mixin.py @@ -1,12 +1,12 @@ from typing import Any, Optional, Protocol, Self -from ..with_base.stage_callable import StageInstance, StageInstanceCollection -from ..with_base.pipeline_interface import ( - PipelineInterface as WithPipelineBaseInterface, -) from ...support.act_as_list.act_as_list_interface import ( ActAsListInterface, ) +from ..step01_base.pipeline_interface import ( + PipelineInterface as WithPipelineBaseInterface, +) +from ..step01_base.stage_callable import StageInstance, StageInstanceCollection class PipelineInterfaceMixin( diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_as_list/pipeline_mixin.py b/src/thecodecrate_pipeline/core/partials/step02_pipeline_as_list/pipeline_mixin.py similarity index 93% rename from src/thecodecrate_pipeline/partials/with_pipeline_as_list/pipeline_mixin.py rename to src/thecodecrate_pipeline/core/partials/step02_pipeline_as_list/pipeline_mixin.py index 3e41535..72f94c0 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_as_list/pipeline_mixin.py +++ b/src/thecodecrate_pipeline/core/partials/step02_pipeline_as_list/pipeline_mixin.py @@ -1,11 +1,11 @@ from abc import ABC from typing import Any, Optional, Self +from ...support.act_as_list import ActAsList +from ..step01_base.stage_callable import StageInstance, StageInstanceCollection from .pipeline_interface_mixin import ( PipelineInterfaceMixin as ImplementsPipelineInterface, ) -from ..with_base.stage_callable import StageInstance, StageInstanceCollection -from ...support.act_as_list import ActAsList class PipelineMixin( diff --git a/src/thecodecrate_pipeline/partials/with_stage_as_callable/stage_interface_mixin.py b/src/thecodecrate_pipeline/core/partials/step03_stage_as_callable/stage_interface_mixin.py similarity index 81% rename from src/thecodecrate_pipeline/partials/with_stage_as_callable/stage_interface_mixin.py rename to src/thecodecrate_pipeline/core/partials/step03_stage_as_callable/stage_interface_mixin.py index 89026d7..ae761f6 100644 --- a/src/thecodecrate_pipeline/partials/with_stage_as_callable/stage_interface_mixin.py +++ b/src/thecodecrate_pipeline/core/partials/step03_stage_as_callable/stage_interface_mixin.py @@ -1,10 +1,10 @@ from abc import abstractmethod from typing import Any, Protocol -from ..with_base.stage_interface import ( +from ..step01_base.stage_interface import ( StageInterface as WithStageBaseInterface, ) -from ..with_base.types import T_in, T_out +from ..step01_base.types import T_in, T_out class StageInterfaceMixin( diff --git a/src/thecodecrate_pipeline/partials/with_stage_as_callable/stage_mixin.py b/src/thecodecrate_pipeline/core/partials/step03_stage_as_callable/stage_mixin.py similarity index 90% rename from src/thecodecrate_pipeline/partials/with_stage_as_callable/stage_mixin.py rename to src/thecodecrate_pipeline/core/partials/step03_stage_as_callable/stage_mixin.py index 1dc6df7..057e057 100644 --- a/src/thecodecrate_pipeline/partials/with_stage_as_callable/stage_mixin.py +++ b/src/thecodecrate_pipeline/core/partials/step03_stage_as_callable/stage_mixin.py @@ -1,10 +1,10 @@ from abc import ABC, abstractmethod from typing import Any +from ..step01_base.types import T_in, T_out from .stage_interface_mixin import ( StageInterfaceMixin as ImplementsStageInterface, ) -from ..with_base.types import T_in, T_out class StageMixin( diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_declared_stages/pipeline_interface_mixin.py b/src/thecodecrate_pipeline/core/partials/step04_pipeline_declared_stages/pipeline_interface_mixin.py similarity index 77% rename from src/thecodecrate_pipeline/partials/with_pipeline_declared_stages/pipeline_interface_mixin.py rename to src/thecodecrate_pipeline/core/partials/step04_pipeline_declared_stages/pipeline_interface_mixin.py index 67c893e..4dfedb3 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_declared_stages/pipeline_interface_mixin.py +++ b/src/thecodecrate_pipeline/core/partials/step04_pipeline_declared_stages/pipeline_interface_mixin.py @@ -1,12 +1,12 @@ from typing import Any, Optional, Protocol, Self -from ..with_pipeline_as_list.pipeline_interface_mixin import ( - PipelineInterfaceMixin as WithPipelineAsListInterface, -) -from ..with_base.stage_callable import StageCollection -from ..with_base.pipeline_interface import ( +from ..step01_base.pipeline_interface import ( PipelineInterface as WithPipelineBaseInterface, ) +from ..step01_base.stage_callable import StageCollection +from ..step02_pipeline_as_list.pipeline_interface_mixin import ( + PipelineInterfaceMixin as WithPipelineAsListInterface, +) class PipelineInterfaceMixin( diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_declared_stages/pipeline_mixin.py b/src/thecodecrate_pipeline/core/partials/step04_pipeline_declared_stages/pipeline_mixin.py similarity index 95% rename from src/thecodecrate_pipeline/partials/with_pipeline_declared_stages/pipeline_mixin.py rename to src/thecodecrate_pipeline/core/partials/step04_pipeline_declared_stages/pipeline_mixin.py index 2f89d12..47fbf00 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_declared_stages/pipeline_mixin.py +++ b/src/thecodecrate_pipeline/core/partials/step04_pipeline_declared_stages/pipeline_mixin.py @@ -1,6 +1,6 @@ from typing import Any, Optional, Self -from ..with_base.stage_callable import StageCollection +from ..step01_base.stage_callable import StageCollection from .pipeline_interface_mixin import ( PipelineInterfaceMixin as ImplementsPipelineInterface, ) diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_declared_stages/stage_facade.py b/src/thecodecrate_pipeline/core/partials/step04_pipeline_declared_stages/stage_facade.py similarity index 64% rename from src/thecodecrate_pipeline/partials/with_pipeline_declared_stages/stage_facade.py rename to src/thecodecrate_pipeline/core/partials/step04_pipeline_declared_stages/stage_facade.py index 3212953..52263e5 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_declared_stages/stage_facade.py +++ b/src/thecodecrate_pipeline/core/partials/step04_pipeline_declared_stages/stage_facade.py @@ -1,10 +1,10 @@ from typing import Protocol -from ..with_base.types import T_in, T_out -from ..with_base.stage_interface import ( +from ..step01_base.stage_interface import ( StageInterface as WithStageBaseInterface, ) -from ..with_stage_as_callable.stage_interface_mixin import ( +from ..step01_base.types import T_in, T_out +from ..step03_stage_as_callable.stage_interface_mixin import ( StageInterfaceMixin as WithStageAsCallableInterface, ) diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_factory/pipeline_factory.py b/src/thecodecrate_pipeline/core/partials/step05_pipeline_factory/pipeline_factory.py similarity index 94% rename from src/thecodecrate_pipeline/partials/with_pipeline_factory/pipeline_factory.py rename to src/thecodecrate_pipeline/core/partials/step05_pipeline_factory/pipeline_factory.py index 08f7773..85497c4 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_factory/pipeline_factory.py +++ b/src/thecodecrate_pipeline/core/partials/step05_pipeline_factory/pipeline_factory.py @@ -1,13 +1,13 @@ from typing import Any, Generic, Optional, Self -from .pipeline_factory_interface import PipelineFactoryInterface -from ..with_base.pipeline_interface import TPipeline -from ..with_base.stage_callable import ( - StageCollection, - StageClassOrInstance, -) from ...support.act_as_factory import ActAsFactory from ...support.act_as_list import ActAsList +from ..step01_base.pipeline_interface import TPipeline +from ..step01_base.stage_callable import ( + StageClassOrInstance, + StageCollection, +) +from .pipeline_factory_interface import PipelineFactoryInterface class PipelineFactory( diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_factory/pipeline_factory_interface.py b/src/thecodecrate_pipeline/core/partials/step05_pipeline_factory/pipeline_factory_interface.py similarity index 81% rename from src/thecodecrate_pipeline/partials/with_pipeline_factory/pipeline_factory_interface.py rename to src/thecodecrate_pipeline/core/partials/step05_pipeline_factory/pipeline_factory_interface.py index 54426c2..3a1b72d 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_factory/pipeline_factory_interface.py +++ b/src/thecodecrate_pipeline/core/partials/step05_pipeline_factory/pipeline_factory_interface.py @@ -1,9 +1,9 @@ from typing import Any, Optional, Protocol, Self -from ..with_base.pipeline_interface import TPipeline -from ..with_base.stage_callable import StageClassOrInstance, StageCollection from ...support.act_as_factory import ActAsFactoryInterface from ...support.act_as_list import ActAsListInterface +from ..step01_base.pipeline_interface import TPipeline +from ..step01_base.stage_callable import StageClassOrInstance, StageCollection class PipelineFactoryInterface( diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_processor/pipeline_factory_interface_mixin.py b/src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/pipeline_factory_interface_mixin.py similarity index 85% rename from src/thecodecrate_pipeline/partials/with_pipeline_processor/pipeline_factory_interface_mixin.py rename to src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/pipeline_factory_interface_mixin.py index b0d93e0..23051aa 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_processor/pipeline_factory_interface_mixin.py +++ b/src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/pipeline_factory_interface_mixin.py @@ -1,11 +1,11 @@ from typing import Any, Optional, Protocol, Self -from .processor_interface import ProcessorInterface -from ..with_base.types import T_in, T_out -from ..with_base.pipeline_interface import PipelineInterface -from ..with_pipeline_factory.pipeline_factory_interface import ( +from ..step01_base.pipeline_interface import PipelineInterface +from ..step01_base.types import T_in, T_out +from ..step05_pipeline_factory.pipeline_factory_interface import ( PipelineFactoryInterface as WithPipelineFactoryBaseInterface, ) +from .processor_interface import ProcessorInterface class PipelineFactoryInterfaceMixin( diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_processor/pipeline_factory_mixin.py b/src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/pipeline_factory_mixin.py similarity index 97% rename from src/thecodecrate_pipeline/partials/with_pipeline_processor/pipeline_factory_mixin.py rename to src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/pipeline_factory_mixin.py index b56cef3..3dc9c2a 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_processor/pipeline_factory_mixin.py +++ b/src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/pipeline_factory_mixin.py @@ -1,11 +1,11 @@ from abc import ABC from typing import Any, Optional, Self -from ..with_base.types import T_in, T_out -from .processor_interface import ProcessorInterface +from ..step01_base.types import T_in, T_out from .pipeline_factory_interface_mixin import ( PipelineFactoryInterfaceMixin as PipelineFactoryInterface, ) +from .processor_interface import ProcessorInterface class PipelineFactoryMixin( diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_processor/pipeline_interface_mixin.py b/src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/pipeline_interface_mixin.py similarity index 87% rename from src/thecodecrate_pipeline/partials/with_pipeline_processor/pipeline_interface_mixin.py rename to src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/pipeline_interface_mixin.py index d4b87dc..aef45da 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_processor/pipeline_interface_mixin.py +++ b/src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/pipeline_interface_mixin.py @@ -1,13 +1,13 @@ from typing import Any, Optional, Protocol, Self -from .processor_interface import ProcessorInterface -from ..with_base.types import T_in, T_out -from ..with_base.pipeline_interface import ( +from ..step01_base.pipeline_interface import ( PipelineInterface as WithPipelineBaseInterface, ) -from ..with_pipeline_as_list.pipeline_interface_mixin import ( +from ..step01_base.types import T_in, T_out +from ..step02_pipeline_as_list.pipeline_interface_mixin import ( PipelineInterfaceMixin as WithPipelineAsListInterface, ) +from .processor_interface import ProcessorInterface class PipelineInterfaceMixin( diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_processor/pipeline_mixin.py b/src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/pipeline_mixin.py similarity index 98% rename from src/thecodecrate_pipeline/partials/with_pipeline_processor/pipeline_mixin.py rename to src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/pipeline_mixin.py index 4ce01b4..1003ecb 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_processor/pipeline_mixin.py +++ b/src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/pipeline_mixin.py @@ -1,11 +1,11 @@ from abc import ABC from typing import Any, Optional, Self -from .processor_interface import ProcessorInterface +from ..step01_base.types import T_in, T_out from .pipeline_interface_mixin import ( PipelineInterfaceMixin as PipelineInterface, ) -from ..with_base.types import T_in, T_out +from .processor_interface import ProcessorInterface class PipelineMixin( diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_processor/processor.py b/src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/processor.py similarity index 90% rename from src/thecodecrate_pipeline/partials/with_pipeline_processor/processor.py rename to src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/processor.py index f8dda1d..a435793 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_processor/processor.py +++ b/src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/processor.py @@ -1,16 +1,16 @@ from abc import ABC, abstractmethod from typing import Any -from ...support.has_call_async import HasCallAsync from ...support.clonable import Clonable -from .processor_interface import ( - ProcessorInterface as ImplementsProcessorInterface, -) -from ..with_base.types import T_in, T_out -from ..with_base.stage_callable import ( +from ...support.has_call_async import HasCallAsync +from ..step01_base.stage_callable import ( StageInstance, StageInstanceCollection, ) +from ..step01_base.types import T_in, T_out +from .processor_interface import ( + ProcessorInterface as ImplementsProcessorInterface, +) class Processor( diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_processor/processor_interface.py b/src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/processor_interface.py similarity index 86% rename from src/thecodecrate_pipeline/partials/with_pipeline_processor/processor_interface.py rename to src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/processor_interface.py index edd1758..b371f0b 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_processor/processor_interface.py +++ b/src/thecodecrate_pipeline/core/partials/step06_pipeline_processor/processor_interface.py @@ -1,10 +1,10 @@ from abc import abstractmethod from typing import Any, Protocol, TypeVar -from ...support.has_call_async import HasCallAsyncInterface from ...support.clonable import ClonableInterface -from ..with_base.types import T_in, T_out -from ..with_base.stage_callable import StageInstance, StageInstanceCollection +from ...support.has_call_async import HasCallAsyncInterface +from ..step01_base.stage_callable import StageInstance, StageInstanceCollection +from ..step01_base.types import T_in, T_out class ProcessorInterface( diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_as_stage/pipeline_interface_mixin.py b/src/thecodecrate_pipeline/core/partials/step07_pipeline_as_stage/pipeline_interface_mixin.py similarity index 68% rename from src/thecodecrate_pipeline/partials/with_pipeline_as_stage/pipeline_interface_mixin.py rename to src/thecodecrate_pipeline/core/partials/step07_pipeline_as_stage/pipeline_interface_mixin.py index 39de936..7081fe4 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_as_stage/pipeline_interface_mixin.py +++ b/src/thecodecrate_pipeline/core/partials/step07_pipeline_as_stage/pipeline_interface_mixin.py @@ -1,16 +1,16 @@ from typing import Protocol -from .stage_facade import StageFacade as WithStageInterface -from ..with_base.types import T_in, T_out -from ..with_base.pipeline_interface import ( +from ..step01_base.pipeline_interface import ( PipelineInterface as WithPipelineBaseInterface, ) -from ..with_pipeline_as_list.pipeline_interface_mixin import ( +from ..step01_base.types import T_in, T_out +from ..step02_pipeline_as_list.pipeline_interface_mixin import ( PipelineInterfaceMixin as WithPipelineAsListInterface, ) -from ..with_pipeline_processor.pipeline_interface_mixin import ( +from ..step06_pipeline_processor.pipeline_interface_mixin import ( PipelineInterfaceMixin as WithPipelineProcessorInterface, ) +from .stage_facade import StageFacade as WithStageInterface class PipelineInterfaceMixin( diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_as_stage/pipeline_mixin.py b/src/thecodecrate_pipeline/core/partials/step07_pipeline_as_stage/pipeline_mixin.py similarity index 89% rename from src/thecodecrate_pipeline/partials/with_pipeline_as_stage/pipeline_mixin.py rename to src/thecodecrate_pipeline/core/partials/step07_pipeline_as_stage/pipeline_mixin.py index 3d22be9..f3b11d2 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_as_stage/pipeline_mixin.py +++ b/src/thecodecrate_pipeline/core/partials/step07_pipeline_as_stage/pipeline_mixin.py @@ -1,10 +1,10 @@ from abc import ABC from typing import Any +from ..step01_base.types import T_in, T_out from .pipeline_interface_mixin import ( PipelineInterfaceMixin as ImplementsPipelineInterface, ) -from ..with_base.types import T_in, T_out class PipelineMixin( diff --git a/src/thecodecrate_pipeline/partials/with_pipeline_as_stage/stage_facade.py b/src/thecodecrate_pipeline/core/partials/step07_pipeline_as_stage/stage_facade.py similarity index 64% rename from src/thecodecrate_pipeline/partials/with_pipeline_as_stage/stage_facade.py rename to src/thecodecrate_pipeline/core/partials/step07_pipeline_as_stage/stage_facade.py index 3212953..52263e5 100644 --- a/src/thecodecrate_pipeline/partials/with_pipeline_as_stage/stage_facade.py +++ b/src/thecodecrate_pipeline/core/partials/step07_pipeline_as_stage/stage_facade.py @@ -1,10 +1,10 @@ from typing import Protocol -from ..with_base.types import T_in, T_out -from ..with_base.stage_interface import ( +from ..step01_base.stage_interface import ( StageInterface as WithStageBaseInterface, ) -from ..with_stage_as_callable.stage_interface_mixin import ( +from ..step01_base.types import T_in, T_out +from ..step03_stage_as_callable.stage_interface_mixin import ( StageInterfaceMixin as WithStageAsCallableInterface, ) diff --git a/src/thecodecrate_pipeline/support/act_as_factory/__init__.py b/src/thecodecrate_pipeline/core/support/act_as_factory/__init__.py similarity index 100% rename from src/thecodecrate_pipeline/support/act_as_factory/__init__.py rename to src/thecodecrate_pipeline/core/support/act_as_factory/__init__.py diff --git a/src/thecodecrate_pipeline/support/act_as_factory/act_as_factory.py b/src/thecodecrate_pipeline/core/support/act_as_factory/act_as_factory.py similarity index 100% rename from src/thecodecrate_pipeline/support/act_as_factory/act_as_factory.py rename to src/thecodecrate_pipeline/core/support/act_as_factory/act_as_factory.py diff --git a/src/thecodecrate_pipeline/support/act_as_factory/act_as_factory_interface.py b/src/thecodecrate_pipeline/core/support/act_as_factory/act_as_factory_interface.py similarity index 100% rename from src/thecodecrate_pipeline/support/act_as_factory/act_as_factory_interface.py rename to src/thecodecrate_pipeline/core/support/act_as_factory/act_as_factory_interface.py diff --git a/src/thecodecrate_pipeline/support/act_as_list/__init__.py b/src/thecodecrate_pipeline/core/support/act_as_list/__init__.py similarity index 100% rename from src/thecodecrate_pipeline/support/act_as_list/__init__.py rename to src/thecodecrate_pipeline/core/support/act_as_list/__init__.py diff --git a/src/thecodecrate_pipeline/support/act_as_list/act_as_list.py b/src/thecodecrate_pipeline/core/support/act_as_list/act_as_list.py similarity index 100% rename from src/thecodecrate_pipeline/support/act_as_list/act_as_list.py rename to src/thecodecrate_pipeline/core/support/act_as_list/act_as_list.py diff --git a/src/thecodecrate_pipeline/support/act_as_list/act_as_list_interface.py b/src/thecodecrate_pipeline/core/support/act_as_list/act_as_list_interface.py similarity index 100% rename from src/thecodecrate_pipeline/support/act_as_list/act_as_list_interface.py rename to src/thecodecrate_pipeline/core/support/act_as_list/act_as_list_interface.py diff --git a/src/thecodecrate_pipeline/support/act_as_list/types.py b/src/thecodecrate_pipeline/core/support/act_as_list/types.py similarity index 100% rename from src/thecodecrate_pipeline/support/act_as_list/types.py rename to src/thecodecrate_pipeline/core/support/act_as_list/types.py diff --git a/src/thecodecrate_pipeline/support/clonable/__init__.py b/src/thecodecrate_pipeline/core/support/clonable/__init__.py similarity index 100% rename from src/thecodecrate_pipeline/support/clonable/__init__.py rename to src/thecodecrate_pipeline/core/support/clonable/__init__.py diff --git a/src/thecodecrate_pipeline/support/clonable/clonable.py b/src/thecodecrate_pipeline/core/support/clonable/clonable.py similarity index 100% rename from src/thecodecrate_pipeline/support/clonable/clonable.py rename to src/thecodecrate_pipeline/core/support/clonable/clonable.py diff --git a/src/thecodecrate_pipeline/support/clonable/clonable_interface.py b/src/thecodecrate_pipeline/core/support/clonable/clonable_interface.py similarity index 100% rename from src/thecodecrate_pipeline/support/clonable/clonable_interface.py rename to src/thecodecrate_pipeline/core/support/clonable/clonable_interface.py diff --git a/src/thecodecrate_pipeline/support/has_call_async/__init__.py b/src/thecodecrate_pipeline/core/support/has_call_async/__init__.py similarity index 100% rename from src/thecodecrate_pipeline/support/has_call_async/__init__.py rename to src/thecodecrate_pipeline/core/support/has_call_async/__init__.py diff --git a/src/thecodecrate_pipeline/support/has_call_async/has_call_async.py b/src/thecodecrate_pipeline/core/support/has_call_async/has_call_async.py similarity index 100% rename from src/thecodecrate_pipeline/support/has_call_async/has_call_async.py rename to src/thecodecrate_pipeline/core/support/has_call_async/has_call_async.py diff --git a/src/thecodecrate_pipeline/support/has_call_async/has_call_async_interface.py b/src/thecodecrate_pipeline/core/support/has_call_async/has_call_async_interface.py similarity index 100% rename from src/thecodecrate_pipeline/support/has_call_async/has_call_async_interface.py rename to src/thecodecrate_pipeline/core/support/has_call_async/has_call_async_interface.py diff --git a/src/thecodecrate_pipeline/processors/chained_processor/chained_pipeline.py b/src/thecodecrate_pipeline/processors/chained_processor/chained_pipeline.py index 96a49ec..154881c 100644 --- a/src/thecodecrate_pipeline/processors/chained_processor/chained_pipeline.py +++ b/src/thecodecrate_pipeline/processors/chained_processor/chained_pipeline.py @@ -1,5 +1,5 @@ -from ...classes.pipeline import Pipeline -from ...classes.types import T_in, T_out +from ...core.final.pipeline import Pipeline +from ...core.final.types import T_in, T_out from .chained_processor import ChainedProcessor diff --git a/src/thecodecrate_pipeline/processors/chained_processor/chained_processor.py b/src/thecodecrate_pipeline/processors/chained_processor/chained_processor.py index 7980938..ff2b93a 100644 --- a/src/thecodecrate_pipeline/processors/chained_processor/chained_processor.py +++ b/src/thecodecrate_pipeline/processors/chained_processor/chained_processor.py @@ -1,8 +1,8 @@ from typing import Any, cast -from ...classes.stage_callable import StageInstanceCollection -from ...classes.types import T_in, T_out -from ...classes.processor import Processor +from ...core.final.processor import Processor +from ...core.final.stage_callable import StageInstanceCollection +from ...core.final.types import T_in, T_out class ChainedProcessor(Processor[T_in, T_out]): diff --git a/src/thecodecrate_pipeline/processors/interruptible_processor/interruptible_pipeline.py b/src/thecodecrate_pipeline/processors/interruptible_processor/interruptible_pipeline.py index 090d2ab..51ce95e 100644 --- a/src/thecodecrate_pipeline/processors/interruptible_processor/interruptible_pipeline.py +++ b/src/thecodecrate_pipeline/processors/interruptible_processor/interruptible_pipeline.py @@ -1,8 +1,8 @@ from typing import Any -from ...classes.pipeline import Pipeline -from ...classes.types import T_in, T_out -from .interruptible_processor import InterruptibleProcessor, CheckCallable +from ...core.final.pipeline import Pipeline +from ...core.final.types import T_in, T_out +from .interruptible_processor import CheckCallable, InterruptibleProcessor class InterruptiblePipeline(Pipeline[T_in, T_out]): diff --git a/src/thecodecrate_pipeline/processors/interruptible_processor/interruptible_processor.py b/src/thecodecrate_pipeline/processors/interruptible_processor/interruptible_processor.py index d09fe46..0d88abb 100644 --- a/src/thecodecrate_pipeline/processors/interruptible_processor/interruptible_processor.py +++ b/src/thecodecrate_pipeline/processors/interruptible_processor/interruptible_processor.py @@ -1,9 +1,9 @@ import inspect from typing import Any, Awaitable, Callable, cast -from ...classes.processor import Processor -from ...classes.stage_callable import StageInstanceCollection -from ...classes.types import T_in, T_out +from ...core.final.processor import Processor +from ...core.final.stage_callable import StageInstanceCollection +from ...core.final.types import T_in, T_out CheckCallable = Callable[[T_in], bool | Awaitable[bool]]