avoid duplicated api calls

Author: mohamedashrraf222

codeflash/api/aiservice.py

@@ -32,6 +32,27 @@
 
 class AiServiceClient:
     def __init__(self) -> None:
+        # Validate API key before initializing the client
+        try:
+            from codeflash.api.cfapi import get_user_id  # noqa: PLC0415
+            
+            # Try to get user ID, if it fails the API key is invalid
+            user_id = get_user_id()
+            if user_id is None:
+                msg = (
+                    "Invalid Codeflash API key. The API key you provided is not valid.\n"
+                    "Please generate a new one at https://app.codeflash.ai/app/apikeys ,\n"
+                    "then set it as a CODEFLASH_API_KEY environment variable.\n"
+                    "For more information, refer to the documentation at \n"
+                    "https://docs.codeflash.ai/optimizing-with-codeflash/codeflash-github-actions#manual-setup\n"
+                    "or\n"
+                    "https://docs.codeflash.ai/optimizing-with-codeflash/codeflash-github-actions#automated-setup-recommended"
+                )
+                raise OSError(msg)
+        except ImportError:
+            # If cfapi is not available, skip validation
+            pass
+        
         self.base_url = self.get_aiservice_base_url()
         self.headers = {"Authorization": f"Bearer {get_codeflash_api_key()}", "Connection": "close"}
 

codeflash/api/cfapi.py

@@ -89,6 +89,7 @@ def make_cfapi_request(
 def get_user_id(api_key: Optional[str] = None) -> Optional[str]:
     """Retrieve the user's userid by making a request to the /cfapi/cli-get-user endpoint.
 
+    :param api_key: The API key to use. If None, uses get_codeflash_api_key().
     :return: The userid or None if the request fails.
     """
     if not api_key and not ensure_codeflash_api_key():
@@ -119,75 +120,6 @@ def get_user_id(api_key: Optional[str] = None) -> Optional[str]:
     logger.error(f"Failed to look up your userid; is your CF API key valid? ({response.reason})")
     return None
 
-
-def validate_api_key(api_key: Optional[str] = None) -> None:
-    """Validate that the API key is valid by attempting to retrieve the user ID.
-    
-    Raises OSError if the API key is invalid or missing.
-    
-    :param api_key: The API key to validate. If None, uses get_codeflash_api_key().
-    :raises OSError: If the API key is invalid or missing.
-    """
-    # First check if API key exists
-    if not api_key:
-        api_key = get_codeflash_api_key()
-
-    def raise_os_error(msg: str) -> None:
-        """Raise OSError with the given message."""
-        raise OSError(msg)
-
-    # Make the request to validate the API key
-    try:
-        response = make_cfapi_request(
-            endpoint="/cli-get-user",
-            method="GET",
-            extra_headers={"cli_version": __version__},
-            api_key=api_key,
-            suppress_errors=True,  # Don't log errors yet, we'll handle it below
-        )
-
-        if response.status_code == 403:
-            msg = (
-                "Invalid Codeflash API key. The API key you provided is not valid.\n"
-                "Please generate a new one at https://app.codeflash.ai/app/apikeys ,\n"
-                "then set it as a CODEFLASH_API_KEY environment variable.\n"
-                "For more information, refer to the documentation at "
-                "https://docs.codeflash.ai/getting-started/codeflash-github-actions#add-your-api-key-to-your-repository-secrets"
-            )
-            raise_os_error(msg)
-        elif response.status_code != 200:
-            msg = (
-                f"Failed to validate API key with Codeflash API (status {response.status_code}).\n"
-                "Please verify your API key is correct.\n"
-                "You can generate a new one at https://app.codeflash.ai/app/apikeys"
-            )
-            raise_os_error(msg)
-
-        # Check for version updates
-        if response.status_code == 200:
-            try:
-                resp_json = response.json()
-                min_version = resp_json.get("min_version")
-                if min_version and version.parse(min_version) > version.parse(__version__):
-                    msg = "Your Codeflash CLI version is outdated. Please update to the latest version using `pip install --upgrade codeflash`."
-                    raise_os_error(msg)
-            except (json.JSONDecodeError, KeyError, TypeError):
-                # If response is not JSON or doesn't have min_version, that's okay
-                pass
-
-    except OSError:
-        # Re-raise OSError as-is
-        raise
-    except Exception as e:
-        # Wrap other exceptions
-        msg = (
-            f"Failed to validate API key: {e}\n"
-            "Please verify your API key is correct.\n"
-            "You can generate a new one at https://app.codeflash.ai/app/apikeys"
-        )
-        raise OSError(msg) from e
-
-
 def suggest_changes(
     owner: str,
     repo: str,

codeflash/optimization/optimizer.py

@@ -11,7 +11,7 @@
 from typing import TYPE_CHECKING
 
 from codeflash.api.aiservice import AiServiceClient, LocalAiServiceClient
-from codeflash.api.cfapi import send_completion_email, validate_api_key
+from codeflash.api.cfapi import send_completion_email
 from codeflash.cli_cmds.console import console, logger, progress_bar
 from codeflash.code_utils import env_utils
 from codeflash.code_utils.code_utils import cleanup_paths, get_run_tmp_file
@@ -494,9 +494,6 @@ def mirror_path(path: Path, src_root: Path, dest_root: Path) -> Path:
 def run_with_args(args: Namespace) -> None:
     optimizer = None
     try:
-        # Validate API key early before initializing optimizer
-        validate_api_key()
-        
         optimizer = Optimizer(args)
         optimizer.run()
     except KeyboardInterrupt: