Refactor pipeline implementation to use common pattern for file naming (

#3160) --------- Signed-off-by: Fellipe Resende <[email protected]>
elyra-ai · Dec 28, 2024 · 7b2ca48 · 7b2ca48
1 parent 14dad20
commit 7b2ca48
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 18 deletions.
diff --git a/...eline/airflow/component_parser_airflow.py → ...eline/airflow/airflow_component_parser.py b/...eline/airflow/component_parser_airflow.py → ...eline/airflow/airflow_component_parser.py
diff --git a/elyra/pipeline/airflow/processor_airflow.py → elyra/pipeline/airflow/airflow_processor.py b/elyra/pipeline/airflow/processor_airflow.py → elyra/pipeline/airflow/airflow_processor.py
diff --git a/elyra/pipeline/component.py b/elyra/pipeline/component.py
@@ -227,8 +227,8 @@ class ComponentParser(LoggingConfigurable):  # ABC
     component_platform: RuntimeProcessorType = None
     _file_types: List[str] = None
     _parser_class_map: Dict[str, str] = {
-        "APACHE_AIRFLOW": "elyra.pipeline.airflow.component_parser_airflow:AirflowComponentParser",
-        "KUBEFLOW_PIPELINES": "elyra.pipeline.kfp.component_parser_kfp:KfpComponentParser",
+        "APACHE_AIRFLOW": "elyra.pipeline.airflow.airflow_component_parser:AirflowComponentParser",
+        "KUBEFLOW_PIPELINES": "elyra.pipeline.kfp.kfp_component_parser:KfpComponentParser",
     }
 
     @classmethod

diff --git a/elyra/pipeline/kfp/component_parser_kfp.py → elyra/pipeline/kfp/kfp_component_parser.py b/elyra/pipeline/kfp/component_parser_kfp.py → elyra/pipeline/kfp/kfp_component_parser.py
diff --git a/elyra/pipeline/kfp/processor_kfp.py → elyra/pipeline/kfp/kfp_processor.py b/elyra/pipeline/kfp/processor_kfp.py → elyra/pipeline/kfp/kfp_processor.py
diff --git a/elyra/pipeline/local/processor_local.py → elyra/pipeline/local/local_processor.py b/elyra/pipeline/local/processor_local.py → elyra/pipeline/local/local_processor.py
diff --git a/elyra/tests/pipeline/airflow/test_processor_airflow.py b/elyra/tests/pipeline/airflow/test_processor_airflow.py
@@ -27,7 +27,7 @@
 import pytest
 
 from elyra.metadata.metadata import Metadata
-from elyra.pipeline.airflow.processor_airflow import AirflowPipelineProcessor
+from elyra.pipeline.airflow.airflow_processor import AirflowPipelineProcessor
 from elyra.pipeline.parser import PipelineParser
 from elyra.pipeline.pipeline import GenericOperation
 from elyra.pipeline.pipeline_constants import COS_OBJECT_PREFIX

diff --git a/elyra/tests/pipeline/kfp/conftest.py b/elyra/tests/pipeline/kfp/conftest.py
@@ -29,7 +29,7 @@
 from elyra.metadata.schemaspaces import RuntimeImages
 from elyra.metadata.schemaspaces import Runtimes
 from elyra.metadata.storage import FileMetadataStore
-from elyra.pipeline.kfp.processor_kfp import WorkflowEngineType
+from elyra.pipeline.kfp.kfp_processor import WorkflowEngineType
 from elyra.pipeline.parser import PipelineParser
 from elyra.pipeline.pipeline import Pipeline
 from elyra.pipeline.pipeline_constants import COS_OBJECT_PREFIX

diff --git a/...pipeline/kfp/test_component_parser_kfp.py → ...pipeline/kfp/test_kfp_component_parser.py b/...pipeline/kfp/test_component_parser_kfp.py → ...pipeline/kfp/test_kfp_component_parser.py
@@ -32,7 +32,7 @@
 from elyra.pipeline.catalog_connector import UrlComponentCatalogConnector
 from elyra.pipeline.component_catalog import ComponentCache
 from elyra.pipeline.component_metadata import ComponentCatalogMetadata
-from elyra.pipeline.kfp.component_parser_kfp import KfpComponentParser
+from elyra.pipeline.kfp.kfp_component_parser import KfpComponentParser
 from elyra.pipeline.runtime_type import RuntimeProcessorType
 
 COMPONENT_CATALOG_DIRECTORY = os.path.join(jupyter_core.paths.ENV_JUPYTER_PATH[0], "components")

diff --git a/.../tests/pipeline/kfp/test_processor_kfp.py → .../tests/pipeline/kfp/test_kfp_processor.py b/.../tests/pipeline/kfp/test_processor_kfp.py → .../tests/pipeline/kfp/test_kfp_processor.py
@@ -28,15 +28,15 @@
 
 from elyra.pipeline.catalog_connector import FilesystemComponentCatalogConnector
 from elyra.pipeline.component import Component
+from elyra.pipeline.kfp.kfp_processor import CRIO_VOL_DEF_MEDIUM
+from elyra.pipeline.kfp.kfp_processor import CRIO_VOL_DEF_NAME
+from elyra.pipeline.kfp.kfp_processor import CRIO_VOL_DEF_SIZE
+from elyra.pipeline.kfp.kfp_processor import CRIO_VOL_MOUNT_PATH
+from elyra.pipeline.kfp.kfp_processor import CRIO_VOL_PYTHON_PATH
+from elyra.pipeline.kfp.kfp_processor import CRIO_VOL_WORKDIR_PATH
+from elyra.pipeline.kfp.kfp_processor import KfpPipelineProcessor
+from elyra.pipeline.kfp.kfp_processor import WorkflowEngineType
 from elyra.pipeline.kfp.kfp_properties import KfpPipelineParameter
-from elyra.pipeline.kfp.processor_kfp import CRIO_VOL_DEF_MEDIUM
-from elyra.pipeline.kfp.processor_kfp import CRIO_VOL_DEF_NAME
-from elyra.pipeline.kfp.processor_kfp import CRIO_VOL_DEF_SIZE
-from elyra.pipeline.kfp.processor_kfp import CRIO_VOL_MOUNT_PATH
-from elyra.pipeline.kfp.processor_kfp import CRIO_VOL_PYTHON_PATH
-from elyra.pipeline.kfp.processor_kfp import CRIO_VOL_WORKDIR_PATH
-from elyra.pipeline.kfp.processor_kfp import KfpPipelineProcessor
-from elyra.pipeline.kfp.processor_kfp import WorkflowEngineType
 from elyra.pipeline.pipeline import GenericOperation
 from elyra.pipeline.pipeline import Operation
 from elyra.pipeline.pipeline import Pipeline

diff --git a/elyra/tests/pipeline/local/test_pipeline_processor_local.py b/elyra/tests/pipeline/local/test_pipeline_processor_local.py
@@ -18,7 +18,7 @@
 import nbformat
 import pytest
 
-from elyra.pipeline.local.processor_local import LocalPipelineProcessor
+from elyra.pipeline.local.local_processor import LocalPipelineProcessor
 from elyra.pipeline.parser import PipelineParser
 from elyra.pipeline.pipeline import GenericOperation
 from elyra.tests.pipeline.util import _read_pipeline_resource

diff --git a/elyra/tests/pipeline/test_processor.py b/elyra/tests/pipeline/test_processor.py
@@ -18,7 +18,7 @@
 
 import pytest
 
-from elyra.pipeline.kfp.processor_kfp import KfpPipelineProcessor
+from elyra.pipeline.kfp.kfp_processor import KfpPipelineProcessor
 from elyra.pipeline.pipeline import GenericOperation
 from elyra.pipeline.properties import ElyraProperty
 from elyra.pipeline.registry import PipelineProcessorRegistry

diff --git a/pyproject.toml b/pyproject.toml
@@ -137,9 +137,9 @@ airflow-package-catalog-schema = "elyra.pipeline.airflow.package_catalog_connect
 metadata-tests = "elyra.tests.metadata.test_utils:MetadataTestSchemasProvider"
 
 [project.entry-points."elyra.pipeline.processors"]
-local = "elyra.pipeline.local.processor_local:LocalPipelineProcessor"
-airflow = "elyra.pipeline.airflow.processor_airflow:AirflowPipelineProcessor"
-kfp = "elyra.pipeline.kfp.processor_kfp:KfpPipelineProcessor"
+local = "elyra.pipeline.local.local_processor:LocalPipelineProcessor"
+airflow = "elyra.pipeline.airflow.airflow_processor:AirflowPipelineProcessor"
+kfp = "elyra.pipeline.kfp.kfp_processor:KfpPipelineProcessor"
 
 [project.entry-points."elyra.component.catalog_types"]
 url-catalog = "elyra.pipeline.catalog_connector:UrlComponentCatalogConnector"