anyscale 0.24.64__tar.gz → 0.24.66__tar.gz

{anyscale-0.24.64 → anyscale-0.24.66}/PKG-INFO

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

{anyscale-0.24.64 → anyscale-0.24.66}/anyscale/_private/anyscale_client/anyscale_client.py

@@ -627,7 +627,7 @@ class AnyscaleClient(AnyscaleClientInterface):
         return self._external_api_client.get_cluster_environment_build(build_id).result
 
     def get_cluster_env_build_image_uri(
-        self, cluster_env_build_id: str
+        self, cluster_env_build_id: str, use_image_alias: bool = False
     ) -> Optional[ImageURI]:
         try:
             build: ClusterEnvironmentBuild = self._external_api_client.get_cluster_environment_build(
@@ -636,7 +636,7 @@ class AnyscaleClient(AnyscaleClientInterface):
             cluster_env = self._external_api_client.get_cluster_environment(
                 build.cluster_environment_id
             ).result
-            return ImageURI.from_cluster_env_build(cluster_env, build)
+            return ImageURI.from_cluster_env_build(cluster_env, build, use_image_alias)
         except ExternalApiException as e:
             if e.status == 404:
                 return None
@@ -741,10 +741,7 @@ class AnyscaleClient(AnyscaleClientInterface):
         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
-        for build in cluster_env_builds:
+        for build in self.list_cluster_env_builds(cluster_env.id):
             if (
                 build.status == ClusterEnvironmentBuildStatus.SUCCEEDED
                 and build.containerfile == containerfile
@@ -781,6 +778,7 @@ class AnyscaleClient(AnyscaleClientInterface):
         image_uri: ImageURI,
         registry_login_secret: Optional[str] = None,
         ray_version: Optional[str] = None,
+        name: Optional[str] = None,
     ) -> str:
         if image_uri.is_cluster_env_image():
             identifier = image_uri.to_cluster_env_identifier()
@@ -800,22 +798,20 @@ class AnyscaleClient(AnyscaleClientInterface):
                         f"Legacy cluster environment '{identifier}' is not found."
                     )
 
-        cluster_env_name = image_uri.to_cluster_env_name()
-        cluster_env = self._find_or_create_cluster_env(cluster_env_name, anonymous=True)
+        cluster_env_name = name if name else image_uri.to_cluster_env_name()
+        cluster_env = self._find_or_create_cluster_env(
+            cluster_env_name, anonymous=not name
+        )
         image_uri_str = str(image_uri)
 
-        cluster_env_builds = self._external_api_client.list_cluster_environment_builds(
-            cluster_environment_id=cluster_env.id, count=1
-        ).results
-        build = cluster_env_builds[0] if cluster_env_builds else None
-        if (
-            build is not None
-            and build.docker_image_name == image_uri_str
-            and build.registry_login_secret == registry_login_secret
-            and build.status == ClusterEnvironmentBuildStatus.SUCCEEDED
-            and build.ray_version == ray_version
-        ):
-            return build.id
+        for build in self.list_cluster_env_builds(cluster_env.id):
+            if (
+                build.docker_image_name == image_uri_str
+                and build.registry_login_secret == registry_login_secret
+                and build.status == ClusterEnvironmentBuildStatus.SUCCEEDED
+                and build.ray_version == ray_version
+            ):
+                return build.id
 
         # Still create a new build if the cluster env already exists but the build does not match the image_uri.
         result = self._external_api_client.create_cluster_environment_build(
@@ -1128,6 +1124,15 @@ class AnyscaleClient(AnyscaleClientInterface):
             id
         )
 
+    def get_dataset(
+        self, name: str, version: Optional[int], project: Optional[str]
+    ) -> Dataset:
+        project_id = self._source_project_id(project)
+        dataset = self._internal_api_client.find_dataset_api_v2_datasets_find_get(
+            name=name, version=version, project_id=project_id
+        ).result
+        return dataset
+
     def upload_dataset(
         self,
         dataset_file: str,
@@ -1187,15 +1192,7 @@ class AnyscaleClient(AnyscaleClientInterface):
     def download_dataset(
         self, name: str, version: Optional[int], project: Optional[str]
     ) -> bytes:
-        if project:
-            project_id = self._get_project_id_by_name(name=project)
-        else:
-            _, project_id = source_cloud_id_and_project_id(
-                internal_api=self._internal_api_client,
-                external_api=self._external_api_client,
-                cloud_id=None,
-                project_id=None,
-            )
+        project_id = self._source_project_id(project)
         with FileDownloadProgress() as progress:
             task_id = progress.add_task(
                 description=f"Getting download info for '{name}'",
@@ -1221,6 +1218,19 @@ class AnyscaleClient(AnyscaleClientInterface):
 
         return dataset_bytes
 
+    def _source_project_id(self, project_name: Optional[str]) -> str:
+        """Sources a project ID from an optionally-provided project name."""
+        if project_name:
+            project_id = self._get_project_id_by_name(name=project_name)
+        else:
+            _, project_id = source_cloud_id_and_project_id(
+                internal_api=self._internal_api_client,
+                external_api=self._external_api_client,
+                cloud_id=None,
+                project_id=None,
+            )
+        return project_id
+
     def get_finetuned_model(
         self, model_id: Optional[str], job_id: Optional[str]
     ) -> FineTunedModel:

{anyscale-0.24.64 → anyscale-0.24.66}/anyscale/_private/anyscale_client/common.py

@@ -37,8 +37,8 @@ from anyscale.utils.workspace_notification import WorkspaceNotification
 # Maybe just make it part of the release process to update it, or fetch the
 # default builds and get the latest one. The best thing to do is probably
 # to populate this in the backend.
-DEFAULT_RAY_VERSION = "2.10.0"
-DEFAULT_PYTHON_VERSION = "py310"
+DEFAULT_RAY_VERSION = "2.36.0"
+DEFAULT_PYTHON_VERSION = "py311"
 RUNTIME_ENV_PACKAGE_FORMAT = "pkg_{content_hash}.zip"
 
 # All workspace cluster names should start with this prefix.
@@ -237,10 +237,11 @@ class AnyscaleClientInterface(ABC):
         image_uri: ImageURI,
         registry_login_secret: Optional[str] = None,
         ray_version: Optional[str] = None,
+        name: Optional[str] = None,
     ):
         """Get the cluster environment build ID for the cluster environment with provided image_uri.
 
-        It maps a image_uri to a cluster env name and then use the name to get the cluster env.
+        It maps a image_uri to a cluster env name if a name is not provided, and then use the name to get the cluster env.
         If there exists a cluster environment for the image_uri, it will reuse the cluster env.
         Else it will create a new cluster environment.
         It will create a new cluster environment build with the provided image_uri or try to reuse one with the same image_uri if exists.
@@ -253,9 +254,10 @@ class AnyscaleClientInterface(ABC):
 
     @abstractmethod
     def get_cluster_env_build_image_uri(
-        self, cluster_env_build_id: str
+        self, cluster_env_build_id: str, use_image_alias: bool = False
     ) -> Optional[ImageURI]:
         """Get the image URI for the provided build ID.
+        If `use_image_alias` is True, the container image alias will be used if the build is BYOD.
 
         Returns None if not found.
         """
@@ -409,6 +411,14 @@ class AnyscaleClientInterface(ABC):
         """
         raise NotImplementedError
 
+    @abstractmethod
+    def get_dataset(
+        self, name: str, version: Optional[int], project: Optional[str]
+    ) -> Dataset:
+        """See docstring for `anyscale.llm.dataset.get()`."""
+        raise NotImplementedError
+
+    @abstractmethod
     def upload_dataset(
         self,
         dataset_file: str,
@@ -417,14 +427,14 @@ class AnyscaleClientInterface(ABC):
         cloud: Optional[str],
         project: Optional[str],
     ) -> Dataset:
-        """See docstring for `anyscale.llm.dataset.upload`."""
+        """See docstring for `anyscale.llm.dataset.upload()`."""
         raise NotImplementedError
 
     @abstractmethod
     def download_dataset(
         self, name: str, version: Optional[int], project: Optional[str]
     ) -> bytes:
-        """See docstring for `anyscale.llm.dataset.download`."""
+        """See docstring for `anyscale.llm.dataset.download()`."""
 
     @abstractmethod
     def create_workspace(self, model: CreateExperimentalWorkspace) -> str:

{anyscale-0.24.64 → anyscale-0.24.66}/anyscale/_private/anyscale_client/fake_anyscale_client.py

@@ -496,6 +496,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         image_uri: ImageURI,
         registry_login_secret: Optional[str] = None,
         ray_version: Optional[str] = None,
+        name: Optional[str] = None,
     ) -> str:
         for build in self._builds.values():
             build_image_uri = self.get_cluster_env_build_image_uri(build.id)
@@ -506,7 +507,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
             ):
                 return build.id  # type: ignore
         cluster_env_id = f"cluster-env-id-{uuid.uuid4()!s}"
-        cluster_env_name = image_uri.to_cluster_env_name()
+        cluster_env_name = name if name else image_uri.to_cluster_env_name()
         self._images[cluster_env_id] = ClusterEnvironment(
             id=cluster_env_id,
             name=cluster_env_name,
@@ -526,13 +527,13 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         return build_id
 
     def get_cluster_env_build_image_uri(
-        self, cluster_env_build_id: str
+        self, cluster_env_build_id: str, use_image_alias: bool = False
     ) -> Optional[ImageURI]:
         build = self._builds.get(cluster_env_build_id, None)
         if build is None:
             return None
         else:
-            if build.docker_image_name is not None:
+            if build.docker_image_name is not None and not use_image_alias:
                 return ImageURI.from_str(build.docker_image_name)
             else:
                 cluster_env = self._images[build.cluster_environment_id]
@@ -819,6 +820,11 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
     def trigger_counts(self, id: str):  # noqa: A002
         return self._schedule_trigger_counts[id]
 
+    def get_dataset(
+        self, name: str, version: Optional[int], project: Optional[str]  # noqa: ARG002
+    ) -> Dataset:
+        pass
+
     def upload_dataset(
         self,
         dataset_file: str,  # noqa: ARG002

{anyscale-0.24.64 → anyscale-0.24.66}/anyscale/_private/docgen/__main__.py

@@ -15,12 +15,14 @@ from anyscale.commands import (
     job_commands,
     logs_commands,
     machine_pool_commands,
+    resource_quota_commands,
     schedule_commands,
     service_account_commands,
     service_commands,
     workspace_commands,
     workspace_commands_v2,
 )
+from anyscale.commands.llm import dataset_commands, models_commands
 from anyscale.compute_config.models import (
     CloudDeployment,
     ComputeConfig,
@@ -41,6 +43,12 @@ from anyscale.job.models import (
     JobState,
     JobStatus,
 )
+from anyscale.llm.dataset._private.models import Dataset
+from anyscale.llm.model.models import (
+    DeletedFineTunedModel,
+    FineTunedModel,
+    FineTuningType,
+)
 from anyscale.schedule.models import ScheduleConfig, ScheduleState, ScheduleStatus
 from anyscale.service.models import (
     RayGCSExternalStorageConfig,
@@ -99,6 +107,9 @@ ALL_MODULES = [
             "fetch_production_job_logs": anyscale.job.get_logs,
             "get_job_logs_download": anyscale.job.get_logs,
             "get_job_logs_stream": anyscale.job.get_logs,
+            # limited support, no replacement yet
+            "search_jobs": None,
+            "list_production_jobs": None,
         },
         legacy_sdk_models=[
             "BaseJobStatus",
@@ -152,6 +163,8 @@ ALL_MODULES = [
             "get_schedule": anyscale.schedule.status,
             "pause_schedule": anyscale.schedule.set_state,
             "run_schedule": anyscale.schedule.trigger,
+            # limited support, no replacement yet
+            "list_schedules": None,
         },
         legacy_cli_prefix="anyscale schedule",
         legacy_cli_commands={schedule_commands.create, schedule_commands.update,},
@@ -184,6 +197,38 @@ ALL_MODULES = [
             ServiceVersionStatus,
             ServiceVersionState,
         ],
+        # The following commands are legacy
+        legacy_sdk_commands={
+            "get_service": anyscale.service.status,
+            "rollback_service": anyscale.service.rollback,
+            "rollout_service": anyscale.service.deploy,
+            "terminate_service": anyscale.service.terminate,
+            # limited support, no replacement yet
+            "list_services": None,
+        },
+        legacy_sdk_models=[
+            "ApplyProductionServiceV2Model",
+            "ApplyServiceModel",
+            "ListServiceModel",
+            "ListservicemodelListResponse",
+            "ProductionServiceV2Model",
+            "ProductionServiceV2VersionModel",
+            "Productionservicev2ModelResponse",
+            "RollbackServiceModel",
+            "RolloutStrategy",
+            "ServiceConfig",
+            "ServiceEventCurrentState",
+            "ServiceGoalStates",
+            "ServiceModel",
+            "ServiceObservabilityUrls",
+            "ServiceSortField",
+            "ServiceType",
+            "ServiceVersionState",
+            "ServicemodelListResponse",
+            "ServicemodelResponse",
+        ],
+        legacy_cli_prefix="anyscale service",
+        legacy_cli_commands={service_commands.rollout},
     ),
     Module(
         title="Compute Config",
@@ -208,6 +253,34 @@ ALL_MODULES = [
             CloudDeployment,
             ComputeConfigVersion,
         ],
+        legacy_sdk_commands={
+            "create_cluster_compute": anyscale.compute_config.create,
+            "delete_cluster_compute": anyscale.compute_config.archive,
+            "get_cluster_compute": anyscale.compute_config.get,
+            "get_default_cluster_compute": anyscale.compute_config.get,
+            # limited support, no replacement yet
+            "search_cluster_computes": None,
+        },
+        legacy_sdk_models=[
+            "ClusterCompute",
+            "ClusterComputeConfig",
+            "ClusterComputesQuery",
+            "ClustercomputeListResponse",
+            "ClustercomputeResponse",
+            "ComputeNodeType",
+            "ComputeTemplate",
+            "ComputeTemplateConfig",
+            "ComputeTemplateQuery",
+            "ComputetemplateListResponse",
+            "ComputetemplateResponse",
+            "ComputetemplateconfigResponse",
+            "CreateClusterCompute",
+            "CreateClusterComputeConfig",
+            "CreateComputeTemplate",
+            "CreateComputeTemplateConfig",
+            "UpdateComputeTemplate",
+            "UpdateComputeTemplateConfig",
+        ],
     ),
     Module(
         title="Service Account",
@@ -251,6 +324,29 @@ ALL_MODULES = [
         sdk_commands=[],
         models=[],
         cli_command_group_prefix={cloud_commands.cloud_config_update: "config"},
+        legacy_sdk_commands={
+            # limited support, no replacement yet
+            "create_cloud": None,
+            "delete_cloud": None,
+            "get_cloud": None,
+            "get_default_cloud": None,
+            "search_clouds": None,
+            "update_cloud": None,
+        },
+        legacy_sdk_models=[
+            "Cloud",
+            "CloudConfig",
+            "CloudListResponse",
+            "CloudProviders",
+            "CloudResponse",
+            "CloudState",
+            "CloudStatus",
+            "CloudTypes",
+            "CloudVersion",
+            "CloudsQuery",
+            "CreateCloud",
+            "UpdateCloud",
+        ],
     ),
     Module(
         title="Logs",
@@ -296,6 +392,9 @@ ALL_MODULES = [
             workspace_commands.terminate,
             workspace_commands.pull,
             workspace_commands.push,
+            # limited support, no replacement yet
+            workspace_commands.clone,
+            workspace_commands.copy_command,
         ],
     ),
     Module(
@@ -311,6 +410,55 @@ ALL_MODULES = [
         sdk_commands=[],
         models=[],
     ),
+    Module(
+        title="LLM Model",
+        filename="llm_models.md",
+        cli_prefix="anyscale llm model",
+        cli_commands=[
+            models_commands.get_model,
+            models_commands.list_models,
+            models_commands.delete_model,
+        ],
+        sdk_prefix="anyscale.llm.model",
+        sdk_commands=[
+            anyscale.llm.model.get,
+            anyscale.llm.model.list,
+            anyscale.llm.model.delete,
+        ],
+        models=[FineTunedModel, FineTuningType, DeletedFineTunedModel],
+    ),
+    Module(
+        title="LLM Dataset",
+        filename="llm_dataset.md",
+        cli_prefix="anyscale llm dataset",
+        cli_commands=[
+            dataset_commands.get_dataset,
+            dataset_commands.upload_dataset,
+            dataset_commands.download_dataset,
+        ],
+        sdk_prefix="anyscale.llm.dataset",
+        sdk_commands=[
+            anyscale.llm.dataset.get,
+            anyscale.llm.dataset.upload,
+            anyscale.llm.dataset.download,
+        ],
+        models=[Dataset],
+    ),
+    Module(
+        title="Resource quotas",
+        filename="resource-quotas.md",
+        cli_prefix="anyscale resource-quota",
+        cli_commands=[
+            resource_quota_commands.create,
+            resource_quota_commands.list_resource_quotas,
+            resource_quota_commands.delete,
+            resource_quota_commands.enable,
+            resource_quota_commands.disable,
+        ],
+        sdk_prefix="anyscale.resource_quota",
+        sdk_commands=[],  # No SDK commands for resource quotas
+        models=[],
+    ),
 ]
 
 

{anyscale-0.24.64 → anyscale-0.24.66}/anyscale/_private/docgen/generator.py

@@ -1,5 +1,6 @@
 import ast
 from dataclasses import dataclass, fields
+from datetime import datetime
 import inspect
 import os
 import typing
@@ -247,6 +248,10 @@ class MarkdownGenerator:
             return "int"
         if t is float:
             return "float"
+        if t is bytes:
+            return "bytes"
+        if t is datetime:
+            return "datetime"
         if t is type(None):
             return "None"
         if typing.get_origin(t) is not None:
@@ -409,13 +414,23 @@ class MarkdownGenerator:
         info_dict: Dict[str, Any] = c.to_info_dict(ctx)
 
         if isinstance(c, LegacyAnyscaleCommand):
-            new_c = c.get_new_cli()
-            new_cli_prefix = c.get_new_prefix()
             md = f'### `{cli_prefix} {c.name}` <span class="label-h3 label-legacy">Legacy</span>\n'
+            if c.is_limited_support():
+                md += ":::warning[Limited support]\n"
+                md += "This command is not actively maintained. Use with caution.\n"
+                md += ":::\n"
+            else:
+                new_c = c.get_new_cli()
+                new_cli_prefix = c.get_new_prefix()
+                md += ":::warning\n"
+                md += f"This command is deprecated. Upgrade to [{new_cli_prefix} {new_c.name}]({self._get_cli_anchor(new_c, new_cli_prefix)}). \n"
+                md += ":::\n"
+        elif isinstance(c, AnyscaleCommand) and c.is_alpha:
+            md = f'### `{cli_prefix} {c.name}` <span class="label-h3 label-alpha">Alpha</span>\n'
             md += ":::warning\n"
-            md += f"This command is deprecated. Upgrade to [{new_cli_prefix} {new_c.name}]({self._get_cli_anchor(new_c, new_cli_prefix)}). \n"
+            md += "This command is in early development and may change. Users must be tolerant of change.\n"
             md += ":::\n"
-        elif isinstance(c, AnyscaleCommand) and c.is_beta():
+        elif isinstance(c, AnyscaleCommand) and c.is_beta:
             md = f'### `{cli_prefix} {c.name}` <span class="label-h3 label-beta">Beta</span>\n'
             md += ":::warning\n"
             md += "This command undergoes rapid iteration. Users must be tolerant of change.\n"
@@ -507,7 +522,7 @@ class MarkdownGenerator:
         return md
 
     def _gen_markdown_for_legacy_sdk_command(
-        self, legacy_sdk: LegacySDK, new_sdk: Callable, sdk_prefix: str
+        self, legacy_sdk: LegacySDK, new_sdk: Optional[Callable], sdk_prefix: str
     ) -> str:
         """Generate a markdown section for a legacy SDK command.
 
@@ -517,8 +532,12 @@ class MarkdownGenerator:
             - Returns (if the return type annotation is not None)
         """
         md = f"### `{legacy_sdk.name}` <span class='label-h3 label-legacy'>Legacy</span>\n"
-        md += ":::warning\n"
-        md += f"This command is deprecated. Upgrade to [{sdk_prefix}.{new_sdk.__name__}]({self._get_sdk_anchor(new_sdk, sdk_prefix)}). \n"
+        if new_sdk:
+            md += ":::warning\n"
+            md += f"This command is deprecated. Upgrade to [{sdk_prefix}.{new_sdk.__name__}]({self._get_sdk_anchor(new_sdk, sdk_prefix)}). \n"
+        else:
+            md += ":::warning[Limited support]\n"
+            md += "This command is not actively maintained. Use with caution.\n"
         md += ":::\n"
         md += legacy_sdk.docstring + "\n"