From 0e47fad1f889beb8477e80ef5d91ea2860cbf557 Mon Sep 17 00:00:00 2001 From: tnm Date: Tue, 17 Dec 2024 15:53:46 -0800 Subject: [PATCH] sort and order --- cased_cli/cli.py | 1 - cased_cli/commands/build.py | 7 +++---- cased_cli/commands/deploy.py | 3 +-- cased_cli/commands/init.py | 5 ++--- cased_cli/commands/login.py | 7 +++---- cased_cli/commands/resources.py | 11 +++++------ cased_cli/utils/api.py | 3 +-- cased_cli/utils/auth.py | 5 ++--- cased_cli/utils/progress.py | 3 +-- 9 files changed, 18 insertions(+), 27 deletions(-) diff --git a/cased_cli/cli.py b/cased_cli/cli.py index 62198d7..b989865 100644 --- a/cased_cli/cli.py +++ b/cased_cli/cli.py @@ -1,5 +1,4 @@ import click - from cased.commands.build import build from cased.commands.deploy import deploy from cased.commands.init import init diff --git a/cased_cli/commands/build.py b/cased_cli/commands/build.py index ca4e94f..121b0c9 100644 --- a/cased_cli/commands/build.py +++ b/cased_cli/commands/build.py @@ -5,15 +5,14 @@ import click import yaml +from cased.utils.api import CasedAPI +from cased.utils.constants import CasedConstants +from cased.utils.git import get_repo_name from jinja2 import Environment, FileSystemLoader from rich.console import Console from rich.panel import Panel from rich.progress import Progress, SpinnerColumn, TextColumn -from cased.utils.api import CasedAPI -from cased.utils.constants import CasedConstants -from cased.utils.git import get_repo_name - console = Console() # Get the directory of the current script CURRENT_DIR = Path(__file__).resolve().parent diff --git a/cased_cli/commands/deploy.py b/cased_cli/commands/deploy.py index 5996246..1a55fed 100644 --- a/cased_cli/commands/deploy.py +++ b/cased_cli/commands/deploy.py @@ -2,12 +2,11 @@ import click import questionary -from rich.console import Console - from cased.utils.api import CasedAPI from cased.utils.auth import validate_credentials from cased.utils.constants import CasedConstants from cased.utils.progress import run_process_with_status_bar +from rich.console import Console console = Console() diff --git a/cased_cli/commands/init.py b/cased_cli/commands/init.py index acf3d69..c2afcbe 100644 --- a/cased_cli/commands/init.py +++ b/cased_cli/commands/init.py @@ -3,11 +3,10 @@ import click import inquirer import yaml -from rich.console import Console -from rich.panel import Panel - from cased.utils.auth import validate_credentials from cased.utils.progress import run_process_with_status_bar +from rich.console import Console +from rich.panel import Panel console = Console() diff --git a/cased_cli/commands/login.py b/cased_cli/commands/login.py index 075225c..c9f5140 100644 --- a/cased_cli/commands/login.py +++ b/cased_cli/commands/login.py @@ -31,15 +31,14 @@ """ import click -from rich.console import Console -from rich.panel import Panel -from rich.progress import Progress - from cased.commands.resources import projects from cased.utils.api import validate_tokens from cased.utils.auth import validate_credentials from cased.utils.config import delete_config, save_config from cased.utils.constants import CasedConstants +from rich.console import Console +from rich.panel import Panel +from rich.progress import Progress console = Console() diff --git a/cased_cli/commands/resources.py b/cased_cli/commands/resources.py index 77d132f..72565a2 100644 --- a/cased_cli/commands/resources.py +++ b/cased_cli/commands/resources.py @@ -34,6 +34,11 @@ import click import questionary +from cased.utils.api import CasedAPI +from cased.utils.auth import validate_credentials +from cased.utils.config import load_config, save_config +from cased.utils.constants import CasedConstants +from cased.utils.progress import run_process_with_status_bar from dateutil import parser from questionary import Style from rich import box @@ -42,12 +47,6 @@ from rich.table import Table from rich.text import Text -from cased.utils.api import CasedAPI -from cased.utils.auth import validate_credentials -from cased.utils.config import load_config, save_config -from cased.utils.constants import CasedConstants -from cased.utils.progress import run_process_with_status_bar - console = Console() # Custom style for questionary diff --git a/cased_cli/utils/api.py b/cased_cli/utils/api.py index 86d1b34..7a7a982 100644 --- a/cased_cli/utils/api.py +++ b/cased_cli/utils/api.py @@ -1,9 +1,8 @@ import requests -from rich.console import Console - from cased.utils.config import load_config from cased.utils.constants import CasedConstants from cased.utils.exception import CasedAPIError +from rich.console import Console console = Console() diff --git a/cased_cli/utils/auth.py b/cased_cli/utils/auth.py index 24ff924..6221c0a 100644 --- a/cased_cli/utils/auth.py +++ b/cased_cli/utils/auth.py @@ -1,10 +1,9 @@ from functools import wraps -from rich.console import Console -from rich.panel import Panel - from cased.utils.config import load_config from cased.utils.constants import CasedConstants +from rich.console import Console +from rich.panel import Panel console = Console() diff --git a/cased_cli/utils/progress.py b/cased_cli/utils/progress.py index 7da8735..a216824 100644 --- a/cased_cli/utils/progress.py +++ b/cased_cli/utils/progress.py @@ -3,11 +3,10 @@ from concurrent.futures import ThreadPoolExecutor, TimeoutError from typing import Any, Callable +from cased.utils.exception import CasedAPIError from rich.console import Console from rich.progress import Progress -from cased.utils.exception import CasedAPIError - def run_process_with_status_bar( process_func: Callable[[], Any],