feat: Exclude PROXY_API_KEY from provider API key loading and enhance model retrieval options

src/proxy_app/main.py

@@ -26,7 +26,8 @@ if not PROXY_API_KEY:
 # Load all provider API keys from environment variables
 api_keys = {}
 for key, value in os.environ.items():
-    if key.endswith("_API_KEY") or "_API_KEY_" in key:
+    # Exclude PROXY_API_KEY from being treated as a provider API key
+    if (key.endswith("_API_KEY") or "_API_KEY_" in key) and key != "PROXY_API_KEY":
         parts = key.split("_API_KEY")
         provider = parts[0].lower()
         if provider not in api_keys:
@@ -75,19 +76,20 @@ def read_root():
     return {"Status": "API Key Proxy is running"}
 
 @app.get("/v1/models")
-async def list_models(_=Depends(verify_api_key)):
+async def list_models(grouped: bool = False, _=Depends(verify_api_key)):
     """
     Returns a list of available models from all configured providers.
+    Optionally returns them as a flat list if grouped=False.
     """
-    models = await rotating_client.get_all_available_models()
-    return {"data": models}
+    models = await rotating_client.get_all_available_models(grouped=grouped)
+    return models
 
 @app.get("/v1/providers")
 async def list_providers(_=Depends(verify_api_key)):
     """
     Returns a list of all available providers.
     """
-    return {"data": list(PROVIDER_PLUGINS.keys())}
+    return list(PROVIDER_PLUGINS.keys())
 
 @app.post("/v1/token-count")
 async def token_count(request: Request, _=Depends(verify_api_key)):

src/rotator_library/client.py

@@ -145,11 +145,19 @@ class RotatingClient:
             logging.warning(f"Model list fetching not implemented for provider: {provider}")
             return []
 
-    async def get_all_available_models(self) -> Dict[str, List[str]]:
+    async def get_all_available_models(self, grouped: bool = True) -> Any:
         """
-        Returns a dictionary of all available models, grouped by provider.
+        Returns a list of all available models, either grouped by provider or as a flat list.
         """
         all_provider_models = {}
         for provider in self.api_keys.keys():
             all_provider_models[provider] = await self.get_available_models(provider)
-        return all_provider_models
+        
+        if grouped:
+            return all_provider_models
+        else:
+            flat_models = []
+            for provider, models in all_provider_models.items():
+                for model in models:
+                    flat_models.append(f"{model}")
+            return flat_models