anyscale 0.24.88__py3-none-any.whl → 0.25.5__py3-none-any.whl

anyscale/commands/service_account_commands.py

@@ -1,12 +1,19 @@
-from typing import Optional
+from typing import List, Optional
 
 import click
+from rich import print as rprint
+import tabulate
 
+import anyscale
 from anyscale.cli_logger import BlockLogger
-from anyscale.controllers.service_account_controller import ServiceAccountController
+from anyscale.service_account.models import ServiceAccount
 from anyscale.util import validate_non_negative_arg
 
 
+DEFAULT_OVERFLOW = "fold"
+DEFAULT_COL_WIDTH = 36
+
+
 log = BlockLogger()  # CLI Logger
 
 
@@ -18,12 +25,45 @@ def service_account_cli() -> None:
     pass
 
 
+def _print_new_api_key(api_key: str):
+    log.warning(
+        "The following API token for the service account will only appear once:",
+    )
+    log.info(api_key)
+
+
+def _print_service_account_table(service_accounts: List[ServiceAccount]):
+    table_rows = []
+    for service_account in service_accounts:
+        table_rows.append(
+            [
+                service_account.name,
+                service_account.created_at.strftime("%m/%d/%Y"),
+                service_account.permission_level,
+                service_account.email,
+            ]
+        )
+    table = tabulate.tabulate(
+        table_rows,
+        headers=["NAME", "CREATED AT", "ORGANIZATION PERMISSION LEVEL", "EMAIL",],
+        tablefmt="plain",
+    )
+
+    rprint(f"Service accounts:\n{table}")
+
+
 @service_account_cli.command(name="create", help="Create a service account.")
 @click.option(
     "--name", "-n", help="Name for the service account.", type=str, required=True
 )
 def create(name: str) -> None:
-    ServiceAccountController().create_service_account(name)
+    try:
+        api_key = anyscale.service_account.create(name)
+
+        log.info(f"Service account {name} created successfully.")
+        _print_new_api_key(api_key)
+    except ValueError as e:
+        log.error(f"Error creating service account: {e}")
 
 
 @service_account_cli.command(
@@ -36,10 +76,14 @@ def create(name: str) -> None:
     "--name", help="Name of the service account to create the new key for.", type=str
 )
 def create_api_key(email: Optional[str], name: Optional[str]) -> None:
-    ServiceAccountController().create_new_service_account_api_key(email, name)
+    try:
+        api_key = anyscale.service_account.create_api_key(email, name)
+        _print_new_api_key(api_key)
+    except ValueError as e:
+        log.error(f"Error creating API key: {e}")
 
 
-@service_account_cli.command(name="list", help="List all service accounts.")
+@service_account_cli.command(name="list", help="List service accounts.")
 @click.option(
     "--max-items",
     required=False,
@@ -49,14 +93,19 @@ def create_api_key(email: Optional[str], name: Optional[str]) -> None:
     callback=validate_non_negative_arg,
 )
 def list_service_accounts(max_items: int) -> None:
-    ServiceAccountController().list_service_accounts(max_items)
+    service_accounts = anyscale.service_account.list(max_items)
+    _print_service_account_table(service_accounts)
 
 
 @service_account_cli.command(name="delete", help="Delete a service account.")
 @click.option("--email", help="Email of the service account to delete.", type=str)
 @click.option("--name", help="Name of the service account to delete.", type=str)
 def delete(email: Optional[str], name: Optional[str]) -> None:
-    ServiceAccountController().delete_service_account(email, name)
+    try:
+        anyscale.service_account.delete(email, name)
+        log.info(f"Service account {email or name} deleted successfully.")
+    except ValueError as e:
+        log.error(f"Error deleting service account: {e}")
 
 
 @service_account_cli.command(
@@ -69,4 +118,12 @@ def delete(email: Optional[str], name: Optional[str]) -> None:
     "--name", help="Rotate API keys for the service account with this name.", type=str
 )
 def rotate_api_keys(email: Optional[str], name: Optional[str]) -> None:
-    ServiceAccountController().rotate_service_account_api_keys(email, name)
+    try:
+        api_key = anyscale.service_account.rotate_api_keys(email, name)
+
+        log.info(
+            f"\nAll API keys for service account {email or name} rotated successfully."
+        )
+        _print_new_api_key(api_key)
+    except ValueError as e:
+        log.error(f"Error rotating API keys: {e}")

anyscale/commands/service_commands.py

@@ -9,7 +9,9 @@ import yaml
 
 from anyscale._private.models.image_uri import ImageURI
 from anyscale.cli_logger import BlockLogger
+from anyscale.commands import command_examples
 from anyscale.commands.util import (
+    AnyscaleCommand,
     convert_kv_strings_to_dict,
     LegacyAnyscaleCommand,
     override_env_vars,
@@ -125,7 +127,7 @@ def _read_name_from_config_file(path: str):
     required=False,
     default=None,
     type=str,
-    help="Path to a requirements.txt file containing dependencies for the service. These will be installed on top of the image. When running in a workspace, this defaults to the workspace dependencies.",
+    help="Path to a requirements.txt file containing dependencies for the service. Anyscale installs these dependencies on top of the image. If you deploy a service from a workspace, the default is to use the workspace dependencies, but specifying this option overrides them.",
 )
 @click.option(
     "-i",
@@ -736,3 +738,61 @@ def terminate(
         project_id=project_id,
     )
     service_controller.terminate(service_id)
+
+
+@service_cli.command(
+    name="archive",
+    help="Archive a service.",
+    cls=AnyscaleCommand,
+    example=command_examples.SERVICE_ARCHIVE_EXAMPLE,
+)
+@click.option(
+    "-n", "--name", required=False, default=None, type=str, help="Name of the service.",
+)
+@click.option(
+    "-f",
+    "--config-file",
+    required=False,
+    default=None,
+    type=str,
+    help="Path to a YAML config file to read the name from.",
+)
+@click.option(
+    "--cloud",
+    required=False,
+    default=None,
+    type=str,
+    help="The Anyscale Cloud to run this workload on. If not provided, the organization default will be used (or, if running in a workspace, the cloud of the workspace).",
+)
+@click.option(
+    "--project",
+    required=False,
+    default=None,
+    type=str,
+    help="Named project to use for the service. If not provided, the default project for the cloud will be used (or, if running in a workspace, the project of the workspace).",
+)
+def archive(
+    name: Optional[str],
+    config_file: Optional[str],
+    cloud: Optional[str],
+    project: Optional[str],
+) -> None:
+    """Archive a service.
+
+    To specify the service by name, use the --name flag. To specify the service by id, use the --id flag. Either name or
+id should be used, specifying both will result in an error.
+    """
+    if name is not None and config_file is not None:
+        raise click.ClickException(
+            "Only one of '--name' and '--config-file' can be provided."
+        )
+
+    if config_file is not None:
+        name = _read_name_from_config_file(config_file)
+
+    if name is None:
+        raise click.ClickException(
+            "Service name must be provided using '--name' or in a config file using '-f'."
+        )
+
+    anyscale.service.archive(name=name, cloud=cloud, project=project)

anyscale/commands/session_commands_hidden.py

@@ -4,7 +4,11 @@ from typing import Optional
 
 import click
 
-from anyscale.project import get_project_id, get_project_session, load_project_or_throw
+from anyscale.project_utils import (
+    get_project_id,
+    get_project_session,
+    load_project_or_throw,
+)
 from anyscale.shared_anyscale_utils.util import execution_log_name
 from anyscale.snapshot import copy_file
 from anyscale.util import deserialize_datetime, send_json_request

anyscale/commands/user_commands.py

@@ -29,7 +29,7 @@ def user_cli() -> None:
 )
 def admin_batch_create(users_file: str,) -> None:
     """
-    Batch create users without email verification as an admin.
+    Batch create, as an admin, users without email verification.
     """
     log.info("Creating users...")
 

anyscale/commands/util.py

@@ -125,8 +125,8 @@ def convert_kv_strings_to_dict(strings: Tuple[str]) -> Dict[str, str]:
     """
     ret_dict = {}
     for s in strings:
-        split = s.split("=")
-        if len(split) != 2:
+        split = s.split("=", maxsplit=1)
+        if len(split) != 2 or len(split[1]) == 0:
             raise click.ClickException(
                 f"Invalid key-value string '{s}'. Must be of the form 'key=value'."
             )

anyscale/commands/workspace_commands.py

@@ -15,7 +15,7 @@ from anyscale.commands import workspace_commands_v2
 from anyscale.commands.util import LegacyAnyscaleCommand
 from anyscale.controllers.cluster_controller import ClusterController
 from anyscale.controllers.workspace_controller import WorkspaceController
-from anyscale.project import find_project_root
+from anyscale.project_utils import find_project_root
 from anyscale.shared_anyscale_utils.utils.byod import BYODInfo
 from anyscale.util import get_endpoint
 from anyscale.workspace_utils import (

anyscale/connect.py

@@ -48,7 +48,7 @@ from anyscale.connect_utils.start_interactive_session import (  # pylint:disable
     _get_interactive_shell_frame,
     start_interactive_session_block,
 )
-import anyscale.project
+import anyscale.project_utils
 from anyscale.sdk.anyscale_client.sdk import AnyscaleSDK
 from anyscale.shared_anyscale_utils.util import slugify
 from anyscale.util import PROJECT_NAME_ENV_VAR

anyscale/connect_utils/project.py

@@ -7,13 +7,14 @@ import yaml
 import anyscale
 from anyscale.authenticate import get_auth_api_client
 from anyscale.cli_logger import BlockLogger
-from anyscale.cloud import (
+from anyscale.cloud_utils import (
     get_cloud_id_and_name,
     get_last_used_cloud,
     get_organization_default_cloud,
 )
 from anyscale.cluster_compute import get_cluster_compute_from_name
 import anyscale.conf
+import anyscale.project_utils
 from anyscale.sdk.anyscale_client import ComputeTemplateConfig
 from anyscale.utils.connect_helpers import find_project_id
 
@@ -70,7 +71,7 @@ class ProjectBlock:
         self.log.open_block(self.block_label, block_title="Choosing a project")
 
         if self.project_dir is None and project_name is None:
-            self.project_dir = anyscale.project.find_project_root(os.getcwd())
+            self.project_dir = anyscale.project_utils.find_project_root(os.getcwd())
 
         parent_cloud_id = self._get_parent_cloud_id(
             self.cloud_name, self.cluster_compute_name, self.cluster_compute_dict,
@@ -186,8 +187,10 @@ class ProjectBlock:
         project_yaml = os.path.join(project_dir, ".anyscale.yaml")
         if os.path.exists(project_yaml):
             # Validate format of project yaml and get project id
-            proj_def = anyscale.project.ProjectDefinition(project_dir)
-            project_id: Optional[str] = anyscale.project.get_project_id(proj_def.root)
+            proj_def = anyscale.project_utils.ProjectDefinition(project_dir)
+            project_id: Optional[str] = anyscale.project_utils.get_project_id(
+                proj_def.root
+            )
             if not project_id:
                 raise click.ClickException(
                     f"{project_yaml} is not correctly formatted. Please attach to a different "

anyscale/controllers/cloud_controller.py

@@ -5,6 +5,7 @@ Fetches data required and formats output for `anyscale cloud` commands.
 import copy
 import json
 from os import getenv
+import pathlib
 import re
 import secrets
 import time
@@ -15,6 +16,7 @@ import boto3
 from botocore.exceptions import ClientError, NoCredentialsError
 import click
 from click import Abort, ClickException
+import yaml
 
 from anyscale import __version__ as anyscale_version
 from anyscale.aws_iam_policies import get_anyscale_iam_permissions_ec2_restricted
@@ -24,6 +26,7 @@ from anyscale.client.openapi_client.models import (
     CloudAnalyticsEventCloudResource,
     CloudAnalyticsEventCommandName,
     CloudAnalyticsEventName,
+    CloudDeploymentConfig,
     CloudProviders,
     CloudState,
     CloudWithCloudResource,
@@ -43,12 +46,6 @@ from anyscale.client.openapi_client.models import (
 from anyscale.client.openapi_client.models.gcp_file_store_config import (
     GCPFileStoreConfig,
 )
-from anyscale.cloud import (
-    get_cloud_id_and_name,
-    get_cloud_json_from_id,
-    get_cloud_resource_by_cloud_id,
-    get_organization_id,
-)
 from anyscale.cloud_resource import (
     associate_aws_subnets_with_azs,
     GCS_STORAGE_PREFIX,
@@ -63,6 +60,11 @@ from anyscale.cloud_resource import (
     verify_aws_subnets,
     verify_aws_vpc,
 )
+from anyscale.cloud_utils import (
+    get_cloud_id_and_name,
+    get_cloud_resource_by_cloud_id,
+    get_organization_id,
+)
 from anyscale.conf import ANYSCALE_IAM_ROLE_NAME
 from anyscale.controllers.base_controller import BaseController
 from anyscale.controllers.cloud_functional_verification_controller import (
@@ -1382,23 +1384,28 @@ class CloudController(BaseController):
 
     def get_cloud_config(
         self, cloud_name: Optional[str] = None, cloud_id: Optional[str] = None,
-    ) -> str:
+    ) -> CloudDeploymentConfig:
         """Get a cloud's current JSON configuration."""
 
         cloud_id, cloud_name = get_cloud_id_and_name(
             self.api_client, cloud_id, cloud_name
         )
 
-        return str(get_cloud_json_from_id(cloud_id, self.api_client)["config"])
+        # In the future we will expose cloud_deployment id as a parameter, for now, it's just a placeholder.
+        config: CloudDeploymentConfig = self.api_client.get_cloud_deployment_config_api_v2_clouds_cloud_id_deployment_cloud_deployment_id_config_get(
+            cloud_id=cloud_id, cloud_deployment_id="default"
+        ).result
+
+        return config
 
     def update_cloud_config(
         self,
         cloud_name: Optional[str] = None,
         cloud_id: Optional[str] = None,
         enable_log_ingestion: Optional[bool] = None,
+        spec_file: Optional[str] = None,
     ):
         """Update a cloud's configuration."""
-
         cloud_id, cloud_name = get_cloud_id_and_name(
             self.api_client, cloud_id, cloud_name
         )
@@ -1410,6 +1417,24 @@ class CloudController(BaseController):
                 f"Successfully updated log ingestion configuration for cloud, "
                 f"{cloud_id} to {enable_log_ingestion}"
             )
+        elif spec_file is not None:
+            path = pathlib.Path(spec_file)
+            if not path.exists():
+                raise FileNotFoundError(f"File {spec_file} does not exist.")
+
+            if not path.is_file():
+                raise ValueError(f"File {spec_file} is not a file.")
+
+            spec = yaml.safe_load(path.read_text())
+            config = CloudDeploymentConfig(spec=spec)
+            self.api_client.update_cloud_deployment_config_api_v2_clouds_cloud_id_deployment_cloud_deployment_id_config_put(
+                cloud_id=cloud_id,
+                cloud_deployment_id="default",
+                cloud_deployment_config=config,
+            )
+            self.log.info(
+                f"Successfully updated cloud configuration for cloud {cloud_name}"
+            )
 
     def set_default_cloud(
         self, cloud_name: Optional[str], cloud_id: Optional[str],
@@ -1641,12 +1666,14 @@ class CloudController(BaseController):
             logger=logger,
             strict=strict,
         )
-        verify_aws_efs_result = verify_aws_efs(
-            cloud_resource=cloud_resource,
-            boto3_session=boto3_session,
-            logger=logger,
-            strict=strict,
-        )
+        verify_aws_efs_result = True
+        if cloud_resource.aws_efs_id:
+            verify_aws_efs_result = verify_aws_efs(
+                cloud_resource=cloud_resource,
+                boto3_session=boto3_session,
+                logger=logger,
+                strict=strict,
+            )
         # Cloudformation is only used in managed cloud setup. Set to True in BYOR case because it's not used.
         verify_aws_cloudformation_stack_result = True
         if not is_bring_your_own_resource:
@@ -1676,9 +1703,12 @@ class CloudController(BaseController):
             f"iam roles: {self._passed_or_failed_str_from_bool(verify_aws_iam_roles_result)}",
             f"security groups: {self._passed_or_failed_str_from_bool(verify_aws_security_groups_result)}",
             f"s3: {self._passed_or_failed_str_from_bool(verify_aws_s3_result)}",
-            f"efs: {self._passed_or_failed_str_from_bool(verify_aws_efs_result)}",
             f"cloudformation stack: {self._passed_or_failed_str_from_bool(verify_aws_cloudformation_stack_result) if not is_bring_your_own_resource else 'N/A'}",
         ]
+        if cloud_resource.aws_efs_id:
+            verification_result_summary.append(
+                f"efs: {self._passed_or_failed_str_from_bool(verify_aws_efs_result)}"
+            )
         if cloud_resource.memorydb_cluster_config is not None:
             verification_result_summary.append(
                 f"memorydb cluster: {self._passed_or_failed_str_from_bool(verify_aws_memorydb_cluster_result)}"
@@ -1875,7 +1905,7 @@ class CloudController(BaseController):
         name: str,
         vpc_id: str,
         subnet_ids: List[str],
-        efs_id: str,
+        efs_id: Optional[str],
         anyscale_iam_role_id: str,
         instance_iam_role_id: str,
         security_group_ids: List[str],
@@ -2012,10 +2042,7 @@ class CloudController(BaseController):
             # When running on the VM compute stack, validate and retrieve the EFS mount target IP.
             # When running on the K8S compute stack, EFS is optional; if efs_id is provided, then
             # validate and retrieve the EFS mount target IP.
-            enable_efs = compute_stack == ComputeStack.VM or (
-                compute_stack == ComputeStack.K8S and efs_id
-            )
-            if enable_efs:
+            if efs_id:
                 try:
                     boto3_session = boto3.Session(region_name=region)
                     aws_efs_mount_target_ip = _get_aws_efs_mount_target_ip(
@@ -2106,7 +2133,8 @@ class CloudController(BaseController):
             # TODO (shomilj): Add verification to the K8S compute stack as well.
             if compute_stack == ComputeStack.VM:
                 with self.log.spinner("Verifying cloud resources...") as spinner:
-                    assert boto3_session is not None
+                    if boto3_session is None:
+                        boto3_session = boto3.Session(region_name=region)
                     if not skip_verifications and not self.verify_aws_cloud_resources(
                         cloud_resource=create_cloud_resource,
                         boto3_session=boto3_session,
@@ -2264,15 +2292,17 @@ class CloudController(BaseController):
                 gcp_logger,
                 strict=strict,
             )
-            verify_filestore_result = verify_lib.verify_filestore(
-                factory, cloud_resource, region, gcp_logger, strict=strict
-            )
             verify_cloud_storage_result = verify_lib.verify_cloud_storage(
                 factory, cloud_resource, project_id, region, gcp_logger, strict=strict,
             )
             verify_anyscale_access_result = verify_anyscale_access(
                 self.api_client, cloud_id, CloudProviders.GCP, self.log
             )
+            verify_filestore_result = True
+            if cloud_resource.gcp_filestore_config.instance_name:
+                verify_filestore_result = verify_lib.verify_filestore(
+                    factory, cloud_resource, region, gcp_logger, strict=strict
+                )
             verify_memorystore_result = True
             if cloud_resource.memorystore_instance_config is not None:
                 verify_memorystore_result = verify_lib.verify_memorystore(
@@ -2287,10 +2317,13 @@ class CloudController(BaseController):
             f"anyscale iam service account: {self._passed_or_failed_str_from_bool(verify_gcp_access_service_account_result)}",
             f"cluster node service account: {self._passed_or_failed_str_from_bool(verify_gcp_dataplane_service_account_result)}",
             f"firewall policy: {self._passed_or_failed_str_from_bool(verify_firewall_policy_result)}",
-            f"filestore: {self._passed_or_failed_str_from_bool(verify_filestore_result)}",
             f"cloud storage: {self._passed_or_failed_str_from_bool(verify_cloud_storage_result)}",
         ]
 
+        if cloud_resource.gcp_filestore_config.instance_name:
+            verification_results.append(
+                f"filestore: {self._passed_or_failed_str_from_bool(verify_filestore_result)}"
+            )
         if cloud_resource.memorystore_instance_config is not None:
             verification_results.append(
                 f"memorystore: {self._passed_or_failed_str_from_bool(verify_memorystore_result)}"
@@ -2425,9 +2458,7 @@ class CloudController(BaseController):
                 instance_service_account_email = ""
                 subnet_names = []
 
-            enable_filestore = compute_stack == ComputeStack.VM or (
-                filestore_location and filestore_instance_id
-            )
+            enable_filestore = filestore_location and filestore_instance_id
 
             # Normally, for Kubernetes clouds, we don't need a VPC name, since networking is managed by Kubernetes.
             # For Kubernetes clouds on GCP where Filestore is enabled, we require the VPC name, since it is needed
@@ -2458,7 +2489,9 @@ class CloudController(BaseController):
                 filestore_config = GCPFileStoreConfig(
                     instance_name="", mount_target_ip="", root_dir=""
                 )
-                vpc_name = ""
+                if compute_stack == ComputeStack.K8S:
+                    # Set vpc_name to empty string for Kubernetes clouds
+                    vpc_name = ""
 
             if memorystore_instance_name:
                 memorystore_instance_config = gcp_utils.get_gcp_memorystore_config(

anyscale/controllers/cloud_functional_verification_controller.py

@@ -30,7 +30,7 @@ from anyscale.client.openapi_client.models import (
     SessionState,
 )
 from anyscale.controllers.base_controller import BaseController
-from anyscale.project import get_default_project
+from anyscale.project_utils import get_default_project
 from anyscale.sdk.anyscale_client.models import (
     ComputeNodeType,
     ComputeTemplateQuery,

anyscale/controllers/cluster_controller.py

@@ -7,7 +7,7 @@ import tabulate
 import yaml
 
 from anyscale.cli_logger import BlockLogger
-from anyscale.cloud import get_cloud_id_and_name, get_last_used_cloud
+from anyscale.cloud_utils import get_cloud_id_and_name, get_last_used_cloud
 from anyscale.cluster_compute import (
     get_cluster_compute_from_name,
     get_default_cluster_compute,
@@ -18,7 +18,7 @@ from anyscale.cluster_env import (
     get_default_cluster_env_build,
 )
 from anyscale.controllers.base_controller import BaseController
-from anyscale.project import (
+from anyscale.project_utils import (
     get_and_validate_project_id,
     get_proj_id_from_name,
     get_project_id,
@@ -411,7 +411,6 @@ class ClusterController(BaseController):
                 cluster.id,
                 cluster.state,
                 cluster.cloud_id,
-                cluster.cost_since_restarted_dollars,
                 get_endpoint(f"/projects/{cluster.project_id}/clusters/{cluster.id}"),
             ]
             for cluster in cluster_list
@@ -419,14 +418,7 @@ class ClusterController(BaseController):
 
         table = tabulate.tabulate(
             clusters_table,
-            headers=[
-                "NAME",
-                "ID",
-                "STATE",
-                "CLOUD ID",
-                "COST SINCE LAST START",
-                "URL",
-            ],
+            headers=["NAME", "ID", "STATE", "CLOUD ID", "URL",],
             tablefmt="plain",
         )
         print(f"Clusters:\n{table}")

anyscale/controllers/compute_config_controller.py

@@ -14,7 +14,7 @@ from anyscale.anyscale_pydantic import (
     validator,
 )
 from anyscale.cli_logger import BlockLogger
-from anyscale.cloud import get_cloud_id_and_name
+from anyscale.cloud_utils import get_cloud_id_and_name
 from anyscale.cluster_compute import get_cluster_compute_from_name
 from anyscale.conf import IDLE_TIMEOUT_DEFAULT_MINUTES
 from anyscale.controllers.base_controller import BaseController

anyscale/controllers/experimental_integrations_controller.py

@@ -3,7 +3,7 @@ from typing import Optional
 import click
 
 from anyscale.cli_logger import BlockLogger
-from anyscale.cloud import get_cloud_id_and_name
+from anyscale.cloud_utils import get_cloud_id_and_name
 from anyscale.controllers.base_controller import BaseController
 
 

anyscale/controllers/job_controller.py

@@ -29,7 +29,7 @@ from anyscale.client.openapi_client.models.decorated_production_job import (
 from anyscale.client.openapi_client.models.ha_job_states import HaJobStates
 from anyscale.controllers.base_controller import BaseController
 from anyscale.models.job_model import JobConfig
-from anyscale.project import infer_project_id
+from anyscale.project_utils import infer_project_id
 from anyscale.sdk.anyscale_client.models.job import Job
 from anyscale.sdk.anyscale_client.models.jobs_query import JobsQuery
 from anyscale.sdk.anyscale_client.models.jobs_sort_field import JobsSortField
@@ -65,6 +65,8 @@ _PENDING_STATES = {
     HaJobStates.RESTARTING,
 }
 
+DEFAULT_PAGE_LIMIT = 500
+
 
 class MiniJobRun(BaseModel):
     last_job_run_id: str
@@ -292,6 +294,7 @@ class JobController(BaseController):
         project_id: Optional[str],
         include_archived: bool,
         max_items: int,
+        states: List[str],
     ) -> None:
         """
         This function will list jobs.
@@ -313,7 +316,6 @@ class JobController(BaseController):
             output_map = {
                 "Name": job.name,
                 "Id": job.id,
-                "Cost (dollars)": job.cost_dollars,
                 "Project name": job.project.name,
                 "Cluster name": job.last_job_run.cluster.name
                 if job.last_job_run and job.last_job_run.cluster
@@ -342,7 +344,8 @@ class JobController(BaseController):
                 creator_id=creator_id,
                 type_filter="BATCH_JOB",
                 archive_status="ALL" if include_archived else "NOT_ARCHIVED",
-                count=10,
+                count=DEFAULT_PAGE_LIMIT,
+                state_filter=states,
             )
             jobs_list.extend(resp.results)
             paging_token = resp.metadata.next_paging_token
@@ -354,8 +357,9 @@ class JobController(BaseController):
                     creator_id=creator_id,
                     type_filter="BATCH_JOB",
                     archive_status="ALL" if include_archived else "NOT_ARCHIVED",
-                    count=10,
+                    count=DEFAULT_PAGE_LIMIT,
                     paging_token=paging_token,
+                    state_filter=states,
                 )
                 jobs_list.extend(resp.results)
                 paging_token = resp.metadata.next_paging_token
@@ -366,7 +370,6 @@ class JobController(BaseController):
             [
                 job.name,
                 job.id,
-                job.cost_dollars,
                 job.project.name,
                 job.last_job_run.cluster.name
                 if job.last_job_run and job.last_job_run.cluster
@@ -385,7 +388,6 @@ class JobController(BaseController):
             headers=[
                 "NAME",
                 "ID",
-                "COST",
                 "PROJECT NAME",
                 "CLUSTER NAME",
                 "CURRENT STATE",