anyscale 0.26.27__py3-none-any.whl → 0.26.29__py3-none-any.whl

anyscale/commands/machine_pool_commands.py

@@ -113,8 +113,9 @@ def describe(name: str, format_: str) -> None:
             "PARTITION",
             "STATE",
             "WORKLOAD DETAILS",
-            "WORKLOAD SCORE",
             "WORKLOAD START TIME",
+            "WORKLOAD CREATOR",
+            "WORKLOAD SCORE",
             "CLOUD INSTANCE ID",
         ]
         for row in scheduler_info.machines:
@@ -124,13 +125,16 @@ def describe(name: str, format_: str) -> None:
                     row.machine_type,
                     row.partition,
                     row.allocation_state,
-                    f"{row.workload_info.workload_type}/{row.workload_info.workload_name}/{row.workload_info.workload_cloud}"
+                    f"{row.workload_info.workload_type}/{row.workload_info.workload_name}/{row.workload_info.workload_project}/{row.workload_info.workload_cloud}"
                     if row.workload_info.workload_name
                     else "",
-                    row.workload_score,
                     format_time(row.workload_info.workload_start_time)
                     if row.workload_info.workload_name
                     else "",
+                    row.workload_info.workload_creator
+                    if row.workload_info.workload_name
+                    else "",
+                    row.workload_score,
                     row.cloud_instance_id,
                 ]
             )
@@ -151,7 +155,7 @@ def describe(name: str, format_: str) -> None:
             "MACHINE TYPE",
             "WORKLOAD DETAILS",
             "WORKLOAD START TIME",
-            "WORKLOAD CLOUD",
+            "WORKLOAD CREATOR",
             "PARTITION SCORES",
         ]
         for row in scheduler_info.requests:
@@ -159,11 +163,9 @@ def describe(name: str, format_: str) -> None:
                 [
                     row.size,
                     row.machine_type,
-                    f"{row.workload_info.workload_type}/{row.workload_info.workload_name}",
-                    format_time(row.workload_info.workload_start_time)
-                    if row.workload_info.workload_name
-                    else "",
-                    row.workload_info.workload_cloud,
+                    f"{row.workload_info.workload_type}/{row.workload_info.workload_name}/{row.workload_info.workload_project}/{row.workload_info.workload_cloud}",
+                    format_time(row.workload_info.workload_start_time),
+                    row.workload_info.workload_creator,
                     row.partition_scores,
                 ]
             )

anyscale/commands/service_commands.py

@@ -159,7 +159,7 @@ def _read_name_from_config_file(path: str):
     required=False,
     default=None,
     type=int,
-    help="The percentage of traffic to send to the canary version of the service (0-100). This can be used to manually shift traffic toward (or away from) the canary version. If not provided, traffic will be shifted incrementally toward the canary version until it reaches 100. Not supported when using --in-place.",
+    help="The percentage of traffic to send to the canary version of the service (0-100). This can be used to manually shift traffic toward (or away from) the canary version. If not provided, traffic will be shifted incrementally toward the canary version until it reaches 100. Not supported when using --in-place. This is ignored when restarting a service or creating a new service.",
 )
 @click.option(
     "--max-surge-percent",
@@ -967,6 +967,8 @@ def terminate(
 
     This applies to both v1 and v2 services.
     """
+    # TODO: Remove service_controller and use the sdk method. Need to update the sdk method
+    # so that it can resolve either service name or config file to the service id.
     service_controller = ServiceController()
     service_id = service_controller.get_service_id(
         service_id=service_id,
@@ -975,7 +977,7 @@ def terminate(
         project_id=project_id,
     )
     try:
-        anyscale.service.terminate(service_id)
+        anyscale.service.terminate(id=service_id)
         log.info(f"Service {service_id} terminate initiated.")
         log.info(
             f'View the service in the UI at {get_endpoint(f"/services/{service_id}")}'

anyscale/controllers/cloud_controller.py

@@ -197,7 +197,6 @@ class CloudController(BaseController):
             ]
         else:
             clouds = self.api_client.list_clouds_api_v2_clouds_get().results
-
         clouds_output = clouds[:max_items]
         output = clouds_formatter.format_clouds_output(
             clouds=clouds_output, json_format=False

anyscale/formatters/clouds_formatter.py

@@ -20,6 +20,8 @@ def format_clouds_output(clouds: List[Cloud], json_format: bool) -> str:
 def format_clouds_output_json(clouds: List[Cloud]) -> str:
     cloud_jsons = []
     for cloud in clouds:
+        # Check if log ingestion is enabled based on is_aggregated_logs_enabled field
+        log_ingestion_enabled = getattr(cloud, "is_aggregated_logs_enabled", False)
         cloud_jsons.append(
             {
                 "id": cloud.id,
@@ -29,6 +31,7 @@ def format_clouds_output_json(clouds: List[Cloud]) -> str:
                 "added_date": cloud.created_at.strftime("%m/%d/%Y"),
                 "default": cloud.is_default,
                 "credentials": cloud.credentials,
+                "log_ingestion": "enabled" if log_ingestion_enabled else "disabled",
             }
         )
     return json.dumps(cloud_jsons)
@@ -37,6 +40,9 @@ def format_clouds_output_json(clouds: List[Cloud]) -> str:
 def format_clouds_output_table(clouds: List[Cloud]) -> str:
     table_rows = []
     for cloud in clouds:
+        # Check if log ingestion is enabled based on is_aggregated_logs_enabled field
+        log_ingestion_enabled = getattr(cloud, "is_aggregated_logs_enabled", False)
+        log_ingestion_status = "enabled" if log_ingestion_enabled else "disabled"
         table_rows.append(
             [
                 cloud.id,
@@ -46,6 +52,7 @@ def format_clouds_output_table(clouds: List[Cloud]) -> str:
                 cloud.created_at.strftime("%m/%d/%Y"),
                 cloud.is_default,
                 cloud.credentials,
+                log_ingestion_status,
             ]
         )
     table = tabulate.tabulate(
@@ -58,6 +65,7 @@ def format_clouds_output_table(clouds: List[Cloud]) -> str:
             "ADDED DATE",
             "DEFAULT",
             "CREDENTIALS",
+            "LOG INGESTION",
         ],
         tablefmt="plain",
     )

anyscale/sdk/anyscale_client/__init__.py

@@ -58,7 +58,6 @@ from anyscale_client.models.cluster_compute_config import ClusterComputeConfig
 from anyscale_client.models.cluster_computes_query import ClusterComputesQuery
 from anyscale_client.models.cluster_environment import ClusterEnvironment
 from anyscale_client.models.cluster_environment_build import ClusterEnvironmentBuild
-from anyscale_client.models.cluster_environment_build_log_response import ClusterEnvironmentBuildLogResponse
 from anyscale_client.models.cluster_environment_build_operation import ClusterEnvironmentBuildOperation
 from anyscale_client.models.cluster_environment_build_status import ClusterEnvironmentBuildStatus
 from anyscale_client.models.cluster_environments_query import ClusterEnvironmentsQuery
@@ -78,7 +77,6 @@ from anyscale_client.models.clusterenvironment_list_response import Clusterenvir
 from anyscale_client.models.clusterenvironment_response import ClusterenvironmentResponse
 from anyscale_client.models.clusterenvironmentbuild_list_response import ClusterenvironmentbuildListResponse
 from anyscale_client.models.clusterenvironmentbuild_response import ClusterenvironmentbuildResponse
-from anyscale_client.models.clusterenvironmentbuildlogresponse_response import ClusterenvironmentbuildlogresponseResponse
 from anyscale_client.models.clusterenvironmentbuildoperation_response import ClusterenvironmentbuildoperationResponse
 from anyscale_client.models.clusteroperation_response import ClusteroperationResponse
 from anyscale_client.models.clusters_query import ClustersQuery
@@ -93,7 +91,6 @@ from anyscale_client.models.create_byod_app_config_configuration_schema import C
 from anyscale_client.models.create_byod_cluster_environment import CreateBYODClusterEnvironment
 from anyscale_client.models.create_byod_cluster_environment_build import CreateBYODClusterEnvironmentBuild
 from anyscale_client.models.create_byod_cluster_environment_configuration_schema import CreateBYODClusterEnvironmentConfigurationSchema
-from anyscale_client.models.create_cloud import CreateCloud
 from anyscale_client.models.create_cluster import CreateCluster
 from anyscale_client.models.create_cluster_compute import CreateClusterCompute
 from anyscale_client.models.create_cluster_compute_config import CreateClusterComputeConfig
@@ -130,9 +127,6 @@ from anyscale_client.models.log_stream import LogStream
 from anyscale_client.models.logdownloadresult_response import LogdownloadresultResponse
 from anyscale_client.models.logstream_response import LogstreamResponse
 from anyscale_client.models.node_type import NodeType
-from anyscale_client.models.object_storage_config import ObjectStorageConfig
-from anyscale_client.models.object_storage_config_s3 import ObjectStorageConfigS3
-from anyscale_client.models.objectstorageconfig_response import ObjectstorageconfigResponse
 from anyscale_client.models.operation_error import OperationError
 from anyscale_client.models.operation_progress import OperationProgress
 from anyscale_client.models.operation_result import OperationResult
@@ -178,14 +172,11 @@ from anyscale_client.models.service_version_state import ServiceVersionState
 from anyscale_client.models.servicemodel_list_response import ServicemodelListResponse
 from anyscale_client.models.servicemodel_response import ServicemodelResponse
 from anyscale_client.models.session import Session
-from anyscale_client.models.session_operation import SessionOperation
-from anyscale_client.models.session_operation_type import SessionOperationType
 from anyscale_client.models.session_response import SessionResponse
 from anyscale_client.models.session_starting_up_data import SessionStartingUpData
 from anyscale_client.models.session_state import SessionState
 from anyscale_client.models.session_state_data import SessionStateData
 from anyscale_client.models.session_stopping_data import SessionStoppingData
-from anyscale_client.models.sessionoperation_response import SessionoperationResponse
 from anyscale_client.models.sort_by_clause_jobs_sort_field import SortByClauseJobsSortField
 from anyscale_client.models.sort_order import SortOrder
 from anyscale_client.models.ssoconfig_response import SsoconfigResponse
@@ -196,10 +187,8 @@ from anyscale_client.models.terminate_cluster_options import TerminateClusterOpt
 from anyscale_client.models.text_query import TextQuery
 from anyscale_client.models.tracing_config import TracingConfig
 from anyscale_client.models.ux_instance import UXInstance
-from anyscale_client.models.update_cloud import UpdateCloud
 from anyscale_client.models.update_cluster import UpdateCluster
 from anyscale_client.models.update_organization import UpdateOrganization
-from anyscale_client.models.update_project import UpdateProject
 from anyscale_client.models.user_service_access_types import UserServiceAccessTypes
 from anyscale_client.models.validation_error import ValidationError
 from anyscale_client.models.worker_node_type import WorkerNodeType