anyscale 0.24.33__tar.gz → 0.24.34__tar.gz

{anyscale-0.24.33 → anyscale-0.24.34}/PKG-INFO

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

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale/__init__.py

@@ -15,7 +15,7 @@ anyscale_dir = os.path.dirname(os.path.abspath(__file__))
 path.append(os.path.join(anyscale_dir, "client"))
 path.append(os.path.join(anyscale_dir, "sdk"))
 
-from anyscale import compute_config, integrations, job, service
+from anyscale import compute_config, image, integrations, job, service
 from anyscale.cluster import get_job_submission_client_cluster_info
 from anyscale.cluster_compute import get_cluster_compute_from_name
 from anyscale.connect import ClientBuilder

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale/_private/anyscale_client/anyscale_client.py

@@ -596,7 +596,9 @@ class AnyscaleClient(AnyscaleClientInterface):
             f"Timed out waiting for image build {build_id} to complete after {timeout_secs}s."
         )
 
-    def _find_or_create_cluster_env(self, cluster_env_name: str) -> ClusterEnvironment:
+    def _find_or_create_cluster_env(
+        self, cluster_env_name: str, anonymous: bool
+    ) -> ClusterEnvironment:
         existing_cluster_env = self._get_cluster_env_by_name(cluster_env_name)
         if existing_cluster_env is not None:
             return existing_cluster_env
@@ -609,14 +611,16 @@ class AnyscaleClient(AnyscaleClientInterface):
         # ```
         # The race condition can happen if another build for the same cluster envrionment is created between the two calls.
         cluster_environment = self._external_api_client.create_cluster_environment(
-            CreateClusterEnvironment(name=cluster_env_name, anonymous=True)
+            CreateClusterEnvironment(name=cluster_env_name, anonymous=anonymous)
         ).result
         return cluster_environment
 
     def get_cluster_env_build_id_from_containerfile(
-        self, cluster_env_name: str, containerfile: str
+        self, cluster_env_name: str, containerfile: str, anonymous: bool = True
     ) -> str:
-        cluster_env = self._find_or_create_cluster_env(cluster_env_name)
+        cluster_env = self._find_or_create_cluster_env(
+            cluster_env_name, anonymous=anonymous
+        )
         cluster_env_builds = self._external_api_client.list_cluster_environment_builds(
             cluster_environment_id=cluster_env.id, count=self.LIST_ENDPOINT_COUNT
         ).results
@@ -662,7 +666,7 @@ class AnyscaleClient(AnyscaleClientInterface):
                     )
 
         cluster_env_name = image_uri.to_cluster_env_name()
-        cluster_env = self._find_or_create_cluster_env(cluster_env_name)
+        cluster_env = self._find_or_create_cluster_env(cluster_env_name, anonymous=True)
         image_uri_str = str(image_uri)
 
         # since we encode the image_uri into the cluster env name, there should exist one and only one build that matches the image_uri.

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale/_private/anyscale_client/common.py

@@ -182,11 +182,11 @@ class AnyscaleClientInterface(ABC):
 
     @abstractmethod
     def get_cluster_env_build_id_from_containerfile(
-        self, cluster_env_name: str, containerfile: str
+        self, cluster_env_name: str, containerfile: str, anonymous: bool
     ) -> str:
         """Get the cluster environment build ID for the cluster environment with provided containerfile.
         Look for an existing cluster environment with the provided name.
-        If found, reuse it. Else, create a new cluster environment.
+        If found, reuse it. Else, create a new cluster environment. The created cluster environment will be anonymous if anonymous is True.
         Create a new cluster environment build with the provided containerfile or try to reuse one with the same containerfile if exists.
         """
         raise NotImplementedError

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale/_private/anyscale_client/fake_anyscale_client.py

@@ -327,7 +327,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         return None
 
     def get_cluster_env_build_id_from_containerfile(
-        self, cluster_env_name: str, containerfile: str  # noqa: ARG002
+        self, cluster_env_name: str, containerfile: str, anonymous: bool  # noqa: ARG002
     ) -> str:
         if containerfile in self._containerfile_to_build_id:
             return self._containerfile_to_build_id[containerfile]

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale/client/openapi_client/api/default_api.py

@@ -18158,9 +18158,10 @@ class DefaultApi(object):
         :param list[ServiceEventScopeFilter] origin: Filter if origin of event is included in this list. If \"\" in this list, no origin will be included in filter, so no results will be returned. Default behavior is to include all origin values in filter.
         :param ServiceEventLevel level: Filter by level of event
         :param str message: Filter by message of event
-        :param datetime start_time: The start time for the query. If  start_time is not set, the query will use beginning of time.
-        :param datetime end_time: The end time for the query. If end_time is not set, the query will use the time now.
+        :param datetime start_time: The start time for the query. Non-inclusive. If start_time is not set, the query will use beginning of time.
+        :param datetime end_time: The end time for the query. Non-inclusive. If end_time is not set, the query will use the time now.
         :param bool include_verbose_events: Show all verbose service events without truncation if set to True.
+        :param bool ascending_order: Fetch events in ascending order of time. Default is descending order.
         :param str paging_token:
         :param int count:
         :param _preload_content: if False, the urllib3.HTTPResponse object will
@@ -18191,9 +18192,10 @@ class DefaultApi(object):
         :param list[ServiceEventScopeFilter] origin: Filter if origin of event is included in this list. If \"\" in this list, no origin will be included in filter, so no results will be returned. Default behavior is to include all origin values in filter.
         :param ServiceEventLevel level: Filter by level of event
         :param str message: Filter by message of event
-        :param datetime start_time: The start time for the query. If  start_time is not set, the query will use beginning of time.
-        :param datetime end_time: The end time for the query. If end_time is not set, the query will use the time now.
+        :param datetime start_time: The start time for the query. Non-inclusive. If start_time is not set, the query will use beginning of time.
+        :param datetime end_time: The end time for the query. Non-inclusive. If end_time is not set, the query will use the time now.
         :param bool include_verbose_events: Show all verbose service events without truncation if set to True.
+        :param bool ascending_order: Fetch events in ascending order of time. Default is descending order.
         :param str paging_token:
         :param int count:
         :param _return_http_data_only: response data without head status code
@@ -18220,6 +18222,7 @@ class DefaultApi(object):
             'start_time',
             'end_time',
             'include_verbose_events',
+            'ascending_order',
             'paging_token',
             'count'
         ]
@@ -18269,6 +18272,8 @@ class DefaultApi(object):
             query_params.append(('end_time', local_var_params['end_time']))  # noqa: E501
         if 'include_verbose_events' in local_var_params and local_var_params['include_verbose_events'] is not None:  # noqa: E501
             query_params.append(('include_verbose_events', local_var_params['include_verbose_events']))  # noqa: E501
+        if 'ascending_order' in local_var_params and local_var_params['ascending_order'] is not None:  # noqa: E501
+            query_params.append(('ascending_order', local_var_params['ascending_order']))  # noqa: E501
         if 'paging_token' in local_var_params and local_var_params['paging_token'] is not None:  # noqa: E501
             query_params.append(('paging_token', local_var_params['paging_token']))  # noqa: E501
         if 'count' in local_var_params and local_var_params['count'] is not None:  # noqa: E501
@@ -20878,8 +20883,9 @@ class DefaultApi(object):
         :param list[WorkspaceEventSourceFilter] origin: Filter if origin of event is included in this list. If \"\" in this list, no origin will be included in filter, so no results will be returned. Default behavior is to include all origin values in filter.
         :param EventLevel level: Filter by level of event. If level is not set, query will return all level values
         :param str message: Filter by message of event. If message is not set, query will not filter for message
-        :param datetime start_time: The start time for the query. If  start_time is not set, the query will use beginning of time.
-        :param datetime end_time: The end time for the query. If end_time is not set, the query will use the time now.
+        :param datetime start_time: The start time for the query. Non-inclusive. If  start_time is not set, the query will use beginning of time.
+        :param datetime end_time: The end time for the query. Non-inclusive. If end_time is not set, the query will use the time now.
+        :param bool ascending_order: Fetch events in ascending order of time. Default is descending order.
         :param str paging_token:
         :param int count:
         :param _preload_content: if False, the urllib3.HTTPResponse object will
@@ -20910,8 +20916,9 @@ class DefaultApi(object):
         :param list[WorkspaceEventSourceFilter] origin: Filter if origin of event is included in this list. If \"\" in this list, no origin will be included in filter, so no results will be returned. Default behavior is to include all origin values in filter.
         :param EventLevel level: Filter by level of event. If level is not set, query will return all level values
         :param str message: Filter by message of event. If message is not set, query will not filter for message
-        :param datetime start_time: The start time for the query. If  start_time is not set, the query will use beginning of time.
-        :param datetime end_time: The end time for the query. If end_time is not set, the query will use the time now.
+        :param datetime start_time: The start time for the query. Non-inclusive. If  start_time is not set, the query will use beginning of time.
+        :param datetime end_time: The end time for the query. Non-inclusive. If end_time is not set, the query will use the time now.
+        :param bool ascending_order: Fetch events in ascending order of time. Default is descending order.
         :param str paging_token:
         :param int count:
         :param _return_http_data_only: response data without head status code
@@ -20937,6 +20944,7 @@ class DefaultApi(object):
             'message',
             'start_time',
             'end_time',
+            'ascending_order',
             'paging_token',
             'count'
         ]
@@ -20984,6 +20992,8 @@ class DefaultApi(object):
             query_params.append(('start_time', local_var_params['start_time']))  # noqa: E501
         if 'end_time' in local_var_params and local_var_params['end_time'] is not None:  # noqa: E501
             query_params.append(('end_time', local_var_params['end_time']))  # noqa: E501
+        if 'ascending_order' in local_var_params and local_var_params['ascending_order'] is not None:  # noqa: E501
+            query_params.append(('ascending_order', local_var_params['ascending_order']))  # noqa: E501
         if 'paging_token' in local_var_params and local_var_params['paging_token'] is not None:  # noqa: E501
             query_params.append(('paging_token', local_var_params['paging_token']))  # noqa: E501
         if 'count' in local_var_params and local_var_params['count'] is not None:  # noqa: E501

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale/client/openapi_client/models/delete_machine_request.py

@@ -35,16 +35,18 @@ class DeleteMachineRequest(object):
     openapi_types = {
         'cloud_id': 'str',
         'message_base64': 'str',
-        'machine_id': 'str'
+        'machine_id': 'str',
+        'machine_pool_name': 'str'
     }
 
     attribute_map = {
         'cloud_id': 'cloud_id',
         'message_base64': 'message_base64',
-        'machine_id': 'machine_id'
+        'machine_id': 'machine_id',
+        'machine_pool_name': 'machine_pool_name'
     }
 
-    def __init__(self, cloud_id=None, message_base64=None, machine_id=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, cloud_id=None, message_base64=None, machine_id=None, machine_pool_name=None, local_vars_configuration=None):  # noqa: E501
         """DeleteMachineRequest - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -53,6 +55,7 @@ class DeleteMachineRequest(object):
         self._cloud_id = None
         self._message_base64 = None
         self._machine_id = None
+        self._machine_pool_name = None
         self.discriminator = None
 
         if cloud_id is not None:
@@ -61,6 +64,8 @@ class DeleteMachineRequest(object):
             self.message_base64 = message_base64
         if machine_id is not None:
             self.machine_id = machine_id
+        if machine_pool_name is not None:
+            self.machine_pool_name = machine_pool_name
 
     @property
     def cloud_id(self):
@@ -131,6 +136,29 @@ class DeleteMachineRequest(object):
 
         self._machine_id = machine_id
 
+    @property
+    def machine_pool_name(self):
+        """Gets the machine_pool_name of this DeleteMachineRequest.  # noqa: E501
+
+        The machine pool name for this machine deletion request (when message_base64 is set, this field is unset).  # noqa: E501
+
+        :return: The machine_pool_name of this DeleteMachineRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._machine_pool_name
+
+    @machine_pool_name.setter
+    def machine_pool_name(self, machine_pool_name):
+        """Sets the machine_pool_name of this DeleteMachineRequest.
+
+        The machine pool name for this machine deletion request (when message_base64 is set, this field is unset).  # noqa: E501
+
+        :param machine_pool_name: The machine_pool_name of this DeleteMachineRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._machine_pool_name = machine_pool_name
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

anyscale-0.24.34/anyscale/commands/image_commands.py

@@ -0,0 +1,35 @@
+from typing import IO
+
+import click
+
+import anyscale
+
+
+@click.group(
+    "image", help="Manage images to define dependencies on Anyscale.",
+)
+def image_cli() -> None:
+    pass
+
+
+@image_cli.command(
+    name="build", help=("Build an image from a Containerfile."),
+)
+@click.option(
+    "--containerfile",
+    "-f",
+    help="Path to the Containerfile.",
+    type=click.File("rb"),
+    required=True,
+)
+@click.option(
+    "--name",
+    "-n",
+    help="Name for the image. If the image with the same name already exists, a new version will be built. Otherwise, a new image will be created.",
+    required=True,
+    type=str,
+)
+def build(containerfile: IO[bytes], name: str) -> None:
+    containerfile_str = containerfile.read().decode("utf-8")
+    image_uri = anyscale.image.build(containerfile_str, name=name)
+    print(f"Image built successfully with URI: {image_uri}")

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale/commands/machine_commands.py

@@ -84,8 +84,12 @@ def list_machines(machine_pool_name: str, format_: str,) -> None:
 @click.option("--cloud", type=str, help="Provide a cloud name.")
 @click.option("--cloud-id", type=str, help="Provide a cloud ID.")
 @click.option("--machine-id", type=str, help="Provide a machine ID.")
+@click.option("--machine-pool-name", type=str, help="Provide a machine pool name.")
 def delete_machine(
-    cloud: Optional[str], cloud_id: Optional[str], machine_id: str
+    cloud: Optional[str],
+    cloud_id: Optional[str],
+    machine_id: str,
+    machine_pool_name: Optional[str],
 ) -> None:
 
     if not cloud and not cloud_id:
@@ -93,7 +97,10 @@ def delete_machine(
 
     machines_controller = MachineController()
     machines_controller.delete_machine(
-        cloud=cloud, cloud_id=cloud_id, machine_id=machine_id,
+        cloud=cloud,
+        cloud_id=cloud_id,
+        machine_id=machine_id,
+        machine_pool_name=machine_pool_name,
     )
 
     print(f"Machine {machine_id} has been deleted.")

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale/controllers/machine_controller.py

@@ -29,11 +29,19 @@ class MachineController(BaseController):
         return response
 
     def delete_machine(
-        self, cloud: Optional[str], cloud_id: Optional[str], machine_id: str,
+        self,
+        cloud: Optional[str],
+        cloud_id: Optional[str],
+        machine_id: str,
+        machine_pool_name: Optional[str],
     ):
         if cloud is not None:
             cloud_id, _ = get_cloud_id_and_name(self.api_client, cloud_name=cloud)
 
         self.api_client.delete_machine_api_v2_machines_delete_post(
-            DeleteMachineRequest(cloud_id=cloud_id, machine_id=machine_id,),
+            DeleteMachineRequest(
+                cloud_id=cloud_id,
+                machine_id=machine_id,
+                machine_pool_name=machine_pool_name,
+            ),
         )

anyscale-0.24.34/anyscale/image/__init__.py

@@ -0,0 +1 @@
+from anyscale.image.commands import build

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale/image/_private/image_sdk.py

@@ -42,7 +42,7 @@ class ImageSDK(BaseSDK):
 
     def build_image_from_containerfile(self, name: str, containerfile: str) -> str:
         return self.client.get_cluster_env_build_id_from_containerfile(
-            cluster_env_name=name, containerfile=containerfile
+            cluster_env_name=name, containerfile=containerfile, anonymous=False
         )
 
     def build_image_from_requirements(

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale/image/commands.py

@@ -12,7 +12,7 @@ FROM anyscale/ray:2.21.0-py39
 RUN pip install --no-cache-dir pandas
 '''
 
-image_uri: str = anyscale.image.build_image_from_containerfile("mycoolimage", containerfile)
+image_uri: str = anyscale.image.build(containerfile, name="mycoolimage")
 """
 
 

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale/scripts.py

@@ -18,6 +18,7 @@ from anyscale.commands.experimental_integrations_commands import (
     experimental_integrations_cli,
 )
 from anyscale.commands.fine_tune_commands import fine_tune_cli
+from anyscale.commands.image_commands import image_cli
 from anyscale.commands.job_commands import job_cli
 from anyscale.commands.list_commands import list_cli
 from anyscale.commands.login_commands import anyscale_login, anyscale_logout
@@ -122,6 +123,7 @@ cli.add_command(anyscale_init)
 cli.add_command(anyscale_exec)
 cli.add_command(anyscale_help)
 cli.add_command(compute_config_cli)
+cli.add_command(image_cli)
 
 # Commands to interact with the Anyscale API
 cli.add_command(anyscale_api)
@@ -139,6 +141,7 @@ ALIASES = {
     "jobs": job_cli,
     "services": service_cli,
     "cluster-compute": compute_config_cli,
+    "images": image_cli,
     "sa": service_account_cli,
 }
 

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale/sdk/anyscale_client/models/cluster_environment.py

@@ -41,7 +41,8 @@ class ClusterEnvironment(object):
         'created_at': 'datetime',
         'last_modified_at': 'datetime',
         'deleted_at': 'datetime',
-        'anonymous': 'bool'
+        'anonymous': 'bool',
+        'is_default': 'bool'
     }
 
     attribute_map = {
@@ -53,10 +54,11 @@ class ClusterEnvironment(object):
         'created_at': 'created_at',
         'last_modified_at': 'last_modified_at',
         'deleted_at': 'deleted_at',
-        'anonymous': 'anonymous'
+        'anonymous': 'anonymous',
+        'is_default': 'is_default'
     }
 
-    def __init__(self, id=None, name=None, project_id=None, organization_id=None, creator_id=None, created_at=None, last_modified_at=None, deleted_at=None, anonymous=False, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, id=None, name=None, project_id=None, organization_id=None, creator_id=None, created_at=None, last_modified_at=None, deleted_at=None, anonymous=False, is_default=False, local_vars_configuration=None):  # noqa: E501
         """ClusterEnvironment - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -71,6 +73,7 @@ class ClusterEnvironment(object):
         self._last_modified_at = None
         self._deleted_at = None
         self._anonymous = None
+        self._is_default = None
         self.discriminator = None
 
         self.id = id
@@ -85,6 +88,8 @@ class ClusterEnvironment(object):
             self.deleted_at = deleted_at
         if anonymous is not None:
             self.anonymous = anonymous
+        if is_default is not None:
+            self.is_default = is_default
 
     @property
     def id(self):
@@ -305,6 +310,29 @@ class ClusterEnvironment(object):
 
         self._anonymous = anonymous
 
+    @property
+    def is_default(self):
+        """Gets the is_default of this ClusterEnvironment.  # noqa: E501
+
+        True if this Cluster Environment is created and managed by anyscale  # noqa: E501
+
+        :return: The is_default of this ClusterEnvironment.  # noqa: E501
+        :rtype: bool
+        """
+        return self._is_default
+
+    @is_default.setter
+    def is_default(self, is_default):
+        """Sets the is_default of this ClusterEnvironment.
+
+        True if this Cluster Environment is created and managed by anyscale  # noqa: E501
+
+        :param is_default: The is_default of this ClusterEnvironment.  # noqa: E501
+        :type: bool
+        """
+
+        self._is_default = is_default
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale/service/_private/service_sdk.py

@@ -240,6 +240,7 @@ class ServiceSDK(WorkloadSDK):
             build_id = self.client.get_cluster_env_build_id_from_containerfile(
                 cluster_env_name=f"image-for-service-{name}",
                 containerfile=self.get_containerfile_contents(config.containerfile),
+                anonymous=True,
             )
         elif config.image_uri is not None:
             build_id = self.client.get_cluster_env_build_id_from_image_uri(

anyscale-0.24.34/anyscale/version.py

@@ -0,0 +1 @@
+__version__ = "0.24.34"

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale.egg-info/PKG-INFO

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

{anyscale-0.24.33 → anyscale-0.24.34}/anyscale.egg-info/SOURCES.txt

@@ -699,6 +699,7 @@ anyscale/commands/config_commands.py
 anyscale/commands/exec_commands.py
 anyscale/commands/experimental_integrations_commands.py
 anyscale/commands/fine_tune_commands.py
+anyscale/commands/image_commands.py
 anyscale/commands/job_commands.py
 anyscale/commands/list_commands.py
 anyscale/commands/login_commands.py
@@ -751,6 +752,7 @@ anyscale/controllers/workspace_controller.py
 anyscale/formatters/__init__.py
 anyscale/formatters/clouds_formatter.py
 anyscale/formatters/common_formatter.py
+anyscale/image/__init__.py
 anyscale/image/commands.py
 anyscale/image/_private/image_sdk.py
 anyscale/job/__init__.py

anyscale-0.24.33/anyscale/version.py

@@ -1 +0,0 @@
-__version__ = "0.24.33"