From b7bfc86362064732821059793109a57bd45dad30 Mon Sep 17 00:00:00 2001 From: anders-albert Date: Mon, 3 Jun 2024 18:24:19 +0200 Subject: [PATCH 1/5] fix: no more dot --- cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py b/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py index ca09dda52..614791727 100644 --- a/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py +++ b/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py @@ -1648,7 +1648,8 @@ class TransformationScheduleLoader( ] ): folder_name = "transformations" - filename_pattern = r"^.*\.schedule$" # Matches all yaml files who's stem contain *.schedule. + # Matches all yaml files whose stem contain *schedule or *TransformationSchedule. + filename_pattern = r"^.*(schedule|TransformationSchedule)$" resource_cls = TransformationSchedule resource_write_cls = TransformationScheduleWrite list_cls = TransformationScheduleList From d2965c1e963cf458c121374d179095a865d0077c Mon Sep 17 00:00:00 2001 From: anders-albert Date: Mon, 3 Jun 2024 18:24:46 +0200 Subject: [PATCH 2/5] refactor; revert --- cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py b/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py index 614791727..fd4995a9e 100644 --- a/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py +++ b/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py @@ -1649,7 +1649,7 @@ class TransformationScheduleLoader( ): folder_name = "transformations" # Matches all yaml files whose stem contain *schedule or *TransformationSchedule. - filename_pattern = r"^.*(schedule|TransformationSchedule)$" + filename_pattern = r"^.*schedule$" resource_cls = TransformationSchedule resource_write_cls = TransformationScheduleWrite list_cls = TransformationScheduleList From 8abaa1db36ff3c46466daf915402787c76aefe21 Mon Sep 17 00:00:00 2001 From: anders-albert Date: Mon, 3 Jun 2024 18:32:23 +0200 Subject: [PATCH 3/5] refactor: simplify patterns --- .../_cdf_tk/loaders/_resource_loaders.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py b/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py index fd4995a9e..a9b4c9063 100644 --- a/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py +++ b/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py @@ -819,7 +819,7 @@ class FunctionScheduleLoader( ResourceLoader[str, FunctionScheduleWrite, FunctionSchedule, FunctionScheduleWriteList, FunctionSchedulesList] ): folder_name = "functions" - filename_pattern = r"^.*schedule.*$" # Matches all yaml files who's stem contain *.schedule. + filename_pattern = r"^.*schedule$" # Matches all yaml files who's stem contain *.schedule. resource_cls = FunctionSchedule resource_write_cls = FunctionScheduleWrite list_cls = FunctionSchedulesList @@ -1648,7 +1648,7 @@ class TransformationScheduleLoader( ] ): folder_name = "transformations" - # Matches all yaml files whose stem contain *schedule or *TransformationSchedule. + # Matches all yaml files whose stem contains *schedule or *TransformationSchedule. filename_pattern = r"^.*schedule$" resource_cls = TransformationSchedule resource_write_cls = TransformationScheduleWrite @@ -1870,7 +1870,7 @@ class ExtractionPipelineConfigLoader( ] ): folder_name = "extraction_pipelines" - filename_pattern = r"^.*\.config$" + filename_pattern = r"^.*config$" resource_cls = ExtractionPipelineConfig resource_write_cls = ExtractionPipelineConfigWrite list_cls = ExtractionPipelineConfigList @@ -2155,7 +2155,7 @@ def get_write_cls_parameter_spec(cls) -> ParameterSpecSet: class SpaceLoader(ResourceContainerLoader[str, SpaceApply, Space, SpaceApplyList, SpaceList]): item_name = "nodes and edges" folder_name = "data_models" - filename_pattern = r"^.*\.?(space)$" + filename_pattern = r"^.*space$" resource_cls = Space resource_write_cls = SpaceApply list_write_cls = SpaceApplyList @@ -2283,7 +2283,7 @@ class ContainerLoader( ): item_name = "nodes and edges" folder_name = "data_models" - filename_pattern = r"^.*\.?(container)$" + filename_pattern = r"^.*container$" resource_cls = Container resource_write_cls = ContainerApply list_cls = ContainerList @@ -2468,7 +2468,7 @@ def get_write_cls_parameter_spec(cls) -> ParameterSpecSet: class ViewLoader(ResourceLoader[ViewId, ViewApply, View, ViewApplyList, ViewList]): folder_name = "data_models" - filename_pattern = r"^.*\.?(view)$" + filename_pattern = r"^.*view$" resource_cls = View resource_write_cls = ViewApply list_cls = ViewList @@ -2662,7 +2662,7 @@ def get_write_cls_parameter_spec(cls) -> ParameterSpecSet: @final class DataModelLoader(ResourceLoader[DataModelId, DataModelApply, DataModel, DataModelApplyList, DataModelList]): folder_name = "data_models" - filename_pattern = r"^.*\.?(datamodel)$" + filename_pattern = r"^.*datamodel$" resource_cls = DataModel resource_write_cls = DataModelApply list_cls = DataModelList @@ -2748,7 +2748,7 @@ def get_write_cls_parameter_spec(cls) -> ParameterSpecSet: class NodeLoader(ResourceContainerLoader[NodeId, NodeApply, Node, NodeApplyListWithCall, NodeList]): item_name = "nodes" folder_name = "data_models" - filename_pattern = r"^.*\.?(node)$" + filename_pattern = r"^.*node$" resource_cls = Node resource_write_cls = NodeApply list_cls = NodeList From 69dc289013ee7fdd4942df0f60517d58ab6e5537 Mon Sep 17 00:00:00 2001 From: anders-albert Date: Mon, 3 Jun 2024 19:23:04 +0200 Subject: [PATCH 4/5] refactor: revert change --- cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py b/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py index a9b4c9063..0c2851a7a 100644 --- a/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py +++ b/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py @@ -819,7 +819,7 @@ class FunctionScheduleLoader( ResourceLoader[str, FunctionScheduleWrite, FunctionSchedule, FunctionScheduleWriteList, FunctionSchedulesList] ): folder_name = "functions" - filename_pattern = r"^.*schedule$" # Matches all yaml files who's stem contain *.schedule. + filename_pattern = r"^.*schedule.*$" # Matches all yaml files whose stem contains *.schedule. resource_cls = FunctionSchedule resource_write_cls = FunctionScheduleWrite list_cls = FunctionSchedulesList From 7b9690e411e86771522ac99c7a28e0c1517e25db Mon Sep 17 00:00:00 2001 From: anders-albert Date: Mon, 3 Jun 2024 19:23:53 +0200 Subject: [PATCH 5/5] refactor: revert change --- cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py b/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py index 0c2851a7a..680c33089 100644 --- a/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py +++ b/cognite_toolkit/_cdf_tk/loaders/_resource_loaders.py @@ -819,7 +819,7 @@ class FunctionScheduleLoader( ResourceLoader[str, FunctionScheduleWrite, FunctionSchedule, FunctionScheduleWriteList, FunctionSchedulesList] ): folder_name = "functions" - filename_pattern = r"^.*schedule.*$" # Matches all yaml files whose stem contains *.schedule. + filename_pattern = r"^.*schedule.*$" # Matches all yaml files who's stem contain *.schedule resource_cls = FunctionSchedule resource_write_cls = FunctionScheduleWrite list_cls = FunctionSchedulesList