anyscale 0.26.51__py3-none-any.whl → 0.26.53__py3-none-any.whl

anyscale/controllers/kubernetes_verifier.py

@@ -1367,7 +1367,7 @@ class KubernetesCloudDeploymentVerifier:
         Args:
             cloud_deployment: The cloud deployment configuration
         """
-        deployment_name = cloud_deployment.name or cloud_deployment.cloud_deployment_id
+        deployment_name = cloud_deployment.name or cloud_deployment.cloud_resource_id
         self.log.info(f"Starting Kubernetes verification for: {deployment_name}")
 
         if cloud_deployment.file_storage is not None and isinstance(

anyscale/job/_private/job_sdk.py

@@ -19,7 +19,7 @@ from anyscale.client.openapi_client.models.ray_runtime_env_config import (
 from anyscale.compute_config.models import (
     ComputeConfig,
     ComputeConfigType,
-    MultiDeploymentComputeConfig,
+    MultiResourceComputeConfig,
 )
 from anyscale.job.models import (
     JobConfig,
@@ -82,19 +82,34 @@ class PrivateJobSDK(WorkloadSDK):
             - 'working_dir' will be set to '.'.
             - 'pip' will be set to the workspace-managed requirements file.
         """
-        runtime_env: Dict[str, Any] = {}
-        [runtime_env] = self.override_and_upload_local_dirs(
-            [runtime_env],
-            working_dir_override=config.working_dir,
-            excludes_override=config.excludes,
-            cloud_id=cloud_id,
-            autopopulate_in_workspace=autopopulate_in_workspace,
-            additional_py_modules=config.py_modules,
-            py_executable_override=config.py_executable,
-            has_multiple_cloud_deployments=self._compute_config_has_multiple_cloud_deployments(
-                compute_config=config.compute_config, cloud=config.cloud
-            ),
+        cloud_resource_names = self._get_compute_config_cloud_resources(
+            compute_config=config.compute_config, cloud=config.cloud
         )
+        assert len(cloud_resource_names) > 0
+
+        runtime_env: Dict[str, Any] = {}
+        if len(cloud_resource_names) == 1:
+            [runtime_env] = self.override_and_upload_local_dirs_single_deployment(
+                [runtime_env],
+                working_dir_override=config.working_dir,
+                excludes_override=config.excludes,
+                cloud_id=cloud_id,
+                autopopulate_in_workspace=autopopulate_in_workspace,
+                additional_py_modules=config.py_modules,
+                py_executable_override=config.py_executable,
+                cloud_resource_name=cloud_resource_names[0],
+            )
+        else:
+            [runtime_env] = self.override_and_upload_local_dirs_multi_cloud_resource(
+                [runtime_env],
+                working_dir_override=config.working_dir,
+                excludes_override=config.excludes,
+                cloud_id=cloud_id,
+                autopopulate_in_workspace=autopopulate_in_workspace,
+                additional_py_modules=config.py_modules,
+                py_executable_override=config.py_executable,
+                cloud_resource_names=cloud_resource_names,
+            )
         [runtime_env] = self.override_and_load_requirements_files(
             [runtime_env],
             requirements_override=config.requirements,
@@ -106,15 +121,15 @@ class PrivateJobSDK(WorkloadSDK):
 
         return runtime_env or None
 
-    def _compute_config_has_multiple_cloud_deployments(
+    def _get_compute_config_cloud_resources(
         self, compute_config: Union[ComputeConfigType, str, None], cloud: Optional[str]
-    ) -> bool:
+    ) -> List[Optional[str]]:
         if isinstance(compute_config, ComputeConfig):
-            # single-deployment compute config
-            return False
+            # single-cloud resource compute config
+            return [compute_config.cloud_resource]
 
-        if isinstance(compute_config, MultiDeploymentComputeConfig):
-            return len(compute_config.configs) > 1
+        if isinstance(compute_config, MultiResourceComputeConfig):
+            return [config.cloud_resource for config in compute_config.configs]
 
         compute_config_id = self._resolve_compute_config_id(
             compute_config=compute_config, cloud=cloud
@@ -125,10 +140,13 @@ class PrivateJobSDK(WorkloadSDK):
                 f"The compute config '{compute_config_id}' does not exist."
             )
 
-        return (
-            compute_template.config.deployment_configs
-            and len(compute_template.config.deployment_configs) > 1
-        )
+        if compute_template.config.deployment_configs is None:
+            return [None]
+
+        return [
+            config.cloud_deployment
+            for config in compute_template.config.deployment_configs
+        ]
 
     def get_default_name(self) -> str:
         """Get a default name for the job.

anyscale/job/models.py

@@ -269,7 +269,7 @@ config = JobConfig(
     name="my-job",
     entrypoint="python main.py",
     max_retries=1,
-    # An inline `ComputeConfig` or `MultiDeploymentComputeConfig` can also be provided.
+    # An inline `ComputeConfig` or `MultiResourceComputeConfig` can also be provided.
     compute_config="my-compute-config:1",
     # A containerfile path can also be provided.
     image_uri="anyscale/image/my-image:1",

anyscale/project/__init__.py

@@ -1,6 +1,7 @@
 from typing import List, Optional
 
 from anyscale._private.anyscale_client import AnyscaleClientInterface
+from anyscale._private.models.model_base import ResultIterator
 from anyscale._private.sdk import sdk_docs
 from anyscale._private.sdk.base_sdk import Timer
 from anyscale.cli_logger import BlockLogger
@@ -8,9 +9,30 @@ from anyscale.project._private.project_sdk import PrivateProjectSDK
 from anyscale.project.commands import (
     _ADD_COLLABORATORS_DOCSTRINGS,
     _ADD_COLLABORATORS_EXAMPLE,
+    _CREATE_PROJECT_DOCSTRINGS,
+    _CREATE_PROJECT_EXAMPLE,
+    _DELETE_PROJECT_DOCSTRINGS,
+    _DELETE_PROJECT_EXAMPLE,
+    _GET_DEFAULT_PROJECT_DOCSTRINGS,
+    _GET_DEFAULT_PROJECT_EXAMPLE,
+    _GET_PROJECT_DOCSTRINGS,
+    _GET_PROJECT_EXAMPLE,
+    _LIST_PROJECTS_DOCSTRINGS,
+    _LIST_PROJECTS_EXAMPLE,
     add_collaborators,
+    create,
+    delete,
+    get,
+    get_default,
+    list,
+)
+from anyscale.project.models import (
+    CreateProjectCollaborator,
+    Project,
+    ProjectPermissionLevel,
+    ProjectSortField,
+    ProjectSortOrder,
 )
-from anyscale.project.models import CreateProjectCollaborator
 
 
 class ProjectSDK:
@@ -33,3 +55,81 @@ class ProjectSDK:
         """Batch add collaborators to a project.
         """
         self._private_sdk.add_collaborators(cloud, project, collaborators)
+
+    @sdk_docs(
+        doc_py_example=_GET_PROJECT_EXAMPLE, arg_docstrings=_GET_PROJECT_DOCSTRINGS,
+    )
+    def get(self, project_id: str) -> Project:  # noqa: F811
+        """Get details of a project."""
+        return self._private_sdk.get(project_id)
+
+    @sdk_docs(
+        doc_py_example=_LIST_PROJECTS_EXAMPLE, arg_docstrings=_LIST_PROJECTS_DOCSTRINGS,
+    )
+    def list(  # noqa: F811
+        self,
+        *,
+        name_contains: Optional[str] = None,
+        creator_id: Optional[str] = None,
+        parent_cloud_id: Optional[str] = None,
+        include_defaults: bool = True,
+        max_items: Optional[int] = None,
+        page_size: Optional[int] = None,
+        sort_field: Optional[ProjectSortField] = None,
+        sort_order: Optional[ProjectSortOrder] = None,
+    ) -> ResultIterator[Project]:
+        """List all projects with optional filters.
+
+        Returns
+        -------
+        ResultIterator[Project]
+            An iterator yielding Project objects. Fetches pages
+            lazily as needed. Use a `for` loop to iterate or `list()`
+            to consume all at once.
+        """
+        return self._private_sdk.list(
+            name_contains=name_contains,
+            creator_id=creator_id,
+            parent_cloud_id=parent_cloud_id,
+            include_defaults=include_defaults,
+            max_items=max_items,
+            page_size=page_size,
+            sort_field=sort_field,
+            sort_order=sort_order,
+        )
+
+    @sdk_docs(
+        doc_py_example=_CREATE_PROJECT_EXAMPLE,
+        arg_docstrings=_CREATE_PROJECT_DOCSTRINGS,
+    )
+    def create(  # noqa: F811
+        self,
+        name: str,
+        parent_cloud_id: str,
+        *,
+        description: Optional[str] = None,
+        initial_cluster_config: Optional[str] = None,
+    ) -> str:
+        """Create a project."""
+        return self._private_sdk.create(
+            name,
+            description or "",
+            parent_cloud_id,
+            initial_cluster_config=initial_cluster_config,
+        )
+
+    @sdk_docs(
+        doc_py_example=_DELETE_PROJECT_EXAMPLE,
+        arg_docstrings=_DELETE_PROJECT_DOCSTRINGS,
+    )
+    def delete(self, project_id: str):  # noqa: F811
+        """Delete a project."""
+        self._private_sdk.delete(project_id)
+
+    @sdk_docs(
+        doc_py_example=_GET_DEFAULT_PROJECT_EXAMPLE,
+        arg_docstrings=_GET_DEFAULT_PROJECT_DOCSTRINGS,
+    )
+    def get_default(self, parent_cloud_id: str) -> Project:  # noqa: F811
+        """Get the default project for a cloud."""
+        return self._private_sdk.get_default(parent_cloud_id)

anyscale/project/_private/project_sdk.py

@@ -1,11 +1,23 @@
-from typing import List
+from typing import List, Optional
 
+from anyscale._private.models.model_base import ResultIterator
 from anyscale._private.sdk.base_sdk import BaseSDK
 from anyscale.client.openapi_client import (
     CreateUserProjectCollaborator,
     CreateUserProjectCollaboratorValue,
+    Project as OpenAPIProject,
+    ProjectListResponse,
+    WriteProject,
 )
-from anyscale.project.models import CreateProjectCollaborator
+from anyscale.project.models import (
+    CreateProjectCollaborator,
+    Project,
+    ProjectSortField,
+    ProjectSortOrder,
+)
+
+
+MAX_PAGE_SIZE = 50
 
 
 class PrivateProjectSDK(BaseSDK):
@@ -25,3 +37,79 @@ class PrivateProjectSDK(BaseSDK):
                 for collaborator in collaborators
             ],
         )
+
+    def get(self, project_id: str) -> Optional[Project]:
+        project: OpenAPIProject = self.client.get_project(project_id)
+        return Project.from_dict(project.to_dict()) if project else None
+
+    def list(
+        self,
+        *,
+        # filters
+        name_contains: Optional[str] = None,
+        creator_id: Optional[str] = None,
+        parent_cloud_id: Optional[str] = None,
+        include_defaults: bool = True,
+        # pagination
+        max_items: Optional[int] = None,
+        page_size: Optional[int] = None,
+        # sorting
+        sort_field: Optional[ProjectSortField] = None,
+        sort_order: Optional[ProjectSortOrder] = None,
+    ) -> ResultIterator[Project]:
+        if max_items is not None and (max_items <= 0):
+            raise ValueError("'max_items' must be greater than 0.")
+
+        if page_size is not None and (page_size <= 0 or page_size > MAX_PAGE_SIZE):
+            raise ValueError(
+                f"'page_size' must be between 1 and {MAX_PAGE_SIZE}, inclusive."
+            )
+
+        def _fetch_page(token: Optional[str],) -> ProjectListResponse:
+            return self.client.list_projects(
+                name_contains=name_contains,
+                creator_id=creator_id,
+                parent_cloud_id=parent_cloud_id,
+                include_defaults=include_defaults,
+                sort_field=str(sort_field) if sort_field else None,
+                sort_order=str(sort_order) if sort_order else None,
+                paging_token=token,
+                count=page_size,
+            )
+
+        def _openapi_project_to_sdk_project(openapi_project: OpenAPIProject) -> Project:
+            return Project.from_dict(openapi_project.to_dict())
+
+        return ResultIterator(
+            page_token=None,
+            max_items=max_items,
+            fetch_page=_fetch_page,
+            parse_fn=_openapi_project_to_sdk_project,
+        )
+
+    def create(
+        self,
+        name: str,
+        description: str,
+        parent_cloud_id: str,
+        *,
+        initial_cluster_config: Optional[str] = None,
+    ) -> str:
+        project = self.client.create_project(
+            project=WriteProject(
+                name=name,
+                description=description,
+                parent_cloud_id=parent_cloud_id,
+                initial_cluster_config=initial_cluster_config,
+            )
+        )
+        return project.id  # type: ignore
+
+    def delete(
+        self, project_id: str,
+    ):
+        self.client.delete_project(project_id)
+
+    def get_default(self, parent_cloud_id: str,) -> Project:
+        project: OpenAPIProject = self.client.get_default_project(parent_cloud_id)
+        return Project.from_dict(project.to_dict())

anyscale/project/commands.py

@@ -1,8 +1,14 @@
 from typing import List, Optional
 
+from anyscale._private.models.model_base import ResultIterator
 from anyscale._private.sdk import sdk_command
 from anyscale.project._private.project_sdk import PrivateProjectSDK
-from anyscale.project.models import CreateProjectCollaborator
+from anyscale.project.models import (
+    CreateProjectCollaborator,
+    Project,
+    ProjectSortField,
+    ProjectSortOrder,
+)
 
 
 _PROJECT_SDK_SINGLETON_KEY = "project_sdk"
@@ -54,3 +60,184 @@ def add_collaborators(
     """Batch add collaborators to a project.
     """
     return _private_sdk.add_collaborators(cloud, project, collaborators)  # type: ignore
+
+
+_GET_PROJECT_EXAMPLE = """
+import anyscale
+from anyscale.project.models import Project
+
+project: Project = anyscale.project.get(project_id="my-project-id")
+"""
+
+_GET_PROJECT_DOCSTRINGS = {
+    "project_id": "The ID of the project to get details of.",
+}
+
+
+@sdk_command(
+    _PROJECT_SDK_SINGLETON_KEY,
+    PrivateProjectSDK,
+    doc_py_example=_GET_PROJECT_EXAMPLE,
+    arg_docstrings=_GET_PROJECT_DOCSTRINGS,
+)
+def get(
+    project_id: str, *, _private_sdk: Optional[PrivateProjectSDK] = None
+) -> Project:
+    """Get details of a project.
+    """
+    return _private_sdk.get(project_id)  # type: ignore
+
+
+_LIST_PROJECTS_EXAMPLE = """
+from typing import Iterator
+
+import anyscale
+from anyscale.project.models import Project, ProjectSortField, ProjectSortOrder
+
+projects: Iterator[Project] = anyscale.project.list(
+    name_contains="my-project",
+    creator_id="my-user-id",
+    parent_cloud_id="my-cloud-id",
+    include_defaults=True,
+    max_items=20,
+    page_size=10,
+    sort_field=ProjectSortField.NAME,
+    sort_order=ProjectSortOrder.ASC,
+)
+for project in projects:
+    print(project.name)
+"""
+
+_LIST_PROJECTS_DOCSTRINGS = {
+    "name_contains": "A string to filter projects by name.",
+    "creator_id": "The ID of a creator to filter projects.",
+    "parent_cloud_id": "The ID of a parent cloud to filter projects.",
+    "include_defaults": "Whether to include default projects.",
+    "max_items": "The maximum number of projects to return.",
+    "page_size": "The number of projects to return per page.",
+    "sort_field": "The field to sort projects by.",
+    "sort_order": "The order to sort projects by.",
+}
+
+
+@sdk_command(
+    _PROJECT_SDK_SINGLETON_KEY,
+    PrivateProjectSDK,
+    doc_py_example=_LIST_PROJECTS_EXAMPLE,
+    arg_docstrings=_LIST_PROJECTS_DOCSTRINGS,
+)
+def list(  # noqa: A001
+    *,
+    name_contains: Optional[str] = None,
+    creator_id: Optional[str] = None,
+    parent_cloud_id: Optional[str] = None,
+    include_defaults: bool = True,
+    max_items: Optional[int] = None,
+    page_size: Optional[int] = None,
+    sort_field: Optional[ProjectSortField] = None,
+    sort_order: Optional[ProjectSortOrder] = None,
+    _private_sdk: Optional[PrivateProjectSDK] = None
+) -> ResultIterator[Project]:
+    """List projects.
+    """
+    return _private_sdk.list(  # type: ignore
+        name_contains=name_contains,
+        creator_id=creator_id,
+        parent_cloud_id=parent_cloud_id,
+        include_defaults=include_defaults,
+        max_items=max_items,
+        page_size=page_size,
+        sort_field=sort_field,
+        sort_order=sort_order,
+    )
+
+
+_CREATE_PROJECT_EXAMPLE = """
+import anyscale
+
+project_id: str = anyscale.project.create(
+    name="my-project",
+    parent_cloud_id="my-cloud-id",
+    description="my-project-description",
+)
+"""
+
+_CREATE_PROJECT_DOCSTRINGS = {
+    "name": "The name of the project.",
+    "parent_cloud_id": "The parent cloud that the project belongs to.",
+    "description": "The description of the project.",
+    "initial_cluster_config": "A YAML string containing the initial cluster config for the project.",
+}
+
+
+@sdk_command(
+    _PROJECT_SDK_SINGLETON_KEY,
+    PrivateProjectSDK,
+    doc_py_example=_CREATE_PROJECT_EXAMPLE,
+    arg_docstrings=_CREATE_PROJECT_DOCSTRINGS,
+)
+def create(
+    name: str,
+    parent_cloud_id: str,
+    *,
+    description: Optional[str] = None,
+    initial_cluster_config: Optional[str] = None,
+    _private_sdk: Optional[PrivateProjectSDK] = None
+) -> str:
+    """Create a project.
+    """
+    return _private_sdk.create(  # type: ignore
+        name,
+        description or "",
+        parent_cloud_id,
+        initial_cluster_config=initial_cluster_config,
+    )
+
+
+_DELETE_PROJECT_EXAMPLE = """
+import anyscale
+
+anyscale.project.delete(project_id="my-project-id")
+"""
+
+_DELETE_PROJECT_DOCSTRINGS = {
+    "project_id": "The ID of the project to delete.",
+}
+
+
+@sdk_command(
+    _PROJECT_SDK_SINGLETON_KEY,
+    PrivateProjectSDK,
+    doc_py_example=_DELETE_PROJECT_EXAMPLE,
+    arg_docstrings=_DELETE_PROJECT_DOCSTRINGS,
+)
+def delete(project_id: str, *, _private_sdk: Optional[PrivateProjectSDK] = None):
+    """Delete a project.
+    """
+    _private_sdk.delete(project_id)  # type: ignore
+
+
+_GET_DEFAULT_PROJECT_EXAMPLE = """
+import anyscale
+from anyscale.project.models import Project
+
+project: Project = anyscale.project.get_default(parent_cloud_id="my-cloud-id")
+"""
+
+_GET_DEFAULT_PROJECT_DOCSTRINGS = {
+    "parent_cloud_id": "The ID of the parent cloud to get the default project for.",
+}
+
+
+@sdk_command(
+    _PROJECT_SDK_SINGLETON_KEY,
+    PrivateProjectSDK,
+    doc_py_example=_GET_DEFAULT_PROJECT_EXAMPLE,
+    arg_docstrings=_GET_DEFAULT_PROJECT_DOCSTRINGS,
+)
+def get_default(
+    parent_cloud_id: str, *, _private_sdk: Optional[PrivateProjectSDK] = None
+) -> Project:
+    """Get the default project for a cloud.
+    """
+    return _private_sdk.get_default(parent_cloud_id)  # type: ignore