Skip to content

Commit

Permalink
Hide api_key fields from disabeld providers
Browse files Browse the repository at this point in the history
  • Loading branch information
@hlohaus
hlohaus committed Dec 15, 2024
1 parent f317fea commit 68c7a92
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 34 deletions.
21 changes: 10 additions & 11 deletions g4f/Provider/Blackbox2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import json
from pathlib import Path
from aiohttp import ClientSession
from typing import AsyncGenerator
from typing import AsyncIterator

from ..typing import AsyncResult, Messages
from ..image import ImageResponse
Expand All @@ -21,12 +21,12 @@ class Blackbox2(AsyncGeneratorProvider, ProviderModelMixin):
"llama-3.1-70b": "https://www.blackbox.ai/api/improve-prompt",
"flux": "https://www.blackbox.ai/api/image-generator"
}

working = True
supports_system_message = True
supports_message_history = True
supports_stream = False

default_model = 'llama-3.1-70b'
chat_models = ['llama-3.1-70b']
image_models = ['flux']
Expand Down Expand Up @@ -97,15 +97,14 @@ async def create_async_generator(
messages: Messages,
prompt: str = None,
proxy: str = None,
prompt: str = None,
max_retries: int = 3,
delay: int = 1,
max_tokens: int = None,
**kwargs
) -> AsyncGenerator[str, None]:
) -> AsyncResult:
if not model:
model = cls.default_model

if model in cls.chat_models:
async for result in cls._generate_text(model, messages, proxy, max_retries, delay, max_tokens):
yield result
Expand All @@ -125,13 +124,13 @@ async def _generate_text(
max_retries: int = 3,
delay: int = 1,
max_tokens: int = None,
) -> AsyncGenerator[str, None]:
) -> AsyncIterator[str]:
headers = cls._get_headers()

async with ClientSession(headers=headers) as session:
license_key = await cls._get_license_key(session)
api_endpoint = cls.api_endpoints[model]

data = {
"messages": messages,
"max_tokens": max_tokens,
Expand Down Expand Up @@ -162,19 +161,19 @@ async def _generate_image(
model: str,
prompt: str,
proxy: str = None
) -> AsyncGenerator[ImageResponse, None]:
) -> AsyncIterator[ImageResponse]:
headers = cls._get_headers()
api_endpoint = cls.api_endpoints[model]

async with ClientSession(headers=headers) as session:
data = {
"query": prompt
}

async with session.post(api_endpoint, headers=headers, json=data, proxy=proxy) as response:
response.raise_for_status()
response_data = await response.json()

if 'markdown' in response_data:
image_url = response_data['markdown'].split('(')[1].split(')')[0]
yield ImageResponse(images=image_url, alt=prompt)
Expand Down
18 changes: 10 additions & 8 deletions g4f/Provider/needs_auth/Cerebras.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class Cerebras(OpenaiAPI):
models = [
"llama3.1-70b",
"llama3.1-8b",
"llama-3.3-70b"
]
model_aliases = {"llama-3.1-70b": "llama3.1-70b", "llama-3.1-8b": "llama3.1-8b"}

Expand All @@ -29,14 +30,15 @@ async def create_async_generator(
cookies: Cookies = None,
**kwargs
) -> AsyncResult:
if api_key is None and cookies is None:
cookies = get_cookies(".cerebras.ai")
async with ClientSession(cookies=cookies) as session:
async with session.get("https://inference.cerebras.ai/api/auth/session") as response:
raise_for_status(response)
data = await response.json()
if data:
api_key = data.get("user", {}).get("demoApiKey")
if api_key is None:
if cookies is None:
cookies = get_cookies(".cerebras.ai")
async with ClientSession(cookies=cookies) as session:
async with session.get("https://inference.cerebras.ai/api/auth/session") as response:
await raise_for_status(response)
data = await response.json()
if data:
api_key = data.get("user", {}).get("demoApiKey")
async for chunk in super().create_async_generator(
model, messages,
api_base=api_base,
Expand Down
2 changes: 1 addition & 1 deletion g4f/Provider/needs_auth/OpenaiChat.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ async def synthesize(cls, params: dict) -> AsyncIterator[bytes]:
await cls.login()
async with StreamSession(
impersonate="chrome",
timeout=900
timeout=0
) as session:
async with session.get(
f"{cls.url}/backend-api/synthesize",
Expand Down
26 changes: 13 additions & 13 deletions g4f/gui/client/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,47 +150,47 @@ <h3>Settings</h3>
<label for="recognition-language" class="label" title="">Speech recognition language</label>
<input type="text" id="recognition-language" value="" placeholder="navigator.language"/>
</div>
<div class="field box">
<div class="field box hidden">
<label for="BingCreateImages-api_key" class="label" title="">Microsoft Designer in Bing:</label>
<textarea id="BingCreateImages-api_key" name="BingCreateImages[api_key]" placeholder="&quot;_U&quot; cookie"></textarea>
</div>
<div class="field box">
<div class="field box hidden">
<label for="Cerebras-api_key" class="label" title="">Cerebras Inference:</label>
<textarea id="Cerebras-api_key" name="Cerebras[api_key]" placeholder="api_key"></textarea>
</div>
<div class="field box">
<div class="field box hidden">
<label for="DeepInfra-api_key" class="label" title="">DeepInfra:</label>
<textarea id="DeepInfra-api_key" name="DeepInfra[api_key]" class="DeepInfraImage-api_key" placeholder="api_key"></textarea>
</div>
<div class="field box">
<div class="field box hidden">
<label for="GeminiPro-api_key" class="label" title="">Gemini API:</label>
<textarea id="GeminiPro-api_key" name="GeminiPro[api_key]" placeholder="api_key"></textarea>
</div>
<div class="field box">
<div class="field box hidden">
<label for="Groq-api_key" class="label" title="">Groq:</label>
<textarea id="Groq-api_key" name="Groq[api_key]" placeholder="api_key"></textarea>
</div>
<div class="field box">
<div class="field box hidden">
<label for="HuggingFace-api_key" class="label" title="">HuggingFace:</label>
<textarea id="HuggingFace-api_key" name="HuggingFace[api_key]" class="HuggingFaceAPI-api_key" placeholder="api_key"></textarea>
</div>
<div class="field box">
<label for="Openai-api_key" class="label" title="">OpenAI API:</label>
<textarea id="Openai-api_key" name="Openai[api_key]" placeholder="api_key"></textarea>
<div class="field box hidden">
<label for="OpenaiAPI-api_key" class="label" title="">OpenAI API:</label>
<textarea id="OpenaiAPI-api_key" name="OpenaiAPI[api_key]" placeholder="api_key"></textarea>
</div>
<div class="field box">
<div class="field box hidden">
<label for="OpenRouter-api_key" class="label" title="">OpenRouter:</label>
<textarea id="OpenRouter-api_key" name="OpenRouter[api_key]" placeholder="api_key"></textarea>
</div>
<div class="field box">
<div class="field box hidden">
<label for="PerplexityApi-api_key" class="label" title="">Perplexity API:</label>
<textarea id="PerplexityApi-api_key" name="PerplexityApi[api_key]" placeholder="api_key"></textarea>
</div>
<div class="field box">
<div class="field box hidden">
<label for="Replicate-api_key" class="label" title="">Replicate:</label>
<textarea id="Replicate-api_key" name="Replicate[api_key]" class="ReplicateImage-api_key" placeholder="api_key"></textarea>
</div>
<div class="field box">
<div class="field box hidden">
<label for="xAI-api_key" class="label" title="">xAI:</label>
<textarea id="xAI-api_key" name="xAI[api_key]" placeholder="api_key"></textarea>
</div>
Expand Down
3 changes: 2 additions & 1 deletion g4f/gui/client/static/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,8 @@ ul {
}

.settings h3 {
padding-left: 50px;
padding-left: 54px;
padding-top: 18px;
}

.buttons {
Expand Down
2 changes: 2 additions & 0 deletions g4f/gui/client/static/js/chat.v1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1293,6 +1293,7 @@ const load_provider_option = (input, provider_name) => {
providerSelect.querySelectorAll(`option[data-parent="${provider_name}"]`).forEach(
(el) => el.removeAttribute("disabled")
);
settings.querySelector(`.field:has(#${provider_name}-api_key)`)?.classList.remove("hidden");
} else {
modelSelect.querySelectorAll(`option[data-providers*="${provider_name}"]`).forEach(
(el) => {
Expand All @@ -1307,6 +1308,7 @@ const load_provider_option = (input, provider_name) => {
providerSelect.querySelectorAll(`option[data-parent="${provider_name}"]`).forEach(
(el) => el.setAttribute("disabled", "disabled")
);
settings.querySelector(`.field:has(#${provider_name}-api_key)`)?.classList.add("hidden");
}
};

Expand Down

0 comments on commit 68c7a92

Please sign in to comment.