Skip to content

Commit daa904e

Browse files
stephenli2000stephenli2000
committed
Run black & isort with deployment lint
1 parent 12b49a3 commit daa904e

14 files changed

Lines changed: 116 additions & 62 deletions

File tree

‎brainframe/cli/brainframe_compose.py‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
import os
2+
import subprocess
23
import sys
34
from pathlib import Path
4-
from typing import List, Optional, Tuple
5+
from typing import List
6+
from typing import Optional
7+
from typing import Tuple
58

69
import i18n
710
import requests
811
import yaml
9-
import subprocess
1012

11-
from . import config, frozen_utils, os_utils, print_utils
13+
from . import config
14+
from . import frozen_utils
15+
from . import os_utils
16+
from . import print_utils
1217

1318
# The URL to the docker-compose.yml
1419
BRAINFRAME_DOCKER_COMPOSE_URL = "https://{subdomain}aotu.ai/releases/brainframe/{version}/docker-compose.yml"
@@ -32,14 +37,20 @@ def assert_installed(install_path: Path) -> None:
3237
def get_docker_compose_command():
3338
try:
3439
# First, try to use 'docker compose'
35-
compose_version = subprocess.check_output(["docker", "compose", "version", "--short"], stderr=subprocess.DEVNULL)
40+
compose_version = subprocess.check_output(
41+
["docker", "compose", "version", "--short"],
42+
stderr=subprocess.DEVNULL,
43+
)
3644
return ["docker", "compose"], compose_version
3745
except subprocess.CalledProcessError as e2:
3846
try:
39-
compose_version = subprocess.check_output(["docker-compose", "version", "--short"], stderr=subprocess.DEVNULL)
47+
compose_version = subprocess.check_output(
48+
["docker-compose", "version", "--short"],
49+
stderr=subprocess.DEVNULL,
50+
)
4051
return ["docker-compose"], compose_version
4152
except subprocess.CalledProcessError as e1:
42-
message = f'Docker Compose V1: {e}; V2: {e}'
53+
message = f"Docker Compose V1: {e}; V2: {e}"
4354
raise DockerComposeNotFoundError(message)
4455

4556

@@ -66,13 +77,13 @@ def run(install_path: Path, commands: List[str]) -> None:
6677
full_command += ["--env-file", str(env_path)]
6778

6879
additional_help = None
69-
if 'down' in commands:
70-
if '--except-volumes' in commands:
71-
commands.remove('--except-volumes')
80+
if "down" in commands:
81+
if "--except-volumes" in commands:
82+
commands.remove("--except-volumes")
7283
else:
73-
if '--volumes' not in commands:
74-
commands += ['--volumes']
75-
if '--help' in commands:
84+
if "--volumes" not in commands:
85+
commands += ["--volumes"]
86+
if "--help" in commands:
7687
additional_help = ' --except-volumes Do not add --volumes to "brainframe compose down"'
7788

7889
os_utils.run(full_command + commands)

‎brainframe/cli/commands/backup.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
from pathlib import Path
55

66
import i18n
7-
from brainframe.cli import (
8-
config,
9-
dependencies,
10-
brainframe_compose,
11-
os_utils,
12-
print_utils,
13-
)
14-
15-
from .utils import command, requires_root, subcommand_parse_args
7+
from brainframe.cli import brainframe_compose
8+
from brainframe.cli import config
9+
from brainframe.cli import dependencies
10+
from brainframe.cli import os_utils
11+
from brainframe.cli import print_utils
12+
13+
from .utils import command
14+
from .utils import requires_root
15+
from .utils import subcommand_parse_args
1616

1717
BACKUP_DIR_FORMAT = "%Y-%m-%d_%H-%M-%S"
1818

‎brainframe/cli/commands/compose.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import sys
22

3-
from brainframe.cli import config, brainframe_compose
3+
from brainframe.cli import brainframe_compose
4+
from brainframe.cli import config
45

56
from .utils import command
67

‎brainframe/cli/commands/info.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
from argparse import ArgumentParser
22

33
import i18n
4-
from brainframe.cli import config, brainframe_compose, print_utils
4+
from brainframe.cli import brainframe_compose
5+
from brainframe.cli import config
6+
from brainframe.cli import print_utils
57

6-
from .utils import command, subcommand_parse_args
8+
from .utils import command
9+
from .utils import subcommand_parse_args
710

811

912
@command("info")

‎brainframe/cli/commands/install.py‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
from pathlib import Path
44

55
import i18n
6-
from brainframe.cli import (
7-
config,
8-
dependencies,
9-
brainframe_compose,
10-
frozen_utils,
11-
os_utils,
12-
print_utils,
13-
)
6+
from brainframe.cli import brainframe_compose
7+
from brainframe.cli import config
8+
from brainframe.cli import dependencies
9+
from brainframe.cli import frozen_utils
10+
from brainframe.cli import os_utils
11+
from brainframe.cli import print_utils
1412

15-
from .utils import command, requires_root, subcommand_parse_args
13+
from .utils import command
14+
from .utils import requires_root
15+
from .utils import subcommand_parse_args
1616

1717

1818
@command("install")
@@ -34,7 +34,8 @@ def install():
3434
# We only require the Docker Compose command in frozen distributions
3535
if frozen_utils.is_frozen() and shutil.which("docker-compose") is None:
3636
print_utils.fail_translate(
37-
"install.install-dependency-manually", dependency="docker-compose",
37+
"install.install-dependency-manually",
38+
dependency="docker-compose",
3839
)
3940

4041
download_version = brainframe_compose.get_latest_version()
@@ -70,7 +71,8 @@ def install():
7071
install_path = config.install_path.default
7172
else:
7273
install_path = print_utils.ask_path(
73-
"install.ask-brainframe-install-path", config.install_path.default,
74+
"install.ask-brainframe-install-path",
75+
config.install_path.default,
7476
)
7577
install_path.mkdir(exist_ok=True, parents=True)
7678

‎brainframe/cli/commands/self_update.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@
55
from argparse import ArgumentParser
66
from pathlib import Path
77
from tempfile import NamedTemporaryFile
8-
from typing import Optional, Tuple, Union
8+
from typing import Optional
9+
from typing import Tuple
10+
from typing import Union
911

1012
import i18n
1113
import requests
12-
from brainframe.cli import __version__, config, frozen_utils, print_utils
14+
from brainframe.cli import __version__
15+
from brainframe.cli import config
16+
from brainframe.cli import frozen_utils
17+
from brainframe.cli import print_utils
1318
from packaging import version
1419

1520
from .utils import command
@@ -87,7 +92,8 @@ def self_update():
8792

8893

8994
def _latest_version(
90-
url_prefix: str, credentials: Optional[Tuple[str, str]],
95+
url_prefix: str,
96+
credentials: Optional[Tuple[str, str]],
9197
) -> Union[version.LegacyVersion, version.Version]:
9298
latest_tag_url = _LATEST_TAG_URL.format(prefix=url_prefix)
9399
response = requests.get(latest_tag_url, auth=credentials)

‎brainframe/cli/commands/uninstall.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22
from argparse import ArgumentParser
33

44
import i18n
5-
from brainframe.cli import config, brainframe_compose, os_utils, print_utils
5+
from brainframe.cli import brainframe_compose
6+
from brainframe.cli import config
7+
from brainframe.cli import os_utils
8+
from brainframe.cli import print_utils
69

7-
from .utils import command, requires_root, subcommand_parse_args
10+
from .utils import command
11+
from .utils import requires_root
12+
from .utils import subcommand_parse_args
813

914

1015
@command("uninstall")
@@ -31,7 +36,8 @@ def uninstall():
3136
print_utils.warning_translate("uninstall.warning")
3237

3338
print_utils.warning_translate(
34-
"uninstall.directories-deleted", directories=directories_to_delete,
39+
"uninstall.directories-deleted",
40+
directories=directories_to_delete,
3541
)
3642
confirmed = print_utils.ask_yes_no("uninstall.ask-confirm")
3743
if not confirmed:

‎brainframe/cli/commands/update.py‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
from argparse import ArgumentParser
22

33
import i18n
4-
from brainframe.cli import config, brainframe_compose, print_utils
4+
from brainframe.cli import brainframe_compose
5+
from brainframe.cli import config
6+
from brainframe.cli import print_utils
57
from packaging import version
68

7-
from .utils import command, subcommand_parse_args
9+
from .utils import command
10+
from .utils import subcommand_parse_args
811

912

1013
@command("update")
@@ -20,7 +23,9 @@ def update():
2023
else:
2124
requested_version_str = args.version
2225

23-
existing_version_str = brainframe_compose.check_existing_version(install_path)
26+
existing_version_str = brainframe_compose.check_existing_version(
27+
install_path
28+
)
2429

2530
existing_version = version.parse(existing_version_str)
2631
requested_version = version.parse(requested_version_str)
@@ -59,7 +64,9 @@ def update():
5964

6065
print_utils.translate("general.downloading-docker-compose")
6166
docker_compose_path = install_path / "docker-compose.yml"
62-
brainframe_compose.download(docker_compose_path, version=requested_version_str)
67+
brainframe_compose.download(
68+
docker_compose_path, version=requested_version_str
69+
)
6370

6471
brainframe_compose.run(install_path, ["pull"])
6572

@@ -98,7 +105,9 @@ def _parse_args():
98105
)
99106

100107
parser.add_argument(
101-
"--force", action="store_true", help=i18n.t("update.force-help"),
108+
"--force",
109+
action="store_true",
110+
help=i18n.t("update.force-help"),
102111
)
103112

104113
return subcommand_parse_args(parser)

‎brainframe/cli/commands/utils.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import functools
22
import sys
33
from argparse import ArgumentParser
4-
from typing import Any, Callable
4+
from typing import Any
5+
from typing import Callable
56

6-
from brainframe.cli import os_utils, print_utils
7+
from brainframe.cli import os_utils
8+
from brainframe.cli import print_utils
79

810
by_name = {}
911
"""A dict that maps command names to their corresponding function"""

‎brainframe/cli/config.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
import os
22
from distutils.util import strtobool
33
from pathlib import Path
4-
from typing import Callable, Dict, Generic, Optional, Tuple, TypeVar, Union
4+
from typing import Callable
5+
from typing import Dict
6+
from typing import Generic
7+
from typing import Optional
8+
from typing import Tuple
9+
from typing import TypeVar
10+
from typing import Union
511

612
import yaml
713

8-
from . import frozen_utils, print_utils
14+
from . import frozen_utils
15+
from . import print_utils
916

1017
T = TypeVar("T")
1118

0 commit comments

Comments
 (0)