lightning-sdk 0.1.48__py3-none-any.whl → 0.1.50__py3-none-any.whl

lightning_sdk/__init__.py

@@ -4,6 +4,7 @@ from lightning_sdk.constants import __GLOBAL_LIGHTNING_UNIQUE_IDS_STORE__  # noq
 from lightning_sdk.helpers import _check_version_and_prompt_upgrade
 from lightning_sdk.job import Job
 from lightning_sdk.machine import Machine
+from lightning_sdk.mmt import MMT
 from lightning_sdk.organization import Organization
 from lightning_sdk.plugin import JobsPlugin, MultiMachineTrainingPlugin, Plugin, SlurmJobsPlugin
 from lightning_sdk.status import Status
@@ -15,6 +16,7 @@ __all__ = [
     "Job",
     "JobsPlugin",
     "Machine",
+    "MMT",
     "MultiMachineTrainingPlugin",
     "Organization",
     "Plugin",
@@ -27,5 +29,5 @@ __all__ = [
     "AIHub",
 ]
 
-__version__ = "0.1.48"
+__version__ = "0.1.50"
 _check_version_and_prompt_upgrade(__version__)

lightning_sdk/api/job_api.py

@@ -1,11 +1,11 @@
 import time
-from typing import TYPE_CHECKING, Dict, List, Optional
+from typing import TYPE_CHECKING, Dict, List, Optional, Union
 from urllib.request import urlopen
 
 from lightning_sdk.api.utils import (
     _COMPUTE_NAME_TO_MACHINE,
-    _MACHINE_TO_COMPUTE_NAME,
     _create_app,
+    _machine_to_compute_name,
     remove_datetime_prefix,
 )
 from lightning_sdk.api.utils import (
@@ -120,7 +120,7 @@ class JobApiV1:
         studio_id: str,
         teamspace_id: str,
         cloud_account: str,
-        machine: Machine,
+        machine: Union[Machine, str],
         interruptible: bool,
     ) -> Externalv1LightningappInstance:
         """Creates an arbitrary app."""
@@ -130,7 +130,7 @@ class JobApiV1:
             teamspace_id=teamspace_id,
             cloud_account=cloud_account,
             plugin_type="job",
-            compute=_MACHINE_TO_COMPUTE_NAME[machine],
+            compute=_machine_to_compute_name(machine),
             name=name,
             entrypoint=command,
             interruptible=interruptible,
@@ -180,6 +180,10 @@ class JobApiV1:
 
         raise RuntimeError("Could not extract command from app")
 
+    def get_total_cost(self, job: Externalv1LightningappInstance) -> float:
+        status: V1LightningappInstanceStatus = job.status
+        return status.total_cost
+
 
 class JobApiV2:
     # these are stages the job can be in.
@@ -205,7 +209,7 @@ class JobApiV2:
         teamspace_id: str,
         studio_id: Optional[str],
         image: Optional[str],
-        machine: Machine,
+        machine: Union[Machine, str],
         interruptible: bool,
         env: Optional[Dict[str, str]],
         image_credentials: Optional[str],
@@ -219,7 +223,7 @@ class JobApiV2:
             for k, v in env.items():
                 env_vars.append(V1EnvVar(name=k, value=v))
 
-        instance_name = _MACHINE_TO_COMPUTE_NAME[machine]
+        instance_name = _machine_to_compute_name(machine)
 
         run_id = __GLOBAL_LIGHTNING_UNIQUE_IDS_STORE__[studio_id] if studio_id is not None else ""
 
@@ -337,3 +341,6 @@ class JobApiV2:
         return _COMPUTE_NAME_TO_MACHINE.get(
             instance_type, _COMPUTE_NAME_TO_MACHINE.get(instance_name, instance_type or instance_name)
         )
+
+    def get_total_cost(self, job: V1Job) -> float:
+        return job.total_cost

lightning_sdk/api/lit_container_api.py

@@ -1,13 +1,23 @@
-from typing import List
+from typing import Generator, List
 
+from lightning_sdk.api.utils import _get_registry_url
 from lightning_sdk.lightning_cloud.openapi.models import V1DeleteLitRepositoryResponse
 from lightning_sdk.lightning_cloud.rest_client import LightningClient
+from lightning_sdk.teamspace import Teamspace
 
 
 class LitContainerApi:
     def __init__(self) -> None:
         self._client = LightningClient(max_tries=3)
 
+        import docker
+
+        try:
+            self._docker_client = docker.from_env()
+            self._docker_client.ping()
+        except docker.errors.DockerException as e:
+            raise RuntimeError(f"Failed to connect to Docker daemon: {e!s}. Is Docker running?") from None
+
     def list_containers(self, project_id: str) -> List:
         project = self._client.lit_registry_service_get_lit_project_registry(project_id)
         return project.repositories
@@ -17,3 +27,29 @@ class LitContainerApi:
             return self._client.lit_registry_service_delete_lit_repository(project_id, container)
         except Exception as ex:
             raise ValueError(f"Could not delete container {container} from project {project_id}") from ex
+
+    def upload_container(self, container: str, teamspace: Teamspace, tag: str) -> Generator[str, None, None]:
+        import docker
+
+        try:
+            self._docker_client.images.get(container)
+        except docker.errors.ImageNotFound:
+            raise ValueError(f"Container {container} does not exist") from None
+
+        registry_url = _get_registry_url()
+        repository = f"{registry_url}/lit-container/{teamspace.owner.name}/{teamspace.name}/{container}"
+        tagged = self._docker_client.api.tag(container, repository, tag)
+        if not tagged:
+            raise ValueError(f"Could not tag container {container} with {repository}:{tag}")
+        return self._docker_client.api.push(repository, stream=True, decode=True)
+
+    def download_container(self, container: str, teamspace: Teamspace, tag: str) -> Generator[str, None, None]:
+        import docker
+
+        registry_url = _get_registry_url()
+        repository = f"{registry_url}/lit-container/{teamspace.owner.name}/{teamspace.name}/{container}"
+        try:
+            self._docker_client.images.pull(repository, tag=tag)
+        except docker.errors.APIError as e:
+            raise ValueError(f"Could not pull container {container} from {repository}:{tag}") from e
+        return self._docker_client.api.tag(repository, container, tag)

lightning_sdk/api/mmt_api.py

@@ -1,12 +1,12 @@
 import json
 import time
-from typing import TYPE_CHECKING, Dict, List, Optional
+from typing import TYPE_CHECKING, Dict, List, Optional, Union
 
 from lightning_sdk.api.job_api import JobApiV1
 from lightning_sdk.api.utils import (
     _COMPUTE_NAME_TO_MACHINE,
-    _MACHINE_TO_COMPUTE_NAME,
     _create_app,
+    _machine_to_compute_name,
 )
 from lightning_sdk.api.utils import (
     _get_cloud_url as _cloud_url,
@@ -43,13 +43,13 @@ class MMTApiV1(JobApiV1):
         cloud_account: Optional[str],
         teamspace_id: str,
         studio_id: str,
-        machine: Machine,
+        machine: Union[Machine, str],
         interruptible: bool,
         strategy: str,
     ) -> Externalv1LightningappInstance:
         """Creates a multi-machine job with given commands."""
         distributed_args = {
-            "cloud_compute": _MACHINE_TO_COMPUTE_NAME[machine],
+            "cloud_compute": _machine_to_compute_name(machine),
             "num_instances": num_machines,
             "strategy": strategy,
         }
@@ -80,7 +80,7 @@ class MMTApiV2:
         teamspace_id: str,
         studio_id: Optional[str],
         image: Optional[str],
-        machine: Machine,
+        machine: Union[Machine, str],
         interruptible: bool,
         env: Optional[Dict[str, str]],
         image_credentials: Optional[str],
@@ -94,7 +94,7 @@ class MMTApiV2:
             for k, v in env.items():
                 env_vars.append(V1EnvVar(name=k, value=v))
 
-        instance_name = _MACHINE_TO_COMPUTE_NAME[machine]
+        instance_name = _machine_to_compute_name(machine)
 
         run_id = __GLOBAL_LIGHTNING_UNIQUE_IDS_STORE__[studio_id] if studio_id is not None else ""
 
@@ -203,3 +203,9 @@ class MMTApiV2:
         return _COMPUTE_NAME_TO_MACHINE.get(
             instance_type, _COMPUTE_NAME_TO_MACHINE.get(instance_name, instance_type or instance_name)
         )
+
+    def get_total_cost(self, job: V1MultiMachineJob) -> float:
+        return job.total_cost
+
+    def get_num_machines(self, job: V1MultiMachineJob) -> int:
+        return job.machines

lightning_sdk/api/utils.py

@@ -354,6 +354,7 @@ def _machine_to_compute_name(machine: Union[Machine, str]) -> str:
 _COMPUTE_NAME_TO_MACHINE: Dict[str, Machine] = {v: k for k, v in _MACHINE_TO_COMPUTE_NAME.items()}
 
 _DEFAULT_CLOUD_URL = "https://lightning.ai"
+_DEFAULT_REGISTRY_URL = "litcr.io"
 
 
 def _get_cloud_url() -> str:
@@ -362,6 +363,12 @@ def _get_cloud_url() -> str:
     return cloud_url
 
 
+def _get_registry_url() -> str:
+    registry_url = os.environ.get("LIGHTNING_REGISTRY_URL", _DEFAULT_REGISTRY_URL)
+    os.environ["LIGHTNING_REGISTRY_URL"] = registry_url
+    return registry_url
+
+
 def _sanitize_studio_remote_path(path: str, studio_id: str) -> str:
     return f"/cloudspaces/{studio_id}/code/content/{path.replace('/teamspace/studios/this_studio/', '')}"
 

lightning_sdk/cli/download.py

@@ -3,14 +3,18 @@ import re
 from pathlib import Path
 from typing import Optional
 
+from rich.console import Console
+
+from lightning_sdk.api.lit_container_api import LitContainerApi
 from lightning_sdk.cli.exceptions import StudioCliError
 from lightning_sdk.cli.studios_menu import _StudiosMenu
+from lightning_sdk.cli.teamspace_menu import _TeamspacesMenu
 from lightning_sdk.models import download_model
 from lightning_sdk.studio import Studio
 from lightning_sdk.utils.resolve import _get_authed_user, skip_studio_init
 
 
-class _Downloads(_StudiosMenu):
+class _Downloads(_StudiosMenu, _TeamspacesMenu):
     """Download files and folders from Lightning AI."""
 
     def model(self, name: str, download_dir: str = ".") -> None:
@@ -130,3 +134,18 @@ class _Downloads(_StudiosMenu):
                 f"Could not download the file from the given Studio {studio}. "
                 "Please contact Lightning AI directly to resolve this issue."
             ) from e
+
+    def container(self, container: str, teamspace: Optional[str] = None, tag: str = "latest") -> None:
+        """Download a docker container from a teamspace.
+
+        Args:
+          container: The name of the container to download.
+          teamspace: The name of the teamspace to download the container from.
+          tag: The tag of the container to download.
+        """
+        resolved_teamspace = self._resolve_teamspace(teamspace)
+        console = Console()
+        with console.status("Downloading container..."):
+            api = LitContainerApi()
+            api.download_container(container, resolved_teamspace, tag)
+            console.print("Container downloaded successfully", style="green")

lightning_sdk/cli/entrypoint.py

@@ -1,3 +1,7 @@
+import sys
+from types import TracebackType
+from typing import Type
+
 from fire import Fire
 from lightning_utilities.core.imports import RequirementCache
 
@@ -32,6 +36,8 @@ class StudioCLI:
         self.inspect = _Inspect()
         self.stop = _Stop()
 
+        sys.excepthook = _notify_exception
+
     def login(self) -> None:
         """Login to Lightning AI Studios."""
         auth = Auth()
@@ -48,6 +54,11 @@ class StudioCLI:
         auth.clear()
 
 
+def _notify_exception(exception_type: Type[BaseException], value: BaseException, tb: TracebackType) -> None:  # No
+    """CLI won't show tracebacks, just print the exception message."""
+    print(value)
+
+
 def main_cli() -> None:
     """CLI entrypoint."""
     Fire(StudioCLI(), name="lightning")

lightning_sdk/cli/list.py

@@ -20,7 +20,36 @@ class _List(_TeamspacesMenu):
         """
         resolved_teamspace = self._resolve_teamspace(teamspace=teamspace)
 
-        print("Available Jobs:\n" + "\n".join([j.name for j in resolved_teamspace.jobs]))
+        jobs = resolved_teamspace.jobs
+
+        table = Table(
+            pad_edge=True,
+        )
+        table.add_column("Name")
+        table.add_column("Teamspace")
+        table.add_column("Studio")
+        table.add_column("Image")
+        table.add_column("Status")
+        table.add_column("Machine")
+        table.add_column("Total Cost")
+        for j in jobs:
+            # we know we just fetched these, so no need to refetch
+            j._prevent_refetch_latest = True
+            j._internal_job._prevent_refetch_latest = True
+
+            studio = j.studio
+            table.add_row(
+                j.name,
+                f"{j.teamspace.owner.name}/{j.teamspace.name}",
+                studio.name if studio else None,
+                j.image,
+                str(j.status),
+                str(j.machine),
+                f"{j.total_cost:.3f}",
+            )
+
+        console = Console()
+        console.print(table)
 
     def mmts(self, teamspace: Optional[str] = None) -> None:
         """List multi-machine jobs for a given teamspace.
@@ -32,7 +61,36 @@ class _List(_TeamspacesMenu):
         """
         resolved_teamspace = self._resolve_teamspace(teamspace=teamspace)
 
-        print("Available MMTs:\n" + "\n".join([j.name for j in resolved_teamspace.multi_machine_jobs]))
+        jobs = resolved_teamspace.multi_machine_jobs
+
+        table = Table(pad_edge=True)
+        table.add_column("Name")
+        table.add_column("Teamspace")
+        table.add_column("Studio")
+        table.add_column("Image")
+        table.add_column("Status")
+        table.add_column("Machine")
+        table.add_column("Num Machines")
+        table.add_column("Total Cost")
+        for j in jobs:
+            # we know we just fetched these, so no need to refetch
+            j._prevent_refetch_latest = True
+            j._internal_job._prevent_refetch_latest = True
+
+            studio = j.studio
+            table.add_row(
+                j.name,
+                f"{j.teamspace.owner.name}/{j.teamspace.name}",
+                studio.name if studio else None,
+                j.image,
+                str(j.status),
+                str(j.machine),
+                str(j.num_machines),
+                str(j.total_cost),
+            )
+
+        console = Console()
+        console.print(table)
 
     def containers(self, teamspace: Optional[str] = None) -> None:
         """Display the list of available containers.

lightning_sdk/cli/run.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Dict, Optional
+from typing import TYPE_CHECKING, Dict, Optional, Union
 
 from lightning_sdk.job import Job
 from lightning_sdk.machine import Machine
@@ -111,7 +111,7 @@ class _Run:
     # might need to move to different cli library
     def job(
         self,
-        name: str,
+        name: Optional[str] = None,
         machine: Optional[str] = None,
         command: Optional[str] = None,
         studio: Optional[str] = None,
@@ -128,16 +128,27 @@ class _Run:
         artifacts_remote: Optional[str] = None,
         entrypoint: str = "sh -c",
     ) -> None:
+        if not name:
+            from datetime import datetime
+
+            timestr = datetime.now().strftime("%Y-%m-%d-%H-%M-%S")
+            name = f"job-{timestr}"
+
         if machine is None:
             # TODO: infer from studio
             machine = "CPU"
-        machine_enum = Machine(machine.upper())
+        machine_enum: Union[str, Machine]
+        try:
+            machine_enum = Machine[machine.upper()]
+        except KeyError:
+            machine_enum = machine
 
         resolved_teamspace = Teamspace(name=teamspace, org=org, user=user)
 
         if cloud_account is None:
             cloud_account = resolved_teamspace.default_cloud_account
         machine_enum = Machine(machine.upper())
+
         Job.run(
             name=name,
             machine=machine_enum,
@@ -188,7 +199,11 @@ class _Run:
         if machine is None:
             # TODO: infer from studio
             machine = "CPU"
-        machine_enum = Machine(machine.upper())
+        machine_enum: Union[str, Machine]
+        try:
+            machine_enum = Machine[machine.upper()]
+        except KeyError:
+            machine_enum = machine
 
         resolved_teamspace = Teamspace(name=teamspace, org=org, user=user)
         if cloud_account is None:

lightning_sdk/cli/upload.py

@@ -4,18 +4,22 @@ import os
 from pathlib import Path
 from typing import Dict, List, Optional
 
+from rich.console import Console
+from rich.progress import Progress, SpinnerColumn, TextColumn, TimeElapsedColumn
 from simple_term_menu import TerminalMenu
 from tqdm import tqdm
 
+from lightning_sdk.api.lit_container_api import LitContainerApi
 from lightning_sdk.api.utils import _get_cloud_url
 from lightning_sdk.cli.exceptions import StudioCliError
 from lightning_sdk.cli.studios_menu import _StudiosMenu
+from lightning_sdk.cli.teamspace_menu import _TeamspacesMenu
 from lightning_sdk.models import upload_model
 from lightning_sdk.studio import Studio
 from lightning_sdk.utils.resolve import _get_authed_user, skip_studio_init
 
 
-class _Uploads(_StudiosMenu):
+class _Uploads(_StudiosMenu, _TeamspacesMenu):
     """Upload files and folders to Lightning AI."""
 
     _studio_upload_status_path = "~/.lightning/studios/uploads"
@@ -146,6 +150,33 @@ class _Uploads(_StudiosMenu):
         )
         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)
+        api = LitContainerApi()
+        console = Console()
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            TimeElapsedColumn(),
+            console=console,
+            transient=False,
+        ) as progress:
+            push_task = progress.add_task("Pushing Docker image", total=None)
+            resp = api.upload_container(container, teamspace, tag)
+            for line in resp:
+                if "status" in line:
+                    console.print(line["status"], style="bright_black")
+                    progress.update(push_task, description="Pushing Docker image")
+                elif "aux" in line:
+                    console.print(line["aux"], style="bright_black")
+                elif "error" in line:
+                    progress.stop()
+                    console.print(f"\n[red]{line}[/red]")
+                    return
+                else:
+                    console.print(line, style="bright_black")
+            progress.update(push_task, description="[green]Container pushed![/green]")
+
     def _start_parallel_upload(
         self, executor: concurrent.futures.ThreadPoolExecutor, studio: Studio, upload_state: Dict[str, str]
     ) -> List[concurrent.futures.Future]:

lightning_sdk/job/base.py

@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 class MachineDict(TypedDict):
     name: str
     status: "Status"
-    machine: "Machine"
+    machine: Union["Machine", str]
 
 
 class JobDict(MachineDict):
@@ -24,6 +24,7 @@ class JobDict(MachineDict):
     teamspace: str
     studio: Optional[str]
     image: Optional[str]
+    total_cost: float
 
 
 class _BaseJob(ABC):
@@ -61,11 +62,13 @@ class _BaseJob(ABC):
         if _fetch_job:
             self._update_internal_job()
 
+        self._prevent_refetch_latest = False
+
     @classmethod
     def run(
         cls,
         name: str,
-        machine: "Machine",
+        machine: Union["Machine", str],
         command: Optional[str] = None,
         studio: Union["Studio", str, None] = None,
         image: Optional[str] = None,
@@ -202,7 +205,7 @@ class _BaseJob(ABC):
     @abstractmethod
     def _submit(
         self,
-        machine: "Machine",
+        machine: Union["Machine", str],
         command: Optional[str] = None,
         studio: Optional["Studio"] = None,
         image: Optional[str] = None,
@@ -268,7 +271,7 @@ class _BaseJob(ABC):
 
     @property
     @abstractmethod
-    def machine(self) -> "Machine":
+    def machine(self) -> Union["Machine", str]:
         """The machine type the job is running on."""
 
     @property
@@ -332,6 +335,7 @@ class _BaseJob(ABC):
             "command": self.command,
             "status": self.status,
             "machine": self.machine,
+            "total_cost": self.total_cost,
         }
 
     def json(self) -> str:
@@ -361,3 +365,18 @@ class _BaseJob(ABC):
             self._update_internal_job()
 
         return self._job
+
+    @property
+    def total_cost(self) -> float:
+        """The number of credits the job was consuming so far."""
+        return self._job_api.get_total_cost(self._latest_job)
+
+    @property
+    def _latest_job(self) -> Any:
+        """Guarantees to fetch the latest version of a job before returning it."""
+        # in some cases we know we just refetched the latest state, no need to refetch again
+        if self._prevent_refetch_latest:
+            return self._guaranteed_job
+
+        self._update_internal_job()
+        return self._job

lightning_sdk/job/job.py

@@ -89,7 +89,7 @@ class Job(_BaseJob):
     def run(
         cls,
         name: str,
-        machine: "Machine",
+        machine: Union["Machine", str],
         command: Optional[str] = None,
         studio: Union["Studio", str, None] = None,
         image: Union[str, None] = None,
@@ -169,7 +169,7 @@ class Job(_BaseJob):
 
     def _submit(
         self,
-        machine: "Machine",
+        machine: Union["Machine", str],
         command: Optional[str] = None,
         studio: Optional["Studio"] = None,
         image: Optional[str] = None,
@@ -225,6 +225,7 @@ class Job(_BaseJob):
             cloud_account_auth=cloud_account_auth,
             artifacts_local=artifacts_local,
             artifacts_remote=artifacts_remote,
+            entrypoint=entrypoint,
         )
         return self
 
@@ -248,7 +249,7 @@ class Job(_BaseJob):
         return self._internal_job.status
 
     @property
-    def machine(self) -> "Machine":
+    def machine(self) -> Union["Machine", str]:
         """The machine type the job is running on."""
         return self._internal_job.machine
 

lightning_sdk/job/v1.py

@@ -44,7 +44,7 @@ class _JobV1(_BaseJob):
     def run(
         cls,
         name: str,
-        machine: "Machine",
+        machine: Union["Machine", str],
         command: str,
         studio: "Studio",
         teamspace: Union[str, "Teamspace", None] = None,
@@ -89,7 +89,7 @@ class _JobV1(_BaseJob):
 
     def _submit(
         self,
-        machine: "Machine",
+        machine: Union["Machine", str],
         command: Optional[str] = None,
         studio: Optional["Studio"] = None,
         image: Optional[str] = None,
@@ -174,7 +174,7 @@ class _JobV1(_BaseJob):
 
     def stop(self) -> None:
         """Stops the job. is blocking until the ob is stopped."""
-        if self.status in (Status.Stopped, Status.Failed):
+        if self.status in (Status.Stopped, Status.Completed, Status.Failed):
             return None
 
         return self._job_api.stop_job(self._job.id, self.teamspace.id)
@@ -195,7 +195,7 @@ class _JobV1(_BaseJob):
         return Work(_work[0].id, self, self.teamspace)
 
     @property
-    def machine(self) -> "Machine":
+    def machine(self) -> Union["Machine", str]:
         """Get the machine the job is running on."""
         return self.work.machine
 

lightning_sdk/job/v2.py

@@ -1,13 +1,13 @@
-from typing import TYPE_CHECKING, Any, Dict, Optional, Union
+from typing import TYPE_CHECKING, Dict, Optional, Union
 
 from lightning_sdk.api.job_api import JobApiV2
 from lightning_sdk.api.utils import _get_cloud_url
 from lightning_sdk.job.base import _BaseJob
+from lightning_sdk.status import Status
 
 if TYPE_CHECKING:
     from lightning_sdk.machine import Machine
     from lightning_sdk.organization import Organization
-    from lightning_sdk.status import Status
     from lightning_sdk.studio import Studio
     from lightning_sdk.teamspace import Teamspace
     from lightning_sdk.user import User
@@ -37,7 +37,7 @@ class _JobV2(_BaseJob):
 
     def _submit(
         self,
-        machine: "Machine",
+        machine: Union["Machine", str],
         command: Optional[str] = None,
         studio: Optional["Studio"] = None,
         image: Optional[str] = None,
@@ -121,6 +121,9 @@ class _JobV2(_BaseJob):
 
     def stop(self) -> None:
         """Stop the job. If the job is already stopped, this is a no-op. This is blocking until the job is stopped."""
+        if self.status in (Status.Stopped, Status.Completed, Status.Failed):
+            return
+
         self._job_api.stop_job(job_id=self._guaranteed_job.id, teamspace_id=self._teamspace.id)
 
     def delete(self) -> None:
@@ -134,19 +137,13 @@ class _JobV2(_BaseJob):
             cloudspace_id=self._guaranteed_job.spec.cloudspace_id,
         )
 
-    @property
-    def _latest_job(self) -> Any:
-        """Guarantees to fetch the latest version of a job before returning it."""
-        self._update_internal_job()
-        return self._job
-
     @property
     def status(self) -> "Status":
         """The current status of the job."""
         return self._job_api._job_state_to_external(self._latest_job.state)
 
     @property
-    def machine(self) -> "Machine":
+    def machine(self) -> Union["Machine", str]:
         """The machine type the job is running on."""
         # only fetch the job it it hasn't been fetched yet as machine cannot change over time
         return self._job_api._get_job_machine_from_spec(self._guaranteed_job.spec)