Spaces:
Sleeping
Sleeping
Commit ·
9ea68b1
1
Parent(s): d186b78
...
Browse files- app/auth.py +19 -4
- app/factory.py +12 -6
- app/main.py +14 -7
- app/providers/hf_openai.py +66 -0
- app/providers/huggingface.py +218 -0
- requirements.txt +4 -1
- start.bat +3 -0
app/auth.py
CHANGED
|
@@ -1,19 +1,34 @@
|
|
| 1 |
import os
|
| 2 |
from fastapi import HTTPException, Security
|
| 3 |
from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
|
|
|
|
| 4 |
|
| 5 |
security = HTTPBearer()
|
| 6 |
|
| 7 |
-
|
| 8 |
-
|
| 9 |
-
|
| 10 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 11 |
|
| 12 |
async def verify_api_key(credentials: HTTPAuthorizationCredentials = Security(security)):
|
| 13 |
"""
|
| 14 |
Проверяет API-ключ, переданный в заголовке Authorization: Bearer <key>.
|
| 15 |
"""
|
| 16 |
provided_key = credentials.credentials
|
|
|
|
|
|
|
| 17 |
if provided_key not in VALID_KEYS:
|
|
|
|
| 18 |
raise HTTPException(status_code=403, detail="Invalid or missing API Key")
|
|
|
|
|
|
|
| 19 |
return provided_key
|
|
|
|
| 1 |
import os
|
| 2 |
from fastapi import HTTPException, Security
|
| 3 |
from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
|
| 4 |
+
import sys
|
| 5 |
|
| 6 |
security = HTTPBearer()
|
| 7 |
|
| 8 |
+
print(f"📁 Looking for .env in: {os.path.abspath('.')}", flush=True)
|
| 9 |
+
print(f"📁 .env exists: {os.path.exists('.env')}", flush=True)
|
| 10 |
+
|
| 11 |
+
# Загружаем ключи из переменной окружения
|
| 12 |
+
API_KEYS_STR = os.getenv("API_KEYS", "")
|
| 13 |
+
|
| 14 |
+
# Разбираем ключи (поддерживаем разделение запятой)
|
| 15 |
+
VALID_KEYS = set()
|
| 16 |
+
if API_KEYS_STR:
|
| 17 |
+
for key in API_KEYS_STR.split(","):
|
| 18 |
+
key = key.strip()
|
| 19 |
+
if key:
|
| 20 |
+
VALID_KEYS.add(key)
|
| 21 |
|
| 22 |
async def verify_api_key(credentials: HTTPAuthorizationCredentials = Security(security)):
|
| 23 |
"""
|
| 24 |
Проверяет API-ключ, переданный в заголовке Authorization: Bearer <key>.
|
| 25 |
"""
|
| 26 |
provided_key = credentials.credentials
|
| 27 |
+
print(f"🔑 Received key: '{provided_key}'", flush=True)
|
| 28 |
+
|
| 29 |
if provided_key not in VALID_KEYS:
|
| 30 |
+
print(f"❌ Invalid key: '{provided_key}' not in {VALID_KEYS}", flush=True)
|
| 31 |
raise HTTPException(status_code=403, detail="Invalid or missing API Key")
|
| 32 |
+
|
| 33 |
+
print(f"✅ Valid key: {provided_key}", flush=True)
|
| 34 |
return provided_key
|
app/factory.py
CHANGED
|
@@ -1,21 +1,27 @@
|
|
| 1 |
from .providers.zhipu import ZhipuFlashProvider
|
| 2 |
-
|
| 3 |
|
| 4 |
class ProviderFactory:
|
| 5 |
_providers = {
|
| 6 |
"zhipu-flash": ZhipuFlashProvider,
|
| 7 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 8 |
}
|
| 9 |
|
| 10 |
_instances = {}
|
| 11 |
|
| 12 |
@classmethod
|
| 13 |
def get_provider(cls, model_name: str):
|
| 14 |
-
# Используем полное имя модели как ключ
|
| 15 |
if model_name not in cls._providers:
|
| 16 |
raise ValueError(f"Unsupported model/provider: {model_name}")
|
| 17 |
|
| 18 |
-
|
| 19 |
-
|
|
|
|
|
|
|
| 20 |
|
| 21 |
-
return cls._instances[
|
|
|
|
| 1 |
from .providers.zhipu import ZhipuFlashProvider
|
| 2 |
+
from .providers.hf_openai import HFOpenAIProvider
|
| 3 |
|
| 4 |
class ProviderFactory:
|
| 5 |
_providers = {
|
| 6 |
"zhipu-flash": ZhipuFlashProvider,
|
| 7 |
+
"arch-router": HFOpenAIProvider,
|
| 8 |
+
"phi-3-mini": HFOpenAIProvider,
|
| 9 |
+
"gemma-2-2b": HFOpenAIProvider,
|
| 10 |
+
"mistral-7b": HFOpenAIProvider,
|
| 11 |
+
"llama-3.2-3b": HFOpenAIProvider,
|
| 12 |
+
"qwen2.5-3b": HFOpenAIProvider,
|
| 13 |
}
|
| 14 |
|
| 15 |
_instances = {}
|
| 16 |
|
| 17 |
@classmethod
|
| 18 |
def get_provider(cls, model_name: str):
|
|
|
|
| 19 |
if model_name not in cls._providers:
|
| 20 |
raise ValueError(f"Unsupported model/provider: {model_name}")
|
| 21 |
|
| 22 |
+
provider_class = cls._providers[model_name]
|
| 23 |
+
cache_key = provider_class.__name__
|
| 24 |
+
if cache_key not in cls._instances:
|
| 25 |
+
cls._instances[cache_key] = provider_class()
|
| 26 |
|
| 27 |
+
return cls._instances[cache_key]
|
app/main.py
CHANGED
|
@@ -1,12 +1,14 @@
|
|
| 1 |
import os
|
| 2 |
import sys
|
| 3 |
-
from
|
| 4 |
-
from typing import List, Optional, Dict, Any
|
| 5 |
|
| 6 |
# Отключаем буферизацию вывода сразу при старте
|
| 7 |
sys.stdout.reconfigure(line_buffering=True)
|
| 8 |
print("🚀 Starting application initialization...", flush=True)
|
| 9 |
|
|
|
|
|
|
|
|
|
|
| 10 |
from .auth import verify_api_key
|
| 11 |
from .factory import ProviderFactory
|
| 12 |
from .models import ChatRequest, ChatResponse
|
|
@@ -21,11 +23,15 @@ async def root():
|
|
| 21 |
|
| 22 |
@app.get("/v1/models")
|
| 23 |
async def list_models(api_key: str = Depends(verify_api_key)):
|
| 24 |
-
"""Возвращает список доступных моделей/провайдеров."""
|
| 25 |
-
print("📋 Models endpoint accessed", flush=True)
|
| 26 |
return {
|
| 27 |
"models": [
|
| 28 |
-
{"id": "zhipu-flash", "name": "GLM-4.7-Flash", "provider": "zhipu", "type": "free"},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 29 |
]
|
| 30 |
}
|
| 31 |
|
|
@@ -67,7 +73,8 @@ async def chat_completion(
|
|
| 67 |
print(f"❌ ValueError: {e}", flush=True)
|
| 68 |
raise HTTPException(status_code=400, detail=str(e))
|
| 69 |
except Exception as e:
|
| 70 |
-
print(f"❌ Exception: {type(e).__name__}: {e}", flush=True)
|
| 71 |
import traceback
|
| 72 |
-
traceback.
|
|
|
|
|
|
|
| 73 |
raise HTTPException(status_code=502, detail=f"Provider error: {str(e)}")
|
|
|
|
| 1 |
import os
|
| 2 |
import sys
|
| 3 |
+
from dotenv import load_dotenv
|
|
|
|
| 4 |
|
| 5 |
# Отключаем буферизацию вывода сразу при старте
|
| 6 |
sys.stdout.reconfigure(line_buffering=True)
|
| 7 |
print("🚀 Starting application initialization...", flush=True)
|
| 8 |
|
| 9 |
+
load_dotenv()
|
| 10 |
+
|
| 11 |
+
from fastapi import FastAPI, Depends, HTTPException
|
| 12 |
from .auth import verify_api_key
|
| 13 |
from .factory import ProviderFactory
|
| 14 |
from .models import ChatRequest, ChatResponse
|
|
|
|
| 23 |
|
| 24 |
@app.get("/v1/models")
|
| 25 |
async def list_models(api_key: str = Depends(verify_api_key)):
|
|
|
|
|
|
|
| 26 |
return {
|
| 27 |
"models": [
|
| 28 |
+
{"id": "zhipu-flash", "name": "GLM-4.7-Flash (Zhipu)", "provider": "zhipu", "type": "free"},
|
| 29 |
+
{"id": "arch-router", "name": "Arch Router 1.5B (HF)", "provider": "huggingface", "type": "free"},
|
| 30 |
+
{"id": "phi-3-mini", "name": "Phi-3 Mini 4K (HF)", "provider": "huggingface", "type": "free"},
|
| 31 |
+
{"id": "gemma-2-2b", "name": "Gemma 2 2B (HF)", "provider": "huggingface", "type": "free"},
|
| 32 |
+
{"id": "mistral-7b", "name": "Mistral 7B (HF)", "provider": "huggingface", "type": "free"},
|
| 33 |
+
{"id": "llama-3.2-3b", "name": "Llama 3.2 3B (HF)", "provider": "huggingface", "type": "free"},
|
| 34 |
+
{"id": "qwen2.5-3b", "name": "Qwen 2.5 3B (HF)", "provider": "huggingface", "type": "free"},
|
| 35 |
]
|
| 36 |
}
|
| 37 |
|
|
|
|
| 73 |
print(f"❌ ValueError: {e}", flush=True)
|
| 74 |
raise HTTPException(status_code=400, detail=str(e))
|
| 75 |
except Exception as e:
|
|
|
|
| 76 |
import traceback
|
| 77 |
+
error_trace = traceback.format_exc()
|
| 78 |
+
print(f"❌ Exception: {type(e).__name__}: {e}", flush=True)
|
| 79 |
+
print(f"❌ Traceback: {error_trace}", flush=True)
|
| 80 |
raise HTTPException(status_code=502, detail=f"Provider error: {str(e)}")
|
app/providers/hf_openai.py
ADDED
|
@@ -0,0 +1,66 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
import os
|
| 2 |
+
from openai import AsyncOpenAI
|
| 3 |
+
from typing import List, Dict, Any
|
| 4 |
+
from .base import BaseLLMProvider
|
| 5 |
+
|
| 6 |
+
class HFOpenAIProvider(BaseLLMProvider):
|
| 7 |
+
"""Провайдер для Hugging Face через OpenAI-совместимый API"""
|
| 8 |
+
|
| 9 |
+
SUPPORTED_MODELS = {
|
| 10 |
+
"arch-router": "katanemo/Arch-Router-1.5B:hf-inference",
|
| 11 |
+
"phi-3-mini": "microsoft/Phi-3-mini-4k-instruct:hf-inference",
|
| 12 |
+
"gemma-2-2b": "google/gemma-2-2b-it:hf-inference",
|
| 13 |
+
"mistral-7b": "mistralai/Mistral-7B-Instruct-v0.3:hf-inference",
|
| 14 |
+
"llama-3.2-3b": "meta-llama/Llama-3.2-3B-Instruct:hf-inference",
|
| 15 |
+
"qwen2.5-3b": "Qwen/Qwen2.5-3B-Instruct:hf-inference",
|
| 16 |
+
}
|
| 17 |
+
|
| 18 |
+
def __init__(self):
|
| 19 |
+
self.api_key = os.getenv("HF_API_KEY")
|
| 20 |
+
if not self.api_key:
|
| 21 |
+
raise ValueError("HF_API_KEY not set in environment variables")
|
| 22 |
+
|
| 23 |
+
self.client = AsyncOpenAI(
|
| 24 |
+
base_url="https://router.huggingface.co/v1",
|
| 25 |
+
api_key=self.api_key
|
| 26 |
+
)
|
| 27 |
+
print(f"🤗 HF OpenAI Provider initialized", flush=True)
|
| 28 |
+
|
| 29 |
+
def _get_model_id(self, model_name: str) -> str:
|
| 30 |
+
"""Получает полный ID модели с провайдером"""
|
| 31 |
+
if model_name in self.SUPPORTED_MODELS:
|
| 32 |
+
return self.SUPPORTED_MODELS[model_name]
|
| 33 |
+
# По умолчанию
|
| 34 |
+
return "katanemo/Arch-Router-1.5B:hf-inference"
|
| 35 |
+
|
| 36 |
+
async def generate(self, messages: List[Dict[str, str]], **kwargs):
|
| 37 |
+
"""Генерация ответа через OpenAI-совместимый API HF"""
|
| 38 |
+
model_name = kwargs.get("model", "arch-router")
|
| 39 |
+
model_id = self._get_model_id(model_name)
|
| 40 |
+
|
| 41 |
+
try:
|
| 42 |
+
print(f"🚀 Sending request to HF OpenAI with model {model_id}", flush=True)
|
| 43 |
+
|
| 44 |
+
response = await self.client.chat.completions.create(
|
| 45 |
+
model=model_id,
|
| 46 |
+
messages=messages,
|
| 47 |
+
max_tokens=kwargs.get("max_tokens", 500),
|
| 48 |
+
temperature=kwargs.get("temperature", 0.7),
|
| 49 |
+
top_p=kwargs.get("top_p", 0.95)
|
| 50 |
+
)
|
| 51 |
+
|
| 52 |
+
print(f"✅ Received response", flush=True)
|
| 53 |
+
|
| 54 |
+
return {
|
| 55 |
+
"content": response.choices[0].message.content,
|
| 56 |
+
"total_tokens": response.usage.total_tokens if response.usage else 0,
|
| 57 |
+
"model": model_id
|
| 58 |
+
}
|
| 59 |
+
|
| 60 |
+
except Exception as e:
|
| 61 |
+
print(f"❌ Error in HF OpenAI provider: {e}", flush=True)
|
| 62 |
+
raise
|
| 63 |
+
|
| 64 |
+
async def generate_stream(self, messages: List[Dict[str, str]], **kwargs):
|
| 65 |
+
"""Стриминг пока не реализован"""
|
| 66 |
+
raise NotImplementedError("Streaming not implemented")
|
app/providers/huggingface.py
ADDED
|
@@ -0,0 +1,218 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
import os
|
| 2 |
+
import httpx
|
| 3 |
+
import json
|
| 4 |
+
from typing import List, Dict, Any, Optional
|
| 5 |
+
from .base import BaseLLMProvider
|
| 6 |
+
import sys
|
| 7 |
+
|
| 8 |
+
class HuggingFaceProvider(BaseLLMProvider):
|
| 9 |
+
"""Провайдер для Hugging Face Serverless Inference API"""
|
| 10 |
+
|
| 11 |
+
# Словарь с информацией о поддерживаемых моделях
|
| 12 |
+
SUPPORTED_MODELS = {
|
| 13 |
+
"phi-3-mini": {
|
| 14 |
+
"model_id": "microsoft/Phi-3-mini-4k-instruct",
|
| 15 |
+
"max_tokens": 4096,
|
| 16 |
+
"description": "Microsoft Phi-3 Mini (3.8B) - очень быстрая",
|
| 17 |
+
"type": "free"
|
| 18 |
+
},
|
| 19 |
+
"mistral-7b": {
|
| 20 |
+
"model_id": "mistralai/Mistral-7B-Instruct-v0.3",
|
| 21 |
+
"max_tokens": 8192,
|
| 22 |
+
"description": "Mistral 7B Instruct - качественная базовая модель",
|
| 23 |
+
"type": "free"
|
| 24 |
+
},
|
| 25 |
+
"gemma-2-2b": {
|
| 26 |
+
"model_id": "google/gemma-2-2b-it",
|
| 27 |
+
"max_tokens": 8192,
|
| 28 |
+
"description": "Google Gemma 2 2B - быстрая и легкая",
|
| 29 |
+
"type": "free"
|
| 30 |
+
},
|
| 31 |
+
"llama-3.2-1b": {
|
| 32 |
+
"model_id": "meta-llama/Llama-3.2-1B-Instruct",
|
| 33 |
+
"max_tokens": 131072,
|
| 34 |
+
"description": "Meta Llama 3.2 1B - сверхбыстрая",
|
| 35 |
+
"type": "free"
|
| 36 |
+
},
|
| 37 |
+
"llama-3.2-3b": {
|
| 38 |
+
"model_id": "meta-llama/Llama-3.2-3B-Instruct",
|
| 39 |
+
"max_tokens": 131072,
|
| 40 |
+
"description": "Meta Llama 3.2 3B - баланс скорости и качества",
|
| 41 |
+
"type": "free"
|
| 42 |
+
},
|
| 43 |
+
"qwen2.5-3b": {
|
| 44 |
+
"model_id": "Qwen/Qwen2.5-3B-Instruct",
|
| 45 |
+
"max_tokens": 32768,
|
| 46 |
+
"description": "Qwen 2.5 3B - хорошая поддержка русского",
|
| 47 |
+
"type": "free"
|
| 48 |
+
},
|
| 49 |
+
"ru-mistral": {
|
| 50 |
+
"model_id": "AlexWortega/ruMistral-7B-Instruct",
|
| 51 |
+
"max_tokens": 8192,
|
| 52 |
+
"description": "Русскоязычный Mistral 7B",
|
| 53 |
+
"type": "free"
|
| 54 |
+
}
|
| 55 |
+
}
|
| 56 |
+
|
| 57 |
+
def __init__(self):
|
| 58 |
+
self.api_key = os.getenv("HF_API_KEY")
|
| 59 |
+
if not self.api_key:
|
| 60 |
+
print("⚠️ HF_API_KEY not set, will use without authentication (rate limits apply)", flush=True)
|
| 61 |
+
self.api_key = None
|
| 62 |
+
self.base_url = "https://router.huggingface.co/hf/v1"
|
| 63 |
+
print(f"🤗 HuggingFaceProvider initialized, API key: {'✅' if self.api_key else '❌'}", flush=True)
|
| 64 |
+
|
| 65 |
+
def _get_model_id(self, model_name: str) -> str:
|
| 66 |
+
"""Получает реальный ID модели из HF по короткому имени"""
|
| 67 |
+
if model_name in self.SUPPORTED_MODELS:
|
| 68 |
+
return self.SUPPORTED_MODELS[model_name]["model_id"]
|
| 69 |
+
# Если передан полный HF ID, используем его
|
| 70 |
+
if "/" in model_name:
|
| 71 |
+
return model_name
|
| 72 |
+
# По умолчанию
|
| 73 |
+
return "microsoft/Phi-3-mini-4k-instruct"
|
| 74 |
+
|
| 75 |
+
async def generate(self, messages: List[Dict[str, str]], **kwargs):
|
| 76 |
+
"""Генерация ответа через HF Inference API - РАБОЧАЯ ВЕРСИЯ ДЛЯ GEMMA"""
|
| 77 |
+
model_name = kwargs.get("model", "phi-3-mini")
|
| 78 |
+
model_id = self._get_model_id(model_name) # Предполагаем, что тут будет "google/gemma-2-2b-it"
|
| 79 |
+
|
| 80 |
+
# Берем последнее сообщение пользователя
|
| 81 |
+
user_message = ""
|
| 82 |
+
for msg in messages:
|
| 83 |
+
if msg["role"] == "user":
|
| 84 |
+
user_message = msg["content"]
|
| 85 |
+
break
|
| 86 |
+
|
| 87 |
+
if not user_message:
|
| 88 |
+
user_message = "Hello"
|
| 89 |
+
|
| 90 |
+
# Gemma 2 instruct требует особого формата промпта для чата [citation:6]
|
| 91 |
+
# <bos><start_of_turn>user\n{user_message}<end_of_turn>\n<start_of_turn>model\n
|
| 92 |
+
prompt = f"<bos><start_of_turn>user\n{user_message}<end_of_turn>\n<start_of_turn>model\n"
|
| 93 |
+
|
| 94 |
+
headers = {}
|
| 95 |
+
if self.api_key:
|
| 96 |
+
headers["Authorization"] = f"Bearer {self.api_key}"
|
| 97 |
+
headers["Content-Type"] = "application/json"
|
| 98 |
+
|
| 99 |
+
# ПРАВИЛЬНЫЙ URL для бесплатного Inference API
|
| 100 |
+
url = f"https://api-inference.huggingface.co/models/{model_id}"
|
| 101 |
+
print(f"🚀 Sending to URL: {url}", flush=True)
|
| 102 |
+
print(f"📝 Prompt: {prompt}", flush=True)
|
| 103 |
+
|
| 104 |
+
payload = {
|
| 105 |
+
"inputs": prompt,
|
| 106 |
+
"parameters": {
|
| 107 |
+
"max_new_tokens": kwargs.get("max_tokens", 500),
|
| 108 |
+
"temperature": kwargs.get("temperature", 0.7),
|
| 109 |
+
"top_p": kwargs.get("top_p", 0.95),
|
| 110 |
+
"do_sample": True,
|
| 111 |
+
"return_full_text": False # Не возвращать промпт в ответе
|
| 112 |
+
}
|
| 113 |
+
}
|
| 114 |
+
|
| 115 |
+
async with httpx.AsyncClient() as client:
|
| 116 |
+
try:
|
| 117 |
+
resp = await client.post(
|
| 118 |
+
url,
|
| 119 |
+
json=payload,
|
| 120 |
+
headers=headers,
|
| 121 |
+
timeout=60.0
|
| 122 |
+
)
|
| 123 |
+
|
| 124 |
+
print(f"📥 Response status: {resp.status_code}", flush=True)
|
| 125 |
+
|
| 126 |
+
if resp.status_code == 200:
|
| 127 |
+
data = resp.json()
|
| 128 |
+
print(f"📦 Response data: {str(data)[:200]}...", flush=True)
|
| 129 |
+
|
| 130 |
+
# Парсим ответ от Gemma (он приходит в виде списка)
|
| 131 |
+
if isinstance(data, list) and len(data) > 0:
|
| 132 |
+
if "generated_text" in data[0]:
|
| 133 |
+
# Ответ модели уже содержит продолжение, нам не нужен промпт
|
| 134 |
+
generated_text = data[0]["generated_text"]
|
| 135 |
+
return {
|
| 136 |
+
"content": generated_text,
|
| 137 |
+
"total_tokens": kwargs.get("max_tokens", 500),
|
| 138 |
+
"model": model_id
|
| 139 |
+
}
|
| 140 |
+
return {
|
| 141 |
+
"content": "Не удалось распарсить ответ модели.",
|
| 142 |
+
"total_tokens": 0,
|
| 143 |
+
"model": model_id
|
| 144 |
+
}
|
| 145 |
+
elif resp.status_code == 503:
|
| 146 |
+
return {
|
| 147 |
+
"content": "⏳ Модель загружается (холодный старт), попробуйте через несколько секунд...",
|
| 148 |
+
"total_tokens": 0,
|
| 149 |
+
"model": model_id
|
| 150 |
+
}
|
| 151 |
+
else:
|
| 152 |
+
error_text = resp.text
|
| 153 |
+
print(f"❌ Error: {resp.status_code} - {error_text}", flush=True)
|
| 154 |
+
return {
|
| 155 |
+
"content": f"Error: {resp.status_code}",
|
| 156 |
+
"total_tokens": 0,
|
| 157 |
+
"model": model_id
|
| 158 |
+
}
|
| 159 |
+
|
| 160 |
+
except Exception as e:
|
| 161 |
+
print(f"❌ Exception: {e}", flush=True)
|
| 162 |
+
return {
|
| 163 |
+
"content": f"Error: {str(e)}",
|
| 164 |
+
"total_tokens": 0,
|
| 165 |
+
"model": model_id
|
| 166 |
+
}
|
| 167 |
+
|
| 168 |
+
def _format_messages(self, messages: List[Dict[str, str]], model_id: str) -> str:
|
| 169 |
+
"""Форматирует сообщения в промпт для конкретной модели"""
|
| 170 |
+
# Простая реализация - берем последнее сообщение пользователя
|
| 171 |
+
# В реальном проекте нужно делать под каждый формат модели
|
| 172 |
+
last_user_msg = None
|
| 173 |
+
system_msg = None
|
| 174 |
+
|
| 175 |
+
for msg in messages:
|
| 176 |
+
if msg["role"] == "user":
|
| 177 |
+
last_user_msg = msg["content"]
|
| 178 |
+
elif msg["role"] == "system":
|
| 179 |
+
system_msg = msg["content"]
|
| 180 |
+
|
| 181 |
+
if not last_user_msg:
|
| 182 |
+
last_user_msg = "Hello"
|
| 183 |
+
|
| 184 |
+
# Форматируем в зависимости от модели
|
| 185 |
+
if "phi" in model_id.lower():
|
| 186 |
+
# Phi-3 формат
|
| 187 |
+
prompt = f"<|user|>\n{last_user_msg}\n<|assistant|>\n"
|
| 188 |
+
elif "llama" in model_id.lower():
|
| 189 |
+
# Llama 3 формат
|
| 190 |
+
prompt = f"<|start_header_id|>user<|end_header_id|>\n\n{last_user_msg}<|eot_id|><|start_header_id|>assistant<|end_header_id|>\n\n"
|
| 191 |
+
elif "gemma" in model_id.lower():
|
| 192 |
+
# Gemma формат
|
| 193 |
+
prompt = f"<start_of_turn>user\n{last_user_msg}<end_of_turn>\n<start_of_turn>model\n"
|
| 194 |
+
else:
|
| 195 |
+
# Универсальный формат
|
| 196 |
+
prompt = last_user_msg
|
| 197 |
+
|
| 198 |
+
return prompt
|
| 199 |
+
|
| 200 |
+
def _extract_response(self, data: Any) -> str:
|
| 201 |
+
"""Извлекает текст ответа из разных форматов HF"""
|
| 202 |
+
try:
|
| 203 |
+
if isinstance(data, list) and len(data) > 0:
|
| 204 |
+
if isinstance(data[0], dict) and "generated_text" in data[0]:
|
| 205 |
+
return data[0]["generated_text"]
|
| 206 |
+
elif isinstance(data, dict):
|
| 207 |
+
if "generated_text" in data:
|
| 208 |
+
return data["generated_text"]
|
| 209 |
+
|
| 210 |
+
# Если ничего не нашли, возвращаем как строку
|
| 211 |
+
return str(data)
|
| 212 |
+
except Exception as e:
|
| 213 |
+
print(f"❌ Error extracting response: {e}", flush=True)
|
| 214 |
+
return str(data)
|
| 215 |
+
|
| 216 |
+
async def generate_stream(self, messages: List[Dict[str, str]], **kwargs):
|
| 217 |
+
"""Стриминг пока не поддерживается"""
|
| 218 |
+
raise NotImplementedError("Streaming not implemented for HuggingFace provider")
|
requirements.txt
CHANGED
|
@@ -2,4 +2,7 @@ fastapi==0.115.0
|
|
| 2 |
uvicorn[standard]==0.30.0
|
| 3 |
httpx==0.27.0
|
| 4 |
pydantic==2.7.0
|
| 5 |
-
python-multipart==0.0.9
|
|
|
|
|
|
|
|
|
|
|
|
| 2 |
uvicorn[standard]==0.30.0
|
| 3 |
httpx==0.27.0
|
| 4 |
pydantic==2.7.0
|
| 5 |
+
python-multipart==0.0.9
|
| 6 |
+
httpx==0.27.0
|
| 7 |
+
python-dotenv==1.0.0
|
| 8 |
+
openai>=1.0.0
|
start.bat
ADDED
|
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
@echo off
|
| 2 |
+
call venv\Scripts\activate
|
| 3 |
+
uvicorn app.main:app --reload --host 127.0.0.1 --port 8000
|