anyscale 0.26.47__tar.gz → 0.26.48__tar.gz

{anyscale-0.26.47 → anyscale-0.26.48}/PKG-INFO

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

{anyscale-0.26.47 → anyscale-0.26.48}/anyscale/__init__.py

@@ -26,7 +26,6 @@ from anyscale import (
     integrations,
     job,
     job_queue,
-    llm,
     organization_invitation,
     project,
     resource_quota,
@@ -48,7 +47,6 @@ from anyscale.connect import ClientBuilder
 from anyscale.image import ImageSDK
 from anyscale.job import JobSDK
 from anyscale.job_queue import JobQueueSDK
-from anyscale.llm import LLMSDK
 from anyscale.organization_invitation import OrganizationInvitationSDK
 from anyscale.project import ProjectSDK
 from anyscale.resource_quota import ResourceQuotaSDK
@@ -127,7 +125,6 @@ class Anyscale:
         self._cloud_sdk = CloudSDK(client=self._anyscale_client)
         self._schedule_sdk = ScheduleSDK(client=self._anyscale_client)
         self._image_sdk = ImageSDK(client=self._anyscale_client)
-        self._llm_sdk = LLMSDK(client=self._anyscale_client)
         self._organization_invitation_sdk = OrganizationInvitationSDK(
             client=self._anyscale_client
         )
@@ -217,10 +214,6 @@ class Anyscale:
     def image(self) -> ImageSDK:  # noqa: F811
         return self._image_sdk
 
-    @property
-    def llm(self) -> LLMSDK:  # noqa: F811
-        return self._llm_sdk
-
     @property
     def organization_invitation(self) -> OrganizationInvitationSDK:  # noqa: F811
         return self._organization_invitation_sdk

{anyscale-0.26.47 → anyscale-0.26.48}/anyscale/_private/anyscale_client/anyscale_client.py

@@ -23,12 +23,7 @@ from anyscale._private.anyscale_client.common import (
     RUNTIME_ENV_PACKAGE_FORMAT,
 )
 from anyscale._private.models.image_uri import ImageURI
-from anyscale._private.models.model_base import InternalListResponse, ListResponse
-from anyscale._private.utils.progress_util import (
-    FileDownloadProgress,
-    ProgressFileReader,
-)
-from anyscale.api_utils.common_utils import source_cloud_id_and_project_id
+from anyscale._private.utils.progress_util import FileDownloadProgress
 from anyscale.api_utils.logs_util import _download_log_from_s3_url_sync
 from anyscale.authenticate import AuthenticationBlock, get_auth_api_client
 from anyscale.cli_logger import BlockLogger
@@ -53,23 +48,17 @@ from anyscale.client.openapi_client.models import (
     ComputeTemplateQuery,
     CreateCloudCollaborator,
     CreateComputeTemplate,
-    CreateDataset,
     CreateExperimentalWorkspace,
     CreateInternalProductionJob,
     CreateOrganizationInvitation,
     CreateResourceQuota,
     CreateUserProjectCollaborator,
-    Dataset as InternalDataset,
-    DatasetUpload,
     DecoratedComputeTemplate,
     DecoratedjobqueueListResponse,
     DecoratedlistserviceapimodelListResponse,
     DecoratedProductionServiceV2APIModel,
     DecoratedSession,
-    DeletedPlatformFineTunedModel,
     ExperimentalWorkspace,
-    FineTunedModel,
-    FinetunedmodelListResponse,
     GetOrCreateBuildFromImageUriRequest,
     InternalProductionJob,
     JobQueueSortDirective,
@@ -1564,160 +1553,6 @@ class AnyscaleClient(AnyscaleClientInterface):
             id
         )
 
-    @handle_api_exceptions
-    def get_dataset(self, name: str, version: Optional[int], project: Optional[str]):
-        project_id = self._source_project_id(project)
-        internal_dataset = self._internal_api_client.find_dataset_api_v2_datasets_find_get(
-            name=name, version=version, project_id=project_id
-        ).result
-        from anyscale.llm.dataset._private.models import Dataset
-
-        dataset = Dataset.parse_from_internal_model(internal_dataset)
-        return dataset
-
-    def upload_dataset(
-        self,
-        dataset_file: str,
-        name: Optional[str],
-        description: Optional[str],
-        cloud: Optional[str],
-        project: Optional[str],
-    ):
-        # Resolve `~/.../file` to `/home/user/.../file`
-        dataset_file = os.path.expanduser(dataset_file)
-
-        if not os.path.isfile(dataset_file):
-            raise ValueError(f"Path '{dataset_file}' is not a valid file.")
-        dataset_file_size = os.path.getsize(dataset_file)
-        if dataset_file_size > 5 * Bytes.GB:
-            raise ValueError(
-                f"File '{dataset_file}' is too large to upload. The maximum size is 5 GB."
-            )
-        project_id = self._get_project_id_by_name(name=project) if project else None
-        cloud_id = self.get_cloud_id(cloud_name=cloud) if cloud else None
-
-        with FileDownloadProgress() as progress:
-            task_id = progress.add_task(
-                description=f"Creating an upload request for '{dataset_file}'",
-                total=dataset_file_size,
-            )
-            _, project_id = source_cloud_id_and_project_id(
-                internal_api=self._internal_api_client,
-                external_api=self._external_api_client,
-                cloud_id=cloud_id,
-                project_id=project_id,
-            )
-            dataset_upload: DatasetUpload = self._internal_api_client.create_dataset_upload_api_v2_datasets_upload_post(
-                create_dataset=CreateDataset(
-                    filename=os.path.basename(dataset_file),
-                    description=description,
-                    name=name,
-                    project_id=project_id,
-                )
-            ).result
-
-            progress.update(task_id, description=f"Uploading '{dataset_file}'")
-
-            with open(dataset_file, "rb") as file_reader:
-                progress_reader = ProgressFileReader(file_reader, progress, task_id)
-                response = requests.put(
-                    dataset_upload.upload_url, data=progress_reader,
-                )
-                response.raise_for_status()
-
-            progress.update(task_id, completed=os.path.getsize(dataset_file))
-            progress.console.print(
-                "Upload complete!", style=Style(bold=True, color="green")
-            )
-        internal_dataset = dataset_upload.dataset
-        from anyscale.llm.dataset._private.models import Dataset
-
-        dataset = Dataset.parse_from_internal_model(internal_dataset)
-        return dataset
-
-    @handle_api_exceptions
-    def download_dataset(
-        self, name: str, version: Optional[int], project: Optional[str]
-    ) -> bytes:
-        project_id = self._source_project_id(project)
-        with FileDownloadProgress() as progress:
-            task_id = progress.add_task(
-                description=f"Getting download info for '{name}'",
-            )
-            download_url: str = self._internal_api_client.get_dataset_download_url_api_v2_datasets_download_get(
-                name, version=version, project_id=project_id,
-            )
-            progress.update(task_id, description=f"Downloading '{name}'")
-            response = requests.get(download_url, stream=True)
-            total_size = int(response.headers.get("content-length", 0))
-            progress.update(task_id, total=total_size)
-
-            # For CLI, consider writing to disk instead of loading the entire file into memory.
-            dataset_bytes = b""
-            for data in response.iter_content(Bytes.MB):
-                dataset_bytes += data
-                progress.update(task_id, advance=len(data))
-
-            progress.update(task_id, completed=total_size)
-            progress.console.print(
-                "Download complete!", style=Style(bold=True, color="green")
-            )
-
-        return dataset_bytes
-
-    @handle_api_exceptions
-    def list_datasets(
-        self,
-        limit: Optional[int] = None,
-        after: Optional[str] = None,  # Unique ID to start listing after
-        name_contains: Optional[str] = None,
-        cloud: Optional[str] = None,
-        project: Optional[str] = None,
-    ):
-        project_id = self._source_project_id(project)
-        cloud_id = self.get_cloud_id(cloud_name=cloud) if cloud else None
-
-        def get_next_page(
-            after_id: Optional[str],
-        ) -> InternalListResponse[InternalDataset]:
-            internal_datasets: InternalListResponse = self._internal_api_client.list_datasets_api_v2_datasets_get(
-                project_id=project_id,
-                cloud_id=cloud_id,
-                name_contains=name_contains,
-                after=after_id,
-            )
-            return internal_datasets
-
-        from anyscale.llm.dataset._private.models import Dataset
-
-        list_response = ListResponse(
-            after=after, limit=limit, get_next_page=get_next_page, cls=Dataset,
-        )
-        return list_response
-
-    def _source_project_id(self, project_name: Optional[str]) -> Optional[str]:
-        """Sources a optional 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 = None
-        return project_id
-
-    @handle_api_exceptions
-    def get_finetuned_model(
-        self, model_id: Optional[str], job_id: Optional[str]
-    ) -> FineTunedModel:
-        if model_id:
-            return self._internal_api_client.get_model_api_v2_llm_models_model_id_get(
-                model_id
-            ).result
-        elif job_id:
-            return self._internal_api_client.get_model_by_job_id_api_v2_llm_models_get_by_job_id_job_id_get(
-                job_id
-            ).result
-        else:
-            raise ValueError("Atleast one of `model_id` or `job_id` must be provided")
-
     @handle_api_exceptions
     def create_workspace(self, model: CreateExperimentalWorkspace) -> str:
         return self._internal_api_client.create_workspace_api_v2_experimental_workspaces_post(
@@ -1898,48 +1733,6 @@ class AnyscaleClient(AnyscaleClientInterface):
         else:
             return project.name
 
-    @handle_api_exceptions
-    def delete_finetuned_model(self, model_id: str) -> DeletedPlatformFineTunedModel:
-        deleted_model = self._internal_api_client.delete_model_api_v2_llm_models_model_id_delete(
-            model_id
-        ).result
-        return deleted_model
-
-    @handle_api_exceptions
-    def list_finetuned_models(
-        self, cloud_id: Optional[str], project_id: Optional[str], max_items: int,
-    ) -> List[FineTunedModel]:
-        if self.inside_workspace():
-            # Resolve `cloud_id` and `project_id`. If not provided and if this is being run in a workspace,
-            # we use the `cloud_id` and `project_id` of the workspace
-            cloud_id, project_id = source_cloud_id_and_project_id(
-                internal_api=self._internal_api_client,
-                external_api=self._external_api_client,
-                cloud_id=cloud_id,
-                project_id=project_id,
-            )
-
-        paging_token = None
-        results = []
-        while True:
-            count = min(self.LIST_ENDPOINT_COUNT, max_items)
-            resp: FinetunedmodelListResponse = self._internal_api_client.list_models_api_v2_llm_models_get(
-                cloud_id=cloud_id,
-                project_id=project_id,
-                paging_token=paging_token,
-                count=count,
-            )
-            models = resp.results
-            results.extend(models)
-            if not len(models) or not resp.metadata.next_paging_token:
-                break
-
-            if max_items and len(results) >= max_items:
-                break
-            paging_token = resp.metadata.next_paging_token
-
-        return results[:max_items] if max_items else results
-
     @handle_api_exceptions
     def download_aggregated_instance_usage_csv(
         self,

{anyscale-0.26.47 → anyscale-0.26.48}/anyscale/_private/anyscale_client/common.py

@@ -20,8 +20,6 @@ from anyscale.client.openapi_client.models import (
     DecoratedjobqueueListResponse,
     DecoratedlistserviceapimodelListResponse,
     DecoratedProductionServiceV2APIModel,
-    DeletedPlatformFineTunedModel,
-    FineTunedModel,
     InternalProductionJob,
     JobQueueSortDirective,
     OrganizationCollaborator,
@@ -575,41 +573,6 @@ class AnyscaleClientInterface(ABC):
         """
         raise NotImplementedError
 
-    @abstractmethod
-    def get_dataset(self, name: str, version: Optional[int], project: Optional[str]):
-        """See docstring for `anyscale.llm.dataset.get()`."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def upload_dataset(
-        self,
-        dataset_file: str,
-        name: Optional[str],
-        description: Optional[str],
-        cloud: Optional[str],
-        project: Optional[str],
-    ):
-        """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()`."""
-
-    @abstractmethod
-    def list_datasets(
-        self,
-        limit: Optional[int] = None,
-        after: Optional[str] = None,  # Unique ID to start listing after
-        name_contains: Optional[str] = None,
-        cloud: Optional[str] = None,
-        project: Optional[str] = None,
-    ):
-        """See docstring for `anyscale.llm.dataset.list()`."""
-        raise NotImplementedError
-
     @abstractmethod
     def create_workspace(self, model: CreateExperimentalWorkspace) -> str:
         """Creates a workspace
@@ -657,13 +620,6 @@ class AnyscaleClientInterface(ABC):
         """Updates the dynamic dependencies of a workspace"""
         raise NotImplementedError
 
-    @abstractmethod
-    def get_finetuned_model(
-        self, model_id: Optional[str], job_id: Optional[str]
-    ) -> FineTunedModel:  # noqa: A002
-        """Returns LLM model information for the given model ID"""
-        raise NotImplementedError
-
     @abstractmethod
     def get_workspace_cluster(
         self, workspace_id: Optional[str]
@@ -693,17 +649,6 @@ class AnyscaleClientInterface(ABC):
         """Get the default directory name for a workspace."""
         raise NotImplementedError
 
-    @abstractmethod
-    def delete_finetuned_model(self, model_id: str) -> DeletedPlatformFineTunedModel:
-        """Deletes a finetuned model from the model registry given the model ID"""
-        raise NotImplementedError
-
-    @abstractmethod
-    def list_finetuned_models(
-        self, cloud_id: Optional[str], project_id: Optional[str], max_items: int,
-    ) -> List[FineTunedModel]:
-        raise NotImplementedError
-
     @abstractmethod
     def update_workspace(
         self,

{anyscale-0.26.47 → anyscale-0.26.48}/anyscale/_private/anyscale_client/fake_anyscale_client.py

@@ -11,7 +11,6 @@ from anyscale._private.anyscale_client.common import (
     WORKSPACE_CLUSTER_NAME_PREFIX,
 )
 from anyscale._private.models.image_uri import ImageURI
-from anyscale._private.models.model_base import ListResponse
 from anyscale.cli_logger import BlockLogger
 from anyscale.client.openapi_client.models import (
     AdminCreatedUser,
@@ -58,7 +57,6 @@ from anyscale.client.openapi_client.models.decorated_schedule import DecoratedSc
 from anyscale.client.openapi_client.models.decorated_session import DecoratedSession
 from anyscale.client.openapi_client.models.session_ssh_key import SessionSshKey
 from anyscale.cluster_compute import parse_cluster_compute_name_version
-from anyscale.llm.dataset._private.models import Dataset
 from anyscale.sdk.anyscale_client.configuration import Configuration
 from anyscale.sdk.anyscale_client.models import (
     ApplyProductionServiceV2Model,
@@ -105,6 +103,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
     WORKSPACE_CLUSTER_ID = "fake-workspace-cluster-id"
     WORKSPACE_PROJECT_ID = "fake-workspace-project-id"
     WORKSPACE_CLUSTER_COMPUTE_ID = "fake-workspace-cluster-compute-id"
+    WORKSPACE_CLUSTER_COMPUTE_NAME = "fake-workspace-cluster-compute"
     WORKSPACE_CLUSTER_ENV_BUILD_ID = "fake-workspace-cluster-env-build-id"
 
     SCHEDULE_NEXT_TRIGGER_AT_TIME = datetime.utcnow()
@@ -210,10 +209,28 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
             ),
             local_vars_configuration=OPENAPI_NO_VALIDATION,
         )
+
+        workspace_compute_config = ClusterCompute(
+            id=self.WORKSPACE_CLUSTER_COMPUTE_ID,
+            name=self.WORKSPACE_CLUSTER_COMPUTE_NAME,
+            config=ClusterComputeConfig(
+                cloud_id=self.WORKSPACE_CLOUD_ID,
+                head_node_type=ComputeNodeType(
+                    name="default-head-node",
+                    instance_type="m5.2xlarge",
+                    resources={"CPU": 8, "GPU": 1},
+                ),
+                local_vars_configuration=OPENAPI_NO_VALIDATION,
+            ),
+            local_vars_configuration=OPENAPI_NO_VALIDATION,
+        )
+
         self._default_compute_configs: Dict[str, ClusterCompute] = {
             self.DEFAULT_CLOUD_ID: compute_config,
+            self.WORKSPACE_CLOUD_ID: workspace_compute_config,
         }
         self.add_compute_config(compute_config)
+        self.add_compute_config(workspace_compute_config)
 
     def get_job_ui_url(self, job_id: str) -> str:
         return f"{self.BASE_UI_URL}/jobs/{job_id}"
@@ -993,50 +1010,6 @@ 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:
-        raise NotImplementedError
-
-    def upload_dataset(
-        self,
-        dataset_file: str,  # noqa: ARG002
-        name: Optional[str],  # noqa: ARG002
-        description: Optional[str],  # noqa: ARG002
-        cloud: Optional[str],  # noqa: ARG002
-        project: Optional[str],  # noqa: ARG002
-    ) -> Dataset:
-        raise NotImplementedError
-
-    def download_dataset(
-        self, name: str, version: Optional[int], project: Optional[str]  # noqa: ARG002
-    ) -> bytes:
-        return b""
-
-    def list_datasets(
-        self,
-        limit: Optional[int] = None,  # noqa: ARG002
-        after: Optional[str] = None,  # noqa: ARG002
-        name_contains: Optional[str] = None,  # noqa: ARG002
-        cloud: Optional[str] = None,  # noqa: ARG002
-        project: Optional[str] = None,  # noqa: ARG002
-    ) -> ListResponse[Dataset]:
-        raise NotImplementedError
-
-    def get_finetuned_model(
-        self, model_id: Optional[str], job_id: Optional[str]  # noqa: ARG002
-    ) -> FineTunedModel:
-        return FineTunedModel(
-            id=model_id if model_id else "test-model-id",
-            model_id=model_id if model_id else "test-model-id",
-            base_model_id="my_base_model_id",
-            ft_type=FineTuneType.LORA,
-            creator_id="",
-            creator_email="",
-            created_at=datetime.utcnow(),
-            storage_uri="s3://fake_bucket/fake_folder/",
-        )
-
     def create_workspace(self, model: CreateExperimentalWorkspace) -> str:
         workspace_id = uuid.uuid4()
 

{anyscale-0.26.47 → anyscale-0.26.48}/anyscale/_private/docgen/__main__.py

@@ -11,11 +11,19 @@ from anyscale import scripts
 from anyscale._private.docgen.generator import MarkdownGenerator, Module
 from anyscale.aggregated_instance_usage.models import DownloadCSVFilters
 from anyscale.cloud.models import (
+    AWSConfig,
     Cloud,
+    CloudDeployment,
     CloudPermissionLevel,
     CloudProvider,
     ComputeStack,
     CreateCloudCollaborator,
+    FileStorage,
+    GCPConfig,
+    KubernetesConfig,
+    NetworkingMode,
+    NFSMountTarget,
+    ObjectStorage,
 )
 from anyscale.commands import (
     aggregated_instance_usage_commands,
@@ -39,9 +47,8 @@ from anyscale.commands import (
     workspace_commands,
     workspace_commands_v2,
 )
-from anyscale.commands.llm import dataset_commands, models_commands
 from anyscale.compute_config.models import (
-    CloudDeployment,
+    CloudDeployment as CloudDeploymentSelector,
     ComputeConfig,
     ComputeConfigVersion,
     HeadNodeConfig,
@@ -61,12 +68,6 @@ 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.organization_invitation.models import OrganizationInvitation
 from anyscale.project.models import CreateProjectCollaborator, ProjectPermissionLevel
 from anyscale.resource_quota.models import CreateResourceQuota, Quota, ResourceQuota
@@ -315,10 +316,11 @@ ALL_MODULES = [
         ],
         models=[
             ComputeConfig,
+            MultiDeploymentComputeConfig,
             HeadNodeConfig,
             WorkerNodeGroupConfig,
             MarketType,
-            CloudDeployment,
+            CloudDeploymentSelector,
             MultiDeploymentComputeConfig,
             ComputeConfigVersion,
         ],
@@ -433,7 +435,10 @@ ALL_MODULES = [
             cloud_commands.cloud_delete,
             cloud_commands.cloud_verify,
             cloud_commands.list_cloud,
-            cloud_commands.cloud_add_deployment,
+            cloud_commands.cloud_deployment_create,
+            cloud_commands.cloud_deployment_get,
+            cloud_commands.cloud_deployment_update,
+            cloud_commands.cloud_deployment_delete,
             cloud_commands.cloud_config_update,
             cloud_commands.cloud_set_default,
             cloud_commands.add_collaborators,
@@ -449,11 +454,19 @@ ALL_MODULES = [
             anyscale.cloud.terminate_system_cluster,
         ],
         models=[
+            Cloud,
             CloudPermissionLevel,
             CreateCloudCollaborator,
-            Cloud,
+            CloudDeployment,
             ComputeStack,
             CloudProvider,
+            NetworkingMode,
+            ObjectStorage,
+            FileStorage,
+            NFSMountTarget,
+            AWSConfig,
+            GCPConfig,
+            KubernetesConfig,
         ],
         cli_command_group_prefix={cloud_commands.cloud_config_update: "config"},
         legacy_sdk_commands={
@@ -582,40 +595,6 @@ ALL_MODULES = [
             "UpdateCluster",
         ],
     ),
-    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",