zenml-nightly 0.65.0.dev20240906__py3-none-any.whl → 0.65.0.dev20240908__py3-none-any.whl

zenml/VERSION

@@ -1 +1 @@
-0.65.0.dev20240906
+0.65.0.dev20240908

zenml/config/compiler.py

@@ -93,6 +93,10 @@ class Compiler:
         self._apply_run_configuration(
             pipeline=pipeline, config=run_configuration
         )
+        convert_component_shortcut_settings_keys(
+            pipeline.configuration.settings, stack=stack
+        )
+
         self._apply_stack_default_settings(pipeline=pipeline, stack=stack)
         if run_configuration.run_name:
             self._verify_run_name(run_configuration.run_name)
@@ -445,6 +449,9 @@ class Compiler:
                 step_config, runtime_parameters=invocation.parameters
             )
 
+        convert_component_shortcut_settings_keys(
+            step.configuration.settings, stack=stack
+        )
         step_spec = self._get_step_spec(invocation=invocation)
         step_settings = self._filter_and_validate_settings(
             settings=step.configuration.settings,
@@ -596,3 +603,30 @@ class Compiler:
             additional_spec_args["parameters"] = pipeline._parameters
 
         return PipelineSpec(steps=step_specs, **additional_spec_args)
+
+
+def convert_component_shortcut_settings_keys(
+    settings: Dict[str, "BaseSettings"], stack: "Stack"
+) -> None:
+    """Convert component shortcut settings keys.
+
+    Args:
+        settings: Dictionary of settings.
+        stack: The stack that the pipeline will run on.
+
+    Raises:
+        ValueError: If stack component settings were defined both using the
+            full and the shortcut key.
+    """
+    for component in stack.components.values():
+        shortcut_key = str(component.type)
+        if component_settings := settings.pop(shortcut_key, None):
+            key = settings_utils.get_stack_component_setting_key(component)
+            if key in settings:
+                raise ValueError(
+                    f"Duplicate settings provided for your {shortcut_key} "
+                    f"using the keys {shortcut_key} and {key}. Remove settings "
+                    "for one of them to fix this error."
+                )
+
+            settings[key] = component_settings

zenml/utils/settings_utils.py

@@ -25,7 +25,7 @@ if TYPE_CHECKING:
     from zenml.stack.flavor import Flavor
 
 STACK_COMPONENT_REGEX = re.compile(
-    "(" + "|".join(StackComponentType.values()) + r")\..*"
+    "(" + "|".join(StackComponentType.values()) + r")(\..*)?"
 )
 
 

{zenml_nightly-0.65.0.dev20240906.dist-info → zenml_nightly-0.65.0.dev20240908.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zenml-nightly
-Version: 0.65.0.dev20240906
+Version: 0.65.0.dev20240908
 Summary: ZenML: Write production-ready ML code.
 Home-page: https://zenml.io
 License: Apache-2.0

{zenml_nightly-0.65.0.dev20240906.dist-info → zenml_nightly-0.65.0.dev20240908.dist-info}/RECORD

@@ -6,7 +6,7 @@ RELEASE_NOTES.md,sha256=rU1qOZVeFcIB3RaZ-5xinYf9xVH2z8udr8NY5wO9pCY,361876
 ROADMAP.md,sha256=hiLSmr16BH8Dfx7SaQM4JcXCGCVl6mFZPFAwJeDTrJU,407
 SECURITY.md,sha256=9DepA8y03yvCZLHEfcXLTDH4lUyKHquAdukBsccNN7c,682
 zenml/README.md,sha256=827dekbOWAs1BpW7VF1a4d7EbwPbjwccX-2zdXBENZo,1777
-zenml/VERSION,sha256=pKA9zHyNyZgXxXz9siESOgofSoiRbdD1gaChwWx6tNw,19
+zenml/VERSION,sha256=dI0V00Pjf3AlsbLHMT7CONTM9ikQrKqmj4XKDexyIyo,19
 zenml/__init__.py,sha256=X_JnjAYTBG2ZYgcM2_FDPssygdj7z7VTAmU9HEi17p0,2306
 zenml/actions/__init__.py,sha256=mrt6wPo73iKRxK754_NqsGyJ3buW7RnVeIGXr1xEw8Y,681
 zenml/actions/base_action.py,sha256=UcaHev6BTuLDwuswnyaPjdA8AgUqB5xPZ-lRtuvf2FU,25553
@@ -73,7 +73,7 @@ zenml/code_repositories/local_repository_context.py,sha256=N1EagG_gh_BTQ4Z_CC1dH
 zenml/config/__init__.py,sha256=DZEic7euSbwI9Yb3FMRQhTgfhqz-C6OdAiYmOb0-opI,1519
 zenml/config/base_settings.py,sha256=itoLqc1cOwEYhgSGdZmSKSaBevQkvYH7NQh7PUamazc,1700
 zenml/config/build_configuration.py,sha256=Jsng7ebpeaRbzXlbszU-uYkaVihgQ4OrD839yWwD3ZY,5126
-zenml/config/compiler.py,sha256=e4DWf6vGyeOFt3IvYHD8NNLf_-o5VE-AszdPl75679o,22049
+zenml/config/compiler.py,sha256=V-BOsJqz3OHmbZubU3W0B1bqzcOXYSK3mA8iUPzcCn4,23269
 zenml/config/constants.py,sha256=QvSgMwXWxtspcJ45CrFDP1ZY3w6gS3bIhXLOtIDAbZA,713
 zenml/config/docker_settings.py,sha256=KTUR9FaRn3ivcagzFgpLe4eev8fvd5Wq1oV8wGNMB-g,13322
 zenml/config/global_config.py,sha256=i1CY0d4T2C0iVqLGVSgTJ90vLQsCZyCGRodaZ73XTi8,29069
@@ -770,7 +770,7 @@ zenml/utils/pipeline_docker_image_builder.py,sha256=ixFi_msj2FshXO4ZeyEn4hLap_rF
 zenml/utils/proxy_utils.py,sha256=fgRlLa9pfXJDoxtB31_YP7DClOMQLek_nMmM0et6i3w,7241
 zenml/utils/pydantic_utils.py,sha256=oQcxY4VXuVY3n632atlvdmi12EYcSQ1xZuQJY3Je-sA,16592
 zenml/utils/secret_utils.py,sha256=gEvqnhzAZwPO6mdOQWvioeH-xLoSObfaNRzt17N8zyU,5965
-zenml/utils/settings_utils.py,sha256=msfMw1Mq_0ERaaCkAl6_BGQbUHCgf4fD2y4N4ZK3U04,4628
+zenml/utils/settings_utils.py,sha256=lAK13CiDCDkcLygizDbWB9q-9ukteVBJPypzFCrne9k,4631
 zenml/utils/singleton.py,sha256=Qgi7yjV7asDuLiKTzFbeW-CoRRmW5RHRhmGAXtDZH7Y,2415
 zenml/utils/source_code_utils.py,sha256=8iyNA2MGIORYVEkSdxNTXfS1ZdFKXTAG1dZRkeQtPL0,3751
 zenml/utils/source_utils.py,sha256=TC9gnR_-oA8xp54cbR1QiDZCmwIlSvC90I3Gl0JmPhY,25730
@@ -1395,8 +1395,8 @@ zenml/zen_stores/secrets_stores/sql_secrets_store.py,sha256=Bq1djrUP9saoD7vECjS7
 zenml/zen_stores/sql_zen_store.py,sha256=4z458K5ItHkAO0bEUAl6rWJDHKh6GS-sRrt2RPridnE,392435
 zenml/zen_stores/template_utils.py,sha256=UB_CBoMIfBequa8g3H7aTI6V_ke1SJr4IW1qwFCL1jc,8932
 zenml/zen_stores/zen_store_interface.py,sha256=kzR_i8vHjULld3MquSaMorcab8lJk1e9RZquw1VXjHY,93510
-zenml_nightly-0.65.0.dev20240906.dist-info/LICENSE,sha256=wbnfEnXnafPbqwANHkV6LUsPKOtdpsd-SNw37rogLtc,11359
-zenml_nightly-0.65.0.dev20240906.dist-info/METADATA,sha256=UIAhggCnYIF2s8OLtTYaLTEvLUeaR1icHKrjiXXf0zM,20960
-zenml_nightly-0.65.0.dev20240906.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zenml_nightly-0.65.0.dev20240906.dist-info/entry_points.txt,sha256=QK3ETQE0YswAM2mWypNMOv8TLtr7EjnqAFq1br_jEFE,43
-zenml_nightly-0.65.0.dev20240906.dist-info/RECORD,,
+zenml_nightly-0.65.0.dev20240908.dist-info/LICENSE,sha256=wbnfEnXnafPbqwANHkV6LUsPKOtdpsd-SNw37rogLtc,11359
+zenml_nightly-0.65.0.dev20240908.dist-info/METADATA,sha256=D2GlyYTrcxxxxZ-zKz3ENytY16yuUCCxpdQ_P_cAb2M,20960
+zenml_nightly-0.65.0.dev20240908.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zenml_nightly-0.65.0.dev20240908.dist-info/entry_points.txt,sha256=QK3ETQE0YswAM2mWypNMOv8TLtr7EjnqAFq1br_jEFE,43
+zenml_nightly-0.65.0.dev20240908.dist-info/RECORD,,