anyscale 0.26.14__py3-none-any.whl → 0.26.15__py3-none-any.whl

anyscale/cloud_utils.py

@@ -11,6 +11,7 @@ from anyscale.client.openapi_client.models import (
     CreateCloudResource,
     CreateCloudResourceGCP,
 )
+from anyscale.sdk.anyscale_client.api.default_api import DefaultApi as SDKDefaultApi
 from anyscale.sdk.anyscale_client.models.cloud import Cloud
 
 
@@ -114,7 +115,8 @@ def get_cloud_resource_by_cloud_id(
 
 
 def get_last_used_cloud(
-    project_id: Optional[str], anyscale_api_client: Optional[DefaultApi] = None
+    project_id: Optional[str],
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> str:
     """Return the name of the cloud last used in the project.
 
@@ -161,7 +163,9 @@ def get_last_used_cloud(
     return cast(str, cloud_name)
 
 
-def get_all_clouds(anyscale_api_client: Optional[DefaultApi] = None) -> List[Cloud]:
+def get_all_clouds(
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
+) -> List[Cloud]:
     """Fetches all Clouds the user has access to.
     Returns:
         List of all Clouds the user has access to.

anyscale/cluster_compute.py

@@ -1,5 +1,5 @@
 import re
-from typing import Optional, Tuple
+from typing import Optional, Tuple, Union
 
 from anyscale.authenticate import get_auth_api_client
 from anyscale.cli_logger import BlockLogger
@@ -10,6 +10,7 @@ from anyscale.sdk.anyscale_client import (
     ComputeTemplateConfig,
     CreateComputeTemplate,
 )
+from anyscale.sdk.anyscale_client.api.default_api import DefaultApi as SDKDefaultApi
 from anyscale.sdk.anyscale_client.models.cluster_compute_config import (
     ClusterComputeConfig,
 )
@@ -27,7 +28,7 @@ def get_default_cluster_compute(
     cloud_name: Optional[str],
     project_id: Optional[str],
     api_client: Optional[DefaultApi] = None,
-    anyscale_api_client: Optional[DefaultApi] = None,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> ComputeTemplate:
     if api_client is None:
         api_client = get_auth_api_client().api_client
@@ -134,7 +135,7 @@ def register_compute_template(
 
 def get_selected_cloud_id_or_default(
     api_client: Optional[DefaultApi] = None,
-    anyscale_api_client: Optional[DefaultApi] = None,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
     cluster_compute_id: Optional[str] = None,
     cluster_compute_config: Optional[ClusterComputeConfig] = None,
     cloud_id: Optional[str] = None,

anyscale/cluster_env.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List, Optional, Union
 
 import click
 
@@ -6,6 +6,7 @@ from anyscale.authenticate import get_auth_api_client
 from anyscale.cli_logger import BlockLogger
 from anyscale.client.openapi_client.api.default_api import DefaultApi
 from anyscale.sdk.anyscale_client import ClusterEnvironmentBuild
+from anyscale.sdk.anyscale_client.api.default_api import DefaultApi as SDKDefaultApi
 from anyscale.shared_anyscale_utils.utils.byod import is_byod_id
 from anyscale.util import get_endpoint, get_ray_and_py_version_for_default_cluster_env
 
@@ -15,7 +16,7 @@ log = BlockLogger()
 
 def get_default_cluster_env_build(
     api_client: Optional[DefaultApi] = None,
-    anyscale_api_client: Optional[DefaultApi] = None,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> ClusterEnvironmentBuild:
     ray_version, py_version = get_ray_and_py_version_for_default_cluster_env()
 
@@ -38,7 +39,8 @@ def get_default_cluster_env_build(
 
 
 def get_build_from_cluster_env_identifier(
-    cluster_env_identifier: str, anyscale_api_client: Optional[DefaultApi] = None,
+    cluster_env_identifier: str,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> ClusterEnvironmentBuild:
     """
     Get a build id from a cluster environment identifier of form `my_cluster_env:1` or
@@ -103,7 +105,8 @@ def get_build_from_cluster_env_identifier(
 
 
 def get_cluster_env_from_name(
-    cluster_env_name: str, anyscale_api_client: Optional[DefaultApi] = None,
+    cluster_env_name: str,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> ClusterEnvironmentBuild:
     """
     Get id of the cluster env (not build) given the name.
@@ -123,7 +126,7 @@ def get_cluster_env_from_name(
 
 def list_builds(
     cluster_env_id: str,
-    anyscale_api_client: Optional[DefaultApi] = None,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
     max_items: Optional[int] = None,
 ) -> List[ClusterEnvironmentBuild]:
     """

anyscale/compute_config/_private/compute_config_sdk.py

@@ -154,7 +154,7 @@ class PrivateComputeConfigSDK(BaseSDK):
         # `worker_nodes=None` uses the default serverless config, so this only happens if `worker_nodes`
         # is explicitly set to an empty list.
         # Returns the default cloud if user-provided cloud is not specified (`None`).
-        cloud_id = self.client.get_cloud_id(cloud_name=compute_config.cloud)
+        cloud_id = self.client.get_cloud_id(cloud_name=compute_config.cloud)  # type: ignore
         cloud = self.client.get_cloud(cloud_id=cloud_id)
         if cloud is None:
             raise RuntimeError(

anyscale/connect_utils/prepare_cluster.py

@@ -275,11 +275,21 @@ class PrepareClusterBlock:
             # Try to generate an auto-incrementing cluster name from the first 100 clusters.
             # If there are more than 40 clusters with, we will generate a random name.
             # If the name is already taken, we will re-try with a different random name.
-            results = list_entities(
-                self.anyscale_api_client.list_sessions, project_id, max=100
-            )
+            used_names: List[str] = []
+            has_more = True
+            paging_token = None
+            while has_more:
+                resp = self.anyscale_api_client.search_clusters(
+                    clusters_query={
+                        "project_id": project_id,
+                        "paging": {"count": 50, "paging_token": paging_token},
+                    }
+                )
+                used_names.extend([c.name for c in resp.results])
+                paging_token = resp.metadata.next_paging_token
+                has_more = paging_token is not None
+
             self.log.debug("-> Starting a new cluster")
-            used_names = [s.name for s in results]
             for i in range(MAX_CLUSTERS):
                 name = f"cluster-{i}"
                 if name not in used_names:

anyscale/controllers/cloud_controller.py

@@ -3243,7 +3243,7 @@ class CloudController(BaseController):
         *,
         cloud_resource: Any,
         edit_details: Dict[str, Optional[str]],
-        gcp_filestore_config: GCPFileStoreConfig,
+        gcp_filestore_config: Optional[GCPFileStoreConfig],
         gcp_filestore_instance_id: Optional[str],
         gcp_filestore_location: Optional[str],
         gcp_utils,
@@ -3276,7 +3276,7 @@ class CloudController(BaseController):
         cloud_id: str,
         cloud_resource: Any,
         edit_details: Dict[str, Optional[str]],
-        gcp_filestore_config: GCPFileStoreConfig,
+        gcp_filestore_config: Optional[GCPFileStoreConfig],
         gcp_utils,
     ):
         rollback_cmd = self._generate_rollback_command(

anyscale/controllers/cloud_functional_verification_controller.py

@@ -820,11 +820,13 @@ class CloudFunctionalVerificationController(BaseController):
             )
 
         confirmation_message.append(
-            "The instances will be terminated after verification. Do you want to continue?"
+            "The instances will be terminated after verification."
         )
 
+        self.log.info("\n".join(confirmation_message))
+
         confirm(
-            "\n".join(confirmation_message), yes,
+            "Continue?", yes,
         )
 
         verification_results: List[bool] = []

anyscale/controllers/service_controller.py

@@ -342,7 +342,7 @@ class ServiceController(BaseController):
     def _overwrite_runtime_env_in_v2_ray_serve_config(self, config: ServiceConfig):
         """Modifies config in place."""
         ray_serve_config = config.ray_serve_config
-        if "applications" in ray_serve_config:
+        if ray_serve_config is not None and "applications" in ray_serve_config:
             for ray_serve_app_config in ray_serve_config["applications"]:
                 ray_serve_app_config["runtime_env"] = override_runtime_env_config(
                     runtime_env=ray_serve_app_config.get("runtime_env"),

anyscale/project_utils.py

@@ -14,6 +14,7 @@ from anyscale.cluster_compute import (
     get_cluster_compute_from_name,
     get_selected_cloud_id_or_default,
 )
+from anyscale.sdk.anyscale_client.api.default_api import DefaultApi as SDKDefaultApi
 from anyscale.sdk.anyscale_client.models.cluster_compute_config import (
     ClusterComputeConfig,
 )
@@ -395,7 +396,7 @@ def get_and_validate_project_id(
     project_name: Optional[str],
     parent_cloud_id: Optional[str],
     api_client: DefaultApi,
-    anyscale_api_client: DefaultApi,
+    anyscale_api_client: Union[DefaultApi, SDKDefaultApi],
 ) -> str:
     project_name = project_name or os.environ.get(PROJECT_NAME_ENV_VAR)
     if project_id:
@@ -421,7 +422,7 @@ def get_and_validate_project_id(
 
 def get_default_project(
     api_client: Optional[DefaultApi] = None,
-    anyscale_api_client: Optional[DefaultApi] = None,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
     parent_cloud_id: Optional[str] = None,
 ):
     """
@@ -448,7 +449,7 @@ def get_default_project(
 
 
 def infer_project_id(  # noqa PLR0913
-    anyscale_api_client: DefaultApi,
+    anyscale_api_client: Union[DefaultApi, SDKDefaultApi],
     api_client: DefaultApi,
     log: BlockLogger,
     project_id: Optional[str],

anyscale/sdk/anyscale_client/sdk.py

@@ -68,7 +68,7 @@ def _upload_and_rewrite_working_dir_in_create_production_job(create_production_j
 
 def _upload_and_rewrite_working_dir_ray_serve_config(
     ray_serve_config: Optional[Dict[str, Any]]
-) -> Dict[str, Any]:
+) -> Optional[Dict[str, Any]]:
     """
     If a local working_dir and upload_path are specified, this method
     will upload the working_dir and rewrites the working_dir to the remote uri.
@@ -159,7 +159,7 @@ class AnyscaleSDK(DefaultApi):  # type: ignore
         poll_rate_seconds: int = 15,
         timeout_seconds: Optional[int] = None,
         log_output: bool = False,
-    ) -> ClusterEnvironmentBuild:
+    ) -> Optional[ClusterEnvironmentBuild]:
         """
         Creates a new Cluster Environment and waits for build to complete.
 
@@ -199,7 +199,7 @@ class AnyscaleSDK(DefaultApi):  # type: ignore
                 correct_base_image_name = get_correct_name_for_base_image_name(base_image_name)
                 if base_image_name != correct_base_image_name: # We need to make sure base_image_name after ray 2.7.0, before 2.8.0 have a optimized suffix
                     self.log.error(f"Starting from Ray version 2.7.0 and before version 2.8.0, you might be required to include the suffix 'optimized' in the base_image name for that specific Ray version. Try using {self.log.highlight(correct_base_image_name)}")
-                    return
+                    return  # type: ignore
                 cluster_environment = self.create_cluster_environment(
                     create_cluster_environment
                 ).result
@@ -224,7 +224,7 @@ class AnyscaleSDK(DefaultApi):  # type: ignore
                 correct_base_image_name = get_correct_name_for_base_image_name(base_image_name)
                 if base_image_name != correct_base_image_name: # We need to make sure base_image_name after ray 2.7.0, before 2.8.0 have a optimized suffix
                     self.log.error(f"Starting from Ray version 2.7.0 and before version 2.8.0, you might be required to include the suffix 'optimized' in the base_image name for that specific Ray version. Try using {self.log.highlight(correct_base_image_name)}")
-                    return
+                    return  # type: ignore
                 build = self.create_cluster_environment_build(
                     {
                         "cluster_environment_id": cluster_environment.id,

anyscale/utils/connect_helpers.py

@@ -1,6 +1,16 @@
 from dataclasses import dataclass
 import inspect
-from typing import Any, Callable, Dict, Generic, List, Optional, TYPE_CHECKING, TypeVar
+from typing import (
+    Any,
+    Callable,
+    Dict,
+    Generic,
+    List,
+    Optional,
+    TYPE_CHECKING,
+    TypeVar,
+    Union,
+)
 
 from anyscale.anyscale_pydantic import BaseModel
 from anyscale.client.openapi_client.models.session import Session
@@ -8,6 +18,7 @@ from anyscale.sdk.anyscale_client.models.cluster import Cluster
 
 
 if TYPE_CHECKING:
+    from anyscale.sdk.anyscale_client.api.default_api import DefaultApi
     from anyscale.sdk.anyscale_client.sdk import AnyscaleSDK
 
 
@@ -48,7 +59,9 @@ def _multiclient_supported() -> bool:
     return "_context_to_restore" in _context_params
 
 
-def find_project_id(sdk: "AnyscaleSDK", project_name: str) -> Optional[str]:
+def find_project_id(
+    sdk: Union["AnyscaleSDK", "DefaultApi"], project_name: str
+) -> Optional[str]:
     """Return id if a project of a given name exists."""
     resp = sdk.search_projects({"name": {"equals": project_name}})
     if len(resp.results) > 0:
@@ -58,7 +71,7 @@ def find_project_id(sdk: "AnyscaleSDK", project_name: str) -> Optional[str]:
 
 
 def get_cluster(
-    sdk: "AnyscaleSDK", project_id: str, session_name: str
+    sdk: Union["AnyscaleSDK", "DefaultApi"], project_id: str, session_name: str
 ) -> Optional[Session]:
     """Query Anyscale for the given cluster's metadata."""
     clusters = sdk.search_clusters(

anyscale/utils/runtime_env.py

@@ -15,6 +15,7 @@ from typing import (
     Optional,
     Tuple,
     TYPE_CHECKING,
+    Union,
 )
 from urllib.parse import urlparse
 
@@ -31,6 +32,7 @@ from anyscale.client.openapi_client.models.cloud_with_cloud_resource_gcp import
     CloudWithCloudResourceGCP,
 )
 from anyscale.client.openapi_client.models.user_info import UserInfo
+from anyscale.sdk.anyscale_client.api.default_api import DefaultApi as SDKDefaultApi
 from anyscale.shared_anyscale_utils.aws import bucket_name_from_maybe_bucket_arn
 from anyscale.util import is_anyscale_workspace
 from anyscale.utils.ray_utils import zip_directory  # type: ignore
@@ -221,7 +223,7 @@ def upload_and_rewrite_working_dir(
 
 def override_runtime_env_config(
     runtime_env: Optional[Dict[str, Any]],
-    anyscale_api_client: DefaultApi,
+    anyscale_api_client: Union[DefaultApi, SDKDefaultApi],
     api_client: DefaultApi,
     workload_type: Workload,
     compute_config_id: Optional[str],

anyscale/version.py

@@ -1 +1 @@
-__version__ = "0.26.14"
+__version__ = "0.26.15"

anyscale/workspace/__init__.py

@@ -40,7 +40,12 @@ from anyscale.workspace.commands import (
     update,
     wait,
 )
-from anyscale.workspace.models import Workspace, WorkspaceConfig, WorkspaceState
+from anyscale.workspace.models import (
+    UpdateWorkspaceConfig,
+    Workspace,
+    WorkspaceConfig,
+    WorkspaceState,
+)
 
 
 class WorkspaceSDK:
@@ -58,12 +63,12 @@ class WorkspaceSDK:
     @sdk_docs(
         doc_py_example=_CREATE_EXAMPLE, arg_docstrings=_CREATE_ARG_DOCSTRINGS,
     )
-    def create(self, config: WorkspaceConfig) -> str:  # noqa: F811
+    def create(self, config: Optional[WorkspaceConfig]) -> str:  # noqa: F811
         """Create a workspace.
 
         Returns the id of the workspace.
         """
-        return self._private_sdk.create(config=config)
+        return self._private_sdk.create(config=config)  # type: ignore
 
     @sdk_docs(
         doc_py_example=_START_EXAMPLE, arg_docstrings=_START_ARG_DOCSTRINGS,
@@ -248,11 +253,11 @@ class WorkspaceSDK:
         doc_py_example=_UPDATE_EXAMPLE, arg_docstrings=_UPDATE_ARG_DOCSTRINGS,
     )
     def update(  # noqa: F811
-        self, *, id: str = None, config: WorkspaceConfig  # noqa: A002
+        self, *, id: str = None, config: UpdateWorkspaceConfig  # noqa: A002
     ):
         """Update a workspace."""
         self._private_sdk.update(
-            id=id, config=config,
+            id=id, config=config,  # type: ignore
         )
 
     @sdk_docs(

anyscale/workspace/_private/workspace_sdk.py

@@ -113,7 +113,7 @@ class PrivateWorkspaceSDK(WorkloadSDK):
         name = config.name
 
         compute_config_id, cloud_id = self.resolve_compute_config_and_cloud_id(
-            compute_config=config.compute_config, cloud=config.cloud,
+            compute_config=config.compute_config, cloud=config.cloud,  # type: ignore
         )
 
         project_id = self.client.get_project_id(
@@ -565,7 +565,7 @@ class PrivateWorkspaceSDK(WorkloadSDK):
         )
 
     def update(self, *, id: str, config: UpdateWorkspaceConfig) -> str:  # noqa: A002
-        workspace = self.client.get_workspace(id=id)
+        workspace = self.client.get_workspace(id=id)  # type: ignore
 
         if not workspace:
             raise ValueError(f"Workspace with id '{id}' was not found.")
@@ -581,7 +581,7 @@ class PrivateWorkspaceSDK(WorkloadSDK):
         compute_config_id = None
         if config.compute_config:
             compute_config_id, _ = self.resolve_compute_config_and_cloud_id(
-                compute_config=config.compute_config, cloud=None,
+                compute_config=config.compute_config, cloud=None,  # type: ignore
             )
 
         build_id = None
@@ -649,7 +649,7 @@ class PrivateWorkspaceSDK(WorkloadSDK):
     ) -> WorkspaceState:
         return cast(
             WorkspaceState,
-            self._BACKEND_SESSION_STATE_TO_WORKSPACE_STATE.get(
+            self._BACKEND_SESSION_STATE_TO_WORKSPACE_STATE.get(  # type: ignore
                 state, WorkspaceState.UNKNOWN
             ),
         )

anyscale/workspace/commands.py

@@ -433,7 +433,7 @@ def update(
 ) -> None:
     """Update a workspace."""
     _sdk.update(
-        id=id, config=config,
+        id=id, config=config,  # type: ignore
     )
 
 

{anyscale-0.26.14.dist-info → anyscale-0.26.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anyscale
-Version: 0.26.14
+Version: 0.26.15
 Summary: Command Line Interface for Anyscale
 Author: Anyscale Inc.
 License: AS License