mirror of
https://github.com/xtekky/gpt4free.git
synced 2024-09-12 08:29:30 -04:00
Merge pull request #1120 from AndPim4912/api-ignore-providers
Added code to ignore certain providers in the API
This commit is contained in:
commit
aa95d30732
@ -1,3 +1,5 @@
|
|||||||
|
import typing
|
||||||
|
from .. import BaseProvider
|
||||||
import g4f; g4f.debug.logging = True
|
import g4f; g4f.debug.logging = True
|
||||||
import time
|
import time
|
||||||
import json
|
import json
|
||||||
@ -26,10 +28,12 @@ class Api:
|
|||||||
__default_ip = '127.0.0.1'
|
__default_ip = '127.0.0.1'
|
||||||
__default_port = 1337
|
__default_port = 1337
|
||||||
|
|
||||||
def __init__(self, engine: g4f, debug: bool = True, sentry: bool = False) -> None:
|
def __init__(self, engine: g4f, debug: bool = True, sentry: bool = False,
|
||||||
|
list_ignored_providers:typing.List[typing.Union[str, BaseProvider]]=None) -> None:
|
||||||
self.engine = engine
|
self.engine = engine
|
||||||
self.debug = debug
|
self.debug = debug
|
||||||
self.sentry = sentry
|
self.sentry = sentry
|
||||||
|
self.list_ignored_providers = list_ignored_providers
|
||||||
self.log_level = logging.DEBUG if debug else logging.WARN
|
self.log_level = logging.DEBUG if debug else logging.WARN
|
||||||
|
|
||||||
hook_logging(level=self.log_level, format='[%(asctime)s] %(levelname)s in %(module)s: %(message)s')
|
hook_logging(level=self.log_level, format='[%(asctime)s] %(levelname)s in %(module)s: %(message)s')
|
||||||
@ -102,7 +106,8 @@ class Api:
|
|||||||
logger.info(f'model: {model}, stream: {stream}, request: {messages[-1]["content"]}')
|
logger.info(f'model: {model}, stream: {stream}, request: {messages[-1]["content"]}')
|
||||||
|
|
||||||
response = self.engine.ChatCompletion.create(model=model,
|
response = self.engine.ChatCompletion.create(model=model,
|
||||||
stream=stream, messages=messages)
|
stream=stream, messages=messages,
|
||||||
|
ignored=self.list_ignored_providers)
|
||||||
|
|
||||||
completion_id = ''.join(random.choices(string.ascii_letters + string.digits, k=28))
|
completion_id = ''.join(random.choices(string.ascii_letters + string.digits, k=28))
|
||||||
completion_timestamp = int(time.time())
|
completion_timestamp = int(time.time())
|
||||||
|
15
g4f/cli.py
15
g4f/cli.py
@ -1,5 +1,8 @@
|
|||||||
import argparse
|
import argparse
|
||||||
|
from enum import Enum
|
||||||
|
|
||||||
import g4f
|
import g4f
|
||||||
|
from g4f import Provider
|
||||||
|
|
||||||
from g4f.api import Api
|
from g4f.api import Api
|
||||||
from g4f.gui.run import gui_parser, run_gui_args
|
from g4f.gui.run import gui_parser, run_gui_args
|
||||||
@ -10,14 +13,22 @@ def run_gui(args):
|
|||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
IgnoredProviders = Enum("ignore_providers", {key: key for key in Provider.__all__})
|
||||||
parser = argparse.ArgumentParser(description="Run gpt4free")
|
parser = argparse.ArgumentParser(description="Run gpt4free")
|
||||||
subparsers = parser.add_subparsers(dest="mode", help="Mode to run the g4f in.")
|
subparsers = parser.add_subparsers(dest="mode", help="Mode to run the g4f in.")
|
||||||
subparsers.add_parser("api")
|
api_parser=subparsers.add_parser("api")
|
||||||
|
api_parser.add_argument("--bind", default="127.0.0.1:1337", help="The bind string.")
|
||||||
|
api_parser.add_argument("--debug", type=bool, default=False, help="Enable verbose logging")
|
||||||
|
api_parser.add_argument("--num-threads", type=int, default=8, help="The number of threads.")
|
||||||
|
api_parser.add_argument("--ignored-providers", nargs="+", choices=[provider.name for provider in IgnoredProviders],
|
||||||
|
default=[], help="List of providers to ignore when processing request.")
|
||||||
subparsers.add_parser("gui", parents=[gui_parser()], add_help=False)
|
subparsers.add_parser("gui", parents=[gui_parser()], add_help=False)
|
||||||
|
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
if args.mode == "api":
|
if args.mode == "api":
|
||||||
Api(g4f).run('127.0.0.1:1337', 8)
|
controller=Api(g4f, debug=args.debug)
|
||||||
|
controller.list_ignored_providers=args.ignored_providers
|
||||||
|
controller.run(args.bind, args.num_threads)
|
||||||
elif args.mode == "gui":
|
elif args.mode == "gui":
|
||||||
run_gui_args(args)
|
run_gui_args(args)
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user