lightning-sdk 0.1.58__py3-none-any.whl → 0.2.1__py3-none-any.whl

lightning_sdk/__init__.py

@@ -1,6 +1,7 @@
 from lightning_sdk.agents import Agent
 from lightning_sdk.ai_hub import AIHub
 from lightning_sdk.constants import __GLOBAL_LIGHTNING_UNIQUE_IDS_STORE__  # noqa: F401
+from lightning_sdk.deployment import Deployment
 from lightning_sdk.helpers import _check_version_and_prompt_upgrade, _set_tqdm_envvars_noninteractive
 from lightning_sdk.job import Job
 from lightning_sdk.machine import Machine
@@ -13,6 +14,9 @@ from lightning_sdk.teamspace import Teamspace
 from lightning_sdk.user import User
 
 __all__ = [
+    "AIHub",
+    "Agent",
+    "Deployment",
     "Job",
     "JobsPlugin",
     "Machine",
@@ -25,10 +29,8 @@ __all__ = [
     "Studio",
     "Teamspace",
     "User",
-    "Agent",
-    "AIHub",
 ]
 
-__version__ = "0.1.58"
+__version__ = "0.2.1"
 _check_version_and_prompt_upgrade(__version__)
 _set_tqdm_envvars_noninteractive()

lightning_sdk/api/deployment_api.py

@@ -1,5 +1,5 @@
 from time import sleep
-from typing import Any, List, Literal, Optional, Union
+from typing import Any, Dict, List, Literal, Optional, Union
 
 from lightning_sdk.api.utils import _machine_to_compute_name
 from lightning_sdk.lightning_cloud.openapi import (
@@ -242,7 +242,7 @@ class DeploymentApi:
         self,
         deployment: V1Deployment,
         machine: Optional[Machine] = None,
-        environment: Optional[str] = None,
+        image: Optional[str] = None,
         entrypoint: Optional[str] = None,
         command: Optional[str] = None,
         env: Optional[List[Union[Env, Secret]]] = None,
@@ -257,6 +257,7 @@ class DeploymentApi:
         health_check: Optional[Union[HttpHealthCheck, ExecHealthCheck]] = None,
         auth: Optional[Union[BasicAuth, TokenAuth]] = None,
         custom_domain: Optional[str] = None,
+        quantity: Optional[int] = None,
     ) -> V1Deployment:
         # Update the deployment in place
 
@@ -274,13 +275,14 @@ class DeploymentApi:
             apply_change(deployment.spec, "instance_type", _machine_to_compute_name(machine))
 
         requires_release = False
-        requires_release |= apply_change(deployment.spec, "image", environment)
+        requires_release |= apply_change(deployment.spec, "image", image)
         requires_release |= apply_change(deployment.spec, "entrypoint", entrypoint)
         requires_release |= apply_change(deployment.spec, "command", command)
         requires_release |= apply_change(deployment.spec, "env", to_env(env))
         requires_release |= apply_change(deployment.spec, "readiness_probe", to_health_check(health_check))
         requires_release |= apply_change(deployment.spec, "cluster_id", cloud_account)
         requires_release |= apply_change(deployment.spec, "spot", spot)
+        requires_release |= apply_change(deployment.spec, "quantity", quantity)
 
         if requires_release:
             if deployment.strategy is None:
@@ -382,13 +384,21 @@ def restore_env(env: List[V1EnvVar]) -> List[Union[Secret, Env]]:
     return [Secret(name=e.from_secret) if e.from_secret else Env(name=e.name, value=e.value) for e in env]
 
 
-def to_env(env: Optional[List[Union[Secret, Env]]] = None) -> Optional[List[V1EnvVar]]:
+def to_env(env: Union[List[Union[Secret, Env]], Dict[str, str], None] = None) -> Optional[List[V1EnvVar]]:
     if not env:
         return None
 
+    env_list = []
+
+    if isinstance(env, dict):
+        for k, v in env.items():
+            env_list.append(Env(name=k, value=v))
+    else:
+        env_list = env
+
     return [
         V1EnvVar(name=env.name, value=env.value) if isinstance(env, Env) else V1EnvVar(from_secret=env.name)
-        for env in env
+        for env in env_list
     ]
 
 
@@ -459,7 +469,7 @@ def to_autoscaling(
             target_metric.target = str(target_metric.target)
 
     metrics = (
-        target_metrics
+        [V1AutoscalingTargetMetric(name=t.name, target=t.target) for t in target_metrics]
         if target_metrics is not None
         else [V1AutoscalingTargetMetric(name=metric, target=str(threshold))]
     )
@@ -532,12 +542,13 @@ def to_health_check(
 def to_spec(
     cloud_account: Optional[str],
     machine: Optional[Machine],
-    environment: Optional[str],
+    image: Optional[str],
     entrypoint: Optional[str],
     command: Optional[str],
     spot: Optional[bool] = False,
-    env: Optional[List[Union[Secret, Env]]] = None,
+    env: Union[List[Union[Secret, Env]], Dict[str, str], None] = None,
     health_check: Optional[Union[HttpHealthCheck, ExecHealthCheck]] = None,
+    quantity: Optional[int] = None,
 ) -> V1JobSpec:
     if cloud_account is None:
         raise ValueError("The cloud account should be defined.")
@@ -545,18 +556,19 @@ def to_spec(
     if machine is None:
         raise ValueError("The machine should be defined.")
 
-    if environment is None:
-        raise ValueError("The environment should be defined.")
+    if image is None:
+        raise ValueError("The image should be defined.")
 
     return V1JobSpec(
         cluster_id=cloud_account,
         command=command,
         entrypoint=entrypoint,
         env=to_env(env),
-        image=environment,
+        image=image,
         spot=spot,
         instance_name=_machine_to_compute_name(machine),
         readiness_probe=to_health_check(health_check),
+        quantity=quantity,
     )
 
 

lightning_sdk/api/job_api.py

@@ -99,9 +99,10 @@ class JobApiV1:
         # prefer user-requested config if specified
         user_requested_compute_config: V1UserRequestedComputeConfig = spec.user_requested_compute_config
         if user_requested_compute_config.name:
-            return Machine(user_requested_compute_config.name, user_requested_compute_config.name)
+            return Machine.from_str(user_requested_compute_config.name)
         compute_config: V1ComputeConfig = spec.compute_config
-        return Machine(compute_config.instance_type, compute_config.instance_type)
+
+        return Machine.from_str(compute_config.instance_type)
 
     def get_studio_name(self, job: Externalv1LightningappInstance) -> str:
         cs: V1CloudSpace = self._client.cloud_space_service_get_cloud_space(
@@ -215,6 +216,43 @@ class JobApiV2:
         artifacts_local: Optional[str],  # deprecated in favor of path_mappings
         artifacts_remote: Optional[str],  # deprecated in favor of path_mappings
     ) -> V1Job:
+        body = self._create_job_body(
+            name=name,
+            command=command,
+            cloud_account=cloud_account,
+            studio_id=studio_id,
+            image=image,
+            machine=machine,
+            interruptible=interruptible,
+            env=env,
+            image_credentials=image_credentials,
+            cloud_account_auth=cloud_account_auth,
+            entrypoint=entrypoint,
+            path_mappings=path_mappings,
+            artifacts_local=artifacts_local,
+            artifacts_remote=artifacts_remote,
+        )
+
+        job: V1Job = self._client.jobs_service_create_job(project_id=teamspace_id, body=body)
+        return job
+
+    @staticmethod
+    def _create_job_body(
+        name: str,
+        command: Optional[str],
+        cloud_account: Optional[str],
+        studio_id: Optional[str],
+        image: Optional[str],
+        machine: Union[Machine, str],
+        interruptible: bool,
+        env: Optional[Dict[str, str]],
+        image_credentials: Optional[str],
+        cloud_account_auth: bool,
+        entrypoint: str,
+        path_mappings: Optional[Dict[str, str]],
+        artifacts_local: Optional[str],  # deprecated in favor of path_mappings
+        artifacts_remote: Optional[str],  # deprecated in favor of path_mappings)
+    ) -> ProjectIdJobsBody:
         env_vars = []
         if env is not None:
             for k, v in env.items():
@@ -244,10 +282,7 @@ class JobApiV2:
             image_secret_ref=image_credentials or "",
             path_mappings=path_mappings_list,
         )
-        body = ProjectIdJobsBody(name=name, spec=spec)
-
-        job: V1Job = self._client.jobs_service_create_job(project_id=teamspace_id, body=body)
-        return job
+        return ProjectIdJobsBody(name=name, spec=spec)
 
     def get_job_by_name(self, name: str, teamspace_id: str) -> V1Job:
         job: V1Job = self._client.jobs_service_find_job(project_id=teamspace_id, name=name)
@@ -340,7 +375,7 @@ class JobApiV2:
         instance_name = spec.instance_name
         instance_type = spec.instance_type
 
-        return Machine(instance_name, instance_type or instance_name)
+        return Machine.from_str(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,3 +1,4 @@
+import inspect
 import time
 from typing import Any, Callable, Dict, Generator, Iterator, List
 
@@ -21,6 +22,16 @@ class DockerPushError(Exception):
 
 
 def retry_on_lcr_auth_failure(func: Callable) -> Callable:
+    def generator_wrapper(self: "LitContainerApi", *args: Any, **kwargs: Any) -> Callable:
+        try:
+            gen = func(self, *args, **kwargs)
+            yield from gen
+        except LCRAuthFailedError:
+            self.authenticate(reauth=True)
+            gen = func(self, *args, **kwargs)
+            yield from gen
+        return
+
     def wrapper(self: "LitContainerApi", *args: Any, **kwargs: Any) -> Callable:
         try:
             return func(self, *args, **kwargs)
@@ -28,6 +39,9 @@ def retry_on_lcr_auth_failure(func: Callable) -> Callable:
             self.authenticate(reauth=True)
             return func(self, *args, **kwargs)
 
+    if inspect.isgeneratorfunction(func):
+        return generator_wrapper
+
     return wrapper
 
 
@@ -39,10 +53,13 @@ class LitContainerApi:
             self._docker_client = docker.from_env()
             self._docker_client.ping()
             self._docker_auth_config = {}
-        except docker.errors.DockerException as e:
-            raise RuntimeError(f"Failed to connect to Docker daemon: {e!s}. Is Docker running?") from None
+        except docker.errors.DockerException:
+            raise RuntimeError(
+                "Failed to connect to Docker, follow these steps to start it: https://docs.docker.com/engine/daemon/start/"
+            ) from None
 
     def authenticate(self, reauth: bool = False) -> bool:
+        resp = None
         try:
             authed_user = self._client.auth_service_get_user()
             username = authed_user.username
@@ -78,6 +95,7 @@ class LitContainerApi:
         except Exception as e:
             raise ValueError(f"Could not delete container {container} from project {project_id}: {e!s}") from e
 
+    @retry_on_lcr_auth_failure
     def upload_container(self, container: str, teamspace: Teamspace, tag: str) -> Generator[dict, None, None]:
         try:
             self._docker_client.images.get(container)
@@ -121,7 +139,9 @@ class LitContainerApi:
                     self.authenticate(reauth=True)
                     time.sleep(2)
 
-                lines = self._docker_client.api.push(repository, stream=True, decode=True, auth_config=self._docker_auth_config)
+                lines = self._docker_client.api.push(
+                    repository, stream=True, decode=True, auth_config=self._docker_auth_config
+                )
                 for line in lines:
                     if isinstance(line, dict) and "error" in line:
                         error = line["error"]

lightning_sdk/api/mmt_api.py

@@ -88,6 +88,45 @@ class MMTApiV2:
         artifacts_local: Optional[str],  # deprecated in favor of path_mappings
         artifacts_remote: Optional[str],  # deprecated in favor of path_mappings
     ) -> V1MultiMachineJob:
+        body = self._create_mmt_body(
+            name=name,
+            num_machines=num_machines,
+            command=command,
+            cloud_account=cloud_account,
+            studio_id=studio_id,
+            image=image,
+            machine=machine,
+            interruptible=interruptible,
+            env=env,
+            image_credentials=image_credentials,
+            cloud_account_auth=cloud_account_auth,
+            entrypoint=entrypoint,
+            path_mappings=path_mappings,
+            artifacts_local=artifacts_local,  # deprecated in favor of path_mappings
+            artifacts_remote=artifacts_remote,  # deprecated in favor of path_mappings
+        )
+
+        job: V1MultiMachineJob = self._client.jobs_service_create_multi_machine_job(project_id=teamspace_id, body=body)
+        return job
+
+    @staticmethod
+    def _create_mmt_body(
+        name: str,
+        num_machines: int,
+        command: Optional[str],
+        cloud_account: Optional[str],
+        studio_id: Optional[str],
+        image: Optional[str],
+        machine: Union[Machine, str],
+        interruptible: bool,
+        env: Optional[Dict[str, str]],
+        image_credentials: Optional[str],
+        cloud_account_auth: bool,
+        entrypoint: str,
+        path_mappings: Optional[Dict[str, str]],
+        artifacts_local: Optional[str],  # deprecated in favor of path_mappings
+        artifacts_remote: Optional[str],  # deprecated in favor of path_mappings
+    ) -> ProjectIdMultimachinejobsBody:
         env_vars = []
         if env is not None:
             for k, v in env.items():
@@ -117,13 +156,10 @@ class MMTApiV2:
             image_secret_ref=image_credentials or "",
             path_mappings=path_mappings_list,
         )
-        body = ProjectIdMultimachinejobsBody(
+        return ProjectIdMultimachinejobsBody(
             name=name, spec=spec, cluster_id=cloud_account or "", machines=num_machines
         )
 
-        job: V1MultiMachineJob = self._client.jobs_service_create_multi_machine_job(project_id=teamspace_id, body=body)
-        return job
-
     def get_job_by_name(self, name: str, teamspace_id: str) -> V1MultiMachineJob:
         job: V1MultiMachineJob = self._client.jobs_service_get_multi_machine_job_by_name(
             project_id=teamspace_id, name=name
@@ -149,13 +185,13 @@ class MMTApiV2:
             return
 
         if current_state != Status.Stopped:
-            update_body = MultimachinejobsIdBody(desired_state=V1MultiMachineJobState.STOPPED)
+            update_body = MultimachinejobsIdBody(desired_state=V1MultiMachineJobState.STOP)
             self._client.jobs_service_update_multi_machine_job(body=update_body, project_id=teamspace_id, id=job_id)
 
         while True:
             current_job = self.get_job(job_id=job_id, teamspace_id=teamspace_id)
-            if self._job_state_to_external(current_job.desired_state) in (
-                Status.Stopped,
+            if self._job_state_to_external(current_job.state) in (
+                Status.Stopping,
                 Status.Completed,
                 Status.Stopped,
                 Status.Failed,
@@ -183,6 +219,8 @@ class MMTApiV2:
             return Status.Completed
         if str(state) == V1MultiMachineJobState.FAILED:
             return Status.Failed
+        if str(state) == V1MultiMachineJobState.STOP:
+            return Status.Stopping
         return Status.Pending
 
     def get_studio_name(self, job: V1MultiMachineJob) -> Optional[str]:
@@ -204,7 +242,7 @@ class MMTApiV2:
         instance_name = spec.instance_name
         instance_type = spec.instance_type
 
-        return Machine(instance_name, instance_type or instance_name)
+        return Machine.from_str(instance_name, instance_type or instance_name)
 
     def get_total_cost(self, job: V1MultiMachineJob) -> float:
         return job.total_cost

lightning_sdk/api/pipeline_api.py

@@ -0,0 +1,50 @@
+from typing import List
+
+from lightning_sdk.lightning_cloud.openapi.models import (
+    ProjectIdPipelinesBody,
+    V1DeletePipelineResponse,
+    V1Pipeline,
+    V1PipelineStep,
+    V1SharedFilesystem,
+)
+from lightning_sdk.lightning_cloud.openapi.rest import ApiException
+from lightning_sdk.lightning_cloud.rest_client import LightningClient
+
+
+class PipelineApi:
+    """Internal API client for Pipeline requests (mainly http requests)."""
+
+    def __init__(self) -> None:
+        self._client = LightningClient(retry=False, max_tries=0)
+
+    def get_pipeline_by_id(self, project_id: str, pipeline_id: str) -> V1Pipeline:
+        try:
+            return self._client.jobs_service_get_deployment(project_id=project_id, id=pipeline_id)
+        except ApiException as ex:
+            if "Reason: Not Found" in str(ex):
+                return None
+            raise ex
+
+    def create_pipeline(
+        self,
+        name: str,
+        project_id: str,
+        steps: List["V1PipelineStep"],
+        shared_filesystem: bool,
+    ) -> V1Pipeline:
+        body = ProjectIdPipelinesBody(
+            name=name,
+            steps=steps,
+            shared_filesystem=V1SharedFilesystem(
+                enabled=shared_filesystem,
+            ),
+        )
+        return self._client.pipelines_service_create_pipeline(body, project_id)
+
+    def stop(self, pipeline: V1Pipeline) -> V1Pipeline:
+        body = pipeline
+        body.state = "stop"
+        return self._client.pipelines_service_update_pipeline(body)
+
+    def delete(self, project_id: str, pipeline_id: str) -> V1DeletePipelineResponse:
+        return self._client.pipelines_service_delete_pipeline(project_id, pipeline_id)

lightning_sdk/api/teamspace_api.py

@@ -203,8 +203,8 @@ class TeamspaceApi:
         model_id = models[0].id
         # decide if delete only version of whole model
         if version:
-            if version == "latest":
-                version = models[0].latest_version
+            if version == "default":
+                version = models[0].default_version
             self.models.models_store_delete_model_version(project_id=teamspace_id, model_id=model_id, version=version)
         else:
             self.models.models_store_delete_model(project_id=teamspace_id, model_id=model_id)

lightning_sdk/api/utils.py

@@ -21,7 +21,6 @@ from lightning_sdk.lightning_cloud.openapi import (
     StorageCompleteBody,
     UploadIdCompleteBody,
     UploadIdPartsBody,
-    UploadsUploadIdBody,
     V1CompletedPart,
     V1CompleteUpload,
     V1PathMapping,
@@ -37,6 +36,12 @@ try:
     from lightning_sdk.lightning_cloud.openapi import AppsIdBody1 as AppsIdBody
 except ImportError:
     from lightning_sdk.lightning_cloud.openapi import AppsIdBody
+
+try:
+    from lightning_sdk.lightning_cloud.openapi import UploadsUploadIdBody1 as UploadsUploadIdBody
+except ImportError:
+    from lightning_sdk.lightning_cloud.openapi import UploadsUploadIdBody
+
 from lightning_sdk.lightning_cloud.openapi.rest import ApiException
 from lightning_sdk.lightning_cloud.rest_client import LightningClient
 from lightning_sdk.machine import Machine
@@ -90,6 +95,8 @@ class _FileUploader:
                 unit="B",
                 unit_scale=True,
                 unit_divisor=1000,
+                position=-1,
+                mininterval=1,
             )
         else:
             self.progress_bar = None
@@ -138,7 +145,7 @@ class _FileUploader:
 
     def _request_urls(self, parts: List[int], upload_id: str) -> List[V1PresignedUrl]:
         """Requests urls for a batch of parts."""
-        body = UploadsUploadIdBody(cluster_id=self.cloud_account, filename=self.remote_path, parts=parts)
+        body = UploadsUploadIdBody(filename=self.remote_path, parts=parts, cluster_id=self.cloud_account)
         resp: V1UploadProjectArtifactPartsResponse = self.client.storage_service_upload_project_artifact_parts(
             body, self.teamspace_id, upload_id
         )
@@ -217,8 +224,9 @@ class _ModelFileUploader:
                 unit="B",
                 unit_scale=True,
                 unit_divisor=1000,
-                position=1,
                 leave=False,
+                position=-1,
+                mininterval=1,
             )
         else:
             self.progress_bar = None
@@ -486,8 +494,8 @@ def _get_model_version(client: LightningClient, teamspace_id: str, name: str, ve
         raise ValueError(f"Model `{name}` does not exist")
     elif len(models) > 1:
         raise ValueError("Multiple models with the same name found")
-    if version == "latest":
-        return models[0].latest_version
+    if version == ("default"):
+        return models[0].default_version
     versions = api.models_store_list_model_versions(project_id=teamspace_id, model_id=models[0].id).versions
     if not versions:
         raise ValueError(f"Model `{name}` does not have any versions")
@@ -520,6 +528,8 @@ def _download_model_files(
             total=float(response.size_bytes),
             unit_scale=True,
             unit_divisor=1000,
+            position=-1,
+            mininterval=1,
         )
 
     with ThreadPoolExecutor(max_workers=min(num_workers, len(response.filepaths))) as file_executor, ThreadPoolExecutor(

lightning_sdk/cli/ai_hub.py

@@ -3,49 +3,6 @@ from typing import Optional
 import click
 
 from lightning_sdk.ai_hub import AIHub
-from lightning_sdk.cli.studios_menu import _StudiosMenu
-
-
-class _AIHub(_StudiosMenu):
-    """Interact with Lightning Studio - AI Hub."""
-
-    def api_info(self, api_id: str) -> None:
-        """Get full API template info such as input details.
-
-        Example:
-          lightning aihub api_info [API_ID]
-
-        Args:
-          api_id: The ID of the API for which information is requested.
-        """
-        return api_info(api_id=api_id)
-
-    def list_apis(self, search: Optional[str] = None) -> None:
-        """List API templates available in the AI Hub.
-
-        Args:
-          search: Search for API templates by name.
-        """
-        return list_apis(search=search)
-
-    def deploy(
-        self,
-        api_id: str,
-        cloud_account: Optional[str] = None,
-        name: Optional[str] = None,
-        teamspace: Optional[str] = None,
-        org: Optional[str] = None,
-    ) -> None:
-        """Deploy an API template from the AI Hub.
-
-        Args:
-          api_id: API template ID.
-          cloud_account: Cloud Account to deploy the API to. Defaults to user's default cloud account.
-          name: Name of the deployed API. Defaults to the name of the API template.
-          teamspace: Teamspace to deploy the API to. Defaults to user's default teamspace.
-          org: Organization to deploy the API to. Defaults to user's default organization.
-        """
-        return deploy(api_id=api_id, cloud_account=cloud_account, name=name, teamspace=teamspace, org=org)
 
 
 @click.group(name="aihub")
@@ -53,8 +10,8 @@ def aihub() -> None:
     """Interact with Lightning Studio - AI Hub."""
 
 
-# @aihub.command(name="api-info")
-# @click.argument("api-id")
+@aihub.command(name="api-info")
+@click.argument("api-id")
 def api_info(api_id: str) -> None:
     """Get full API template info such as input details.
 
@@ -67,34 +24,42 @@ def api_info(api_id: str) -> None:
     ai_hub.api_info(api_id)
 
 
-# @aihub.command(name="list-apis")
-# @click.option("--search", default=None, help="Search for API templates by name.")
+@aihub.command(name="list-apis")
+@click.option("--search", default=None, help="Search for API templates by name.")
 def list_apis(search: Optional[str]) -> None:
     """List API templates available in the AI Hub."""
     ai_hub = AIHub()
     ai_hub.list_apis(search=search)
 
 
-# @aihub.command(name="deploy")
-# @click.argument("api-id")
-# @click.option(
-#     "--cloud-account",
-#     default=None,
-#     help="Cloud Account to deploy the API to. Defaults to user's default cloud account.",
-# )
-# @click.option("--name", default=None, help="Name of the deployed API. Defaults to the name of the API template.")
-# @click.option(
-#     "--teamspace",
-#     default=None,
-#     help="Teamspace to deploy the API to. Defaults to user's default teamspace.",
-# )
-# @click.option(
-#     "--org",
-#     default=None,
-#     help="Organization to deploy the API to. Defaults to user's default organization.",
-# )
+@aihub.command(name="deploy")
+@click.argument("api-id")
+@click.option(
+    "--cloud-account",
+    "--cloud_account",
+    default=None,
+    help="Cloud Account to deploy the API to. Defaults to user's default cloud account.",
+)
+@click.option("--name", default=None, help="Name of the deployed API. Defaults to the name of the API template.")
+@click.option(
+    "--teamspace",
+    default=None,
+    help="Teamspace to deploy the API to. Defaults to user's default teamspace.",
+)
+@click.option(
+    "--org",
+    default=None,
+    help="Organization to deploy the API to. Defaults to user's default organization.",
+)
 def deploy(
     api_id: str, cloud_account: Optional[str], name: Optional[str], teamspace: Optional[str], org: Optional[str]
 ) -> None:
+    """Deploy an API template from the AI Hub.
+
+    Example:
+      lightning aihub deploy API-ID
+
+    API-ID: The ID of the API which should be deployed.
+    """
     ai_hub = AIHub()
     ai_hub.run(api_id, cloud_account=cloud_account, name=name, teamspace=teamspace, org=org)