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

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/gcp_utils.py

@@ -41,15 +41,31 @@ GCP_REQUIRED_APIS = [
 ]
 
 GCP_RESOURCE_DICT: Dict[str, CloudAnalyticsEventCloudResource] = {
-    "VPC": CloudAnalyticsEventCloudResource.GCP_VPC,
-    "Subnet": CloudAnalyticsEventCloudResource.GCP_SUBNET,
-    "Project": CloudAnalyticsEventCloudResource.GCP_PROJECT,
-    "Anyscale Access Service Account": CloudAnalyticsEventCloudResource.GCP_SERVICE_ACCOUNT,
-    "Dataplane Service Account": CloudAnalyticsEventCloudResource.GCP_SERVICE_ACCOUNT,
-    "Firewall Policy": CloudAnalyticsEventCloudResource.GCP_FIREWALL_POLICY,
-    "Filestore": CloudAnalyticsEventCloudResource.GCP_FILESTORE,
-    "Google Cloud Storage Bucket": CloudAnalyticsEventCloudResource.GCP_STORAGE_BUCKET,
-    "Memorystore": CloudAnalyticsEventCloudResource.GCP_MEMORYSTORE,
+    "VPC": CloudAnalyticsEventCloudResource(CloudAnalyticsEventCloudResource.GCP_VPC),
+    "Subnet": CloudAnalyticsEventCloudResource(
+        CloudAnalyticsEventCloudResource.GCP_SUBNET
+    ),
+    "Project": CloudAnalyticsEventCloudResource(
+        CloudAnalyticsEventCloudResource.GCP_PROJECT
+    ),
+    "Anyscale Access Service Account": CloudAnalyticsEventCloudResource(
+        CloudAnalyticsEventCloudResource.GCP_SERVICE_ACCOUNT
+    ),
+    "Dataplane Service Account": CloudAnalyticsEventCloudResource(
+        CloudAnalyticsEventCloudResource.GCP_SERVICE_ACCOUNT
+    ),
+    "Firewall Policy": CloudAnalyticsEventCloudResource(
+        CloudAnalyticsEventCloudResource.GCP_FIREWALL_POLICY
+    ),
+    "Filestore": CloudAnalyticsEventCloudResource(
+        CloudAnalyticsEventCloudResource.GCP_FILESTORE
+    ),
+    "Google Cloud Storage Bucket": CloudAnalyticsEventCloudResource(
+        CloudAnalyticsEventCloudResource.GCP_STORAGE_BUCKET
+    ),
+    "Memorystore": CloudAnalyticsEventCloudResource(
+        CloudAnalyticsEventCloudResource.GCP_MEMORYSTORE
+    ),
 }
 
 

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.16"

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: Optional[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(
@@ -292,7 +292,7 @@ class PrivateWorkspaceSDK(WorkloadSDK):
                 f"Workspace '{workspace_id_or_name}' did not reach target state {state} within {timeout_s}s. Last seen state: {curr_state}."
             )
 
-    def _get_workspace_status(self, workspace_id: str) -> WorkspaceState:
+    def _get_workspace_status(self, workspace_id: Optional[str]) -> WorkspaceState:
 
         cluster = self.client.get_workspace_cluster(workspace_id)
         if not cluster:
@@ -564,8 +564,10 @@ class PrivateWorkspaceSDK(WorkloadSDK):
             delete=delete,
         )
 
-    def update(self, *, id: str, config: UpdateWorkspaceConfig) -> str:  # noqa: A002
-        workspace = self.client.get_workspace(id=id)
+    def update(
+        self, *, id: Optional[str], config: UpdateWorkspaceConfig  # noqa: A002
+    ) -> str:
+        workspace = self.client.get_workspace(id=id)  # type: ignore
 
         if not workspace:
             raise ValueError(f"Workspace with id '{id}' was not found.")
@@ -581,7 +583,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
@@ -642,14 +644,14 @@ class PrivateWorkspaceSDK(WorkloadSDK):
             )
             self._logger.info(f"Applied environment variables to workspace id: {id}")
 
-        return id
+        return id  # type: ignore
 
     def _convert_cluster_state_to_workspace_state(
         self, state: SessionState
     ) -> 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

@@ -34,12 +34,14 @@ _WAIT_TIMEOUT_SECONDS = 1800.0
     doc_py_example=_CREATE_EXAMPLE,
     arg_docstrings=_CREATE_ARG_DOCSTRINGS,
 )
-def create(config: WorkspaceConfig, *, _sdk: PrivateWorkspaceSDK) -> str:
+def create(
+    config: WorkspaceConfig, *, _private_sdk: Optional[PrivateWorkspaceSDK] = None
+) -> str:
     """Create a workspace.
 
     Returns the id of the created workspace.
     """
-    return _sdk.create(config)
+    return _private_sdk.create(config)  # type: ignore
 
 
 _START_EXAMPLE = """
@@ -70,13 +72,13 @@ def start(
     id: Optional[str] = None,  # noqa: A002
     cloud: Optional[str] = None,
     project: Optional[str] = None,
-    _sdk: PrivateWorkspaceSDK,
+    _private_sdk: Optional[PrivateWorkspaceSDK] = None,
 ) -> str:
     """Start a workspace.
 
     Returns the id of the started workspace.
     """
-    return _sdk.start(name=name, id=id, cloud=cloud, project=project)
+    return _private_sdk.start(name=name, id=id, cloud=cloud, project=project)  # type: ignore
 
 
 _TERMINATE_EXAMPLE = """
@@ -107,13 +109,13 @@ def terminate(
     id: Optional[str] = None,  # noqa: A002
     cloud: Optional[str] = None,
     project: Optional[str] = None,
-    _sdk: PrivateWorkspaceSDK,
+    _private_sdk: Optional[PrivateWorkspaceSDK] = None,
 ) -> str:
     """Terminate a workspace.
 
     Returns the id of the terminated workspace.
     """
-    return _sdk.terminate(name=name, id=id, cloud=cloud, project=project)
+    return _private_sdk.terminate(name=name, id=id, cloud=cloud, project=project)  # type: ignore
 
 
 _STATUS_EXAMPLE = """
@@ -144,13 +146,13 @@ def status(
     id: Optional[str] = None,  # noqa: A002
     cloud: Optional[str] = None,
     project: Optional[str] = None,
-    _sdk: PrivateWorkspaceSDK,
+    _private_sdk: Optional[PrivateWorkspaceSDK] = None,
 ) -> str:
     """Get the status of a workspace.
 
     Returns the status of the workspace.
     """
-    return _sdk.status(name=name, id=id, cloud=cloud, project=project)
+    return _private_sdk.status(name=name, id=id, cloud=cloud, project=project)  # type: ignore
 
 
 _WAIT_EXAMPLE = """
@@ -185,13 +187,13 @@ def wait(
     project: Optional[str] = None,
     timeout_s: float = _WAIT_TIMEOUT_SECONDS,
     state: str = WorkspaceState.RUNNING,
-    _sdk: PrivateWorkspaceSDK,
+    _private_sdk: Optional[PrivateWorkspaceSDK] = None,
 ) -> str:
     """Wait for a workspace to reach a terminal state.
 
     Returns the status of the workspace.
     """
-    return _sdk.wait(
+    return _private_sdk.wait(  # type: ignore
         name=name,
         id=id,
         cloud=cloud,
@@ -235,13 +237,13 @@ def generate_ssh_config_file(
     cloud: Optional[str] = None,
     project: Optional[str] = None,
     ssh_config_path: Optional[str] = None,
-    _sdk: PrivateWorkspaceSDK,
+    _private_sdk: Optional[PrivateWorkspaceSDK] = None,
 ) -> Tuple[str, str]:
     """Generate an SSH config file for a workspace.
 
     Returns the hostname and path to the generated config file.
     """
-    return _sdk.generate_ssh_config_file(
+    return _private_sdk.generate_ssh_config_file(  # type: ignore
         name=name, id=id, cloud=cloud, project=project, ssh_config_path=ssh_config_path,
     )
 
@@ -281,14 +283,14 @@ def run_command(
     cloud: Optional[str] = None,
     project: Optional[str] = None,
     command: str,
-    _sdk: PrivateWorkspaceSDK,
+    _private_sdk: Optional[PrivateWorkspaceSDK] = None,
     **kwargs: Dict[str, Any],
 ):
     """Run a command in a workspace.
 
     Returns a subprocess.CompletedProcess object.
     """
-    return _sdk.run_command(
+    return _private_sdk.run_command(  # type: ignore
         name=name, id=id, cloud=cloud, project=project, command=command, **kwargs,
     )
 
@@ -328,13 +330,13 @@ def pull(
     pull_git_state: bool = False,
     rsync_args: Optional[List[str]] = None,
     delete: bool = False,
-    _sdk: PrivateWorkspaceSDK,
+    _private_sdk: Optional[PrivateWorkspaceSDK] = None,
 ) -> None:
     """Pull a workspace to a local directory.
 
     Returns the path to the pulled workspace.
     """
-    _sdk.pull(
+    _private_sdk.pull(  # type: ignore
         name=name,
         id=id,
         cloud=cloud,
@@ -383,13 +385,13 @@ def push(
     push_git_state: bool = False,
     rsync_args: Optional[List[str]] = None,
     delete: bool = False,
-    _sdk: PrivateWorkspaceSDK,
+    _private_sdk: Optional[PrivateWorkspaceSDK] = None,
 ) -> None:
     """Push a local directory to a workspace.
 
     Returns the path to the pushed workspace.
     """
-    _sdk.push(
+    _private_sdk.push(  # type: ignore
         name=name,
         id=id,
         cloud=cloud,
@@ -427,12 +429,12 @@ _UPDATE_ARG_DOCSTRINGS = {
 )
 def update(
     *,
-    id: str = None,  # noqa: A002
+    id: Optional[str] = None,  # noqa: A002
     config: UpdateWorkspaceConfig,
-    _sdk: PrivateWorkspaceSDK,
+    _private_sdk: Optional[PrivateWorkspaceSDK] = None,
 ) -> None:
     """Update a workspace."""
-    _sdk.update(
+    _private_sdk.update(  # type: ignore
         id=id, config=config,
     )
 
@@ -466,7 +468,7 @@ def get(
     id: Optional[str] = None,  # noqa: A002
     cloud: Optional[str] = None,
     project: Optional[str] = None,
-    _sdk: PrivateWorkspaceSDK,
+    _private_sdk: Optional[PrivateWorkspaceSDK] = None,
 ) -> Workspace:
     """Get a workspace."""
-    return _sdk.get(name=name, id=id, cloud=cloud, project=project)
+    return _private_sdk.get(name=name, id=id, cloud=cloud, project=project)  # type: ignore

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

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