Update app.py
Browse files
app.py
CHANGED
|
@@ -12,7 +12,7 @@ import logging
|
|
| 12 |
|
| 13 |
import g4f
|
| 14 |
from g4f.client import Client
|
| 15 |
-
|
| 16 |
|
| 17 |
|
| 18 |
# =====================================================
|
|
@@ -31,9 +31,18 @@ API_KEY = "sk-your-secret-key"
|
|
| 31 |
REQUEST_TIMEOUT = 45
|
| 32 |
|
| 33 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 34 |
# =====================================================
|
| 35 |
# MODEL โ PROVIDER MAP
|
| 36 |
-
# ู
ุฒูุฏูู ุญูููููู ุจุฏูู API KEY
|
| 37 |
# =====================================================
|
| 38 |
|
| 39 |
MODEL_PROVIDERS = {
|
|
@@ -80,11 +89,11 @@ MODEL_PROVIDERS = {
|
|
| 80 |
# KIMI
|
| 81 |
# =================================================
|
| 82 |
|
| 83 |
-
"kimi
|
| 84 |
Provider.PollinationsAI
|
| 85 |
],
|
| 86 |
|
| 87 |
-
"kimi": [
|
| 88 |
Provider.PollinationsAI
|
| 89 |
],
|
| 90 |
|
|
@@ -108,7 +117,7 @@ MODEL_PROVIDERS = {
|
|
| 108 |
],
|
| 109 |
|
| 110 |
"gpt-3.5-turbo": [
|
| 111 |
-
Provider.
|
| 112 |
Provider.PollinationsAI
|
| 113 |
],
|
| 114 |
|
|
@@ -325,7 +334,7 @@ async def root():
|
|
| 325 |
|
| 326 |
|
| 327 |
# =====================================================
|
| 328 |
-
# MODELS
|
| 329 |
# =====================================================
|
| 330 |
|
| 331 |
@app.get("/v1/models")
|
|
@@ -333,12 +342,14 @@ async def get_models():
|
|
| 333 |
|
| 334 |
models_data = []
|
| 335 |
|
|
|
|
|
|
|
| 336 |
for model_name in MODEL_PROVIDERS.keys():
|
| 337 |
|
| 338 |
models_data.append({
|
| 339 |
"id": model_name,
|
| 340 |
"object": "model",
|
| 341 |
-
"created":
|
| 342 |
"owned_by": "g4f"
|
| 343 |
})
|
| 344 |
|
|
@@ -354,18 +365,10 @@ async def get_models():
|
|
| 354 |
|
| 355 |
async def safe_completion(model, messages, stream=False):
|
| 356 |
|
| 357 |
-
providers = MODEL_PROVIDERS.get(
|
| 358 |
-
|
| 359 |
-
|
| 360 |
-
|
| 361 |
-
logger.warning(
|
| 362 |
-
f"Model '{model}' not found. Using fallback."
|
| 363 |
-
)
|
| 364 |
-
|
| 365 |
-
providers = [
|
| 366 |
-
Provider.PollinationsAI,
|
| 367 |
-
Provider.DDG
|
| 368 |
-
]
|
| 369 |
|
| 370 |
last_error = None
|
| 371 |
|
|
@@ -413,7 +416,7 @@ async def safe_completion(model, messages, stream=False):
|
|
| 413 |
|
| 414 |
except Exception as e:
|
| 415 |
|
| 416 |
-
last_error = e
|
| 417 |
|
| 418 |
logger.warning(
|
| 419 |
f"Failed provider={provider_name} error={e}"
|
|
|
|
| 12 |
|
| 13 |
import g4f
|
| 14 |
from g4f.client import Client
|
| 15 |
+
from g4f import Provider
|
| 16 |
|
| 17 |
|
| 18 |
# =====================================================
|
|
|
|
| 31 |
REQUEST_TIMEOUT = 45
|
| 32 |
|
| 33 |
|
| 34 |
+
# =====================================================
|
| 35 |
+
# PROVIDERS
|
| 36 |
+
# =====================================================
|
| 37 |
+
|
| 38 |
+
SAFE_FALLBACK_PROVIDERS = [
|
| 39 |
+
Provider.PollinationsAI,
|
| 40 |
+
Provider.DDGS
|
| 41 |
+
]
|
| 42 |
+
|
| 43 |
+
|
| 44 |
# =====================================================
|
| 45 |
# MODEL โ PROVIDER MAP
|
|
|
|
| 46 |
# =====================================================
|
| 47 |
|
| 48 |
MODEL_PROVIDERS = {
|
|
|
|
| 89 |
# KIMI
|
| 90 |
# =================================================
|
| 91 |
|
| 92 |
+
"kimi": [
|
| 93 |
Provider.PollinationsAI
|
| 94 |
],
|
| 95 |
|
| 96 |
+
"kimi-k2": [
|
| 97 |
Provider.PollinationsAI
|
| 98 |
],
|
| 99 |
|
|
|
|
| 117 |
],
|
| 118 |
|
| 119 |
"gpt-3.5-turbo": [
|
| 120 |
+
Provider.DDGS,
|
| 121 |
Provider.PollinationsAI
|
| 122 |
],
|
| 123 |
|
|
|
|
| 334 |
|
| 335 |
|
| 336 |
# =====================================================
|
| 337 |
+
# MODELS
|
| 338 |
# =====================================================
|
| 339 |
|
| 340 |
@app.get("/v1/models")
|
|
|
|
| 342 |
|
| 343 |
models_data = []
|
| 344 |
|
| 345 |
+
now = int(time.time())
|
| 346 |
+
|
| 347 |
for model_name in MODEL_PROVIDERS.keys():
|
| 348 |
|
| 349 |
models_data.append({
|
| 350 |
"id": model_name,
|
| 351 |
"object": "model",
|
| 352 |
+
"created": now,
|
| 353 |
"owned_by": "g4f"
|
| 354 |
})
|
| 355 |
|
|
|
|
| 365 |
|
| 366 |
async def safe_completion(model, messages, stream=False):
|
| 367 |
|
| 368 |
+
providers = MODEL_PROVIDERS.get(
|
| 369 |
+
model,
|
| 370 |
+
SAFE_FALLBACK_PROVIDERS
|
| 371 |
+
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 372 |
|
| 373 |
last_error = None
|
| 374 |
|
|
|
|
| 416 |
|
| 417 |
except Exception as e:
|
| 418 |
|
| 419 |
+
last_error = str(e)
|
| 420 |
|
| 421 |
logger.warning(
|
| 422 |
f"Failed provider={provider_name} error={e}"
|