mirrors/gpt4free
1
Fork 0
mirror of https://github.com/xtekky/gpt4free.git synced 2026-03-13 02:04:04 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fix handling of stream_timeout

Browse source
This commit is contained in:
hlohaus 2025-09-08 05:21:44 +02:00
parent b18d2970e0
commit 4c1da4e610
3 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
g4f/api/__init__.py
View file

@ -60,9 +60,10 @@ except ImportError:
import g4f
import g4f.debug
from g4f.client import AsyncClient, ChatCompletion, ImagesResponse, ClientResponse
from g4f.client import AsyncClient, ChatCompletion, ImagesResponse
from g4f.providers.response import BaseConversation, JsonConversation
from g4f.client.helper import filter_none
from g4f.config import DEFAULT_PORT, DEFAULT_TIMEOUT, DEFAULT_STREAM_TIMEOUT
from g4f.image import EXTENSIONS_MAP, is_data_an_media, process_image
from g4f.image.copy_images import get_media_dir, copy_media, get_source_url
from g4f.errors import ProviderNotFoundError, ModelNotFoundError, MissingAuthError, NoValidHarFileError, MissingRequirementsError
@ -90,18 +91,14 @@ except ImportError:
logger = logging.getLogger(__name__)
DEFAULT_PORT = 1337
DEFAULT_TIMEOUT = 600
DEFAULT_STREAM_TIMEOUT = 15
@asynccontextmanager
async def lifespan(app: FastAPI):
# Read cookie files if not ignored
if not AppConfig.ignore_cookie_files:
read_cookie_files()
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)
AppConfig.timeout = int(os.environ.get("G4F_TIMEOUT", AppConfig.timeout))
AppConfig.stream_timeout = int(os.environ.get("G4F_STREAM_TIMEOUT", AppConfig.stream_timeout))
yield
if has_nodriver:
for browser in util.get_registered_instances():
@ -442,7 +439,7 @@ class Api:
config.conversation_id = conversation_id
if config.timeout is None:
config.timeout = AppConfig.timeout
if config.stream_timeout is None:
if config.stream_timeout is None and config.stream:
config.stream_timeout = AppConfig.stream_timeout
if credentials is not None and credentials.credentials != "secret":
config.api_key = credentials.credentials

23
g4f/cli/__init__.py
View file

@ -2,17 +2,18 @@ from __future__ import annotations
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
import g4f.cookies
from ..gui.run import gui_parser, run_gui_args
from ..config import DEFAULT_PORT, DEFAULT_TIMEOUT, DEFAULT_STREAM_TIMEOUT
from .. import Provider
from .. import cookies
def get_api_parser():
api_parser = ArgumentParser(description="Run the API and GUI")
api_parser.add_argument("--bind", default=None, help="The bind string. (Default: 0.0.0.0:1337)")
api_parser.add_argument("--port", "-p", default=None, help="Change the port of the server.")
api_parser.add_argument("--bind", default=None, help=f"The bind string. (Default: 0.0.0.0:{DEFAULT_PORT})")
api_parser.add_argument("--port", "-p", default=None, help=f"Change the port of the server. (Default: {DEFAULT_PORT})")
api_parser.add_argument("--debug", "-d", action="store_true", help="Enable verbose logging.")
api_parser.add_argument("--gui", "-g", default=None, action="store_true", help="(deprecated)")
api_parser.add_argument("--no-gui", "-ng", default=False, action="store_true", help="Start without the gui.")
@ -28,11 +29,12 @@ def get_api_parser():
api_parser.add_argument("--g4f-api-key", type=str, default=None, help="Sets an authentication key for your API. (incompatible with --reload and --workers)")
api_parser.add_argument("--ignored-providers", nargs="+", choices=[provider.__name__ for provider in Provider.__providers__ if provider.working],
default=[], help="List of providers to ignore when processing request. (incompatible with --reload and --workers)")
api_parser.add_argument("--cookie-browsers", nargs="+", choices=[browser.__name__ for browser in g4f.cookies.BROWSERS],
api_parser.add_argument("--cookie-browsers", nargs="+", choices=[browser.__name__ for browser in cookies.BROWSERS],
default=[], help="List of browsers to access or retrieve cookies from. (incompatible with --reload and --workers)")
api_parser.add_argument("--reload", action="store_true", help="Enable reloading.")
api_parser.add_argument("--demo", action="store_true", help="Enable demo mode.")
api_parser.add_argument("--timeout", type=int, default=600, help="Default timeout for requests in seconds. (incompatible with --reload and --workers)")
api_parser.add_argument("--timeout", type=int, default=DEFAULT_TIMEOUT, help="Default timeout for requests in seconds. (incompatible with --reload and --workers)")
api_parser.add_argument("--stream-timeout", type=int, default=DEFAULT_STREAM_TIMEOUT, help="Default timeout for streaming requests in seconds. (incompatible with --reload and --workers)")
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.")
@ -55,12 +57,15 @@ def run_api_args(args):
gui=not args.no_gui,
demo=args.demo,
timeout=args.timeout,
stream_timeout=args.stream_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]
cookies.BROWSERS = [cookies[browser] for browser in args.cookie_browsers]
run_api(
bind=args.bind,
port=args.port,

3
g4f/config.py
View file

@ -14,6 +14,9 @@ def get_config_dir() -> Path:
return Path.home() / "Library" / "Application Support"
return Path.home() / ".config"
DEFAULT_PORT = 1337
DEFAULT_TIMEOUT = 600
DEFAULT_STREAM_TIMEOUT = 15
PACKAGE_NAME = "g4f"
CONFIG_DIR = get_config_dir() / PACKAGE_NAME