Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor pipeline implementation to use common pattern for file naming #3160

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions elyra/pipeline/component.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion elyra/tests/pipeline/airflow/test_processor_airflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion elyra/tests/pipeline/kfp/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion elyra/tests/pipeline/test_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,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"
Expand Down