XFE Git
XFE Studio Git
Git 首页 全局搜索
XFE 主站 文档 NuGet
公开
关注 0 Fork 0 Star 1
返回提交历史

XFEstudio/gpt4free

Fix loading models in Airforce provider

08085d34
Heiner Lohaus <hlohaus@users.noreply.github.com>
提交于

代码差异

2 个文件 +23 -20
Modified g4f/Provider/airforce/AirforceChat.py +8 -3
@@ -4,6 +4,7 @@ import json
4 4 import requests
5 5 from aiohttp import ClientSession
6 6 from typing import List
7 import logging
7 8
8 9 from ...typing import AsyncResult, Messages
9 10 from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin
@@ -54,9 +55,13 @@ class AirforceChat(AsyncGeneratorProvider, ProviderModelMixin):
54 55 @classmethod
55 56 def get_models(cls) -> list:
56 57 if not cls.models:
57 response = requests.get('https://api.airforce/models')
58 data = response.json()
59 cls.models = [model['id'] for model in data['data']]
58 try:
59 response = requests.get('https://api.airforce/models', verify=False)
60 data = response.json()
61 cls.models = [model['id'] for model in data['data']]
62 except Exception as e:
63 logging.exception(e)
64 cls.models = [cls.default_model]
60 65
61 66 model_aliases = {
62 67 # openchat
Modified g4f/Provider/airforce/AirforceImage.py +15 -17
@@ -4,39 +4,37 @@ from aiohttp import ClientSession
4 4 from urllib.parse import urlencode
5 5 import random
6 6 import requests
7 import logging
7 8
8 9 from ...typing import AsyncResult, Messages
9 10 from ...image import ImageResponse
10 11 from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin
11 12
12
13 13 class AirforceImage(AsyncGeneratorProvider, ProviderModelMixin):
14 14 label = "Airforce Image"
15 #url = "https://api.airforce"
15 url = "https://api.airforce"
16 16 api_endpoint = "https://api.airforce/imagine2"
17 #working = True
17 working = False
18 18
19 19 default_model = 'flux'
20
21 response = requests.get('https://api.airforce/imagine/models')
22 data = response.json()
23
24 image_models = data
25
26 models = [*image_models, "stable-diffusion-xl-base", "stable-diffusion-xl-lightning", "Flux-1.1-Pro"]
27
20 additional_models = ["stable-diffusion-xl-base", "stable-diffusion-xl-lightning", "Flux-1.1-Pro"]
28 21 model_aliases = {
29 22 "sdxl": "stable-diffusion-xl-base",
30 23 "sdxl": "stable-diffusion-xl-lightning",
31 24 "flux-pro": "Flux-1.1-Pro",
32 25 }
33
26
34 27 @classmethod
35 def get_model(cls, model: str) -> str:
36 if model in cls.models:
37 return model
38 else:
39 return cls.default_model
28 def get_models(cls) -> list:
29 if not cls.models:
30 try:
31 response = requests.get('https://api.airforce/imagine/models', verify=False)
32 response.raise_for_status()
33 cls.models = [*response.json(), *cls.additional_models]
34 except Exception as e:
35 logging.exception(e)
36 cls.models = [cls.default_model]
37 return cls.models
40 38
41 39 @classmethod
42 40 async def create_async_generator(