Request for openai api key by calling sgpt with litellm resolved

sgpt/app.py

@@ -46,6 +46,11 @@ def main(
         max=1.0,
         help="Limits highest probable tokens (words).",
     ),
+    use_litellm: str = typer.Option(
+        cfg.get("USE_LITELLM"),
+        "--use-litellm",
+        help="Use LiteLLM for completions.",
+    ),
     md: bool = typer.Option(
         cfg.get("PRETTIFY_MARKDOWN") == "true",
         help="Prettify markdown output.",
@@ -158,6 +163,8 @@ def main(
 ) -> None:
     stdin_passed = not sys.stdin.isatty()
 
+    cfg["USE_LITELLM"] = use_litellm
+
     if stdin_passed:
         stdin = ""
         # TODO: This is very hacky.

sgpt/config.py

@@ -44,9 +44,13 @@
 class Config(dict):  # type: ignore
     def __init__(self, config_path: Path, **defaults: Any):
         self.config_path = config_path
-
         if self._exists:
             self._read()
+            # If OPENAI_API_KEY is missing and LiteLLM is not used, prompt for it.
+            if "OPENAI_API_KEY" not in self and defaults["USE_LITELLM"] == "false":
+                __api_key = getpass(prompt="Please enter your OpenAI API key: ")
+                self["OPENAI_API_KEY"] = __api_key
+                self._write()
             has_new_config = False
             for key, value in defaults.items():
                 if key not in self:
@@ -56,8 +60,12 @@ def __init__(self, config_path: Path, **defaults: Any):
                 self._write()
         else:
             config_path.parent.mkdir(parents=True, exist_ok=True)
-            # Don't write API key to config file if it is in the environment.
-            if not defaults.get("OPENAI_API_KEY") and not os.getenv("OPENAI_API_KEY"):
+            # Don't write API key to config file if it is in the environment or if LiteLLM is true.
+            if (
+                not defaults.get("OPENAI_API_KEY")
+                and not os.getenv("OPENAI_API_KEY")
+                and not defaults["USE_LITELLM"] == "true"
+            ):
                 __api_key = getpass(prompt="Please enter your OpenAI API key: ")
                 defaults["OPENAI_API_KEY"] = __api_key
             super().__init__(**defaults)

sgpt/handlers/handler.py

@@ -12,19 +12,24 @@
 
 base_url = cfg.get("API_BASE_URL")
 use_litellm = cfg.get("USE_LITELLM") == "true"
-additional_kwargs = {
-    "timeout": int(cfg.get("REQUEST_TIMEOUT")),
-    "api_key": cfg.get("OPENAI_API_KEY"),
-    "base_url": None if base_url == "default" else base_url,
-}
+
 
 if use_litellm:
-    import litellm  # type: ignore
+    additional_kwargs = {
+        "timeout": int(cfg.get("REQUEST_TIMEOUT")),
+        "api_key": "",
+        "base_url": None if base_url == "default" else base_url,
+    }
+    import litellm    # type: ignore
 
     completion = litellm.completion
     litellm.suppress_debug_info = True
-    additional_kwargs.pop("api_key")
 else:
+    additional_kwargs = {
+        "timeout": int(cfg.get("REQUEST_TIMEOUT")),
+        "api_key": cfg.get("OPENAI_API_KEY"),
+        "base_url": None if base_url == "default" else base_url,
+    }
     from openai import OpenAI
 
     client = OpenAI(**additional_kwargs)  # type: ignore