anyscale 0.24.22__tar.gz → 0.24.24__tar.gz

{anyscale-0.24.22 → anyscale-0.24.24}/PKG-INFO

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

{anyscale-0.24.22 → anyscale-0.24.24}/anyscale/_private/anyscale_client/anyscale_client.py

@@ -33,6 +33,7 @@ from anyscale.client.openapi_client.models import (
     DecoratedComputeTemplate,
     InternalProductionJob,
 )
+from anyscale.client.openapi_client.models.production_job import ProductionJob
 from anyscale.client.openapi_client.rest import ApiException as InternalApiException
 from anyscale.cluster_compute import parse_cluster_compute_name_version
 from anyscale.sdk.anyscale_client.api.default_api import DefaultApi as ExternalApi
@@ -160,9 +161,9 @@ class AnyscaleClient(AnyscaleClientInterface):
                 raise RuntimeError(
                     "Could not import the Amazon S3 Python API via `import boto3`.  Please check your installation or try running `pip install boto3`."
                 )
-            self._s3_client = boto3.client(
+            self._s3_client = boto3.client(  # type: ignore
                 "s3", config=botocore.config.Config(signature_version="s3v4")
-            )  # type: ignore
+            )
         return self._s3_client  # type: ignore
 
     @property
@@ -722,6 +723,42 @@ class AnyscaleClient(AnyscaleClientInterface):
 
         return service
 
+    def get_job(
+        self, name: Optional[str], job_id: Optional[str]
+    ) -> Optional[ProductionJob]:
+        if job_id is not None:
+            try:
+                return self._external_api_client.get_production_job(job_id).result
+            except ExternalApiException as e:
+                if e.status == 404:
+                    return None
+                raise e from None
+        else:
+            paging_token = None
+            cloud_id = self.get_cloud_id()
+            project_id = self.get_project_id(parent_cloud_id=cloud_id)
+            result: Optional[ProductionJob] = None
+            while True:
+                resp = self._external_api_client.list_production_jobs(
+                    project_id=project_id,
+                    name=name,
+                    count=self.LIST_ENDPOINT_COUNT,
+                    paging_token=paging_token,
+                )
+                for job in resp.results:
+                    if (
+                        job is not None
+                        and job.name == name
+                        and (result is None or job.created_at > result.created_at)
+                    ):
+                        result = job
+
+                paging_token = resp.metadata.next_paging_token
+                if paging_token is None:
+                    break
+
+            return result
+
     def rollout_service(self, model: ApplyServiceModel) -> ServiceModel:
         result: ServiceModel = self._external_api_client.rollout_service(model).result
         return result
@@ -747,6 +784,14 @@ class AnyscaleClient(AnyscaleClientInterface):
         ).result
         return job
 
+    def terminate_job(self, job_id: str):
+        self._external_api_client.terminate_job(job_id)
+
+    def archive_job(self, job_id: str):
+        self._internal_api_client.archive_job_api_v2_decorated_ha_jobs_production_job_id_archive_post(
+            job_id
+        )
+
     def upload_local_dir_to_cloud_storage(
         self,
         local_dir: str,

{anyscale-0.24.22 → anyscale-0.24.24}/anyscale/_private/anyscale_client/common.py

@@ -9,6 +9,7 @@ from anyscale.client.openapi_client.models import (
     DecoratedComputeTemplate,
     InternalProductionJob,
 )
+from anyscale.client.openapi_client.models.production_job import ProductionJob
 from anyscale.sdk.anyscale_client.models import (
     ApplyServiceModel,
     Cluster,
@@ -209,6 +210,16 @@ class AnyscaleClientInterface(ABC):
         """
         raise NotImplementedError
 
+    @abstractmethod
+    def get_job(
+        self, name: Optional[str], job_id: Optional[str]
+    ) -> Optional[ProductionJob]:
+        """Get a job by name.
+
+        Returns None if not found.
+        """
+        raise NotImplementedError
+
     @abstractmethod
     def rollout_service(self, model: ApplyServiceModel) -> ServiceModel:
         """Deploy or update the service to use the provided config.
@@ -237,6 +248,16 @@ class AnyscaleClientInterface(ABC):
         """Submit the job to run."""
         raise NotImplementedError
 
+    @abstractmethod
+    def terminate_job(self, job_id: str):
+        """Mark the job to be terminated asynchronously."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def archive_job(self, job_id: str):
+        """Mark the job to be archived asynchronously."""
+        raise NotImplementedError
+
     @abstractmethod
     def upload_local_dir_to_cloud_storage(
         self,

{anyscale-0.24.22 → anyscale-0.24.24}/anyscale/_private/anyscale_client/fake_anyscale_client.py

@@ -18,6 +18,7 @@ from anyscale.client.openapi_client.models import (
     InternalProductionJob,
     ProductionJobStateTransition,
 )
+from anyscale.client.openapi_client.models.production_job import ProductionJob
 from anyscale.sdk.anyscale_client.configuration import Configuration
 from anyscale.sdk.anyscale_client.models import (
     ApplyServiceModel,
@@ -66,10 +67,12 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         self._workspace_cluster: Optional[Cluster] = None
         self._workspace_dependency_tracking_enabled: bool = False
         self._services: Dict[str, ServiceModel] = {}
+        self._jobs: Dict[str, ProductionJob] = {}
         self._rolled_out_model: Optional[ApplyServiceModel] = None
         self._sent_workspace_notifications: List[WorkspaceNotification] = []
         self._rolled_back_service: Optional[Tuple[str, Optional[int]]] = None
         self._terminated_service: Optional[str] = None
+        self._archived_jobs: Dict[str, ProductionJob] = {}
         self._requirements_path: Optional[str] = None
         self._upload_uri_mapping: Dict[str, str] = {}
         self._submitted_job: Optional[CreateInternalProductionJob] = None
@@ -305,6 +308,26 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
 
         return None
 
+    def get_job(
+        self, name: Optional[str], job_id: Optional[str]
+    ) -> Optional[ProductionJob]:
+        if job_id is not None:
+            return self._jobs.get(job_id, None)
+        else:
+            result: ProductionJob = None
+            for job in self._jobs.values():
+                if (
+                    job is not None
+                    and job.name == name
+                    and (result is None or job.created_at > result.created_at)
+                ):
+                    result = job
+
+        return result
+
+    def update_job(self, model: ProductionJob):
+        self._jobs[model.id] = model
+
     @property
     def rolled_out_model(self) -> Optional[ApplyServiceModel]:
         return self._rolled_out_model
@@ -373,7 +396,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
     def submit_job(self, model: CreateInternalProductionJob) -> InternalProductionJob:
         self._submitted_job = model
 
-        return InternalProductionJob(
+        job = InternalProductionJob(
             id=f"job-{uuid.uuid4()!s}",
             name=model.name,
             config=model.config,
@@ -385,6 +408,18 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
             local_vars_configuration=OPENAPI_NO_VALIDATION,
         )
 
+        self.update_job(job)
+        return job
+
+    def terminate_job(self, job_id: str):
+        self._jobs[job_id].state = HaJobStates.TERMINATED
+
+    def archive_job(self, job_id: str):
+        self._archived_jobs[job_id] = self._jobs.pop(job_id)
+
+    def is_archived_job(self, job_id: str) -> bool:
+        return job_id in self._archived_jobs
+
     def upload_local_dir_to_cloud_storage(
         self,
         local_dir: str,  # noqa: ARG002

{anyscale-0.24.22 → anyscale-0.24.24}/anyscale/_private/docgen/__main__.py

@@ -15,7 +15,7 @@ from anyscale.compute_config.models import (
     MarketType,
     WorkerNodeGroupConfig,
 )
-from anyscale.job.models import JobConfig
+from anyscale.job.models import JobConfig, JobState, JobStatus
 from anyscale.service.models import (
     RayGCSExternalStorageConfig,
     ServiceConfig,
@@ -32,10 +32,20 @@ ALL_MODULES = [
         title="Job",
         filename="job-api.md",
         cli_prefix="anyscale job",
-        cli_commands=[job_commands.submit],
+        cli_commands=[
+            job_commands.submit,
+            job_commands.status,
+            job_commands.terminate,
+            job_commands.archive,
+        ],
         sdk_prefix="anyscale.job",
-        sdk_commands=[anyscale.job.submit],
-        models=[JobConfig],
+        sdk_commands=[
+            anyscale.job.submit,
+            anyscale.job.status,
+            anyscale.job.terminate,
+            anyscale.job.archive,
+        ],
+        models=[JobConfig, JobState, JobStatus],
     ),
     Module(
         title="Service",

{anyscale-0.24.22 → anyscale-0.24.24}/anyscale/anyscale-cloud-setup-oa.yaml

@@ -104,38 +104,6 @@ Resources:
       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:

{anyscale-0.24.22 → anyscale-0.24.24}/anyscale/client/README.md

@@ -128,6 +128,7 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**delete_cloud_api_v2_clouds_cloud_id_delete**](docs/DefaultApi.md#delete_cloud_api_v2_clouds_cloud_id_delete) | **DELETE** /api/v2/clouds/{cloud_id} | Delete Cloud
 *DefaultApi* | [**delete_cloud_collaborator_api_v2_clouds_cloud_id_collaborators_identity_id_delete**](docs/DefaultApi.md#delete_cloud_collaborator_api_v2_clouds_cloud_id_collaborators_identity_id_delete) | **DELETE** /api/v2/clouds/{cloud_id}/collaborators/{identity_id} | Delete Cloud Collaborator
 *DefaultApi* | [**delete_compute_template_api_v2_compute_templates_template_id_delete**](docs/DefaultApi.md#delete_compute_template_api_v2_compute_templates_template_id_delete) | **DELETE** /api/v2/compute_templates/{template_id} | Delete Compute Template
+*DefaultApi* | [**delete_hosted_cloud_api_v2_clouds_hosted_cloud_id_delete**](docs/DefaultApi.md#delete_hosted_cloud_api_v2_clouds_hosted_cloud_id_delete) | **DELETE** /api/v2/clouds/hosted/{cloud_id} | Delete Hosted Cloud
 *DefaultApi* | [**delete_machine_api_v2_machines_delete_post**](docs/DefaultApi.md#delete_machine_api_v2_machines_delete_post) | **POST** /api/v2/machines/delete | Delete Machine
 *DefaultApi* | [**delete_machine_pool_api_v2_machine_pools_delete_post**](docs/DefaultApi.md#delete_machine_pool_api_v2_machine_pools_delete_post) | **POST** /api/v2/machine_pools/delete | Delete Machine Pool
 *DefaultApi* | [**delete_project_api_v2_projects_project_id_delete**](docs/DefaultApi.md#delete_project_api_v2_projects_project_id_delete) | **DELETE** /api/v2/projects/{project_id} | Delete Project
@@ -502,6 +503,7 @@ Class | Method | HTTP request | Description
  - [ClusterconfigwithsessionidletimeoutResponse](docs/ClusterconfigwithsessionidletimeoutResponse.md)
  - [ClustereventsoutputResponse](docs/ClustereventsoutputResponse.md)
  - [ClusterfeaturesResponse](docs/ClusterfeaturesResponse.md)
+ - [CompanySize](docs/CompanySize.md)
  - [ComputeNodeType](docs/ComputeNodeType.md)
  - [ComputeTemplate](docs/ComputeTemplate.md)
  - [ComputeTemplateConfig](docs/ComputeTemplateConfig.md)
@@ -737,6 +739,7 @@ Class | Method | HTTP request | Description
  - [OrganizationCollaborator](docs/OrganizationCollaborator.md)
  - [OrganizationInvitation](docs/OrganizationInvitation.md)
  - [OrganizationInvitationBase](docs/OrganizationInvitationBase.md)
+ - [OrganizationMarketingQuestions](docs/OrganizationMarketingQuestions.md)
  - [OrganizationPermissionLevel](docs/OrganizationPermissionLevel.md)
  - [OrganizationProjectCollaborator](docs/OrganizationProjectCollaborator.md)
  - [OrganizationProjectCollaboratorValue](docs/OrganizationProjectCollaboratorValue.md)

{anyscale-0.24.22 → anyscale-0.24.24}/anyscale/client/openapi_client/__init__.py

@@ -154,6 +154,7 @@ from openapi_client.models.clusterconfig_response import ClusterconfigResponse
 from openapi_client.models.clusterconfigwithsessionidletimeout_response import ClusterconfigwithsessionidletimeoutResponse
 from openapi_client.models.clustereventsoutput_response import ClustereventsoutputResponse
 from openapi_client.models.clusterfeatures_response import ClusterfeaturesResponse
+from openapi_client.models.company_size import CompanySize
 from openapi_client.models.compute_node_type import ComputeNodeType
 from openapi_client.models.compute_template import ComputeTemplate
 from openapi_client.models.compute_template_config import ComputeTemplateConfig
@@ -389,6 +390,7 @@ from openapi_client.models.organization_availability import OrganizationAvailabi
 from openapi_client.models.organization_collaborator import OrganizationCollaborator
 from openapi_client.models.organization_invitation import OrganizationInvitation
 from openapi_client.models.organization_invitation_base import OrganizationInvitationBase
+from openapi_client.models.organization_marketing_questions import OrganizationMarketingQuestions
 from openapi_client.models.organization_permission_level import OrganizationPermissionLevel
 from openapi_client.models.organization_project_collaborator import OrganizationProjectCollaborator
 from openapi_client.models.organization_project_collaborator_value import OrganizationProjectCollaboratorValue

{anyscale-0.24.22 → anyscale-0.24.24}/anyscale/client/openapi_client/api/default_api.py

@@ -6229,6 +6229,120 @@ class DefaultApi(object):
             _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def delete_hosted_cloud_api_v2_clouds_hosted_cloud_id_delete(self, cloud_id, **kwargs):  # noqa: E501
+        """Delete Hosted Cloud  # noqa: E501
+
+        Deletes a hosted cloud.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_hosted_cloud_api_v2_clouds_hosted_cloud_id_delete(cloud_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool: execute request asynchronously
+        :param str cloud_id: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        return self.delete_hosted_cloud_api_v2_clouds_hosted_cloud_id_delete_with_http_info(cloud_id, **kwargs)  # noqa: E501
+
+    def delete_hosted_cloud_api_v2_clouds_hosted_cloud_id_delete_with_http_info(self, cloud_id, **kwargs):  # noqa: E501
+        """Delete Hosted Cloud  # noqa: E501
+
+        Deletes a hosted cloud.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_hosted_cloud_api_v2_clouds_hosted_cloud_id_delete_with_http_info(cloud_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool: execute request asynchronously
+        :param str cloud_id: (required)
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        local_var_params = locals()
+
+        all_params = [
+            'cloud_id'
+        ]
+        all_params.extend(
+            [
+                'async_req',
+                '_return_http_data_only',
+                '_preload_content',
+                '_request_timeout'
+            ]
+        )
+
+        for key, val in six.iteritems(local_var_params['kwargs']):
+            if key not in all_params:
+                raise ApiTypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_hosted_cloud_api_v2_clouds_hosted_cloud_id_delete" % key
+                )
+            local_var_params[key] = val
+        del local_var_params['kwargs']
+        # verify the required parameter 'cloud_id' is set
+        if self.api_client.client_side_validation and ('cloud_id' not in local_var_params or  # noqa: E501
+                                                        local_var_params['cloud_id'] is None):  # noqa: E501
+            raise ApiValueError("Missing the required parameter `cloud_id` when calling `delete_hosted_cloud_api_v2_clouds_hosted_cloud_id_delete`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'cloud_id' in local_var_params:
+            path_params['cloud_id'] = local_var_params['cloud_id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/clouds/hosted/{cloud_id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def delete_machine_api_v2_machines_delete_post(self, delete_machine_request, **kwargs):  # noqa: E501
         """Delete Machine  # noqa: E501
 
@@ -9330,7 +9444,7 @@ class DefaultApi(object):
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
-        :return: str
+        :return: BillingVersionCode
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -9356,7 +9470,7 @@ class DefaultApi(object):
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
-        :return: tuple(str, status_code(int), headers(HTTPHeaderDict))
+        :return: tuple(BillingVersionCode, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -9397,7 +9511,7 @@ class DefaultApi(object):
         body_params = None
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
-            ['text/plain'])  # noqa: E501
+            ['application/json'])  # noqa: E501
 
         # Authentication setting
         auth_settings = []  # noqa: E501
@@ -9410,7 +9524,7 @@ class DefaultApi(object):
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='str',  # noqa: E501
+            response_type='BillingVersionCode',  # noqa: E501
             auth_settings=auth_settings,
             async_req=local_var_params.get('async_req'),
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501

{anyscale-0.24.22 → anyscale-0.24.24}/anyscale/client/openapi_client/models/__init__.py

@@ -140,6 +140,7 @@ from openapi_client.models.clusterconfig_response import ClusterconfigResponse
 from openapi_client.models.clusterconfigwithsessionidletimeout_response import ClusterconfigwithsessionidletimeoutResponse
 from openapi_client.models.clustereventsoutput_response import ClustereventsoutputResponse
 from openapi_client.models.clusterfeatures_response import ClusterfeaturesResponse
+from openapi_client.models.company_size import CompanySize
 from openapi_client.models.compute_node_type import ComputeNodeType
 from openapi_client.models.compute_template import ComputeTemplate
 from openapi_client.models.compute_template_config import ComputeTemplateConfig
@@ -375,6 +376,7 @@ from openapi_client.models.organization_availability import OrganizationAvailabi
 from openapi_client.models.organization_collaborator import OrganizationCollaborator
 from openapi_client.models.organization_invitation import OrganizationInvitation
 from openapi_client.models.organization_invitation_base import OrganizationInvitationBase
+from openapi_client.models.organization_marketing_questions import OrganizationMarketingQuestions
 from openapi_client.models.organization_permission_level import OrganizationPermissionLevel
 from openapi_client.models.organization_project_collaborator import OrganizationProjectCollaborator
 from openapi_client.models.organization_project_collaborator_value import OrganizationProjectCollaboratorValue