anyscale 0.26.54__tar.gz → 0.26.55__tar.gz

{anyscale-0.26.54/anyscale.egg-info → anyscale-0.26.55}/PKG-INFO

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

{anyscale-0.26.54 → anyscale-0.26.55}/anyscale/client/openapi_client/models/task_table_row.py

@@ -43,6 +43,7 @@ class TaskTableRow(object):
         'start_time_ns': 'int',
         'end_time_ns': 'int',
         'required_resources': 'str',
+        'runtime_env': 'str',
         'node_id': 'str',
         'worker_id': 'str',
         'worker_pid': 'str',
@@ -62,6 +63,7 @@ class TaskTableRow(object):
         'start_time_ns': 'start_time_ns',
         'end_time_ns': 'end_time_ns',
         'required_resources': 'required_resources',
+        'runtime_env': 'runtime_env',
         'node_id': 'node_id',
         'worker_id': 'worker_id',
         'worker_pid': 'worker_pid',
@@ -70,7 +72,7 @@ class TaskTableRow(object):
         'exception_type': 'exception_type'
     }
 
-    def __init__(self, id=None, attempt_number=None, job_id=None, function_name=None, task_type=None, current_state=None, error_message=None, start_time_ns=None, end_time_ns=None, required_resources=None, node_id=None, worker_id=None, worker_pid=None, parent_task_id=None, ray_session_name=None, exception_type=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, id=None, attempt_number=None, job_id=None, function_name=None, task_type=None, current_state=None, error_message=None, start_time_ns=None, end_time_ns=None, required_resources=None, runtime_env=None, node_id=None, worker_id=None, worker_pid=None, parent_task_id=None, ray_session_name=None, exception_type=None, local_vars_configuration=None):  # noqa: E501
         """TaskTableRow - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -86,6 +88,7 @@ class TaskTableRow(object):
         self._start_time_ns = None
         self._end_time_ns = None
         self._required_resources = None
+        self._runtime_env = None
         self._node_id = None
         self._worker_id = None
         self._worker_pid = None
@@ -108,6 +111,8 @@ class TaskTableRow(object):
             self.end_time_ns = end_time_ns
         if required_resources is not None:
             self.required_resources = required_resources
+        if runtime_env is not None:
+            self.runtime_env = runtime_env
         if node_id is not None:
             self.node_id = node_id
         if worker_id is not None:
@@ -342,6 +347,27 @@ class TaskTableRow(object):
 
         self._required_resources = required_resources
 
+    @property
+    def runtime_env(self):
+        """Gets the runtime_env of this TaskTableRow.  # noqa: E501
+
+
+        :return: The runtime_env of this TaskTableRow.  # noqa: E501
+        :rtype: str
+        """
+        return self._runtime_env
+
+    @runtime_env.setter
+    def runtime_env(self, runtime_env):
+        """Sets the runtime_env of this TaskTableRow.
+
+
+        :param runtime_env: The runtime_env of this TaskTableRow.  # noqa: E501
+        :type: str
+        """
+
+        self._runtime_env = runtime_env
+
     @property
     def node_id(self):
         """Gets the node_id of this TaskTableRow.  # noqa: E501

{anyscale-0.26.54 → anyscale-0.26.55}/anyscale/cloud/models.py

@@ -109,12 +109,14 @@ class CloudProvider(ModelEnum):
     AWS = "AWS"
     GCP = "GCP"
     AZURE = "AZURE"
+    GENERIC = "GENERIC"
 
     __docstrings__ = {
         UNKNOWN: "Unknown cloud provider.",
         AWS: "Amazon Web Services.",
         GCP: "Google Cloud Platform.",
         AZURE: "Microsoft Azure.",
+        GENERIC: "Generic cloud provider.",
     }  # type: ignore
 
 
@@ -141,7 +143,7 @@ cloud = Cloud(
     id: str = field(metadata={"docstring": "Unique identifier for this Cloud."})
     provider: Union[CloudProvider, str] = field(
         metadata={
-            "docstring": "Cloud provider (AWS, GCP, AZURE) or UNKNOWN if not recognized."
+            "docstring": "Cloud provider (AWS, GCP, AZURE, GENERIC) or UNKNOWN if not recognized."
         },
     )
     compute_stack: Union[ComputeStack, str] = field(
@@ -499,15 +501,15 @@ bucket_name: s3://my-bucket
 file_storage:
 file_storage_id: fs-12345678901234567
 aws_config:
-vpc_id: vpc-12345678901234567
-subnet_ids:
-    - subnet-11111111111111111
-    - subnet-22222222222222222
-security_group_ids:
-    - sg-12345678901234567
-anyscale_iam_role_id: arn:aws:iam::123456789012:role/anyscale-iam-role
-cluster_iam_role_id: arn:aws:iam::123456789012:role/cluster-node-role
-memorydb_cluster_name: my-memorydb-cluster
+  vpc_id: vpc-12345678901234567
+  subnet_ids:
+  - subnet-11111111111111111
+  - subnet-22222222222222222
+  security_group_ids:
+  - sg-12345678901234567
+  anyscale_iam_role_id: arn:aws:iam::123456789012:role/anyscale-iam-role
+  cluster_iam_role_id: arn:aws:iam::123456789012:role/cluster-node-role
+  memorydb_cluster_name: my-memorydb-cluster
 """
 
     cloud_resource_id: Optional[str] = field(
@@ -519,7 +521,9 @@ memorydb_cluster_name: my-memorydb-cluster
     )
     provider: Union[CloudProvider, str] = field(
         default=CloudProvider.UNKNOWN,
-        metadata={"docstring": "The cloud provider type (e.g., AWS, GCP, or AZURE)."},
+        metadata={
+            "docstring": "The cloud provider type (e.g., AWS, GCP, AZURE, or GENERIC)."
+        },
     )
     compute_stack: Union[ComputeStack, str] = field(
         default=ComputeStack.VM,

{anyscale-0.26.54 → anyscale-0.26.55}/anyscale/controllers/cloud_controller.py

@@ -1471,18 +1471,26 @@ class CloudController(BaseController):
             d.pop("cloud_deployment_id", None)
         return formatted_cloud_resources
 
-    def get_cloud_resources(self, cloud_id: str) -> List[CloudDeployment]:
-        decorated_cloud_resources = self.get_decorated_cloud_resources(cloud_id)
-
+    def _convert_decorated_cloud_resource_to_cloud_deployment(
+        self, decorated_cloud_resource: DecoratedCloudResource
+    ) -> CloudDeployment:
         # DecoratedCloudResource has extra fields that are not in CloudDeployment.
         allowed_keys = set(CloudDeployment.attribute_map.keys())
         allowed_keys.remove(
             "cloud_deployment_id"
         )  # Remove deprecated cloud_deployment_id field.
+        return CloudDeployment(
+            **{
+                k: v
+                for k, v in decorated_cloud_resource.to_dict().items()
+                if k in allowed_keys
+            }
+        )
+
+    def get_cloud_resources(self, cloud_id: str) -> List[CloudDeployment]:
+        decorated_cloud_resources = self.get_decorated_cloud_resources(cloud_id)
         return [
-            CloudDeployment(
-                **{k: v for k, v in resource.to_dict().items() if k in allowed_keys}
-            )
+            self._convert_decorated_cloud_resource_to_cloud_deployment(resource)
             for resource in decorated_cloud_resources
         ]
 
@@ -1815,24 +1823,25 @@ class CloudController(BaseController):
                 "Please use `anyscale cloud resource create` to add cloud resources."
             )
 
-        # Diff the existing and new specs
-        diff = self._generate_diff(
-            [self._remove_empty_values(r.to_dict()) for r in existing_resources], spec
-        )
-        if not diff:
-            self.log.info("No changes detected.")
-            return
-
         existing_resources_dict = {
             resource.cloud_resource_id: resource for resource in existing_resources
         }
 
+        all_deployments: List[CloudDeployment] = []
         updated_deployments: List[CloudDeployment] = []
         for d in spec:
             try:
                 deployment = CloudDeployment(**d)
             except Exception as e:  # noqa: BLE001
-                raise ClickException(f"Failed to parse cloud resource: {e}")
+                try:
+                    # Try to parse the cloud deployment as a DecoratedCloudResource as well,
+                    # which has extra fields that are not in CloudDeployment.
+                    deployment = self._convert_decorated_cloud_resource_to_cloud_deployment(
+                        DecoratedCloudResource(**d)
+                    )
+                except:  # noqa: E722
+                    # Raise original error from parsing as CloudDeployment.
+                    raise ClickException(f"Failed to parse cloud resource: {e}")
 
             if not deployment.cloud_resource_id:
                 raise ClickException(
@@ -1846,10 +1855,20 @@ class CloudController(BaseController):
                 raise ClickException(
                     "Please use the `anyscale machine-pool` CLI to update machine pools."
                 )
+
+            all_deployments.append(deployment)
             if deployment != existing_resources_dict[deployment.cloud_resource_id]:
                 updated_deployments.append(deployment)
 
-        # Log the diff and confirm.
+        # Diff the existing and new specs and confirm.
+        diff = self._generate_diff(
+            [self._remove_empty_values(r.to_dict()) for r in existing_resources],
+            [self._remove_empty_values(r.to_dict()) for r in all_deployments],
+        )
+        if not diff:
+            self.log.info("No changes detected.")
+            return
+
         self.log.info(f"Detected the following changes:\n{diff}")
 
         confirm("Would you like to proceed with updating this cloud?", yes)

anyscale-0.26.55/anyscale/version.py

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

{anyscale-0.26.54 → anyscale-0.26.55/anyscale.egg-info}/PKG-INFO

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

anyscale-0.26.54/anyscale/version.py

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