返回提交历史
Modified
g4f/providers/retry_provider.py
+6
-6
Modified
projects/discord-bot/bot.py
+1
-1
XFEstudio/gpt4free
Fix getatt using
14e1f207
代码差异
2 个文件
+7
-7
@@ -5,11 +5,11 @@ import random
5
5
from ..typing import Dict, Type, List, Messages, AsyncResult
6
6
from .types import BaseProvider, BaseRetryProvider, ProviderType
7
7
from .response import ProviderInfo, JsonConversation, is_content
8
from .base_provider import get_async_provider_method, to_async_iterator
8
from .base_provider import get_async_provider_method
9
9
from .. import debug
10
10
from ..tools.run_tools import AuthManager
11
11
from ..config import AppConfig
12
from ..errors import RetryProviderError, RetryNoProviderError, MissingAuthError, NoValidHarFileError
12
from ..errors import RetryProviderError, RetryNoProviderError
13
13
14
14
15
15
def _resolve_model(provider: Type[BaseProvider], model: str) -> str:
@@ -70,8 +70,8 @@ class RotatedProvider(BaseRetryProvider):
70
70
"""Gets the provider at the current index."""
71
71
p = self.providers[self.current_index]
72
72
if isinstance(p, str):
73
import g4f.Provider
74
p = getattr(g4f.Provider, p)
73
from ..Provider import __getattr__
74
p = __getattr__(p)
75
75
return p
76
76
77
77
def _rotate_provider(self) -> None:
@@ -193,12 +193,12 @@ class IterListProvider(BaseRetryProvider):
193
193
raise_exceptions(exceptions)
194
194
195
195
def get_providers(self, ignored: list[str] = []) -> list[ProviderType]:
196
import g4f.Provider
197
196
resolved_providers = []
197
from ..Provider import __getattr__
198
198
for p in self.providers:
199
199
if isinstance(p, str):
200
200
try:
201
p = getattr(g4f.Provider, p)
201
p = __getattr__(p)
202
202
except AttributeError:
203
203
continue
204
204
if getattr(p, "__name__", "") not in ignored:
@@ -70,7 +70,7 @@ log = logging.getLogger("g4f-discord")
70
70
# ---------------------------------------------------------------------------
71
71
client = ClientFactory.create_async_client(provider="default",
72
72
api_key=os.getenv("G4F_API_KEY"),
73
media_provider=getattr(g4f.Provider, os.getenv("G4F_MEDIA_PROVIDER", "PollinationsImage")))
73
media_provider=os.getenv("G4F_MEDIA_PROVIDER"))
74
74
mcp = MCPToolManager(enabled_tools=ENABLED_TOOLS)
75
75
76
76
# Per-user conversation history: user_id -> deque of {"role", "content"}