anyscale 0.26.54__py3-none-any.whl → 0.26.55__py3-none-any.whl

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/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/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/version.py

@@ -1 +1 @@
-__version__ = "0.26.54"
+__version__ = "0.26.55"

{anyscale-0.26.54.dist-info → anyscale-0.26.55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 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.dist-info → anyscale-0.26.55.dist-info}/RECORD

@@ -28,7 +28,7 @@ anyscale/snapshot.py,sha256=UGJT5C1s_4xmQxjWODK5DFpGxHRBX5jOCdSCqXESH8E,1685
 anyscale/tables.py,sha256=TV4F2uLnwehvbkAfaP7iuLlT2wLIo6ORH2LVdRGXW5g,2840
 anyscale/telemetry.py,sha256=U90C2Vgx48z9PMTI6EbzHFbP3jWnDUutbIfMPBb8-SI,14711
 anyscale/util.py,sha256=7YPUcm1KCWnmwQpgO0iy0Ly3kSKEAdsCI2jmFridKH0,42881
-anyscale/version.py,sha256=UMZ1FP1ASEyBpwT4Sq4ExB9MkLr8I6ko_CBwd6tl-V0,24
+anyscale/version.py,sha256=Q91RXdcQACvk1n5hluPOYNf8C1ugDnw4_PqOP-z1lsI,24
 anyscale/workspace_utils.py,sha256=OViE88CnIF5ruVxd3kazQ0Mf2BxqtMq6wx-XQ5A2cp8,1204
 anyscale/_private/anyscale_client/README.md,sha256=kSfI2Jfw5RHZWYtu0di3XtdSCx0d2pSwKMfjmDvw7Tg,3770
 anyscale/_private/anyscale_client/__init__.py,sha256=807Blx3RHQeS8BmKZcsOQQ4dYoKlCnpm6Bdsif2CrHg,337
@@ -667,7 +667,7 @@ anyscale/client/openapi_client/models/task_state.py,sha256=KpRA6VImK3r0qNeaiHh4a
 anyscale/client/openapi_client/models/task_summary.py,sha256=8GIpf9xxmPDV8LJgIsGmSQex2R6CDKx0oJ9_VrL7oPw,9102
 anyscale/client/openapi_client/models/task_table_config.py,sha256=sy9cStVRjjT6KFU_47ibBbSRPf7fXjXe9YW2hwtPFhM,6928
 anyscale/client/openapi_client/models/task_table_response.py,sha256=T8VDBMlOzD1c2hY_Q1JdOF8ZF1MqA5JUMbnRjCKZmcg,5074
-anyscale/client/openapi_client/models/task_table_row.py,sha256=neF3ZAb_A12MsZkm_5tc8QV_PaItUirrVugGLTP27eE,15434
+anyscale/client/openapi_client/models/task_table_row.py,sha256=7fXOimaIWXfTd7SLMsktKVUH6Mg7P4IOshBCL3bm9rs,16151
 anyscale/client/openapi_client/models/task_type.py,sha256=BwGeFgSgxL8aazGdhr58L7KyPHK5EqRrE_rVWuWyWCE,2807
 anyscale/client/openapi_client/models/tasksummary_response.py,sha256=sgOV63ZyYroVvcLbISXz0LU44tW8tLCefcqYB1WFsQ0,3539
 anyscale/client/openapi_client/models/text_query.py,sha256=aMcKF6nRme1J1jYKhvqUIG8VzlcDN72znSFF9kKCc2Y,5107
@@ -748,7 +748,7 @@ anyscale/client/openapi_client/models/write_project.py,sha256=48Jym8VDE57cZXTnVH
 anyscale/client/openapi_client/models/write_support_request.py,sha256=pFOalGDQi9FCDjeJV7ccBpq6iRq1Sub4NBfcUVfCglE,3614
 anyscale/cloud/__init__.py,sha256=cpMh-fHKh-LaK2VKF7uDtUN4gnFXhgWnVrtaIEZPPuU,4508
 anyscale/cloud/commands.py,sha256=2tGXjhL4QinVUE2ayGhUNRnsRPgHdSust1flWBi7QIw,4159
-anyscale/cloud/models.py,sha256=HMGzcQr0xnHTO0FvdOuFvO57RpNRLFiPMNCRv71U5p0,18945
+anyscale/cloud/models.py,sha256=cy2NPzBmyg614QXqDe69Lx627XcMSSTXe20jPFY6C14,19059
 anyscale/cloud/_private/cloud_sdk.py,sha256=5TBGyGSjMI4jLOnSle1WWC6za0psP9xgTGWU2LgwemA,4099
 anyscale/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anyscale/commands/aggregated_instance_usage_commands.py,sha256=TRP1X3hdIWbKg9V20VtazlDXsYAeV--M0DH3-Z5tnj4,2293
@@ -798,7 +798,7 @@ anyscale/connect_utils/start_interactive_session.py,sha256=DbuIK2wuWofmbwJ9MLbsb
 anyscale/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anyscale/controllers/auth_controller.py,sha256=hDY2sPvUP8pvh8PnlDYH5rCHjQes2v3b_KBVjMbrzeE,5127
 anyscale/controllers/base_controller.py,sha256=1QFJoScFUV7YTzpKarhwPOc1SvI-xqX3TZmwxKonW6I,1998
-anyscale/controllers/cloud_controller.py,sha256=WslkGFtv0YE4VIvNiPA-F9kRfqfeQvGgapunBb5OjAU,201395
+anyscale/controllers/cloud_controller.py,sha256=Yjrqmy-gcUXD0mmTyVON0fRc2ok0bReGbNKn2qixsOY,202329
 anyscale/controllers/cloud_file_storage_utils.py,sha256=ifaqClEybTgxhqGWHYoH1vrlbxwjRuO-De_3666R2O4,6987
 anyscale/controllers/cloud_functional_verification_controller.py,sha256=YsEfdHT9hPtxy_3a5Q62UlRXW0iFJ1lVS4IZ_NHoemE,33399
 anyscale/controllers/cluster_controller.py,sha256=Sb5wVjrjpycg5iqmENAVtZ4iy9Kr6kM97_ck-KH85LM,28745
@@ -1092,10 +1092,10 @@ anyscale/workspace/__init__.py,sha256=Innbm5ZhCyADEVBiYSo_vbpKwUNcMzVSAfxIGKOYe6
 anyscale/workspace/commands.py,sha256=GBwZenhxe4LFAOCoW8y8KLSgm2HxMxozJ3njEcx53QE,18555
 anyscale/workspace/models.py,sha256=uiMqoJRQNRgTcOIIsysSrtlHMtnI7paUWS34EN626Cg,10016
 anyscale/workspace/_private/workspace_sdk.py,sha256=2CMeYfJt0UtIFCocDn1ukw1iI5esKHdopLe6duEs-qE,27599
-anyscale-0.26.54.dist-info/licenses/LICENSE,sha256=UOPu974Wzsna6frFv1mu4VrZgNdZT7lbcNPzo5ue3qs,3494
-anyscale-0.26.54.dist-info/licenses/NOTICE,sha256=gHqDhSnUYlRXX-mDOL5FtE7774oiKyV_HO80qM3r9Xo,196
-anyscale-0.26.54.dist-info/METADATA,sha256=lc5Y0k8_kRn_LslhkLQBAlaZ7oht9fjvZSvpQOz0xY0,3231
-anyscale-0.26.54.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-anyscale-0.26.54.dist-info/entry_points.txt,sha256=NqO18sCZn6zG6J0S38itjcN00s7aE3C3v3k5lMAfCLk,51
-anyscale-0.26.54.dist-info/top_level.txt,sha256=g3NVNS8Oh0NZwbFFgeX696C5MZZkS5dqV2NqcsbDRJE,9
-anyscale-0.26.54.dist-info/RECORD,,
+anyscale-0.26.55.dist-info/licenses/LICENSE,sha256=UOPu974Wzsna6frFv1mu4VrZgNdZT7lbcNPzo5ue3qs,3494
+anyscale-0.26.55.dist-info/licenses/NOTICE,sha256=gHqDhSnUYlRXX-mDOL5FtE7774oiKyV_HO80qM3r9Xo,196
+anyscale-0.26.55.dist-info/METADATA,sha256=Eckny4k8rW5-VXvfnrA2lu9Mx6GXNWP_aPUMFeMksLo,3231
+anyscale-0.26.55.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+anyscale-0.26.55.dist-info/entry_points.txt,sha256=NqO18sCZn6zG6J0S38itjcN00s7aE3C3v3k5lMAfCLk,51
+anyscale-0.26.55.dist-info/top_level.txt,sha256=g3NVNS8Oh0NZwbFFgeX696C5MZZkS5dqV2NqcsbDRJE,9
+anyscale-0.26.55.dist-info/RECORD,,