返回提交历史
Modified
g4f/Provider/needs_auth/LMArenaBeta.py
+3
-3
Modified
g4f/cli/__init__.py
+2
-2
Modified
g4f/gui/gui_parser.py
+2
-2
Modified
g4f/gui/run.py
+1
-1
XFEstudio/gpt4free
refactor: update cookie browsers var and LMArenaBeta availability logic
- In `g4f/Provider/needs_auth/LMArenaBeta.py`, import `has_nodriver` from `...requests` in the same line as other imports - Change `working` attribute to be set based on `has_nodriver` instead of `True` - Add new class attribute `active_by_default = True` to `LMArenaBeta` - In `g4f/cli/__init__.py`, change `--cookie-browsers` argument choices to use `g4f.cookies.BROWSERS` instead of `g4f.cookies.browsers` - In `g4f/cli/__init__.py`, update `run_api_args` to assign to `g4f.cookies.BROWSERS` instead of `g4f.cookies.browsers` - In `g4f/gui/gui_parser.py`, change import from `browsers` to `BROWSERS` - In `g4f/gui/gui_parser.py`, update `--cookie-browsers` argument choices to use `BROWSERS` instead of `browsers` - In `g4f/gui/run.py`, update `run_gui_args` to assign to `g4f.cookies.BROWSERS` instead of `g4f.cookies.browsers
6fad9c5d
代码差异
4 个文件
+8
-8
@@ -7,8 +7,7 @@ import asyncio
7
7
import os
8
8
9
9
from ...typing import AsyncResult, Messages, MediaListType
10
from ...requests import StreamSession, get_args_from_nodriver, raise_for_status, merge_cookies
11
from ...requests import DEFAULT_HEADERS, has_nodriver
10
from ...requests import StreamSession, get_args_from_nodriver, raise_for_status, merge_cookies, has_nodriver
12
11
from ...errors import ModelNotFoundError
13
12
from ...providers.response import FinishReason, Usage, JsonConversation, ImageResponse
14
13
from ...tools.media import merge_media
@@ -122,7 +121,8 @@ class LMArenaBeta(AsyncGeneratorProvider, ProviderModelMixin, AuthFileMixin):
122
121
label = "LMArena (New)"
123
122
url = "https://lmarena.ai"
124
123
api_endpoint = "https://lmarena.ai/api/stream/create-evaluation"
125
working = True
124
working = has_nodriver
125
active_by_default = True
126
126
127
127
default_model = list(text_models.keys())[0]
128
128
models = list(text_models) + list(image_models)
@@ -26,7 +26,7 @@ def get_api_parser():
26
26
api_parser.add_argument("--g4f-api-key", type=str, default=None, help="Sets an authentication key for your API. (incompatible with --reload and --workers)")
27
27
api_parser.add_argument("--ignored-providers", nargs="+", choices=[provider.__name__ for provider in Provider.__providers__ if provider.working],
28
28
default=[], help="List of providers to ignore when processing request. (incompatible with --reload and --workers)")
29
api_parser.add_argument("--cookie-browsers", nargs="+", choices=[browser.__name__ for browser in g4f.cookies.browsers],
29
api_parser.add_argument("--cookie-browsers", nargs="+", choices=[browser.__name__ for browser in g4f.cookies.BROWSERS],
30
30
default=[], help="List of browsers to access or retrieve cookies from. (incompatible with --reload and --workers)")
31
31
api_parser.add_argument("--reload", action="store_true", help="Enable reloading.")
32
32
api_parser.add_argument("--demo", action="store_true", help="Enable demo mode.")
@@ -53,7 +53,7 @@ def run_api_args(args):
53
53
timeout=args.timeout,
54
54
)
55
55
if args.cookie_browsers:
56
g4f.cookies.browsers = [g4f.cookies[browser] for browser in args.cookie_browsers]
56
g4f.cookies.BROWSERS = [g4f.cookies[browser] for browser in args.cookie_browsers]
57
57
run_api(
58
58
bind=args.bind,
59
59
port=args.port,
@@ -1,6 +1,6 @@
1
1
from argparse import ArgumentParser
2
2
3
from ..cookies import browsers
3
from ..cookies import BROWSERS
4
4
from .. import Provider
5
5
6
6
def gui_parser():
@@ -11,6 +11,6 @@ def gui_parser():
11
11
parser.add_argument("--ignore-cookie-files", action="store_true", help="Don't read .har and cookie files.")
12
12
parser.add_argument("--ignored-providers", nargs="+", choices=[provider.__name__ for provider in Provider.__providers__ if provider.working],
13
13
default=[], help="List of providers to ignore when processing request. (incompatible with --reload and --workers)")
14
parser.add_argument("--cookie-browsers", nargs="+", choices=[browser.__name__ for browser in browsers],
14
parser.add_argument("--cookie-browsers", nargs="+", choices=[browser.__name__ for browser in BROWSERS],
15
15
default=[], help="List of browsers to access or retrieve cookies from.")
16
16
return parser
@@ -14,7 +14,7 @@ def run_gui_args(args):
14
14
host = args.host
15
15
port = args.port
16
16
debug = args.debug
17
g4f.cookies.browsers = [g4f.cookies[browser] for browser in args.cookie_browsers]
17
g4f.cookies.BROWSERS = [g4f.cookies[browser] for browser in args.cookie_browsers]
18
18
if args.ignored_providers:
19
19
for provider in args.ignored_providers:
20
20
if provider in ProviderUtils.convert: