anyscale 0.24.18__tar.gz → 0.24.19__tar.gz

{anyscale-0.24.18 → anyscale-0.24.19}/PKG-INFO

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

{anyscale-0.24.18 → anyscale-0.24.19}/anyscale/_private/anyscale_client/anyscale_client.py

@@ -143,7 +143,7 @@ class AnyscaleClient(AnyscaleClientInterface):
         self._gcs_client = gcs_client
 
         # Cached IDs and models to avoid duplicate lookups.
-        self._default_project_id: Optional[str] = None
+        self._default_project_id_from_cloud_id: Dict[str, str] = {}
         self._cloud_id_cache: Dict[Optional[str], str] = {}
         self._current_workspace_cluster: Optional[Cluster] = None
         self._logger = logger or BlockLogger()
@@ -226,7 +226,7 @@ class AnyscaleClient(AnyscaleClientInterface):
             return None
         except Exception as e:  # noqa: BLE001
             raise RuntimeError(
-                f"Failed to download the working directory from Google Cloud Storage. Error {repr(e)}"
+                f"Failed to download the working directory from Google Cloud Storage. Error {e!r}"
                 "Please validate you have exported cloud credentials with the correct read permissions and the intended bucket exists in your Cloud Storage account. "
             ) from e
 
@@ -247,7 +247,7 @@ class AnyscaleClient(AnyscaleClientInterface):
             raise
         except Exception as e:  # noqa: BLE001
             raise RuntimeError(
-                f"Failed to download the working directory from S3. Error {repr(e)}"
+                f"Failed to download the working directory from S3. Error {e!r}"
                 "Please validate you have exported cloud credentials with the correct read permissions and the intended bucket exists in your S3 account. "
             ) from e
 
@@ -309,7 +309,7 @@ class AnyscaleClient(AnyscaleClientInterface):
         if workspace_cluster is not None:
             return workspace_cluster.project_id
 
-        if self._default_project_id is None:
+        if self._default_project_id_from_cloud_id.get(parent_cloud_id) is None:
             # Cloud isolation organizations follow the permissions model in https://docs.anyscale.com/organization-and-user-account/access-controls
             # TODO(nikita): Remove this FF check after completing the cloud isolation migration in Q2 2024
             cloud_isolation_ff_on = self._internal_api_client.check_is_feature_flag_on_api_v2_userinfo_check_is_feature_flag_on_get(
@@ -318,9 +318,9 @@ class AnyscaleClient(AnyscaleClientInterface):
             default_project: Project = self._external_api_client.get_default_project(
                 parent_cloud_id=(parent_cloud_id if cloud_isolation_ff_on else None)
             ).result
-            self._default_project_id = default_project.id
+            self._default_project_id_from_cloud_id[parent_cloud_id] = default_project.id
 
-        return self._default_project_id
+        return self._default_project_id_from_cloud_id[parent_cloud_id]
 
     def _get_cloud_id_for_compute_config_id(self, compute_config_id: str) -> str:
         cluster_compute: ClusterCompute = self._external_api_client.get_cluster_compute(

{anyscale-0.24.18 → anyscale-0.24.19}/anyscale/_private/anyscale_client/fake_anyscale_client.py

@@ -315,7 +315,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         if existing_service is not None:
             service_id = existing_service.id
         else:
-            service_id = f"service-id-{str(uuid.uuid4())}"
+            service_id = f"service-id-{uuid.uuid4()!s}"
 
         service = ServiceModel(
             id=service_id,
@@ -374,7 +374,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         self._submitted_job = model
 
         return InternalProductionJob(
-            id=f"job-{str(uuid.uuid4())}",
+            id=f"job-{uuid.uuid4()!s}",
             name=model.name,
             config=model.config,
             state=ProductionJobStateTransition(

{anyscale-0.24.18 → anyscale-0.24.19}/anyscale/_private/docgen/generator.py

@@ -187,11 +187,10 @@ class MarkdownGenerator:
                 raise ValueError(
                     f"Config model '{t.__name__}' is missing a '__doc_yaml_example__'."
                 )
-        else:
-            if not py_example:
-                raise ValueError(
-                    f"SDK command '{t.__name__}' is missing a '__doc_py_example__'."
-                )
+        elif not py_example:
+            raise ValueError(
+                f"SDK command '{t.__name__}' is missing a '__doc_py_example__'."
+            )
 
         md = "#### Examples\n\n"
         md += "<Tabs>\n"
@@ -356,7 +355,7 @@ class MarkdownGenerator:
                 assert param.annotation is not inspect.Parameter.empty
                 type_str = self._model_type_to_string(param.annotation)
                 if param.default != inspect.Parameter.empty:
-                    type_str += f" = {str(param.default)}"
+                    type_str += f" = {param.default!s}"
 
                 arg_docs = c.__arg_docstrings__.get(name, None)  # type: ignore
                 if not arg_docs:

{anyscale-0.24.18 → anyscale-0.24.19}/anyscale/_private/workload/workload_sdk.py

@@ -1,7 +1,7 @@
 import copy
 import os
 import pathlib
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Tuple, Union
 
 from anyscale._private.anyscale_client import (
     AnyscaleClientInterface,
@@ -177,14 +177,16 @@ class WorkloadSDK(BaseSDK):
 
         return new_runtime_envs
 
-    def resolve_compute_config_to_id(
+    def resolve_compute_config(
         self, compute_config: Union[None, str, ComputeConfig]
-    ) -> str:
-        """Resolve the passed compute config to an ID that can be passed to the backend.
+    ) -> Tuple[str, str]:
+        """Resolve the passed compute config to its ID and corresponding cloud ID.
 
         Accepts either:
             - A string of the form: '<name>[:<version>]'.
             - A dictionary from which an anonymous compute config will be built.
+
+        Returns (compute_config_id, cloud_id).
         """
         if compute_config is None:
             compute_config_id = self._client.get_compute_config_id()
@@ -202,7 +204,10 @@ class WorkloadSDK(BaseSDK):
                 compute_config
             )
 
-        return compute_config_id
+        return (
+            compute_config_id,
+            self.client.get_cloud_id(compute_config_id=compute_config_id),
+        )
 
     def get_current_workspace_name(self) -> Optional[str]:
         """Get the name of the curernt workspace if running inside one."""

{anyscale-0.24.18 → anyscale-0.24.19}/anyscale/anyscale-cloud-setup-gcp-oa.yaml

@@ -29,54 +29,20 @@ resources:
       method: ["GET", "PUT", "POST", "HEAD", "DELETE"]
     labels:
       anyscale-cloud-id: ${CLOUD_ID_UNDERSCORE}
-- name: ${ANYSCALE_ACCESS_SERVICE_ACCOUNT}
-  type: iam.v1.serviceAccount
-  properties:
-    accountId: ${ANYSCALE_ACCESS_SERVICE_ACCOUNT}
-    displayName: ${CLOUD_ID} Anyscale access service account
-    projectId: ${PROJECT_ID}
-  accessControl:
-    gcpIamPolicy:
-        bindings:
-        - role: roles/iam.serviceAccountTokenCreator
-          members:
-          - serviceAccount:${ANYSCALE_ACCESS_SERVICE_ACCOUNT}@${PROJECT_ID}.iam.gserviceaccount.com
-        - role: roles/iam.workloadIdentityUser
-          members:
-          - principalSet://iam.googleapis.com/${WORKLOAD_IDENTITY_POOL_NAME}/attribute.aws_role/arn:aws:sts::${ANYSCALE_AWS_ACCOUNT}:assumed-role/gcp_if_${ORGANIZATION_ID}
-- name: iam-policy-anyscale-access-project-${CLOUD_ID}
-  type: gcp-types/cloudresourcemanager-v1:virtual.projects.iamMemberBinding
-  properties:
-    resource: ${PROJECT_ID}
-    role: roles/owner
-    member: "serviceAccount:$$(ref.${ANYSCALE_ACCESS_SERVICE_ACCOUNT}.email)"
-  metadata:
-    dependsOn:
-      - ${ANYSCALE_ACCESS_SERVICE_ACCOUNT}
 - name: ${CLOUD_ID}
   type: iam.v1.serviceAccount
   properties:
     accountId: ${CLOUD_ID}
     displayName: ${CLOUD_ID} Cluster Node Service Account
     projectId: ${PROJECT_ID}
-- name: iam-policy-instance-project-${CLOUD_ID}
-  type: gcp-types/cloudresourcemanager-v1:virtual.projects.iamMemberBinding
-  properties:
-    resource: ${PROJECT_ID}
-    role: roles/artifactregistry.reader
-    member: "serviceAccount:$$(ref.${CLOUD_ID}.email)"
-  metadata:
-    dependsOn:
-      - ${CLOUD_ID}
 - name: bucket-iam-anyscale-acess-${CLOUD_ID}
   type: gcp-types/storage-v1:virtual.buckets.iamMemberBinding
   properties:
     bucket: $$(ref.storage-bucket-${CLOUD_ID}.name)
-    member: serviceAccount:$$(ref.${ANYSCALE_ACCESS_SERVICE_ACCOUNT}.email)
+    member: serviceAccount:${ANYSCALE_CONTROL_PLANE_SERVICE_ACCOUNT_EMAIL}
     role: roles/storage.admin
   metadata:
     dependsOn:
-      - ${ANYSCALE_ACCESS_SERVICE_ACCOUNT}
       - storage-bucket-${CLOUD_ID}
 - name: bucket-iam-${CLOUD_ID}
   type: gcp-types/storage-v1:virtual.buckets.iamMemberBinding

{anyscale-0.24.18 → anyscale-0.24.19}/anyscale/anyscale-cloud-setup-oa.yaml

@@ -22,24 +22,6 @@ Parameters:
     Description: ID of the VPC to use for the anyscale cloud.
     Type: String
 
-  # The subnets are needed for EFS mount targets. We can remove them
-  # once we start sharing EFS as well in anyscale hosted.
-  Subnet0:
-    Description: ID of the first subnet to use for the anyscale cloud.
-    Type: String
-
-  Subnet1:
-    Description: ID of the second subnet to use for the anyscale cloud.
-    Type: String
-
-  Subnet2:
-    Description: ID of the third subnet to use for the anyscale cloud.
-    Type: String
-
-  Subnet3:
-    Description: ID of the fourth subnet to use for the anyscale cloud.
-    Type: String
-
   ClusterNodeIAMRoleName:
     Description: Name of the data plane cluster IAM role
     Type: String
@@ -93,25 +75,6 @@ Resources:
       GroupId: !Ref AnyscaleSecurityGroup
       DestinationSecurityGroupId: !Ref AnyscaleSecurityGroup
 
-  EFS:
-    Type: AWS::EFS::FileSystem
-    Properties:
-        BackupPolicy:
-          Status: ENABLED
-        Encrypted: true
-        LifecyclePolicies:
-          - TransitionToIA: AFTER_60_DAYS
-        PerformanceMode: generalPurpose
-        Encrypted: true
-        ThroughputMode: bursting
-        FileSystemTags:
-          - Key: anyscale-cloud-id
-            Value: !Ref CloudID
-          - Key: anyscale-deploy-environment
-            Value: !Ref EnvironmentName
-
-$EFSMountTargets
-
   nodeRole:
     Type: 'AWS::IAM::Role'
     Properties:
@@ -141,6 +104,38 @@ $EFSMountTargets
       Roles:
         - !Ref nodeRole
 
+  IAMPermissionRequireSameVPC:
+    Type: AWS::IAM::Policy
+    Properties:
+      PolicyDocument:
+          Version: 2012-10-17
+          Statement:
+            - Effect: Deny
+              NotAction: 's3:GetBucketLocation'
+              Resource: '*'
+              Condition:
+                # Deny all actions if the source VPC is not the same as the instance's VPC
+                'StringNotEquals':
+                  'aws:SourceVpc': '${aws:Ec2InstanceSourceVpc}'
+                'StringEquals':
+                  's3:ResourceAccount': ['${aws:PrincipalAccount}']
+                # Allow your EC2 instances to communicate with KMS when mounting an encrypted volume.
+                'ArnNotLike':
+                  'aws:PrincipalArn': ['arn:aws:iam::*:role/aws:ec2-infrastructure']
+            - Effect: Deny
+              NotAction: 's3:GetBucketLocation'
+              Resource: '*'
+              Condition:
+                'StringNotEquals':
+                  'aws:VpcSourceIp': '${aws:ec2InstanceSourcePrivateIPv4}'
+                'StringEquals':
+                  's3:ResourceAccount': ['${aws:PrincipalAccount}']
+                'ArnNotLike':
+                  'aws:PrincipalArn': ['arn:aws:iam::*:role/aws:ec2-infrastructure']
+      PolicyName: RequireSameVPC
+      Roles:
+        - !Ref nodeRole
+
 $MEMORY_DB_RESOURCE
 
 Outputs:
@@ -149,16 +144,6 @@ Outputs:
     Description: Anyscale Security group
     Value: !Ref AnyscaleSecurityGroup
 
-  EFS:
-    Description: Anyscale managed EFS
-    Value: !Ref EFS
-
-  EFSMountTargetIP:
-    Description: Anyscale managed EFS mount target
-    Value: !GetAtt
-      - EFSMountTarget0
-      - IpAddress
-
   NodeIamRole:
     Description: ARN of the node IAM role
     Value: !GetAtt

{anyscale-0.24.18 → anyscale-0.24.19}/anyscale/client/README.md

@@ -251,6 +251,7 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**get_user_info_api_v2_userinfo_get**](docs/DefaultApi.md#get_user_info_api_v2_userinfo_get) | **GET** /api/v2/userinfo/ | Get User Info
 *DefaultApi* | [**get_workspace_api_v2_experimental_workspaces_workspace_id_get**](docs/DefaultApi.md#get_workspace_api_v2_experimental_workspaces_workspace_id_get) | **GET** /api/v2/experimental_workspaces/{workspace_id} | Get Workspace
 *DefaultApi* | [**get_workspace_dataplane_artifacts_api_v2_experimental_workspaces_workspace_id_dataplane_artifacts_get**](docs/DefaultApi.md#get_workspace_dataplane_artifacts_api_v2_experimental_workspaces_workspace_id_dataplane_artifacts_get) | **GET** /api/v2/experimental_workspaces/{workspace_id}/dataplane_artifacts | Get Workspace Dataplane Artifacts
+*DefaultApi* | [**get_workspace_events_api_v2_experimental_workspaces_workspace_id_events_get**](docs/DefaultApi.md#get_workspace_events_api_v2_experimental_workspaces_workspace_id_events_get) | **GET** /api/v2/experimental_workspaces/{workspace_id}/events | Get Workspace Events
 *DefaultApi* | [**get_workspace_proxied_dataplane_artifacts_api_v2_experimental_workspaces_workspace_id_proxied_dataplane_artifacts_get**](docs/DefaultApi.md#get_workspace_proxied_dataplane_artifacts_api_v2_experimental_workspaces_workspace_id_proxied_dataplane_artifacts_get) | **GET** /api/v2/experimental_workspaces/{workspace_id}/proxied_dataplane_artifacts | Get Workspace Proxied Dataplane Artifacts
 *DefaultApi* | [**get_workspace_readme_api_v2_experimental_workspaces_workspace_id_readme_get**](docs/DefaultApi.md#get_workspace_readme_api_v2_experimental_workspaces_workspace_id_readme_get) | **GET** /api/v2/experimental_workspaces/{workspace_id}/readme | Get Workspace Readme
 *DefaultApi* | [**get_workspace_template_cluster_environment_api_v2_experimental_workspaces_template_template_id_cluster_environment_get**](docs/DefaultApi.md#get_workspace_template_cluster_environment_api_v2_experimental_workspaces_template_template_id_cluster_environment_get) | **GET** /api/v2/experimental_workspaces/template/{template_id}/cluster_environment | Get Workspace Template Cluster Environment
@@ -324,6 +325,7 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**request_password_reset_api_v2_users_request_password_reset_post**](docs/DefaultApi.md#request_password_reset_api_v2_users_request_password_reset_post) | **POST** /api/v2/users/request_password_reset | Request Password Reset
 *DefaultApi* | [**reset_password_api_v2_users_reset_password_post**](docs/DefaultApi.md#reset_password_api_v2_users_reset_password_post) | **POST** /api/v2/users/reset_password | Reset Password
 *DefaultApi* | [**restart_service_api_v2_services_v2_service_id_restart_post**](docs/DefaultApi.md#restart_service_api_v2_services_v2_service_id_restart_post) | **POST** /api/v2/services-v2/{service_id}/restart | Restart Service
+*DefaultApi* | [**resubmit_fine_tuning_job_api_v2_fine_tuning_jobs_internal_resubmit_post**](docs/DefaultApi.md#resubmit_fine_tuning_job_api_v2_fine_tuning_jobs_internal_resubmit_post) | **POST** /api/v2/fine_tuning/jobs/internal/resubmit | Resubmit Fine Tuning Job
 *DefaultApi* | [**rollback_service_api_v2_services_v2_service_id_rollback_post**](docs/DefaultApi.md#rollback_service_api_v2_services_v2_service_id_rollback_post) | **POST** /api/v2/services-v2/{service_id}/rollback | Rollback Service
 *DefaultApi* | [**rotate_api_key_api_v2_users_rotate_api_key_get**](docs/DefaultApi.md#rotate_api_key_api_v2_users_rotate_api_key_get) | **GET** /api/v2/users/rotate_api_key | Rotate Api Key
 *DefaultApi* | [**rotate_api_key_for_user_api_v2_organization_collaborators_rotate_api_key_for_user_user_id_post**](docs/DefaultApi.md#rotate_api_key_for_user_api_v2_organization_collaborators_rotate_api_key_for_user_user_id_post) | **POST** /api/v2/organization_collaborators/rotate_api_key_for_user/{user_id} | Rotate Api Key For User
@@ -613,6 +615,7 @@ Class | Method | HTTP request | Description
  - [EditableCloudResource](docs/EditableCloudResource.md)
  - [EditableCloudResourceGCP](docs/EditableCloudResourceGCP.md)
  - [Error](docs/Error.md)
+ - [EventLevel](docs/EventLevel.md)
  - [ExecuteCommandResponse](docs/ExecuteCommandResponse.md)
  - [ExecuteInteractiveCommandOptions](docs/ExecuteInteractiveCommandOptions.md)
  - [ExecuteShellCommandOptions](docs/ExecuteShellCommandOptions.md)
@@ -796,6 +799,7 @@ Class | Method | HTTP request | Description
  - [RequestotpreturnapimodelResponse](docs/RequestotpreturnapimodelResponse.md)
  - [ResetPasswordParams](docs/ResetPasswordParams.md)
  - [Resources](docs/Resources.md)
+ - [ResubmitFTJobRequest](docs/ResubmitFTJobRequest.md)
  - [RollbackServiceModel](docs/RollbackServiceModel.md)
  - [RolloutStrategy](docs/RolloutStrategy.md)
  - [S3DownloadLocation](docs/S3DownloadLocation.md)
@@ -919,12 +923,16 @@ Class | Method | HTTP request | Description
  - [WorkspaceDataplaneArtifact](docs/WorkspaceDataplaneArtifact.md)
  - [WorkspaceDataplaneArtifacts](docs/WorkspaceDataplaneArtifacts.md)
  - [WorkspaceDataplaneProxiedArtifacts](docs/WorkspaceDataplaneProxiedArtifacts.md)
+ - [WorkspaceEvent](docs/WorkspaceEvent.md)
+ - [WorkspaceEventSource](docs/WorkspaceEventSource.md)
+ - [WorkspaceEventSourceFilter](docs/WorkspaceEventSourceFilter.md)
  - [WorkspaceReadme](docs/WorkspaceReadme.md)
  - [WorkspaceSnapshotStates](docs/WorkspaceSnapshotStates.md)
  - [WorkspaceTemplate](docs/WorkspaceTemplate.md)
  - [WorkspaceTemplateClusterEnvironmentMetadata](docs/WorkspaceTemplateClusterEnvironmentMetadata.md)
  - [WorkspacedataplaneartifactsResponse](docs/WorkspacedataplaneartifactsResponse.md)
  - [WorkspacedataplaneproxiedartifactsResponse](docs/WorkspacedataplaneproxiedartifactsResponse.md)
+ - [WorkspaceeventListResponse](docs/WorkspaceeventListResponse.md)
  - [WorkspacereadmeResponse](docs/WorkspacereadmeResponse.md)
  - [WorkspacetemplateListResponse](docs/WorkspacetemplateListResponse.md)
  - [WorkspacetemplateclusterenvironmentmetadataResponse](docs/WorkspacetemplateclusterenvironmentmetadataResponse.md)

{anyscale-0.24.18 → anyscale-0.24.19}/anyscale/client/openapi_client/__init__.py

@@ -268,6 +268,7 @@ from openapi_client.models.ebs_block_device import EbsBlockDevice
 from openapi_client.models.editable_cloud_resource import EditableCloudResource
 from openapi_client.models.editable_cloud_resource_gcp import EditableCloudResourceGCP
 from openapi_client.models.error import Error
+from openapi_client.models.event_level import EventLevel
 from openapi_client.models.execute_command_response import ExecuteCommandResponse
 from openapi_client.models.execute_interactive_command_options import ExecuteInteractiveCommandOptions
 from openapi_client.models.execute_shell_command_options import ExecuteShellCommandOptions
@@ -451,6 +452,7 @@ from openapi_client.models.requestemailmagiclinkresponse_response import Request
 from openapi_client.models.requestotpreturnapimodel_response import RequestotpreturnapimodelResponse
 from openapi_client.models.reset_password_params import ResetPasswordParams
 from openapi_client.models.resources import Resources
+from openapi_client.models.resubmit_ft_job_request import ResubmitFTJobRequest
 from openapi_client.models.rollback_service_model import RollbackServiceModel
 from openapi_client.models.rollout_strategy import RolloutStrategy
 from openapi_client.models.s3_download_location import S3DownloadLocation
@@ -574,12 +576,16 @@ from openapi_client.models.worker_node_type import WorkerNodeType
 from openapi_client.models.workspace_dataplane_artifact import WorkspaceDataplaneArtifact
 from openapi_client.models.workspace_dataplane_artifacts import WorkspaceDataplaneArtifacts
 from openapi_client.models.workspace_dataplane_proxied_artifacts import WorkspaceDataplaneProxiedArtifacts
+from openapi_client.models.workspace_event import WorkspaceEvent
+from openapi_client.models.workspace_event_source import WorkspaceEventSource
+from openapi_client.models.workspace_event_source_filter import WorkspaceEventSourceFilter
 from openapi_client.models.workspace_readme import WorkspaceReadme
 from openapi_client.models.workspace_snapshot_states import WorkspaceSnapshotStates
 from openapi_client.models.workspace_template import WorkspaceTemplate
 from openapi_client.models.workspace_template_cluster_environment_metadata import WorkspaceTemplateClusterEnvironmentMetadata
 from openapi_client.models.workspacedataplaneartifacts_response import WorkspacedataplaneartifactsResponse
 from openapi_client.models.workspacedataplaneproxiedartifacts_response import WorkspacedataplaneproxiedartifactsResponse
+from openapi_client.models.workspaceevent_list_response import WorkspaceeventListResponse
 from openapi_client.models.workspacereadme_response import WorkspacereadmeResponse
 from openapi_client.models.workspacetemplate_list_response import WorkspacetemplateListResponse
 from openapi_client.models.workspacetemplateclusterenvironmentmetadata_response import WorkspacetemplateclusterenvironmentmetadataResponse