mirror of
https://github.com/xtekky/gpt4free.git
synced 2025-09-26 20:31:14 +08:00
Enhance PuterJS provider to track live model instances and update BrowserConfig for automation tool settings
This commit is contained in:
@@ -264,6 +264,7 @@ class PuterJS(AsyncGeneratorProvider, ProviderModelMixin):
|
||||
url = "https://api.puter.com/puterai/chat/models/"
|
||||
cls.models = requests.get(url).json().get("models", [])
|
||||
cls.models = [model for model in cls.models if "/" not in model and model not in ["abuse", "costly", "fake", "model-fallback-test-1"]]
|
||||
cls.live += 1
|
||||
except Exception as e:
|
||||
debug.log(f"PuterJS: Failed to fetch models from API: {e}")
|
||||
cls.models = []
|
||||
|
@@ -71,6 +71,7 @@ from g4f.providers.types import ProviderType
|
||||
from g4f.providers.response import AudioResponse
|
||||
from g4f.providers.any_provider import AnyProvider
|
||||
from g4f.providers.any_model_map import model_map, vision_models, image_models, audio_models, video_models
|
||||
from g4f.requests import BrowserConfig
|
||||
from g4f import Provider
|
||||
from g4f.gui import get_gui_app
|
||||
from .stubs import (
|
||||
@@ -78,8 +79,7 @@ from .stubs import (
|
||||
ProviderResponseModel, ModelResponseModel,
|
||||
ErrorResponseModel, ProviderResponseDetailModel,
|
||||
FileResponseModel,
|
||||
TranscriptionResponseModel, AudioSpeechConfig,
|
||||
ResponsesConfig
|
||||
TranscriptionResponseModel, AudioSpeechConfig
|
||||
)
|
||||
from g4f import debug
|
||||
|
||||
@@ -103,6 +103,8 @@ async def lifespan(app: FastAPI):
|
||||
AppConfig.g4f_api_key = os.environ.get("G4F_API_KEY", AppConfig.g4f_api_key)
|
||||
AppConfig.timeout = os.environ.get("G4F_TIMEOUT", AppConfig.timeout)
|
||||
AppConfig.stream_timeout = os.environ.get("G4F_STREAM_TIMEOUT", AppConfig.stream_timeout)
|
||||
BrowserConfig.port = os.environ.get("G4F_BROWSER_PORT", BrowserConfig.port)
|
||||
BrowserConfig.host = os.environ.get("G4F_BROWSER_HOST", BrowserConfig.host)
|
||||
yield
|
||||
if has_nodriver:
|
||||
for browser in util.get_registered_instances():
|
||||
|
@@ -1,9 +1,9 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import sys
|
||||
import argparse
|
||||
from argparse import ArgumentParser
|
||||
from .client import get_parser, run_client_args
|
||||
from ..requests import BrowserConfig
|
||||
|
||||
from g4f import Provider
|
||||
from g4f.gui.run import gui_parser, run_gui_args
|
||||
@@ -36,7 +36,9 @@ def get_api_parser():
|
||||
api_parser.add_argument("--ssl-keyfile", type=str, default=None, help="Path to SSL key file for HTTPS.")
|
||||
api_parser.add_argument("--ssl-certfile", type=str, default=None, help="Path to SSL certificate file for HTTPS.")
|
||||
api_parser.add_argument("--log-config", type=str, default=None, help="Custom log config.")
|
||||
|
||||
api_parser.add_argument("--browser-port", type=int, help="Port for the browser automation tool.")
|
||||
api_parser.add_argument("--browser-host", type=str, default="127.0.0.1", help="Host for the browser automation tool.")
|
||||
|
||||
return api_parser
|
||||
|
||||
def run_api_args(args):
|
||||
@@ -54,6 +56,9 @@ def run_api_args(args):
|
||||
demo=args.demo,
|
||||
timeout=args.timeout,
|
||||
)
|
||||
if args.browser_port:
|
||||
BrowserConfig.port = args.browser_port
|
||||
BrowserConfig.host = args.browser_host
|
||||
if args.cookie_browsers:
|
||||
g4f.cookies.BROWSERS = [g4f.cookies[browser] for browser in args.cookie_browsers]
|
||||
run_api(
|
||||
|
@@ -46,6 +46,8 @@ from ..cookies import get_cookies_dir
|
||||
from .defaults import DEFAULT_HEADERS, WEBVIEW_HAEDERS
|
||||
|
||||
class BrowserConfig:
|
||||
port: int = None
|
||||
host: str = None
|
||||
stop_browser = lambda: None
|
||||
browser_executable_path: str = None
|
||||
|
||||
@@ -168,8 +170,8 @@ async def get_nodriver(
|
||||
if not os.path.exists(browser_executable_path):
|
||||
browser_executable_path = None
|
||||
debug.log(f"Browser executable path: {browser_executable_path}")
|
||||
lock_file = Path(get_cookies_dir()) / ".nodriver_is_open"
|
||||
if user_data_dir:
|
||||
lock_file = Path(get_cookies_dir()) / ".nodriver_is_open"
|
||||
lock_file.parent.mkdir(exist_ok=True)
|
||||
# Implement a short delay (milliseconds) to prevent race conditions.
|
||||
await asyncio.sleep(0.1 * random.randint(0, 50))
|
||||
@@ -199,6 +201,8 @@ async def get_nodriver(
|
||||
user_data_dir=user_data_dir,
|
||||
browser_args=[*browser_args, f"--proxy-server={proxy}"] if proxy else browser_args,
|
||||
browser_executable_path=browser_executable_path,
|
||||
port=BrowserConfig.port,
|
||||
host=BrowserConfig.host,
|
||||
**kwargs
|
||||
)
|
||||
except FileNotFoundError as e:
|
||||
@@ -211,7 +215,7 @@ async def get_nodriver(
|
||||
raise
|
||||
def on_stop():
|
||||
try:
|
||||
if browser.connection:
|
||||
if BrowserConfig.port is None and browser.connection:
|
||||
browser.stop()
|
||||
except:
|
||||
pass
|
||||
|
Reference in New Issue
Block a user