zenml-nightly 0.61.0.dev20240714__py3-none-any.whl → 0.62.0.dev20240719__py3-none-any.whl

zenml/zen_server/deploy/helm/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: zenml
-version: "0.61.0"
+version: "0.62.0"
 description: Open source MLOps framework for portable production ready ML pipelines
 keywords:
 - mlops

zenml/zen_server/deploy/helm/README.md

@@ -20,8 +20,8 @@ ZenML is an open-source MLOps framework designed to help you create robust, main
 To install the ZenML chart directly from Amazon ECR, use the following command:
 
 ```bash
-# example command for version 0.61.0
-helm install my-zenml oci://public.ecr.aws/zenml/zenml --version 0.61.0
+# example command for version 0.62.0
+helm install my-zenml oci://public.ecr.aws/zenml/zenml --version 0.62.0
 ```
 
 Note: Ensure you have OCI support enabled in your Helm client and that you are authenticated with Amazon ECR.

zenml/zen_server/routers/service_connectors_endpoints.py

@@ -21,6 +21,7 @@ from fastapi import APIRouter, Depends, Security
 from zenml.constants import (
     API,
     SERVICE_CONNECTOR_CLIENT,
+    SERVICE_CONNECTOR_FULL_STACK,
     SERVICE_CONNECTOR_TYPES,
     SERVICE_CONNECTOR_VERIFY,
     SERVICE_CONNECTORS,
@@ -35,6 +36,13 @@ from zenml.models import (
     ServiceConnectorTypeModel,
     ServiceConnectorUpdate,
 )
+from zenml.models.v2.misc.full_stack import (
+    ServiceConnectorInfo,
+    ServiceConnectorResourcesInfo,
+)
+from zenml.service_connectors.service_connector_utils import (
+    get_resources_options_from_resource_model_for_full_stack,
+)
 from zenml.zen_server.auth import AuthContext, authorize
 from zenml.zen_server.exceptions import error_response
 from zenml.zen_server.rbac.endpoint_utils import (
@@ -393,3 +401,52 @@ def get_service_connector_type(
         The requested service connector type.
     """
     return zen_store().get_service_connector_type(connector_type)
+
+
+@router.post(
+    SERVICE_CONNECTOR_FULL_STACK,
+    responses={401: error_response, 409: error_response, 422: error_response},
+)
+@handle_exceptions
+def get_resources_based_on_service_connector_info(
+    connector_info: Optional[ServiceConnectorInfo] = None,
+    connector_uuid: Optional[UUID] = None,
+    _: AuthContext = Security(authorize),
+) -> ServiceConnectorResourcesInfo:
+    """Gets the list of resources that a service connector can access.
+
+    Args:
+        connector_info: The service connector info.
+        connector_uuid: The service connector uuid.
+
+    Returns:
+        The list of resources that the service connector configuration has
+        access to and consumable from UI/CLI.
+
+    Raises:
+        ValueError: If both connector_info and connector_uuid are provided.
+        ValueError: If neither connector_info nor connector_uuid are provided.
+    """
+    if connector_info is not None and connector_uuid is not None:
+        raise ValueError(
+            "Only one of connector_info or connector_uuid must be provided."
+        )
+    if connector_info is None and connector_uuid is None:
+        raise ValueError(
+            "Either connector_info or connector_uuid must be provided."
+        )
+
+    if connector_info is not None:
+        verify_permission(
+            resource_type=ResourceType.SERVICE_CONNECTOR, action=Action.CREATE
+        )
+    elif connector_uuid is not None:
+        verify_permission(
+            resource_type=ResourceType.SERVICE_CONNECTOR,
+            action=Action.READ,
+            resource_id=connector_uuid,
+        )
+
+    return get_resources_options_from_resource_model_for_full_stack(
+        connector_details=connector_info or connector_uuid  # type: ignore[arg-type]
+    )

zenml/zen_stores/migrations/versions/0.62.0_release.py

@@ -0,0 +1,23 @@
+"""Release [0.62.0].
+
+Revision ID: 0.62.0
+Revises: b4fca5241eea
+Create Date: 2024-07-15 14:15:45.347033
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "0.62.0"
+down_revision = "b4fca5241eea"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    """Upgrade database schema and/or data, creating a new revision."""
+    pass
+
+
+def downgrade() -> None:
+    """Downgrade database schema and/or data back to the previous revision."""
+    pass

zenml/zen_stores/rest_zen_store.py

@@ -2591,6 +2591,10 @@ class RestZenStore(BaseZenStore):
         response_body = self.get(
             f"{WORKSPACES}/{workspace_name_or_id}{SERVICE_CONNECTORS}{SERVICE_CONNECTOR_RESOURCES}",
             params=params,
+            timeout=max(
+                self.config.http_timeout,
+                SERVICE_CONNECTOR_VERIFY_REQUEST_TIMEOUT,
+            ),
         )
 
         assert isinstance(response_body, list)

zenml/zen_stores/schemas/component_schemas.py

@@ -38,6 +38,7 @@ from zenml.zen_stores.schemas.user_schemas import UserSchema
 from zenml.zen_stores.schemas.workspace_schemas import WorkspaceSchema
 
 if TYPE_CHECKING:
+    from zenml.zen_stores.schemas.flavor_schemas import FlavorSchema
     from zenml.zen_stores.schemas.logs_schemas import LogsSchema
     from zenml.zen_stores.schemas.run_metadata_schemas import RunMetadataSchema
     from zenml.zen_stores.schemas.schedule_schema import ScheduleSchema
@@ -85,6 +86,13 @@ class StackComponentSchema(NamedSchema, table=True):
     run_metadata: List["RunMetadataSchema"] = Relationship(
         back_populates="stack_component",
     )
+    flavor_schema: Optional["FlavorSchema"] = Relationship(
+        sa_relationship_kwargs={
+            "primaryjoin": "and_(foreign(StackComponentSchema.flavor) == FlavorSchema.name, foreign(StackComponentSchema.type) == FlavorSchema.type)",
+            "lazy": "joined",
+            "uselist": False,
+        },
+    )
 
     run_or_step_logs: List["LogsSchema"] = Relationship(
         back_populates="artifact_store",
@@ -161,6 +169,12 @@ class StackComponentSchema(NamedSchema, table=True):
             user=self.user.to_model() if self.user else None,
             created=self.created,
             updated=self.updated,
+            logo_url=self.flavor_schema.logo_url
+            if self.flavor_schema
+            else None,
+            integration=self.flavor_schema.integration
+            if self.flavor_schema
+            else None,
         )
         metadata = None
         if include_metadata:

{zenml_nightly-0.61.0.dev20240714.dist-info → zenml_nightly-0.62.0.dev20240719.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zenml-nightly
-Version: 0.61.0.dev20240714
+Version: 0.62.0.dev20240719
 Summary: ZenML: Write production-ready ML code.
 Home-page: https://zenml.io
 License: Apache-2.0
@@ -467,7 +467,7 @@ the Apache License Version 2.0.
     <a href="https://github.com/zenml-io/zenml-projects">Projects Showcase</a>
     <br />
     <br />
-    🎉 Version 0.61.0 is out. Check out the release notes
+    🎉 Version 0.62.0 is out. Check out the release notes
     <a href="https://github.com/zenml-io/zenml/releases">here</a>.
     <br />
     🖥️ Download our VS Code Extension <a href="https://marketplace.visualstudio.com/items?itemName=ZenML.zenml-vscode">here</a>.