zenml-nightly 0.83.1.dev20250625__py3-none-any.whl → 0.83.1.dev20250626__py3-none-any.whl

zenml/VERSION

@@ -1 +1 @@
-0.83.1.dev20250625
+0.83.1.dev20250626

zenml/cli/base.py

@@ -49,6 +49,7 @@ from zenml.integrations.registry import integration_registry
 from zenml.io import fileio
 from zenml.logger import get_logger
 from zenml.utils.io_utils import copy_dir, get_global_config_directory
+from zenml.utils.package_utils import get_package_information
 from zenml.utils.server_utils import get_local_server
 from zenml.utils.yaml_utils import write_yaml
 
@@ -640,7 +641,7 @@ def info(
     }
 
     if all:
-        user_info["packages"] = cli_utils.get_package_information()
+        user_info["packages"] = get_package_information()
     if packages:
         if user_info.get("packages"):
             if isinstance(user_info["packages"], dict):
@@ -650,7 +651,7 @@ def info(
                     if p in packages
                 }
         else:
-            user_info["query_packages"] = cli_utils.get_package_information(
+            user_info["query_packages"] = get_package_information(
                 list(packages)
             )
     if file:

zenml/cli/service_connectors.py

@@ -899,14 +899,7 @@ def register_service_connector(
 
         # Prepare the rest of the variables to fall through to the
         # non-interactive configuration case
-        parsed_args = connector_model.configuration
-        parsed_args.update(
-            {
-                k: s.get_secret_value()
-                for k, s in connector_model.secrets.items()
-                if s is not None
-            }
-        )
+        parsed_args = connector_model.configuration.plain
         auto_configure = False
         no_verify = False
         expiration_seconds = connector_model.expiration_seconds
@@ -1137,7 +1130,7 @@ def describe_service_connector(
         try:
             connector = client.get_service_connector(
                 name_id_or_prefix=name_id_or_prefix,
-                load_secrets=True,
+                expand_secrets=show_secrets,
             )
         except KeyError as err:
             cli_utils.error(str(err))
@@ -1385,7 +1378,7 @@ def update_service_connector(
         connector = client.get_service_connector(
             name_id_or_prefix,
             allow_name_prefix_match=False,
-            load_secrets=True,
+            expand_secrets=True,
         )
     except KeyError as e:
         cli_utils.error(str(e))
@@ -1445,7 +1438,7 @@ def update_service_connector(
                 default=False,
             )
 
-        existing_config = connector.full_configuration
+        existing_config = connector.configuration.plain
 
         if confirm:
             # Here we reconfigure the connector or update the existing
@@ -1582,7 +1575,7 @@ def update_service_connector(
         # Non-interactive configuration
 
         # Apply the configuration from the command line arguments
-        config_dict = connector.full_configuration
+        config_dict = connector.configuration.plain
         config_dict.update(parsed_args)
 
         if not resource_type and not connector.is_multi_type:

zenml/cli/stack.py

@@ -1783,14 +1783,10 @@ def _get_service_connector_info(
     answers = {}
     for req_field in required_fields:
         if connector_details:
-            if conf_value := connector_details.configuration.get(
+            if conf_value := connector_details.configuration.get_plain(
                 req_field, None
             ):
                 answers[req_field] = conf_value
-            elif secret_value := connector_details.secrets.get(
-                req_field, None
-            ):
-                answers[req_field] = secret_value.get_secret_value()
         if req_field not in answers:
             answers[req_field] = Prompt.ask(
                 f"Please enter value for `{req_field}`:",

zenml/cli/utils.py

@@ -40,7 +40,6 @@ from typing import (
 )
 
 import click
-import pkg_resources
 import yaml
 from pydantic import BaseModel, SecretStr
 from rich import box, table
@@ -80,6 +79,7 @@ from zenml.stack import StackComponent
 from zenml.stack.flavor import Flavor
 from zenml.stack.stack_component import StackComponentConfig
 from zenml.utils import secret_utils
+from zenml.utils.package_utils import requirement_installed
 from zenml.utils.time_utils import expires_in
 from zenml.utils.typing_utils import get_origin, is_union
 
@@ -1052,7 +1052,7 @@ def install_packages(
         # just return without doing anything
         return
 
-    if use_uv and not is_installed_in_python_environment("uv"):
+    if use_uv and not requirement_installed("uv"):
         # If uv is installed globally, don't run as a python module
         command = []
     else:
@@ -1094,7 +1094,7 @@ def uninstall_package(package: str, use_uv: bool = False) -> None:
         package: The package to uninstall.
         use_uv: Whether to use uv for package uninstallation.
     """
-    if use_uv and not is_installed_in_python_environment("uv"):
+    if use_uv and not requirement_installed("uv"):
         # If uv is installed globally, don't run as a python module
         command = []
     else:
@@ -1110,22 +1110,6 @@ def uninstall_package(package: str, use_uv: bool = False) -> None:
     subprocess.check_call(command)
 
 
-def is_installed_in_python_environment(package: str) -> bool:
-    """Check if a package is installed in the current python environment.
-
-    Args:
-        package: The package to check.
-
-    Returns:
-        True if the package is installed, False otherwise.
-    """
-    try:
-        pkg_resources.get_distribution(package)
-        return True
-    except pkg_resources.DistributionNotFound:
-        return False
-
-
 def is_uv_installed() -> bool:
     """Check if uv is installed.
 
@@ -1141,7 +1125,7 @@ def is_pip_installed() -> bool:
     Returns:
         True if pip is installed, False otherwise.
     """
-    return is_installed_in_python_environment("pip")
+    return requirement_installed("pip")
 
 
 def pretty_print_secret(
@@ -1830,7 +1814,7 @@ def print_service_connector_configuration(
 
     console.print(rich_table)
 
-    if len(connector.configuration) == 0 and len(connector.secrets) == 0:
+    if len(connector.configuration) == 0:
         declare("No configuration options are set for this connector.")
 
     else:
@@ -1842,8 +1826,8 @@ def print_service_connector_configuration(
         rich_table.add_column("PROPERTY")
         rich_table.add_column("VALUE", overflow="fold")
 
-        config = connector.configuration.copy()
-        secrets = connector.secrets.copy()
+        config = connector.configuration.non_secrets
+        secrets = connector.configuration.secrets
         for key, value in secrets.items():
             if not show_secrets:
                 config[key] = "[HIDDEN]"
@@ -2499,30 +2483,6 @@ def temporary_active_stack(
             Client().activate_stack(old_stack_id)
 
 
-def get_package_information(
-    package_names: Optional[List[str]] = None,
-) -> Dict[str, str]:
-    """Get a dictionary of installed packages.
-
-    Args:
-        package_names: Specific package names to get the information for.
-
-    Returns:
-        A dictionary of the name:version for the package names passed in or
-            all packages and their respective versions.
-    """
-    import pkg_resources
-
-    if package_names:
-        return {
-            pkg.key: pkg.version
-            for pkg in pkg_resources.working_set
-            if pkg.key in package_names
-        }
-
-    return {pkg.key: pkg.version for pkg in pkg_resources.working_set}
-
-
 def print_user_info(info: Dict[str, Any]) -> None:
     """Print user information to the terminal.
 
@@ -2617,11 +2577,7 @@ def is_jupyter_installed() -> bool:
     Returns:
         bool: True if Jupyter notebook is installed, False otherwise.
     """
-    try:
-        pkg_resources.get_distribution("notebook")
-        return True
-    except pkg_resources.DistributionNotFound:
-        return False
+    return requirement_installed("notebook")
 
 
 def multi_choice_prompt(

zenml/client.py

@@ -5500,17 +5500,18 @@ class Client(metaclass=ClientMetaClass):
         self,
         name_id_or_prefix: Union[str, UUID],
         allow_name_prefix_match: bool = True,
-        load_secrets: bool = False,
         hydrate: bool = True,
+        expand_secrets: bool = False,
     ) -> ServiceConnectorResponse:
         """Fetches a registered service connector.
 
         Args:
             name_id_or_prefix: The id of the service connector to fetch.
             allow_name_prefix_match: If True, allow matching by name prefix.
-            load_secrets: If True, load the secrets for the service connector.
             hydrate: Flag deciding whether to hydrate the output model(s)
                 by including metadata fields in the response.
+            expand_secrets: If True, expand the secrets for the service
+                connector.
 
         Returns:
             The registered service connector.
@@ -5521,25 +5522,9 @@ class Client(metaclass=ClientMetaClass):
             name_id_or_prefix=name_id_or_prefix,
             allow_name_prefix_match=allow_name_prefix_match,
             hydrate=hydrate,
+            expand_secrets=expand_secrets,
         )
 
-        if load_secrets and connector.secret_id:
-            client = Client()
-            try:
-                secret = client.get_secret(
-                    name_id_or_prefix=connector.secret_id,
-                    allow_partial_id_match=False,
-                    allow_partial_name_match=False,
-                )
-            except KeyError as err:
-                logger.error(
-                    "Unable to retrieve secret values associated with "
-                    f"service connector '{connector.name}': {err}"
-                )
-            else:
-                # Add secret values to connector configuration
-                connector.secrets.update(secret.values)
-
         return connector
 
     def list_service_connectors(
@@ -5558,8 +5543,8 @@ class Client(metaclass=ClientMetaClass):
         resource_id: Optional[str] = None,
         user: Optional[Union[UUID, str]] = None,
         labels: Optional[Dict[str, Optional[str]]] = None,
-        secret_id: Optional[Union[str, UUID]] = None,
         hydrate: bool = False,
+        expand_secrets: bool = False,
     ) -> Page[ServiceConnectorResponse]:
         """Lists all registered service connectors.
 
@@ -5580,10 +5565,10 @@ class Client(metaclass=ClientMetaClass):
             user: Filter by user name/ID.
             name: The name of the service connector to filter by.
             labels: The labels of the service connector to filter by.
-            secret_id: Filter by the id of the secret that is referenced by the
-                service connector.
             hydrate: Flag deciding whether to hydrate the output model(s)
                 by including metadata fields in the response.
+            expand_secrets: If True, expand the secrets for the service
+                connectors.
 
         Returns:
             A page of service connectors.
@@ -5603,11 +5588,11 @@ class Client(metaclass=ClientMetaClass):
             created=created,
             updated=updated,
             labels=labels,
-            secret_id=secret_id,
         )
         return self.zen_store.list_service_connectors(
             filter_model=connector_filter_model,
             hydrate=hydrate,
+            expand_secrets=expand_secrets,
         )
 
     def update_service_connector(
@@ -5691,7 +5676,9 @@ class Client(metaclass=ClientMetaClass):
         connector_model = self.get_service_connector(
             name_id_or_prefix,
             allow_name_prefix_match=False,
-            load_secrets=True,
+            # We need the existing secrets only if a new configuration is not
+            # provided.
+            expand_secrets=configuration is None,
         )
 
         connector_instance: Optional[ServiceConnector] = None
@@ -5736,23 +5723,16 @@ class Client(metaclass=ClientMetaClass):
         )
 
         # Validate and configure the resources
-        if configuration is not None:
+        connector_update.validate_and_configure_resources(
+            connector_type=connector,
+            resource_types=resource_types,
+            resource_id=resource_id,
             # The supplied configuration is a drop-in replacement for the
-            # existing configuration and secrets
-            connector_update.validate_and_configure_resources(
-                connector_type=connector,
-                resource_types=resource_types,
-                resource_id=resource_id,
-                configuration=configuration,
-            )
-        else:
-            connector_update.validate_and_configure_resources(
-                connector_type=connector,
-                resource_types=resource_types,
-                resource_id=resource_id,
-                configuration=connector_model.configuration,
-                secrets=connector_model.secrets,
-            )
+            # existing configuration
+            configuration=configuration
+            if configuration is not None
+            else connector_model.configuration,
+        )
 
         # Add the labels
         if labels is not None:
@@ -5912,6 +5892,12 @@ class Client(metaclass=ClientMetaClass):
                 list_resources=list_resources,
             )
         else:
+            # Get the service connector model, with full secrets
+            service_connector = self.get_service_connector(
+                name_id_or_prefix=name_id_or_prefix,
+                allow_name_prefix_match=False,
+                expand_secrets=True,
+            )
             connector_instance = (
                 service_connector_registry.instantiate_connector(
                     model=service_connector
@@ -6034,6 +6020,12 @@ class Client(metaclass=ClientMetaClass):
                 # server-side implementation may not be able to do so
                 connector_client.verify()
         else:
+            # Get the service connector model, with full secrets
+            service_connector = self.get_service_connector(
+                name_id_or_prefix=name_id_or_prefix,
+                allow_name_prefix_match=False,
+                expand_secrets=True,
+            )
             connector_instance = (
                 service_connector_registry.instantiate_connector(
                     model=service_connector

zenml/integrations/aws/container_registries/aws_container_registry.py

@@ -81,7 +81,9 @@ class AWSContainerRegistry(BaseContainerRegistry):
         """
         if self.connector:
             try:
-                model = Client().get_service_connector(self.connector)
+                model = Client().get_service_connector(
+                    self.connector, expand_secrets=True
+                )
                 connector = service_connector_registry.instantiate_connector(
                     model=model
                 )

zenml/integrations/databricks/orchestrators/databricks_orchestrator_entrypoint_config.py

@@ -17,7 +17,10 @@ import os
 import sys
 from typing import Any, List, Set
 
-import pkg_resources
+if sys.version_info < (3, 10):
+    from importlib_metadata import distribution
+else:
+    from importlib.metadata import distribution
 
 from zenml.entrypoints.step_entrypoint_configuration import (
     StepEntrypointConfiguration,
@@ -81,8 +84,10 @@ class DatabricksEntrypointConfiguration(StepEntrypointConfiguration):
         """Runs the step."""
         # Get the wheel package and add it to the sys path
         wheel_package = self.entrypoint_args[WHEEL_PACKAGE_OPTION]
-        distribution = pkg_resources.get_distribution(wheel_package)
-        project_root = os.path.join(distribution.location, wheel_package)
+
+        dist = distribution(wheel_package)
+        project_root = os.path.join(dist.locate_file("."), wheel_package)
+
         if project_root not in sys.path:
             sys.path.insert(0, project_root)
             sys.path.insert(-1, project_root)

zenml/integrations/integration.py

@@ -13,16 +13,14 @@
 #  permissions and limitations under the License.
 """Base and meta classes for ZenML integrations."""
 
-import re
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Type, cast
 
-import pkg_resources
-from pkg_resources import Requirement
+from packaging.requirements import Requirement
 
 from zenml.integrations.registry import integration_registry
 from zenml.logger import get_logger
 from zenml.stack.flavor import Flavor
-from zenml.utils.integration_utils import parse_requirement
+from zenml.utils.package_utils import get_dependencies, requirement_installed
 
 if TYPE_CHECKING:
     from zenml.plugins.base_plugin_flavor import BasePluginFlavor
@@ -69,65 +67,32 @@ class Integration(metaclass=IntegrationMeta):
         Returns:
             True if all required packages are installed, False otherwise.
         """
-        for r in cls.get_requirements():
-            try:
-                # First check if the base package is installed
-                dist = pkg_resources.get_distribution(r)
-
-                # Next, check if the dependencies (including extras) are
-                # installed
-                deps: List[Requirement] = []
-
-                _, extras = parse_requirement(r)
-                if extras:
-                    extra_list = extras[1:-1].split(",")
-                    for extra in extra_list:
-                        try:
-                            requirements = dist.requires(extras=[extra])  # type: ignore[arg-type]
-                        except pkg_resources.UnknownExtra as e:
-                            logger.debug(f"Unknown extra: {str(e)}")
-                            return False
-                        deps.extend(requirements)
-                else:
-                    deps = dist.requires()
-
-                for ri in deps:
-                    try:
-                        # Remove the "extra == ..." part from the requirement string
-                        cleaned_req = re.sub(
-                            r"; extra == \"\w+\"", "", str(ri)
-                        )
-                        pkg_resources.get_distribution(cleaned_req)
-                    except pkg_resources.DistributionNotFound as e:
-                        logger.debug(
-                            f"Unable to find required dependency "
-                            f"'{e.req}' for requirement '{r}' "
-                            f"necessary for integration '{cls.NAME}'."
-                        )
-                        return False
-                    except pkg_resources.VersionConflict as e:
-                        logger.debug(
-                            f"Package version '{e.dist}' does not match "
-                            f"version '{e.req}' required by '{r}' "
-                            f"necessary for integration '{cls.NAME}'."
-                        )
-                        return False
-
-            except pkg_resources.DistributionNotFound as e:
-                logger.debug(
-                    f"Unable to find required package '{e.req}' for "
-                    f"integration {cls.NAME}."
-                )
-                return False
-            except pkg_resources.VersionConflict as e:
+        for requirement in cls.get_requirements():
+            parsed_requirement = Requirement(requirement)
+
+            if not requirement_installed(parsed_requirement):
                 logger.debug(
-                    f"Package version '{e.dist}' does not match version "
-                    f"'{e.req}' necessary for integration {cls.NAME}."
+                    "Requirement '%s' for integration '%s' is not installed "
+                    "or installed with the wrong version.",
+                    requirement,
+                    cls.NAME,
                 )
                 return False
 
+            dependencies = get_dependencies(parsed_requirement)
+
+            for dependency in dependencies:
+                if not requirement_installed(dependency):
+                    logger.debug(
+                        "Requirement '%s' for integration '%s' is not "
+                        "installed or installed with the wrong version.",
+                        dependency,
+                        cls.NAME,
+                    )
+                    return False
+
         logger.debug(
-            f"Integration {cls.NAME} is installed correctly with "
+            f"Integration '{cls.NAME}' is installed correctly with "
             f"requirements {cls.get_requirements()}."
         )
         return True

zenml/models/__init__.py

@@ -286,6 +286,7 @@ from zenml.models.v2.core.service_account import (
     ServiceAccountResponse,
 )
 from zenml.models.v2.core.service_connector import (
+    ServiceConnectorConfiguration,
     ServiceConnectorRequest,
     ServiceConnectorUpdate,
     ServiceConnectorFilter,
@@ -739,6 +740,7 @@ __all__ = [
     "ServiceAccountUpdate",
     "ServiceAccountRequest",
     "ServiceAccountResponse",
+    "ServiceConnectorConfiguration",
     "ServiceConnectorRequest",
     "ServiceConnectorUpdate",
     "ServiceConnectorFilter",