返回提交历史
Modified
g4f/Provider/retry_provider.py
+4
-3
Modified
g4f/__init__.py
+29
-56
Modified
g4f/debug.py
+38
-1
Added
g4f/errors.py
+26
-0
Modified
g4f/gui/server/backend.py
+8
-10
XFEstudio/gpt4free
Add error classes Move version check to debug
d743ee0c
代码差异
5 个文件
+105
-70
@@ -6,6 +6,7 @@ from typing import List, Type, Dict
6
6
from ..typing import CreateResult, Messages
7
7
from .base_provider import BaseProvider, AsyncProvider
8
8
from .. import debug
9
from ..errors import RetryProviderError, RetryNoProviderError
9
10
10
11
11
12
class RetryProvider(AsyncProvider):
@@ -84,8 +85,8 @@ class RetryProvider(AsyncProvider):
84
85
85
86
def raise_exceptions(self) -> None:
86
87
if self.exceptions:
87
raise RuntimeError("\n".join(["RetryProvider failed:"] + [
88
f"{p}: {self.exceptions[p].__class__.__name__}: {self.exceptions[p]}" for p in self.exceptions
88
raise RetryProviderError("RetryProvider failed:\n" + "\n".join([
89
f"{p}: {exception.__class__.__name__}: {exception}" for p, exception in self.exceptions.items()
89
90
]))
90
91
91
raise RuntimeError("RetryProvider: No provider found")
92
raise RetryNoProviderError("No provider found")
@@ -1,61 +1,35 @@
1
1
from __future__ import annotations
2
2
3
3
import os
4
from requests import get
5
from importlib.metadata import version as get_package_version, PackageNotFoundError
6
from subprocess import check_output, CalledProcessError, PIPE
7
4
5
from .errors import *
8
6
from .models import Model, ModelUtils, _all_models
9
from .Provider import BaseProvider, AsyncGeneratorProvider, RetryProvider
7
from .Provider import BaseProvider, AsyncGeneratorProvider, RetryProvider, ProviderUtils
10
8
from .typing import Messages, CreateResult, AsyncResult, Union, List
11
9
from . import debug
12
10
13
def get_version() -> str:
14
# Read from package manager
15
try:
16
return get_package_version("g4f")
17
except PackageNotFoundError:
18
pass
19
# Read from docker environment
20
current_version = os.environ.get("G4F_VERSION")
21
if current_version:
22
return current_version
23
# Read from git repository
24
try:
25
command = ["git", "describe", "--tags", "--abbrev=0"]
26
return check_output(command, text=True, stderr=PIPE).strip()
27
except CalledProcessError:
28
pass
29
30
def get_lastet_version() -> str:
31
response = get("https://pypi.org/pypi/g4f/json").json()
32
return response["info"]["version"]
33
34
def check_pypi_version() -> None:
35
try:
36
version = get_version()
37
latest_version = get_lastet_version()
38
except Exception as e:
39
print(f'Failed to check g4f pypi version: {e}')
40
if version != latest_version:
41
print(f'New pypi version: {latest_version} (current: {version}) | pip install -U g4f')
42
43
11
def get_model_and_provider(model : Union[Model, str],
44
provider : Union[type[BaseProvider], None],
12
provider : Union[type[BaseProvider], str, None],
45
13
stream : bool,
46
14
ignored : List[str] = None,
47
15
ignore_working: bool = False,
48
16
ignore_stream: bool = False) -> tuple[Model, type[BaseProvider]]:
49
17
if debug.version_check:
50
check_pypi_version()
51
18
debug.version_check = False
52
19
debug.check_pypi_version()
20
21
if isinstance(provider, str):
22
if provider in ProviderUtils.convert:
23
provider = ProviderUtils.convert[provider]
24
else:
25
raise ProviderNotFoundError(f'Provider not found: {provider}')
26
53
27
if isinstance(model, str):
54
28
if model in ModelUtils.convert:
55
29
model = ModelUtils.convert[model]
56
30
else:
57
raise ValueError(f'The model: {model} does not exist')
58
31
raise ModelNotFoundError(f'The model: {model} does not exist')
32
59
33
if not provider:
60
34
provider = model.best_provider
61
35
@@ -63,14 +37,14 @@ def get_model_and_provider(model : Union[Model, str],
63
37
provider.providers = [p for p in provider.providers if p.__name__ not in ignored]
64
38
65
39
if not provider:
66
raise RuntimeError(f'No provider found for model: {model}')
67
40
raise ProviderNotFoundError(f'No provider found for model: {model}')
41
68
42
if not provider.working and not ignore_working:
69
raise RuntimeError(f'{provider.__name__} is not working')
70
43
raise ProviderNotWorkingError(f'{provider.__name__} is not working')
44
71
45
if not ignore_stream and not provider.supports_stream and stream:
72
raise ValueError(f'{provider.__name__} does not support "stream" argument')
73
46
raise StreamNotSupportedError(f'{provider.__name__} does not support "stream" argument')
47
74
48
if debug.logging:
75
49
print(f'Using {provider.__name__} provider')
76
50
@@ -80,7 +54,7 @@ class ChatCompletion:
80
54
@staticmethod
81
55
def create(model : Union[Model, str],
82
56
messages : Messages,
83
provider : Union[type[BaseProvider], None] = None,
57
provider : Union[type[BaseProvider], str, None] = None,
84
58
stream : bool = False,
85
59
auth : Union[str, None] = None,
86
60
ignored : List[str] = None,
@@ -91,15 +65,15 @@ class ChatCompletion:
91
65
model, provider = get_model_and_provider(model, provider, stream, ignored, ignore_working, ignore_stream_and_auth)
92
66
93
67
if not ignore_stream_and_auth and provider.needs_auth and not auth:
94
raise ValueError(
95
f'{provider.__name__} requires authentication (use auth=\'cookie or token or jwt ...\' param)')
68
raise AuthenticationRequiredError(f'{provider.__name__} requires authentication (use auth=\'cookie or token or jwt ...\' param)')
96
69
97
70
if auth:
98
71
kwargs['auth'] = auth
99
100
proxy = os.environ.get("G4F_PROXY")
101
if proxy and "proxy" not in kwargs:
102
kwargs['proxy'] = proxy
72
73
if "proxy" not in kwargs:
74
proxy = os.environ.get("G4F_PROXY")
75
if proxy:
76
kwargs['proxy'] = proxy
103
77
104
78
result = provider.create_completion(model.name, messages, stream, **kwargs)
105
79
return result if stream else ''.join(result)
@@ -107,7 +81,7 @@ class ChatCompletion:
107
81
@staticmethod
108
82
async def create_async(model : Union[Model, str],
109
83
messages : Messages,
110
provider : Union[type[BaseProvider], None] = None,
84
provider : Union[type[BaseProvider], str, None] = None,
111
85
stream : bool = False,
112
86
ignored : List[str] = None,
113
87
**kwargs) -> Union[AsyncResult, str]:
@@ -116,7 +90,7 @@ class ChatCompletion:
116
90
if stream:
117
91
if isinstance(provider, type) and issubclass(provider, AsyncGeneratorProvider):
118
92
return await provider.create_async_generator(model.name, messages, **kwargs)
119
raise ValueError(f'{provider.__name__} does not support "stream" argument in "create_async"')
93
raise StreamNotSupportedError(f'{provider.__name__} does not support "stream" argument in "create_async"')
120
94
121
95
return await provider.create_async(model.name, messages, **kwargs)
122
96
@@ -136,9 +110,8 @@ class Completion:
136
110
'text-davinci-002',
137
111
'text-davinci-003'
138
112
]
139
140
113
if model not in allowed_models:
141
raise Exception(f'ValueError: Can\'t use {model} with Completion.create()')
114
raise ModelNotAllowed(f'Can\'t use {model} with Completion.create()')
142
115
143
116
model, provider = get_model_and_provider(model, provider, stream, ignored)
144
117
@@ -1,2 +1,39 @@
1
from os import environ
2
from requests import get
3
from importlib.metadata import version, PackageNotFoundError
4
from subprocess import check_output, CalledProcessError, PIPE
5
from .errors import VersionNotFoundError
6
1
7
logging = False
2
version_check = True
8
version_check = True
9
10
def get_version() -> str:
11
# Read from package manager
12
try:
13
return version("g4f")
14
except PackageNotFoundError:
15
pass
16
# Read from docker environment
17
current_version = environ.get("G4F_VERSION")
18
if current_version:
19
return current_version
20
# Read from git repository
21
try:
22
command = ["git", "describe", "--tags", "--abbrev=0"]
23
return check_output(command, text=True, stderr=PIPE).strip()
24
except CalledProcessError:
25
pass
26
raise VersionNotFoundError("Version not found")
27
28
def get_lastet_version() -> str:
29
response = get("https://pypi.org/pypi/g4f/json").json()
30
return response["info"]["version"]
31
32
def check_pypi_version() -> None:
33
try:
34
version = get_version()
35
latest_version = get_lastet_version()
36
except Exception as e:
37
print(f'Failed to check g4f pypi version: {e}')
38
if version != latest_version:
39
print(f'New pypi version: {latest_version} (current: {version}) | pip install -U g4f')
@@ -0,0 +1,26 @@
1
class ProviderNotFoundError(Exception):
2
pass
3
4
class ProviderNotWorkingError(Exception):
5
pass
6
7
class StreamNotSupportedError(Exception):
8
pass
9
10
class AuthenticationRequiredError(Exception):
11
pass
12
13
class ModelNotFoundError(Exception):
14
pass
15
16
class ModelNotAllowed(Exception):
17
pass
18
19
class RetryProviderError(Exception):
20
pass
21
22
class RetryNoProviderError(Exception):
23
pass
24
25
class VersionNotFoundError(Exception):
26
pass
@@ -4,8 +4,9 @@ from g4f.Provider import __providers__
4
4
import json
5
5
from flask import request, Flask
6
6
from .internet import get_search_message
7
from g4f import debug
7
8
8
g4f.debug.logging = True
9
debug.logging = True
9
10
10
11
class Backend_Api:
11
12
def __init__(self, app: Flask) -> None:
@@ -52,8 +53,8 @@ class Backend_Api:
52
53
53
54
def version(self):
54
55
return {
55
"version": g4f.get_version(),
56
"lastet_version": g4f.get_lastet_version(),
56
"version": debug.get_version(),
57
"lastet_version": debug.get_lastet_version(),
57
58
}
58
59
59
60
def _gen_title(self):
@@ -68,28 +69,25 @@ class Backend_Api:
68
69
messages[-1]["content"] = get_search_message(messages[-1]["content"])
69
70
model = request.json.get('model')
70
71
model = model if model else g4f.models.default
71
provider = request.json.get('provider').replace('g4f.Provider.', '')
72
provider = request.json.get('provider', '').replace('g4f.Provider.', '')
72
73
provider = provider if provider and provider != "Auto" else None
73
if provider != None:
74
provider = g4f.Provider.ProviderUtils.convert.get(provider)
75
74
76
75
def try_response():
77
76
try:
78
response = g4f.ChatCompletion.create(
77
yield from g4f.ChatCompletion.create(
79
78
model=model,
80
79
provider=provider,
81
80
messages=messages,
82
81
stream=True,
83
82
ignore_stream_and_auth=True
84
83
)
85
yield from response
86
84
except Exception as e:
87
85
print(e)
88
86
yield json.dumps({
89
87
'code' : 'G4F_ERROR',
90
88
'_action': '_ask',
91
89
'success': False,
92
'error' : f'an error occurred {str(e)}'
93
})
90
'error' : f'{e.__class__.__name__}: {e}'
91
})
94
92
95
93
return self.app.response_class(try_response(), mimetype='text/event-stream')