Skip to content

Commit 8f06023

Browse files
KRRT7oz-agent
andcommitted
Move apologize_and_exit to console.py, delete cli_common.py
Function now lives alongside the console/logger it depends on. Updated all 8 callers to import from cli_cmds.console instead. Co-Authored-By: Oz <oz-agent@warp.dev>
1 parent dd87a37 commit 8f06023

10 files changed

Lines changed: 19 additions & 28 deletions

File tree

codeflash/cli_cmds/cli.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from pathlib import Path
77

88
from codeflash.cli_cmds import logging_config
9-
from codeflash.cli_cmds.console import logger
9+
from codeflash.cli_cmds.console import apologize_and_exit, logger
1010
from codeflash.code_utils import env_utils
1111
from codeflash.code_utils.code_utils import exit_with_message, normalize_ignore_paths
1212
from codeflash.code_utils.config_parser import parse_config_file
@@ -234,8 +234,6 @@ def handle_optimize_all_arg_parsing(args: Namespace) -> Namespace:
234234
f"I couldn't find a git repository in the current directory. "
235235
f"I need a git repository to run {mode} and open PRs for optimizations. Exiting..."
236236
)
237-
from codeflash.cli_cmds.cli_common import apologize_and_exit
238-
239237
apologize_and_exit()
240238
git_remote = getattr(args, "git_remote", None)
241239
if not check_and_push_branch(git_repo, git_remote=git_remote):

codeflash/cli_cmds/cli_common.py

Lines changed: 0 additions & 16 deletions
This file was deleted.

codeflash/cli_cmds/cmd_init.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
from rich.table import Table
1616
from rich.text import Text
1717

18-
from codeflash.cli_cmds.cli_common import apologize_and_exit
19-
from codeflash.cli_cmds.console import console, logger
18+
from codeflash.cli_cmds.console import apologize_and_exit, console, logger
2019
from codeflash.cli_cmds.extension import install_vscode_extension
2120
from codeflash.cli_cmds.github_workflow import install_github_actions
2221
from codeflash.cli_cmds.init_auth import install_github_app, prompt_api_key

codeflash/cli_cmds/console.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import contextlib
44
import logging
5+
import sys
56
from collections import deque
67
from contextlib import contextmanager
78
from itertools import cycle
@@ -114,6 +115,16 @@ def advance(self, task_id: TaskID, advance: int = 1) -> None:
114115
pass
115116

116117

118+
def apologize_and_exit() -> None:
119+
console.rule()
120+
logger.info(
121+
"💡 If you're having trouble, see https://docs.codeflash.ai/getting-started/local-installation for further help getting started with Codeflash!"
122+
)
123+
console.rule()
124+
logger.info("👋 Exiting...")
125+
sys.exit(1)
126+
127+
117128
def lsp_log(message: LspMessage) -> None:
118129
if not is_LSP_enabled():
119130
return

codeflash/cli_cmds/github_workflow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
from codeflash.api.aiservice import AiServiceClient
1717
from codeflash.api.cfapi import setup_github_actions
18-
from codeflash.cli_cmds.cli_common import apologize_and_exit
18+
from codeflash.cli_cmds.console import apologize_and_exit
1919
from codeflash.cli_cmds.console import console, logger
2020
from codeflash.cli_cmds.init_config import CodeflashTheme
2121
from codeflash.code_utils.compat import LF

codeflash/cli_cmds/init_auth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from rich.text import Text
1010

1111
from codeflash.api.cfapi import get_user_id, is_github_app_installed_on_repo
12-
from codeflash.cli_cmds.cli_common import apologize_and_exit
12+
from codeflash.cli_cmds.console import apologize_and_exit
1313
from codeflash.cli_cmds.console import console
1414
from codeflash.cli_cmds.init_config import CodeflashTheme
1515
from codeflash.cli_cmds.oauth_handler import perform_oauth_signin

codeflash/cli_cmds/init_config.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
import tomlkit
1313
from pydantic.dataclasses import dataclass
1414

15-
from codeflash.cli_cmds.cli_common import apologize_and_exit
16-
from codeflash.cli_cmds.console import console
15+
from codeflash.cli_cmds.console import apologize_and_exit, console
1716
from codeflash.code_utils.compat import LF
1817
from codeflash.code_utils.config_parser import parse_config_file
1918
from codeflash.code_utils.env_utils import check_formatter_installed

codeflash/cli_cmds/init_java.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from rich.table import Table
2020
from rich.text import Text
2121

22-
from codeflash.cli_cmds.cli_common import apologize_and_exit
22+
from codeflash.cli_cmds.console import apologize_and_exit
2323
from codeflash.cli_cmds.console import console
2424
from codeflash.code_utils.code_utils import validate_relative_directory_path
2525
from codeflash.code_utils.compat import LF

codeflash/cli_cmds/init_javascript.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from rich.table import Table
2424
from rich.text import Text
2525

26-
from codeflash.cli_cmds.cli_common import apologize_and_exit
26+
from codeflash.cli_cmds.console import apologize_and_exit
2727
from codeflash.cli_cmds.console import console
2828
from codeflash.code_utils.code_utils import validate_relative_directory_path
2929
from codeflash.code_utils.compat import LF

codeflash/code_utils/github_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from typing import TYPE_CHECKING, Optional
44

55
from codeflash.api.cfapi import is_github_app_installed_on_repo
6-
from codeflash.cli_cmds.cli_common import apologize_and_exit
6+
from codeflash.cli_cmds.console import apologize_and_exit
77
from codeflash.cli_cmds.console import paneled_text
88
from codeflash.code_utils.compat import LF
99
from codeflash.code_utils.git_utils import get_repo_owner_and_name

0 commit comments

Comments
 (0)