lightning-sdk 0.1.54__py3-none-any.whl → 0.1.56__py3-none-any.whl

lightning_sdk/cli/inspect.py

@@ -1,5 +1,7 @@
 from typing import Optional
 
+from rich.console import Console
+
 from lightning_sdk.cli.job_and_mmt_action import _JobAndMMTAction
 
 
@@ -16,7 +18,7 @@ class _Inspect(_JobAndMMTAction):
                 If not specified can be selected interactively.
 
         """
-        print(super().job(name=name, teamspace=teamspace).json())
+        (super().job(name=name, teamspace=teamspace).json())
 
     def mmt(self, name: Optional[str] = None, teamspace: Optional[str] = None) -> None:
         """Inspect a multi-machine job for further details as JSON.
@@ -28,4 +30,4 @@ class _Inspect(_JobAndMMTAction):
                 If not specified can be selected interactively.
 
         """
-        print(super().mmt(name=name, teamspace=teamspace).json())
+        Console().print(super().mmt(name=name, teamspace=teamspace).json())

lightning_sdk/cli/jobs_menu.py

@@ -1,5 +1,6 @@
 from typing import Dict, List, Optional
 
+from rich.console import Console
 from simple_term_menu import TerminalMenu
 
 from lightning_sdk.cli.exceptions import StudioCliError
@@ -20,7 +21,7 @@ class _JobsMenu:
             if j.name == job:
                 return j
 
-        print("Could not find Job {job}, please select it from the list:")
+        Console().print("Could not find Job {job}, please select it from the list:")
         return self._get_job_from_interactive_menu(possible_jobs)
 
     @staticmethod

lightning_sdk/cli/list.py

@@ -3,6 +3,7 @@ from typing import Optional
 from rich.console import Console
 from rich.table import Table
 
+from lightning_sdk import Machine
 from lightning_sdk.cli.teamspace_menu import _TeamspacesMenu
 from lightning_sdk.lit_container import LitContainer
 
@@ -10,6 +11,37 @@ from lightning_sdk.lit_container import LitContainer
 class _List(_TeamspacesMenu):
     """List resources on the Lightning AI platform."""
 
+    def studios(self, teamspace: Optional[str] = None) -> None:
+        """List studios for a given teamspace.
+
+        Args:
+            teamspace: the teamspace to list studios from. Should be specified as {owner}/{name}
+                If not provided, can be selected in an interactive menu.
+
+        """
+        resolved_teamspace = self._resolve_teamspace(teamspace=teamspace)
+
+        studios = resolved_teamspace.studios
+
+        table = Table(
+            pad_edge=True,
+        )
+        table.add_column("Name")
+        table.add_column("Teamspace")
+        table.add_column("Status")
+        table.add_column("Machine")
+        table.add_column("Cloud account")
+        for studio in studios:
+            table.add_row(
+                studio.name,
+                f"{studio.teamspace.owner.name}/{studio.teamspace.name}",
+                str(studio.status),
+                str(studio.machine) if studio.machine is not None else None,
+                str(studio.cloud_account),
+            )
+
+        Console().print(table)
+
     def jobs(self, teamspace: Optional[str] = None) -> None:
         """List jobs for a given teamspace.
 
@@ -48,8 +80,7 @@ class _List(_TeamspacesMenu):
                 f"{j.total_cost:.3f}",
             )
 
-        console = Console()
-        console.print(table)
+        Console().print(table)
 
     def mmts(self, teamspace: Optional[str] = None) -> None:
         """List multi-machine jobs for a given teamspace.
@@ -89,8 +120,7 @@ class _List(_TeamspacesMenu):
                 str(j.total_cost),
             )
 
-        console = Console()
-        console.print(table)
+        Console().print(table)
 
     def containers(self, teamspace: Optional[str] = None) -> None:
         """Display the list of available containers.
@@ -108,5 +138,18 @@ class _List(_TeamspacesMenu):
         table.add_column("CREATED")
         for repo in result:
             table.add_row(repo["REPOSITORY"], repo["IMAGE ID"], repo["CREATED"])
-        console = Console()
-        console.print(table)
+        Console().print(table)
+
+    def machines(self) -> None:
+        """Display the list of available machines."""
+        table = Table(pad_edge=True)
+        table.add_column("Name")
+
+        # Get all machine types from the enum
+        machine_types = [name for name in dir(Machine) if not name.startswith("_")]
+
+        # Add rows to table
+        for name in sorted(machine_types):
+            table.add_row(name)
+
+        Console().print(table)

lightning_sdk/cli/mmts_menu.py

@@ -1,5 +1,6 @@
 from typing import Dict, List, Optional
 
+from rich.console import Console
 from simple_term_menu import TerminalMenu
 
 from lightning_sdk.cli.exceptions import StudioCliError
@@ -20,7 +21,7 @@ class _MMTsMenu:
             if j.name == mmt:
                 return j
 
-        print("Could not find Multi-Machine Job {mmt}, please select it from the list:")
+        Console().print("Could not find Multi-Machine Job {mmt}, please select it from the list:")
         return self._get_mmt_from_interactive_menu(possible_mmts)
 
     @staticmethod

lightning_sdk/cli/run.py

@@ -8,7 +8,7 @@ from lightning_sdk.teamspace import Teamspace
 if TYPE_CHECKING:
     from lightning_sdk.cli.legacy import _LegacyLightningCLI
 
-_MACHINE_VALUES = tuple([machine.value for machine in Machine])
+_MACHINE_VALUES = tuple([machine.name for machine in Machine.__dict__.values() if isinstance(machine, Machine)])
 
 
 class _Run:
@@ -156,7 +156,7 @@ class _Run:
             machine = "CPU"
         machine_enum: Union[str, Machine]
         try:
-            machine_enum = Machine[machine.upper()]
+            machine_enum = getattr(Machine, machine.upper(), Machine(machine, machine))
         except KeyError:
             machine_enum = machine
 
@@ -222,7 +222,7 @@ class _Run:
             machine = "CPU"
         machine_enum: Union[str, Machine]
         try:
-            machine_enum = Machine[machine.upper()]
+            machine_enum = getattr(Machine, machine.upper(), Machine(machine, machine))
         except KeyError:
             machine_enum = machine
 

lightning_sdk/cli/serve.py

@@ -167,7 +167,6 @@ class _Docker:
         import litserve as ls
         from litserve import docker_builder
 
-        console = Console()
         requirements = ""
         if os.path.exists("requirements.txt"):
             requirements = "-r requirements.txt"
@@ -210,5 +209,5 @@ Update [underline]{os.path.abspath("Dockerfile")}[/underline] to add any additio
 [bold]To push the container to a registry:[/bold]
 > [underline]docker push {tag}[/underline]
 """
-        console.print(success_msg)
+        Console().print(success_msg)
         return os.path.abspath("Dockerfile")

lightning_sdk/cli/start.py

@@ -0,0 +1,43 @@
+from typing import Optional
+
+from lightning_sdk import Machine, Studio
+
+
+class _Start:
+    """Start resources on the Lightning AI platform."""
+
+    def __init__(self) -> None:
+        _machine_values = tuple([machine.name for machine in Machine.__dict__.values() if isinstance(machine, Machine)])
+
+        docstr_studio = f"""Start a studio on a given machine.
+
+        Args:
+            name: The name of the studio to start.
+                If not specified, tries to infer from the environment (e.g. when run from within a Studio.)
+            teamspace: The teamspace the studio is part of. Should be of format <OWNER>/<TEAMSPACE_NAME>.
+                If not specified, tries to infer from the environment (e.g. when run from within a Studio.)
+            machine: The machine type to start the studio on. One of {", ".join(_machine_values)}.
+                Defaults to the CPU Machine.
+        """
+        self.studio.__func__.__doc__ = docstr_studio
+
+    def studio(self, name: Optional[str] = None, teamspace: Optional[str] = None, machine: str = "CPU") -> None:
+        if teamspace is not None:
+            ts_splits = teamspace.split("/")
+            if len(ts_splits) != 2:
+                raise ValueError(f"Teamspace should be of format <OWNER>/<TEAMSPACE_NAME> but got {teamspace}")
+            owner, teamspace = ts_splits
+        else:
+            owner, teamspace = None, None
+
+        try:
+            studio = Studio(name=name, teamspace=teamspace, org=owner, user=None, create_ok=False)
+        except (RuntimeError, ValueError):
+            studio = Studio(name=name, teamspace=teamspace, org=None, user=owner, create_ok=False)
+
+        try:
+            resolved_machine = getattr(Machine, machine.upper(), Machine(machine, machine))
+        except KeyError:
+            resolved_machine = machine
+
+        studio.start(resolved_machine)

lightning_sdk/cli/stop.py

@@ -1,6 +1,9 @@
 from typing import Optional
 
+from rich.console import Console
+
 from lightning_sdk.cli.job_and_mmt_action import _JobAndMMTAction
+from lightning_sdk.studio import Studio
 
 
 class _Stop(_JobAndMMTAction):
@@ -19,7 +22,7 @@ class _Stop(_JobAndMMTAction):
         job = super().job(name=name, teamspace=teamspace)
 
         job.stop()
-        print(f"Successfully stopped {job.name}!")
+        Console().print(f"Successfully stopped {job.name}!")
 
     def mmt(self, name: Optional[str] = None, teamspace: Optional[str] = None) -> None:
         """Stop a multi-machine job.
@@ -34,4 +37,29 @@ class _Stop(_JobAndMMTAction):
         mmt = super().mmt(name=name, teamspace=teamspace)
 
         mmt.stop()
-        print(f"Successfully stopped {mmt.name}!")
+        Console().print(f"Successfully stopped {mmt.name}!")
+
+    def studio(self, name: Optional[str] = None, teamspace: Optional[str] = None) -> None:
+        """Stop a running studio.
+
+        Args:
+            name: The name of the studio to stop.
+                If not specified, tries to infer from the environment (e.g. when run from within a Studio.)
+            teamspace: The teamspace the studio is part of. Should be of format <OWNER>/<TEAMSPACE_NAME>.
+                If not specified, tries to infer from the environment (e.g. when run from within a Studio.)
+        """
+        if teamspace is not None:
+            ts_splits = teamspace.split("/")
+            if len(ts_splits) != 2:
+                raise ValueError(f"Teamspace should be of format <OWNER>/<TEAMSPACE_NAME> but got {teamspace}")
+            owner, teamspace = ts_splits
+        else:
+            owner, teamspace = None, None
+
+        try:
+            studio = Studio(name=name, teamspace=teamspace, org=owner, user=None, create_ok=False)
+        except (RuntimeError, ValueError):
+            studio = Studio(name=name, teamspace=teamspace, org=None, user=owner, create_ok=False)
+
+        studio.stop()
+        Console().print("Studio successfully stopped")

lightning_sdk/cli/studios_menu.py

@@ -1,7 +1,9 @@
 from typing import Dict, List, Optional
 
+from rich.console import Console
 from simple_term_menu import TerminalMenu
 
+from lightning_sdk import Studio
 from lightning_sdk.api import OrgApi, TeamspaceApi
 from lightning_sdk.user import User
 
@@ -18,7 +20,7 @@ class _StudiosMenu:
             if st["teamspace"] == teamspace and name == st["name"]:
                 return st
 
-        print("Could not find Studio {studio}, please select it from the list:")
+        Console().print("Could not find Studio {studio}, please select it from the list:")
         return self._get_studio_from_interactive_menu(possible_studios)
 
     @staticmethod
@@ -76,3 +78,24 @@ class _StudiosMenu:
                 possible_studios.append({"name": st.name, **teamspaces[teamspace_id]})
 
         return possible_studios
+
+    def _get_studio(self, name: str, teamspace: str) -> Studio:
+        """Get studio object from name and teamspace.
+
+        Args:
+            name: Name of the studio
+            teamspace: Name of the teamspace
+        """
+        if teamspace:
+            ts_splits = teamspace.split("/")
+            if len(ts_splits) != 2:
+                raise ValueError(f"Teamspace should be of format <OWNER>/<TEAMSPACE_NAME> but got {teamspace}")
+            owner, teamspace = ts_splits
+        else:
+            owner, teamspace = None, None
+
+        try:
+            studio = Studio(name=name, teamspace=teamspace, org=owner, user=None, create_ok=False)
+        except (RuntimeError, ValueError):
+            studio = Studio(name=name, teamspace=teamspace, org=None, user=owner, create_ok=False)
+        return studio

lightning_sdk/cli/switch.py

@@ -0,0 +1,43 @@
+from typing import Optional
+
+from lightning_sdk import Machine, Studio
+
+
+class _Switch:
+    """Switch machines for resources on the Lightning AI platform."""
+
+    def __init__(self) -> None:
+        _machine_values = tuple([machine.name for machine in Machine.__dict__.values() if isinstance(machine, Machine)])
+
+        docstr_studio = f"""Switch a studio to a given machine.
+
+        Args:
+            name: The name of the studio to start.
+                If not specified, tries to infer from the environment (e.g. when run from within a Studio.)
+            teamspace: The teamspace the studio is part of. Should be of format <OWNER>/<TEAMSPACE_NAME>.
+                If not specified, tries to infer from the environment (e.g. when run from within a Studio.)
+            machine: The machine type to switch to. One of {", ".join(_machine_values)}.
+                Defaults to the CPU Machine.
+        """
+        self.studio.__func__.__doc__ = docstr_studio
+
+    def studio(self, name: Optional[str] = None, teamspace: Optional[str] = None, machine: str = "CPU") -> None:
+        if teamspace is not None:
+            ts_splits = teamspace.split("/")
+            if len(ts_splits) != 2:
+                raise ValueError(f"Teamspace should be of format <OWNER>/<TEAMSPACE_NAME> but got {teamspace}")
+            owner, teamspace = ts_splits
+        else:
+            owner, teamspace = None, None
+
+        try:
+            studio = Studio(name=name, teamspace=teamspace, org=owner, user=None, create_ok=False)
+        except (RuntimeError, ValueError):
+            studio = Studio(name=name, teamspace=teamspace, org=None, user=owner, create_ok=False)
+
+        try:
+            resolved_machine = getattr(Machine, machine.upper(), Machine(machine, machine))
+        except KeyError:
+            resolved_machine = machine
+
+        studio.switch_machine(resolved_machine)

lightning_sdk/cli/teamspace_menu.py

@@ -1,5 +1,6 @@
 from typing import Dict, List, Optional
 
+from rich.console import Console
 from simple_term_menu import TerminalMenu
 
 from lightning_sdk.api import OrgApi
@@ -26,7 +27,7 @@ class _TeamspacesMenu:
             if ts["name"] == name and (ts["user"] == owner or ts["org"] == owner):
                 return ts
 
-        print("Could not find Teamspace {teamspace}, please select it from the list:")
+        Console().print("Could not find Teamspace {teamspace}, please select it from the list:")
         return self._get_teamspace_from_interactive_menu(possible_teamspaces)
 
     @staticmethod

lightning_sdk/cli/upload.py

@@ -71,6 +71,7 @@ class _Uploads(_StudiosMenu, _TeamspacesMenu):
             If not specified, will use the file or directory name of the path you want to upload
             and place it in your home directory.
         """
+        console = Console()
         if remote_path is None:
             remote_path = os.path.basename(path)
 
@@ -81,7 +82,7 @@ class _Uploads(_StudiosMenu, _TeamspacesMenu):
 
         selected_studio = self._resolve_studio(studio)
 
-        print(f"Uploading to {selected_studio.teamspace.name}/{selected_studio.name}")
+        console.print(f"Uploading to {selected_studio.teamspace.name}/{selected_studio.name}")
 
         pairs = {}
         for root, _, files in os.walk(path):
@@ -112,7 +113,7 @@ class _Uploads(_StudiosMenu, _TeamspacesMenu):
             + "/studios/"
             + selected_studio.name
         )
-        print(f"See your files at {studio_url}")
+        console.print(f"See your files at {studio_url}")
 
     def file(self, path: str, studio: Optional[str] = None, remote_path: Optional[str] = None) -> None:
         """Upload a file to a Studio.
@@ -126,6 +127,7 @@ class _Uploads(_StudiosMenu, _TeamspacesMenu):
             If not specified, will use the name of the file you want to upload
             and place it in your home directory.
         """
+        console = Console()
         if remote_path is None:
             remote_path = os.path.basename(path)
 
@@ -136,7 +138,7 @@ class _Uploads(_StudiosMenu, _TeamspacesMenu):
 
         selected_studio = self._resolve_studio(studio)
 
-        print(f"Uploading to {selected_studio.teamspace.name}/{selected_studio.name}")
+        console.print(f"Uploading to {selected_studio.teamspace.name}/{selected_studio.name}")
 
         self._single_file_upload(selected_studio, path, remote_path, True)
 
@@ -149,7 +151,7 @@ class _Uploads(_StudiosMenu, _TeamspacesMenu):
             + "/studios/"
             + selected_studio.name
         )
-        print(f"See your file at {studio_url}")
+        console.print(f"See your file at {studio_url}")
 
     def container(self, container: str, tag: str = "latest", teamspace: Optional[str] = None) -> None:
         teamspace = self._resolve_teamspace(teamspace)

lightning_sdk/lightning_cloud/openapi/__init__.py

@@ -124,6 +124,7 @@ from lightning_sdk.lightning_cloud.openapi.models.id_publications_body import Id
 from lightning_sdk.lightning_cloud.openapi.models.id_publications_body1 import IdPublicationsBody1
 from lightning_sdk.lightning_cloud.openapi.models.id_release_body import IdReleaseBody
 from lightning_sdk.lightning_cloud.openapi.models.id_reportlogsactivity_body import IdReportlogsactivityBody
+from lightning_sdk.lightning_cloud.openapi.models.id_reportrestarttimings_body import IdReportrestarttimingsBody
 from lightning_sdk.lightning_cloud.openapi.models.id_start_body import IdStartBody
 from lightning_sdk.lightning_cloud.openapi.models.id_storage_body import IdStorageBody
 from lightning_sdk.lightning_cloud.openapi.models.id_uploads_body import IdUploadsBody
@@ -446,6 +447,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_get_agent_job_logs_metadata
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_artifacts_page_response import V1GetArtifactsPageResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_cloud_space_instance_status_response import V1GetCloudSpaceInstanceStatusResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_cloud_space_size_response import V1GetCloudSpaceSizeResponse
+from lightning_sdk.lightning_cloud.openapi.models.v1_get_cluster_accelerator_demand_response import V1GetClusterAcceleratorDemandResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_cluster_credentials_response import V1GetClusterCredentialsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_deployment_routing_telemetry_aggregated_response import V1GetDeploymentRoutingTelemetryAggregatedResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_deployment_routing_telemetry_response import V1GetDeploymentRoutingTelemetryResponse
@@ -571,6 +573,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_list_lightningapp_instances
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_lightningwork_events_response import V1ListLightningworkEventsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_lightningwork_response import V1ListLightningworkResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_lit_pages_response import V1ListLitPagesResponse
+from lightning_sdk.lightning_cloud.openapi.models.v1_list_lit_registry_repository_image_artifact_versions_response import V1ListLitRegistryRepositoryImageArtifactVersionsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_logger_artifact_response import V1ListLoggerArtifactResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_managed_endpoints_response import V1ListManagedEndpointsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_memberships_response import V1ListMembershipsResponse
@@ -606,6 +609,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_list_studio_jobs_response i
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_user_slurm_jobs_response import V1ListUserSLURMJobsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_lit_page import V1LitPage
 from lightning_sdk.lightning_cloud.openapi.models.v1_lit_page_type import V1LitPageType
+from lightning_sdk.lightning_cloud.openapi.models.v1_lit_registry_artifact import V1LitRegistryArtifact
 from lightning_sdk.lightning_cloud.openapi.models.v1_lit_registry_project import V1LitRegistryProject
 from lightning_sdk.lightning_cloud.openapi.models.v1_lit_repository import V1LitRepository
 from lightning_sdk.lightning_cloud.openapi.models.v1_locked_resource import V1LockedResource
@@ -699,6 +703,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_refresh_response import V1R
 from lightning_sdk.lightning_cloud.openapi.models.v1_region_state import V1RegionState
 from lightning_sdk.lightning_cloud.openapi.models.v1_regional_load_balancer import V1RegionalLoadBalancer
 from lightning_sdk.lightning_cloud.openapi.models.v1_report_logs_activity_response import V1ReportLogsActivityResponse
+from lightning_sdk.lightning_cloud.openapi.models.v1_report_restart_timings_response import V1ReportRestartTimingsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_request_cluster_access_request import V1RequestClusterAccessRequest
 from lightning_sdk.lightning_cloud.openapi.models.v1_request_cluster_access_response import V1RequestClusterAccessResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_request_verification_code_response import V1RequestVerificationCodeResponse
@@ -708,6 +713,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_resources import V1Resource
 from lightning_sdk.lightning_cloud.openapi.models.v1_response_choice import V1ResponseChoice
 from lightning_sdk.lightning_cloud.openapi.models.v1_response_choice_delta import V1ResponseChoiceDelta
 from lightning_sdk.lightning_cloud.openapi.models.v1_restart_cloud_space_instance_response import V1RestartCloudSpaceInstanceResponse
+from lightning_sdk.lightning_cloud.openapi.models.v1_restart_timing import V1RestartTiming
 from lightning_sdk.lightning_cloud.openapi.models.v1_restore_deployment_release_response import V1RestoreDeploymentReleaseResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_role import V1Role
 from lightning_sdk.lightning_cloud.openapi.models.v1_rolling_update_strategy import V1RollingUpdateStrategy

lightning_sdk/lightning_cloud/openapi/api/cluster_service_api.py

@@ -1096,6 +1096,7 @@ class ClusterServiceApi(object):
         :param async_req bool
         :param str cluster_id: (required)
         :param str id: (required)
+        :param str org_id:
         :return: V1DeleteClusterUsageRestrictionResponse
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1118,12 +1119,13 @@ class ClusterServiceApi(object):
         :param async_req bool
         :param str cluster_id: (required)
         :param str id: (required)
+        :param str org_id:
         :return: V1DeleteClusterUsageRestrictionResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['cluster_id', 'id']  # noqa: E501
+        all_params = ['cluster_id', 'id', 'org_id']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -1156,6 +1158,8 @@ class ClusterServiceApi(object):
             path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
+        if 'org_id' in params:
+            query_params.append(('orgId', params['org_id']))  # noqa: E501
 
         header_params = {}
 
@@ -1525,6 +1529,111 @@ class ClusterServiceApi(object):
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def cluster_service_get_cluster_accelerator_demand(self, cluster_id: 'str', id: 'str', **kwargs) -> 'V1GetClusterAcceleratorDemandResponse':  # noqa: E501
+        """cluster_service_get_cluster_accelerator_demand  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.cluster_service_get_cluster_accelerator_demand(cluster_id, id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str cluster_id: (required)
+        :param str id: (required)
+        :param bool spot:
+        :return: V1GetClusterAcceleratorDemandResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.cluster_service_get_cluster_accelerator_demand_with_http_info(cluster_id, id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.cluster_service_get_cluster_accelerator_demand_with_http_info(cluster_id, id, **kwargs)  # noqa: E501
+            return data
+
+    def cluster_service_get_cluster_accelerator_demand_with_http_info(self, cluster_id: 'str', id: 'str', **kwargs) -> 'V1GetClusterAcceleratorDemandResponse':  # noqa: E501
+        """cluster_service_get_cluster_accelerator_demand  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.cluster_service_get_cluster_accelerator_demand_with_http_info(cluster_id, id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str cluster_id: (required)
+        :param str id: (required)
+        :param bool spot:
+        :return: V1GetClusterAcceleratorDemandResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['cluster_id', 'id', 'spot']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method cluster_service_get_cluster_accelerator_demand" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'cluster_id' is set
+        if ('cluster_id' not in params or
+                params['cluster_id'] is None):
+            raise ValueError("Missing the required parameter `cluster_id` when calling `cluster_service_get_cluster_accelerator_demand`")  # noqa: E501
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `cluster_service_get_cluster_accelerator_demand`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'cluster_id' in params:
+            path_params['clusterId'] = params['cluster_id']  # noqa: E501
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+        if 'spot' in params:
+            query_params.append(('spot', params['spot']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+
+        return self.api_client.call_api(
+            '/v1/core/clusters/{clusterId}/accelerator/{id}/demand', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='V1GetClusterAcceleratorDemandResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def cluster_service_get_cluster_availability(self, **kwargs) -> 'V1ClusterAvailability':  # noqa: E501
         """cluster_service_get_cluster_availability  # noqa: E501
 
@@ -2311,6 +2420,7 @@ class ClusterServiceApi(object):
 
         :param async_req bool
         :param str cluster_id: (required)
+        :param str org_id:
         :return: V1ListClusterUsageRestrictionsResponse
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2332,12 +2442,13 @@ class ClusterServiceApi(object):
 
         :param async_req bool
         :param str cluster_id: (required)
+        :param str org_id:
         :return: V1ListClusterUsageRestrictionsResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['cluster_id']  # noqa: E501
+        all_params = ['cluster_id', 'org_id']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -2364,6 +2475,8 @@ class ClusterServiceApi(object):
             path_params['clusterId'] = params['cluster_id']  # noqa: E501
 
         query_params = []
+        if 'org_id' in params:
+            query_params.append(('orgId', params['org_id']))  # noqa: E501
 
         header_params = {}