Allow disconnecting service-connector from stack component

src/zenml/cli/stack_components.py

@@ -1749,6 +1749,55 @@ def connect_stack_component_command(
     return connect_stack_component_command
 
 
+def generate_stack_component_disconnect_command(
+    component_type: StackComponentType,
+) -> Callable[[str], None]:
+    """Generates a `disconnect` command for the specific stack component type.
+
+    Args:
+        component_type: Type of the component to generate the command for.
+
+    Returns:
+        A function that can be used as a `click` command.
+    """
+    display_name = _component_display_name(component_type)
+
+    @click.argument(
+        "name_id_or_prefix",
+        type=str,
+        required=True,
+    )
+    def disconnect_stack_component_command(name_id_or_prefix: str) -> None:
+        """Disconnect a stack component from a service connector.
+
+        Args:
+            name_id_or_prefix: The name of the stack component to disconnect.
+        """
+        if component_type == StackComponentType.SECRETS_MANAGER:
+            warn_deprecated_secrets_manager()
+
+        client = Client()
+
+        with console.status(
+            f"Disconnecting service-connector from {display_name} '{name_id_or_prefix}'...\n"
+        ):
+            try:
+                updated_component = client.update_stack_component(
+                    name_id_or_prefix=name_id_or_prefix,
+                    component_type=component_type,
+                    disconnect=True,
+                )
+            except (KeyError, IllegalOperationError) as err:
+                cli_utils.error(str(err))
+
+            cli_utils.declare(
+                f"Successfully disconnected the service-connector from {display_name} `{name_id_or_prefix}`."
+            )
+            print_model_url(get_component_url(updated_component))
+
+    return disconnect_stack_component_command
+
+
 def register_single_stack_component_cli_commands(
     component_type: StackComponentType, parent_group: click.Group
 ) -> None:
@@ -1879,6 +1928,15 @@ def command_group() -> None:
         help=f"Connect {singular_display_name} to a service connector.",
     )(connect_command)
 
+    # zenml stack-component connect
+    disconnect_command = generate_stack_component_disconnect_command(
+        component_type
+    )
+    command_group.command(
+        "disconnect",
+        help=f"Disconnect {singular_display_name} from a service connector.",
+    )(disconnect_command)
+
     # zenml stack-component explain
     explain_command = generate_stack_component_explain_command(component_type)
     command_group.command(

src/zenml/client.py

@@ -2192,6 +2192,7 @@ def update_stack_component(
         configuration: Optional[Dict[str, Any]] = None,
         labels: Optional[Dict[str, Any]] = None,
         is_shared: Optional[bool] = None,
+        disconnect: Optional[bool] = None,
         connector_id: Optional[UUID] = None,
         connector_resource_id: Optional[str] = None,
     ) -> "ComponentResponseModel":
@@ -2206,6 +2207,8 @@ def update_stack_component(
             configuration: The new configuration of the stack component.
             labels: The new labels of the stack component.
             is_shared: The new shared status of the stack component.
+            disconnect: Whether to disconnect the stack component from its
+                service connector.
             connector_id: The new connector id of the stack component.
             connector_resource_id: The new connector resource id of the
                 stack component.
@@ -2291,10 +2294,22 @@ def update_stack_component(
             }
             update_model.labels = existing_labels
 
-        if connector_id is not None:
+        if disconnect:
+            update_model.connector = None
+            update_model.connector_resource_id = None
+        else:
+            existing_component = self.get_stack_component(
+                name_id_or_prefix=name_id_or_prefix,
+                component_type=component_type,
+                allow_name_prefix_match=False,
+            )
             update_model.connector = connector_id
-        if connector_resource_id is not None:
             update_model.connector_resource_id = connector_resource_id
+            if connector_id is None and existing_component.connector:
+                update_model.connector = existing_component.connector.id
+                update_model.connector_resource_id = (
+                    existing_component.connector_resource_id
+                )
 
         # Send the updated component to the ZenStore
         return self.zen_store.update_stack_component(

src/zenml/zen_stores/sql_zen_store.py

@@ -1538,7 +1538,6 @@ def update_stack_component(
 
             existing_component.update(component_update=component_update)
 
-            service_connector: Optional[ServiceConnectorSchema] = None
             if component_update.connector:
                 service_connector = session.exec(
                     select(ServiceConnectorSchema).where(
@@ -1551,9 +1550,13 @@ def update_stack_component(
                         "Service connector with ID "
                         f"{component_update.connector} not found."
                     )
-
-            if service_connector:
                 existing_component.connector = service_connector
+                existing_component.connector_resource_id = (
+                    component_update.connector_resource_id
+                )
+            else:
+                existing_component.connector = None
+                existing_component.connector_resource_id = None
 
             session.add(existing_component)
             session.commit()