zenml-nightly 0.66.0.dev20240911__py3-none-any.whl → 0.66.0.dev20240914__py3-none-any.whl

zenml/VERSION

@@ -1 +1 @@
-0.66.0.dev20240911
+0.66.0.dev20240914

zenml/cli/service_accounts.py

@@ -35,6 +35,7 @@ def _create_api_key(
     name: str,
     description: Optional[str],
     set_key: bool = False,
+    output_file: Optional[str] = None,
 ) -> None:
     """Create an API key.
 
@@ -44,6 +45,7 @@ def _create_api_key(
         name: Name of the API key
         description: The API key description.
         set_key: Configure the local client with the generated key.
+        output_file: Output file to write the API key to.
     """
     client = Client()
     zen_store = client.zen_store
@@ -74,13 +76,19 @@ def _create_api_key(
             )
             return
 
-    cli_utils.declare(
-        f"The API key value is: '{api_key.key}'\nPlease store it safely as "
-        "it will not be shown again.\nTo configure a ZenML client to use "
-        "this API key, run:\n\n"
-        f"zenml connect --url {zen_store.config.url} --api-key \\\n"
-        f"    '{api_key.key}'\n"
-    )
+    if output_file and api_key.key:
+        with open(output_file, "w") as f:
+            f.write(api_key.key)
+
+        cli_utils.declare(f"Wrote API key value to {output_file}")
+    else:
+        cli_utils.declare(
+            f"The API key value is: '{api_key.key}'\nPlease store it safely as "
+            "it will not be shown again.\nTo configure a ZenML client to use "
+            "this API key, run:\n\n"
+            f"zenml connect --url {zen_store.config.url} --api-key \\\n"
+            f"    '{api_key.key}'\n"
+        )
 
 
 @cli.group(cls=TagGroup, tag=CliCategories.IDENTITY_AND_SECURITY)
@@ -111,11 +119,18 @@ def service_account() -> None:
     help=("Configure the local client to use the generated API key."),
     is_flag=True,
 )
+@click.option(
+    "--output-file",
+    type=str,
+    required=False,
+    help="File to write the API key to.",
+)
 def create_service_account(
     service_account_name: str,
     description: str = "",
     create_api_key: bool = True,
     set_api_key: bool = False,
+    output_file: Optional[str] = None,
 ) -> None:
     """Create a new service account.
 
@@ -124,6 +139,7 @@ def create_service_account(
         description: The API key description.
         create_api_key: Create an API key for the service account.
         set_api_key: Configure the local client to use the generated API key.
+        output_file: Output file to write the API key to.
     """
     client = Client()
     try:
@@ -142,6 +158,7 @@ def create_service_account(
             name="default",
             description="Default API key.",
             set_key=set_api_key,
+            output_file=output_file,
         )
 
 
@@ -302,12 +319,19 @@ def api_key(
     is_flag=True,
     help="Configure the local client with the generated key.",
 )
+@click.option(
+    "--output-file",
+    type=str,
+    required=False,
+    help="File to write the API key to.",
+)
 @click.pass_obj
 def create_api_key(
     service_account_name_or_id: str,
     name: str,
     description: Optional[str],
     set_key: bool = False,
+    output_file: Optional[str] = None,
 ) -> None:
     """Create an API key.
 
@@ -317,12 +341,14 @@ def create_api_key(
         name: Name of the API key
         description: The API key description.
         set_key: Configure the local client with the generated key.
+        output_file: Output file to write the API key to.
     """
     _create_api_key(
         service_account_name_or_id=service_account_name_or_id,
         name=name,
         description=description,
         set_key=set_key,
+        output_file=output_file,
     )
 
 
@@ -450,12 +476,19 @@ def update_api_key(
     is_flag=True,
     help="Configure the local client with the generated key.",
 )
+@click.option(
+    "--output-file",
+    type=str,
+    required=False,
+    help="File to write the API key to.",
+)
 @click.pass_obj
 def rotate_api_key(
     service_account_name_or_id: str,
     name_or_id: str,
     retain: int = 0,
     set_key: bool = False,
+    output_file: Optional[str] = None,
 ) -> None:
     """Rotate an API key.
 
@@ -466,6 +499,7 @@ def rotate_api_key(
         retain: Number of minutes for which the previous key is still valid
             after it has been rotated.
         set_key: Configure the local client with the newly generated key.
+        output_file: Output file to write the API key to.
     """
     client = Client()
     zen_store = client.zen_store
@@ -499,13 +533,19 @@ def rotate_api_key(
             )
             return
 
-    cli_utils.declare(
-        f"The new API key value is: '{api_key.key}'\nPlease store it "
-        "safely as it will not be shown again.\nTo configure a ZenML "
-        "client to use this API key, run:\n\n"
-        f"zenml connect --url {zen_store.config.url} --api-key \\\n"
-        f"    '{api_key.key}'\n"
-    )
+    if output_file and api_key.key:
+        with open(output_file, "w") as f:
+            f.write(api_key.key)
+
+        cli_utils.declare(f"Wrote API key value to {output_file}")
+    else:
+        cli_utils.declare(
+            f"The new API key value is: '{api_key.key}'\nPlease store it "
+            "safely as it will not be shown again.\nTo configure a ZenML "
+            "client to use this API key, run:\n\n"
+            f"zenml connect --url {zen_store.config.url} --api-key \\\n"
+            f"    '{api_key.key}'\n"
+        )
 
 
 @api_key.command("delete")

zenml/steps/base_step.py

@@ -592,16 +592,34 @@ class BaseStep(metaclass=BaseStepMeta):
         from zenml.new.pipelines.pipeline import Pipeline
 
         if not Pipeline.ACTIVE_PIPELINE:
-            # The step is being called outside the context of a pipeline, either
-            # run the step function or run it as a single step pipeline on the
-            # active stack
+            from zenml import constants, get_step_context
+
+            # If the environment variable was set to explicitly not run on the
+            # stack, we do that.
             run_without_stack = handle_bool_env_var(
                 ENV_ZENML_RUN_SINGLE_STEPS_WITHOUT_STACK, default=False
             )
             if run_without_stack:
                 return self.call_entrypoint(*args, **kwargs)
+
+            try:
+                get_step_context()
+            except RuntimeError:
+                pass
             else:
-                return run_as_single_step_pipeline(self, *args, **kwargs)
+                # We're currently inside the execution of a different step
+                # -> We don't want to launch another single step pipeline here,
+                # but instead just call the step function
+                return self.call_entrypoint(*args, **kwargs)
+
+            if constants.SHOULD_PREVENT_PIPELINE_EXECUTION:
+                logger.info(
+                    "Preventing execution of step '%s'.",
+                    self.name,
+                )
+                return
+
+            return run_as_single_step_pipeline(self, *args, **kwargs)
 
         (
             input_artifacts,

{zenml_nightly-0.66.0.dev20240911.dist-info → zenml_nightly-0.66.0.dev20240914.dist-info}/METADATA

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

{zenml_nightly-0.66.0.dev20240911.dist-info → zenml_nightly-0.66.0.dev20240914.dist-info}/RECORD

@@ -6,7 +6,7 @@ RELEASE_NOTES.md,sha256=GjuHlUd-5AcepXC8ETMkIRMxKVQtBekiuY_CW0oP4XQ,365106
 ROADMAP.md,sha256=hiLSmr16BH8Dfx7SaQM4JcXCGCVl6mFZPFAwJeDTrJU,407
 SECURITY.md,sha256=9DepA8y03yvCZLHEfcXLTDH4lUyKHquAdukBsccNN7c,682
 zenml/README.md,sha256=827dekbOWAs1BpW7VF1a4d7EbwPbjwccX-2zdXBENZo,1777
-zenml/VERSION,sha256=z587lueMfLtk_cl6JsTB3mS4HLQXyMCR82stHJFvprU,19
+zenml/VERSION,sha256=UpeMLZWAYhpkLA7pj4EGlixlGYWN-fPOYNaVrpD7CrI,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
@@ -51,7 +51,7 @@ zenml/cli/pipeline.py,sha256=8UO3ZjKZbaU3tiRLBsN-N3kK_i_bD-8Qbq_YpR8mstw,17442
 zenml/cli/secret.py,sha256=2WxDYg6iodnAVSbVJQvQEYWEgcy0oytcSBVnnyN0JOw,20135
 zenml/cli/served_model.py,sha256=lIPd6kOS9kfWFOsd3DSILtiYomINpmXrdpyP5vtQlj8,14604
 zenml/cli/server.py,sha256=N2cvu9C_z8CzwGu3a7P6fE2X8Se_rHEx30iq9nYMy9o,28682
-zenml/cli/service_accounts.py,sha256=MO8pVVjppdvIULFxpvQKlhfEDmRqvlH8aIbPTdNSHXU,16489
+zenml/cli/service_accounts.py,sha256=V6Oeomcs0tg-MIOUbYABqTcO4PsGCdM2WXJH576iqKM,17723
 zenml/cli/service_connectors.py,sha256=v6o-FpTEnDXYcQXczBELwfWPCcYBi9z7b1GC90Fvp30,74397
 zenml/cli/stack.py,sha256=vT-7Kac_Cf2g9XoIzwrxdQYgtkpuv_d-BpDvL-p9XUk,82862
 zenml/cli/stack_components.py,sha256=BxWsqeu5e2DtP5TMjzE98d8Lqfwe5o45TC2awjil5wY,74144
@@ -731,7 +731,7 @@ zenml/step_operators/base_step_operator.py,sha256=ZRnY6lcEHY8xZskrKKdPhgKg2BlEoh
 zenml/step_operators/step_operator_entrypoint_configuration.py,sha256=vG0Z9D2C72PYOZ_P3eXYTmm2TvL-dS_kHhSMq-coAKE,3690
 zenml/steps/__init__.py,sha256=IvxepI3tYp6LiVHFJnet9xZ7yFlH6NHCAI69SvQsfaI,1682
 zenml/steps/base_parameters.py,sha256=rKnALd0lMv0jOX8E9TwHJkeP3H-ijEFXY0T5dMCu9EQ,756
-zenml/steps/base_step.py,sha256=RsSIETBgBYk3phwTzN407iJy-Lp8Mtdzni8zNP4g7Sg,51852
+zenml/steps/base_step.py,sha256=sQbGnPt_1-upcYAGPqqKW0xrULNZZc9NR_7fu2y5qQk,52434
 zenml/steps/entrypoint_function_utils.py,sha256=25LxlZ8E-3YoWEdAUFK4UZ04hbp4GNMqpKwD2O-Rp_0,12484
 zenml/steps/external_artifact.py,sha256=63ngwlSJvR8GoM93ttz1Mp6BuAg7xH-QZAsBvW3M80Q,1109
 zenml/steps/step_decorator.py,sha256=_rV5MGMziqNiOoxupZUy055o-a0b8Y4RtLuB6nLyYyg,8188
@@ -1399,8 +1399,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.66.0.dev20240911.dist-info/LICENSE,sha256=wbnfEnXnafPbqwANHkV6LUsPKOtdpsd-SNw37rogLtc,11359
-zenml_nightly-0.66.0.dev20240911.dist-info/METADATA,sha256=HAq5cQQeGuNKMEtBHcs08RrVLjQ7cRiGLxqX0UC0e38,20961
-zenml_nightly-0.66.0.dev20240911.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zenml_nightly-0.66.0.dev20240911.dist-info/entry_points.txt,sha256=QK3ETQE0YswAM2mWypNMOv8TLtr7EjnqAFq1br_jEFE,43
-zenml_nightly-0.66.0.dev20240911.dist-info/RECORD,,
+zenml_nightly-0.66.0.dev20240914.dist-info/LICENSE,sha256=wbnfEnXnafPbqwANHkV6LUsPKOtdpsd-SNw37rogLtc,11359
+zenml_nightly-0.66.0.dev20240914.dist-info/METADATA,sha256=BY28zlC6T5ke23Yrq8nL4xXdxBc98kE3ouTXpTxao-w,20961
+zenml_nightly-0.66.0.dev20240914.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zenml_nightly-0.66.0.dev20240914.dist-info/entry_points.txt,sha256=QK3ETQE0YswAM2mWypNMOv8TLtr7EjnqAFq1br_jEFE,43
+zenml_nightly-0.66.0.dev20240914.dist-info/RECORD,,