anyscale 0.24.88__py3-none-any.whl → 0.25.5__py3-none-any.whl

anyscale/__init__.py

@@ -20,13 +20,18 @@ path.append(os.path.join(anyscale_dir, "sdk"))
 import anyscale
 from anyscale import (
     aggregated_instance_usage,
+    cloud,
     compute_config,
     image,
     integrations,
     job,
     llm,
+    organization_invitation,
+    project,
+    resource_quota,
     schedule,
     service,
+    service_account,
     user,
 )
 from anyscale._private.anyscale_client import AnyscaleClient, AnyscaleClientInterface
@@ -34,6 +39,7 @@ from anyscale._private.sdk.base_sdk import Timer
 from anyscale.aggregated_instance_usage import AggregatedInstanceUsageSDK
 from anyscale.authenticate import AuthenticationBlock
 from anyscale.cli_logger import BlockLogger
+from anyscale.cloud import CloudSDK
 from anyscale.cluster import get_job_submission_client_cluster_info
 from anyscale.cluster_compute import get_cluster_compute_from_name
 from anyscale.compute_config import ComputeConfigSDK
@@ -41,9 +47,13 @@ from anyscale.connect import ClientBuilder
 from anyscale.image import ImageSDK
 from anyscale.job import JobSDK
 from anyscale.llm import LLMSDK
+from anyscale.organization_invitation import OrganizationInvitationSDK
+from anyscale.project import ProjectSDK
+from anyscale.resource_quota import ResourceQuotaSDK
 from anyscale.schedule import ScheduleSDK
 from anyscale.sdk.anyscale_client.sdk import AnyscaleSDK
 from anyscale.service import ServiceSDK
+from anyscale.service_account import ServiceAccountSDK
 from anyscale.user import UserSDK
 from anyscale.workspace import WorkspaceSDK
 
@@ -58,6 +68,10 @@ for attr, _ in inspect.getmembers(ClientBuilder, inspect.isfunction):
     if attr.startswith("_"):
         continue
 
+    # This is exposed in anyscale/cloud/__init__.py since anyscale.cloud is used as the SDK module too.
+    if attr == "cloud":
+        continue
+
     def _new_builder(attr: str) -> Any:
         target = getattr(ClientBuilder, attr)
 
@@ -107,9 +121,16 @@ class Anyscale:
         self._job_sdk = JobSDK(client=self._anyscale_client)
         self._service_sdk = ServiceSDK(client=self._anyscale_client)
         self._compute_config_sdk = ComputeConfigSDK(client=self._anyscale_client)
+        self._cloud_sdk = CloudSDK(client=self._anyscale_client)
         self._schedule_sdk = ScheduleSDK(client=self._anyscale_client)
         self._image_sdk = ImageSDK(client=self._anyscale_client)
         self._llm_sdk = LLMSDK(client=self._anyscale_client)
+        self._organization_invitation_sdk = OrganizationInvitationSDK(
+            client=self._anyscale_client
+        )
+        self._project_sdk = ProjectSDK(client=self._anyscale_client)
+        self._resource_quota_sdk = ResourceQuotaSDK(client=self._anyscale_client)
+        self._service_account_sdk = ServiceAccountSDK(client=self._anyscale_client)
         self._user_sdk = UserSDK(client=self._anyscale_client)
         self._workspace_sdk = WorkspaceSDK(client=self._anyscale_client)
 
@@ -131,13 +152,28 @@ class Anyscale:
         obj._compute_config_sdk = ComputeConfigSDK(  # noqa: SLF001
             client=client, logger=logger, timer=timer
         )
+        obj._cloud_sdk = CloudSDK(  # noqa: SLF001
+            client=client, logger=logger, timer=timer
+        )
         obj._schedule_sdk = ScheduleSDK(  # noqa: SLF001
             client=client, logger=logger, timer=timer,
         )
         obj._image_sdk = ImageSDK(client=client, logger=logger)  # noqa: SLF001
+        obj._organization_invitation_sdk = OrganizationInvitationSDK(  # noqa: SLF001
+            client=client, logger=logger
+        )
+        obj._project_sdk = ProjectSDK(  # noqa: SLF001
+            client=client, logger=logger, timer=timer
+        )
+        obj._service_account_sdk = ServiceAccountSDK(  # noqa: SLF001
+            client=client, logger=logger, timer=timer
+        )
         obj._user_sdk = UserSDK(  # noqa: SLF001
             client=client, logger=logger, timer=timer
         )
+        obj._resource_quota_sdk = ResourceQuotaSDK(  # noqa: SLF001
+            client=client, logger=logger, timer=timer
+        )
         obj._workspace_sdk = WorkspaceSDK(  # noqa: SLF001
             client=client, logger=logger, timer=timer,
         )
@@ -159,6 +195,10 @@ class Anyscale:
     def compute_config(self) -> ComputeConfigSDK:  # noqa: F811
         return self._compute_config_sdk
 
+    @property
+    def cloud(self) -> CloudSDK:  # noqa: F811
+        return self._cloud_sdk
+
     @property
     def schedule(self) -> ScheduleSDK:  # noqa: F811
         return self._schedule_sdk
@@ -171,6 +211,22 @@ class Anyscale:
     def llm(self) -> LLMSDK:  # noqa: F811
         return self._llm_sdk
 
+    @property
+    def organization_invitation(self) -> OrganizationInvitationSDK:  # noqa: F811
+        return self._organization_invitation_sdk
+
+    @property
+    def project(self) -> ProjectSDK:  # noqa: F811
+        return self._project_sdk
+
+    @property
+    def resource_quota(self) -> ResourceQuotaSDK:  # noqa: F811
+        return self._resource_quota_sdk
+
+    @property
+    def service_account(self) -> ServiceAccountSDK:  # noqa: F811
+        return self._service_account_sdk
+
     @property
     def user(self) -> UserSDK:  # noqa: F811
         return self._user_sdk

anyscale/_private/anyscale_client/anyscale_client.py

@@ -36,6 +36,8 @@ from anyscale.client.openapi_client.api.default_api import DefaultApi as Interna
 from anyscale.client.openapi_client.models import (
     AdminCreatedUser,
     AdminCreateUser,
+    AnyscaleServiceAccount,
+    ApiKeyParameters,
     ArchiveStatus,
     Cloud,
     CloudDataBucketAccessMode,
@@ -47,10 +49,14 @@ from anyscale.client.openapi_client.models import (
     ComputeTemplate,
     ComputeTemplateConfig,
     ComputeTemplateQuery,
+    CreateCloudCollaborator,
     CreateComputeTemplate,
     CreateDataset,
     CreateExperimentalWorkspace,
     CreateInternalProductionJob,
+    CreateOrganizationInvitation,
+    CreateResourceQuota,
+    CreateUserProjectCollaborator,
     Dataset as InternalDataset,
     DatasetUpload,
     DecoratedComputeTemplate,
@@ -60,6 +66,12 @@ from anyscale.client.openapi_client.models import (
     FineTunedModel,
     FinetunedmodelListResponse,
     InternalProductionJob,
+    ListResourceQuotasQuery,
+    OrganizationCollaborator,
+    OrganizationInvitation,
+    ResourceQuota,
+    ResourceQuotaStatus,
+    ServerSessionToken,
     SessionSshKey,
     StartSessionOptions,
     StopSessionOptions,
@@ -544,6 +556,14 @@ class AnyscaleClient(AnyscaleClientInterface):
 
             raise e from None
 
+    @handle_api_exceptions
+    def add_cloud_collaborators(
+        self, cloud_id: str, collaborators: List[CreateCloudCollaborator]
+    ) -> None:
+        self._internal_api_client.batch_create_cloud_collaborators_api_v2_clouds_cloud_id_collaborators_users_batch_create_post(
+            cloud_id, collaborators
+        )
+
     @handle_api_exceptions
     def create_compute_config(
         self, config: ComputeTemplateConfig, *, name: Optional[str] = None
@@ -986,6 +1006,14 @@ class AnyscaleClient(AnyscaleClientInterface):
             project_id
         ).result
 
+    @handle_api_exceptions
+    def add_project_collaborators(
+        self, project_id: str, collaborators: List[CreateUserProjectCollaborator]
+    ) -> None:
+        self._internal_api_client.batch_create_project_collaborators_api_v2_projects_project_id_collaborators_users_batch_create_post(
+            project_id, collaborators
+        )
+
     @handle_api_exceptions
     def get_job(
         self,
@@ -1067,6 +1095,11 @@ class AnyscaleClient(AnyscaleClientInterface):
         result: ServiceModel = self._external_api_client.terminate_service(service_id)
         return result
 
+    @handle_api_exceptions
+    def archive_service(self, service_id: str) -> ServiceModel:
+        result: ServiceModel = self._external_api_client.archive_service(service_id)
+        return result
+
     @handle_api_exceptions
     def submit_job(self, model: CreateInternalProductionJob) -> InternalProductionJob:
         job: InternalProductionJob = self._internal_api_client.create_job_api_v2_decorated_ha_jobs_create_post(
@@ -1122,39 +1155,26 @@ class AnyscaleClient(AnyscaleClientInterface):
                 # If the presigned URL scheme is SMART_OPEN, upload to cloud storage using the provided bucket name, path, & environment, and the smart_open library.
                 bucket_name = info.bucket_name
                 bucket_path = info.bucket_path
-                file_uri = info.file_uri
 
-                if file_uri and file_uri.startswith("azure"):
-
-                    from anyscale.utils.imports.azure import (
-                        try_import_azure_storage_blob_BlobServiceClient,
-                    )
-
-                    # Smartopen needs transport_params to be passed in for Azure.
-                    blob_service_client = (
-                        try_import_azure_storage_blob_BlobServiceClient()
-                    )
-
-                    transport_params = {
-                        "client": blob_service_client.from_connection_string(info.url),
-                    }
-                    with smart_open.open(
-                        f"{file_uri}", "wb", transport_params=transport_params,
-                    ) as fout:
-                        fout.write(zip_file_bytes)
-                else:
-                    env_vars: Dict[str, str] = {
-                        "AWS_ENDPOINT_URL": info.url,
-                    }
-                    with set_env(**env_vars), smart_open.open(
-                        f"{bucket_name}/{bucket_path}", "wb",
-                    ) as fout:
-                        fout.write(zip_file_bytes)
+                env_vars: Dict[str, str] = {
+                    "AWS_ENDPOINT_URL": info.url,
+                }
+                with set_env(**env_vars), smart_open.open(
+                    f"{bucket_name}/{bucket_path}", "wb",
+                ) as fout:
+                    fout.write(zip_file_bytes)
 
             else:
                 # Default to HTTP PUT.
                 internal_logger.debug(f"Uploading file '{file_name}' to cloud storage.")
-                requests.put(info.url, data=zip_file_bytes).raise_for_status()
+                headers = (
+                    {"x-ms-blob-type": "BlockBlob"}
+                    if info.file_uri.startswith("azure")
+                    else None
+                )
+                requests.put(
+                    info.url, data=zip_file_bytes, headers=headers
+                ).raise_for_status()
 
         return info.file_uri
 
@@ -1848,6 +1868,20 @@ class AnyscaleClient(AnyscaleClientInterface):
 
         return filepath
 
+    @handle_api_exceptions
+    def create_api_key(
+        self, duration: float, user_id: Optional[str]
+    ) -> ServerSessionToken:
+        return self._internal_api_client.create_api_key_api_v2_users_create_api_key_post(
+            ApiKeyParameters(user_id=user_id, duration=duration)
+        ).result
+
+    @handle_api_exceptions
+    def rotate_api_key(self, user_id: str) -> None:
+        self._internal_api_client.rotate_api_key_for_user_api_v2_organization_collaborators_rotate_api_key_for_user_user_id_post(
+            user_id
+        )
+
     @handle_api_exceptions
     def admin_batch_create_users(
         self, admin_create_users: List[AdminCreateUser]
@@ -1855,3 +1889,120 @@ class AnyscaleClient(AnyscaleClientInterface):
         return self._internal_api_client.admin_batch_create_users_api_v2_users_admin_batch_create_post(
             admin_create_users
         ).results
+
+    @handle_api_exceptions
+    def create_organization_invitations(
+        self, emails: List[str]
+    ) -> Tuple[List[str], List[str]]:
+        results = self._internal_api_client.batch_create_invitations_api_v2_organization_invitations_batch_create_post(
+            [CreateOrganizationInvitation(email=email) for email in emails]
+        ).results
+
+        success_emails = []
+        error_messages = []
+
+        for idx, result in enumerate(results):
+            if result.data:
+                success_emails.append(emails[idx])
+            else:
+                error_messages.append(result.error.detail)
+
+        return success_emails, error_messages
+
+    @handle_api_exceptions
+    def list_organization_invitations(self) -> List[OrganizationInvitation]:
+        results = (
+            self._internal_api_client.list_invitations_api_v2_organization_invitations_get().results
+        )
+
+        return results
+
+    @handle_api_exceptions
+    def delete_organization_invitation(self, email: str) -> OrganizationInvitation:
+        invitation = self._internal_api_client.list_invitations_api_v2_organization_invitations_get(
+            email=email
+        ).results
+
+        if len(invitation) == 0:
+            raise ValueError(f"Invitation for email '{email}' not found.")
+        elif len(invitation) > 1:
+            raise ValueError(
+                f"Multiple invitations found for email '{email}'. Please contact Anyscale support."
+            )
+
+        invitation_id = invitation[0].id
+
+        return self._internal_api_client.invalidate_invitation_api_v2_organization_invitations_invitation_id_invalidate_post(
+            invitation_id
+        ).result
+
+    @handle_api_exceptions
+    def get_organization_collaborators(
+        self,
+        email: Optional[str] = None,
+        name: Optional[str] = None,
+        is_service_account: Optional[bool] = None,
+    ) -> List[OrganizationCollaborator]:
+        results = self._internal_api_client.list_organization_collaborators_api_v2_organization_collaborators_get(
+            email=email, name=name, is_service_account=is_service_account
+        ).results
+
+        return results
+
+    @handle_api_exceptions
+    def delete_organization_collaborator(self, identity_id: str) -> None:
+        self._internal_api_client.remove_organization_collaborator_api_v2_organization_collaborators_identity_id_delete(
+            identity_id
+        )
+
+    @handle_api_exceptions
+    def create_service_account(self, name: str) -> AnyscaleServiceAccount:
+        return self._internal_api_client.create_service_account_api_v2_users_service_accounts_post(
+            name
+        ).result
+
+    @handle_api_exceptions
+    def create_resource_quota(
+        self, create_resource_quota: CreateResourceQuota
+    ) -> ResourceQuota:
+        return self._internal_api_client.create_resource_quota_api_v2_resource_quotas_post(
+            create_resource_quota
+        ).result
+
+    @handle_api_exceptions
+    def list_resource_quotas(
+        self,
+        name: Optional[str] = None,
+        cloud_id: Optional[str] = None,
+        creator_id: Optional[str] = None,
+        is_enabled: Optional[bool] = None,
+        max_items: int = 20,
+    ) -> List[ResourceQuota]:
+
+        query = ListResourceQuotasQuery(
+            name=TextQuery(equals=name) if name else None,
+            cloud_id=cloud_id,
+            creator_id=creator_id,
+            is_enabled=is_enabled,
+            paging=PageQuery(count=max_items),
+        )
+
+        resource_quotas = self._internal_api_client.search_resource_quotas_api_v2_resource_quotas_search_post(
+            query
+        ).results
+
+        return resource_quotas
+
+    @handle_api_exceptions
+    def delete_resource_quota(self, resource_quota_id: str) -> None:
+        self._internal_api_client.delete_resource_quota_api_v2_resource_quotas_resource_quota_id_delete(
+            resource_quota_id
+        )
+
+    @handle_api_exceptions
+    def set_resource_quota_status(
+        self, resource_quota_id: str, is_enabled: bool
+    ) -> None:
+        self._internal_api_client.set_resource_quota_status_api_v2_resource_quotas_resource_quota_id_status_patch(
+            resource_quota_id, ResourceQuotaStatus(is_enabled=is_enabled)
+        ).result

anyscale/_private/anyscale_client/common.py

@@ -6,15 +6,23 @@ from anyscale._private.models.image_uri import ImageURI
 from anyscale.client.openapi_client.models import (
     AdminCreatedUser,
     AdminCreateUser,
+    AnyscaleServiceAccount,
     Cloud,
     ComputeTemplateConfig,
+    CreateCloudCollaborator,
     CreateExperimentalWorkspace,
     CreateInternalProductionJob,
+    CreateResourceQuota,
+    CreateUserProjectCollaborator,
     DecoratedComputeTemplate,
     DeletedPlatformFineTunedModel,
     FineTunedModel,
     InternalProductionJob,
+    OrganizationCollaborator,
+    OrganizationInvitation,
     Project,
+    ResourceQuota,
+    ServerSessionToken,
     WorkspaceDataplaneProxiedArtifacts,
 )
 from anyscale.client.openapi_client.models.create_schedule import CreateSchedule
@@ -41,7 +49,7 @@ from anyscale.utils.workspace_notification import WorkspaceNotification
 # Maybe just make it part of the release process to update it, or fetch the
 # default builds and get the latest one. The best thing to do is probably
 # to populate this in the backend.
-DEFAULT_RAY_VERSION = "2.40.0"  # RAY_RELEASE_UPDATE: update to latest version.
+DEFAULT_RAY_VERSION = "2.41.0"  # RAY_RELEASE_UPDATE: update to latest version.
 DEFAULT_PYTHON_VERSION = "py311"
 RUNTIME_ENV_PACKAGE_FORMAT = "pkg_{content_hash}.zip"
 
@@ -142,6 +150,13 @@ class AnyscaleClientInterface(ABC):
         """
         raise NotImplementedError
 
+    @abstractmethod
+    def add_cloud_collaborators(
+        self, cloud_id: str, collaborators: List[CreateCloudCollaborator]
+    ) -> None:
+        """Batch add collaborators to a cloud."""
+        raise NotImplementedError
+
     @abstractmethod
     def create_compute_config(
         self, config: ComputeTemplateConfig, *, name: Optional[str] = None
@@ -285,6 +300,13 @@ class AnyscaleClientInterface(ABC):
         """
         raise NotImplementedError
 
+    @abstractmethod
+    def add_project_collaborators(
+        self, project_id: str, collaborators: List[CreateUserProjectCollaborator]
+    ) -> None:
+        """Batch add collaborators to a project."""
+        raise NotImplementedError
+
     @abstractmethod
     def get_job(
         self,
@@ -331,6 +353,11 @@ class AnyscaleClientInterface(ABC):
         """Mark the service to be terminated asynchronously."""
         raise NotImplementedError
 
+    @abstractmethod
+    def archive_service(self, service_id: str):
+        """Mark the service to be archived asynchronously."""
+        raise NotImplementedError
+
     @abstractmethod
     def submit_job(self, model: CreateInternalProductionJob) -> InternalProductionJob:
         """Submit the job to run."""
@@ -594,9 +621,89 @@ class AnyscaleClientInterface(ABC):
         """Download the aggregated instance usage csv."""
         raise NotImplementedError
 
+    @abstractmethod
+    def create_api_key(
+        self, duration: float, user_id: Optional[str]
+    ) -> ServerSessionToken:
+        """Create a new API key."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def rotate_api_key(self, user_id: str) -> None:
+        """Rotate the API key for user."""
+        raise NotImplementedError
+
     @abstractmethod
     def admin_batch_create_users(
         self, admin_create_users: List[AdminCreateUser]
     ) -> List[AdminCreatedUser]:
-        """Batch create users without email verification as an admin."""
+        """Batch create, as an admin, users without email verification."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def create_organization_invitations(
+        self, emails: List[str]
+    ) -> Tuple[List[str], List[str]]:
+        """Create organization invitations."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def list_organization_invitations(self) -> List[OrganizationInvitation]:
+        """List organization invitations."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def delete_organization_invitation(self, email: str) -> OrganizationInvitation:
+        """Delete organization invitation."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def get_organization_collaborators(
+        self,
+        email: Optional[str] = None,
+        name: Optional[str] = None,
+        is_service_account: Optional[bool] = None,
+    ) -> List[OrganizationCollaborator]:
+        """Get organization collaborators."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def delete_organization_collaborator(self, identity_id: str) -> None:
+        """Delete organization collaborator."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def create_service_account(self, name: str) -> AnyscaleServiceAccount:
+        """Create a service account."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def create_resource_quota(
+        self, create_resource_quota: CreateResourceQuota
+    ) -> ResourceQuota:
+        """Create a resource quota."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def list_resource_quotas(
+        self,
+        name: Optional[str] = None,
+        cloud_id: Optional[str] = None,
+        creator_id: Optional[str] = None,
+        is_enabled: Optional[bool] = None,
+        max_items: int = 20,
+    ) -> List[ResourceQuota]:
+        """List resource quotas."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def delete_resource_quota(self, resource_quota_id: str) -> None:
+        """Delete a resource quota."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def set_resource_quota_status(
+        self, resource_quota_id: str, is_enabled: bool
+    ) -> None:
+        """Set the status of a resource quota."""
         raise NotImplementedError