improve messaging

Author: KRRT7

codeflash/api/aiservice.py

@@ -6,6 +6,7 @@
 import time
 from typing import TYPE_CHECKING, Any, cast
 
+import git
 import requests
 from pydantic.json import pydantic_encoder
 
@@ -637,7 +638,14 @@ def get_aiservice_base_url(self) -> str:
 def safe_get_repo_owner_and_name() -> tuple[str | None, str | None]:
     try:
         git_repo_owner, git_repo_name = get_repo_owner_and_name()
+    except (ValueError, git.exc.InvalidGitRepositoryError):
+        # Expected errors when:
+        # - No remotes are configured (e.g., local-only repos) -> ValueError
+        # - Not in a git repository -> InvalidGitRepositoryError
+        # These are normal and shouldn't be logged as warnings
+        git_repo_owner, git_repo_name = None, None
     except Exception as e:
+        # Unexpected errors should still be logged
         logger.warning(f"Could not determine repo owner and name: {e}")
         git_repo_owner, git_repo_name = None, None
     return git_repo_owner, git_repo_name

codeflash/cli_cmds/cli.py

@@ -143,8 +143,15 @@ def process_and_validate_cmd_args(args: Namespace) -> Namespace:
             exit_with_message(f"File {args.file} does not exist", error_on_exit=True)
         args.file = Path(args.file).resolve()
         if not args.no_pr:
-            owner, repo = get_repo_owner_and_name()
-            require_github_app_or_exit(owner, repo)
+            try:
+                owner, repo = get_repo_owner_and_name()
+                require_github_app_or_exit(owner, repo)
+            except ValueError as e:
+                exit_with_message(
+                    f"Cannot determine repository information: {e}\n"
+                    f"Please ensure your git repository has a remote configured, or use '--no-pr' to optimize locally.",
+                    error_on_exit=True
+                )
     if args.replay_test:
         for test_path in args.replay_test:
             if not Path(test_path).is_file():
@@ -265,9 +272,16 @@ def handle_optimize_all_arg_parsing(args: Namespace) -> Namespace:
                 apologize_and_exit()
             git_remote = getattr(args, "git_remote", None)
             if not check_and_push_branch(git_repo, git_remote=git_remote):
-                exit_with_message("Branch is not pushed...", error_on_exit=True)
-            owner, repo = get_repo_owner_and_name(git_repo)
-            require_github_app_or_exit(owner, repo)
+                exit_with_message("Cannot proceed without a valid git remote configuration. See error message above.", error_on_exit=True)
+            try:
+                owner, repo = get_repo_owner_and_name(git_repo)
+                require_github_app_or_exit(owner, repo)
+            except ValueError as e:
+                exit_with_message(
+                    f"Cannot determine repository information: {e}\n"
+                    f"Please ensure your git repository has a remote configured, or use '--no-pr' to optimize locally.",
+                    error_on_exit=True
+                )
     if not hasattr(args, "all"):
         args.all = None
     elif args.all == "":

codeflash/code_utils/git_utils.py

@@ -80,6 +80,11 @@ def get_current_branch(repo: Repo | None = None) -> str:
 
 def get_remote_url(repo: Repo | None = None, git_remote: str | None = "origin") -> str:
     repository: Repo = repo if repo else git.Repo(search_parent_directories=True)
+    available_remotes = get_git_remotes(repository)
+    if not available_remotes:
+        raise ValueError(f"No git remotes configured in this repository")
+    if git_remote not in available_remotes:
+        raise ValueError(f"Git remote '{git_remote}' does not exist. Available remotes: {', '.join(available_remotes)}")
     return repository.remote(name=git_remote).url
 
 
@@ -128,6 +133,30 @@ def confirm_proceeding_with_no_git_repo() -> str | bool:
 def check_and_push_branch(repo: git.Repo, git_remote: str | None = "origin", *, wait_for_push: bool = False) -> bool:
     current_branch = repo.active_branch
     current_branch_name = current_branch.name
+    available_remotes = get_git_remotes(repo)
+    if not available_remotes:
+        logger.error(
+            f"❌ No git remotes configured in this repository.\n"
+            f"This appears to be a local-only git repository. To use codeflash with PR features, you need to:\n"
+            f"  1. Create a repository on GitHub (or another git hosting service)\n"
+            f"  2. Add it as a remote: git remote add origin <repository-url>\n"
+            f"  3. Push your branch: git push -u origin {current_branch_name}\n\n"
+            f"Alternatively, you can run codeflash with the '--no-pr' flag to optimize locally without creating PRs."
+        )
+        return False
+    
+    # Check if the specified remote exists
+    if git_remote not in available_remotes:
+        logger.error(
+            f"❌ Git remote '{git_remote}' does not exist in this repository.\n"
+            f"Available remotes: {', '.join(available_remotes)}\n\n"
+            f"You can either:\n"
+            f"  1. Use one of the existing remotes by setting 'git-remote' in pyproject.toml\n"
+            f"  2. Add the '{git_remote}' remote: git remote add {git_remote} <repository-url>\n"
+            f"  3. Run codeflash with '--no-pr' to optimize locally without creating PRs."
+        )
+        return False
+    
     remote = repo.remote(name=git_remote)
 
     # Check if the branch is pushed

codeflash/discovery/functions_to_optimize.py

@@ -598,8 +598,8 @@ def was_function_previously_optimized(
     # already_optimized_count = 0
     try:
         owner, repo = get_repo_owner_and_name()
-    except git.exc.InvalidGitRepositoryError:
-        logger.warning("No git repository found")
+    except (git.exc.InvalidGitRepositoryError, ValueError) as e:
+        logger.debug(f"Cannot get repository info: {e}")
         owner, repo = None, None
     pr_number = get_pr_number()