返回提交历史
Modified
g4f/Provider/Yupp.py
+2
-1
Modified
g4f/Provider/yupp/models.py
+1
-32
XFEstudio/gpt4free
fix: reorder parameters in YuppModelManager constructor and update scraper session handling
1ed74509
代码差异
2 个文件
+3
-33
@@ -70,6 +70,7 @@ def create_scraper():
70
70
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36 Edg/137.0.0.0",
71
71
"Accept": "text/x-component, */*",
72
72
"Accept-Language": "en-US,en;q=0.9",
73
"Accept-Encoding": "gzip, deflate",
73
74
"Sec-Fetch-Dest": "empty",
74
75
"Sec-Fetch-Mode": "cors",
75
76
"Sec-Fetch-Site": "same-origin",
@@ -364,7 +365,7 @@ class Yupp(AsyncGeneratorProvider, ProviderModelMixin):
364
365
raise MissingAuthError(
365
366
"No Yupp accounts configured. Set YUPP_API_KEY environment variable."
366
367
)
367
manager = YuppModelManager(api_key=api_key, session=create_scraper())
368
manager = YuppModelManager(session=create_scraper(), api_key=api_key)
368
369
models = manager.client.fetch_models()
369
370
if models:
370
371
cls.models_tags = {
@@ -227,7 +227,7 @@ class DataManager:
227
227
class YuppModelManager:
228
228
"""Main manager class for Yupp model operations"""
229
229
230
def __init__(self, config: ModelConfig = None, api_key: str = None, session=None):
230
def __init__(self, session, config: ModelConfig = None, api_key: str = None):
231
231
self.config = config or ModelConfig()
232
232
self.client = YuppAPIClient(config, api_key, session)
233
233
self.processor = ModelProcessor()
@@ -263,34 +263,3 @@ class YuppModelManager:
263
263
processed_models = self.processor.filter_and_process(data)
264
264
265
265
return self.data_manager.save_data(processed_models, output_file)
266
267
def run_interactive(self) -> bool:
268
"""Run in interactive mode (for CLI use)"""
269
270
print("=== Yupp Model Data Tool ===")
271
272
if not self.has_valid_token():
273
print("Error: YUPP_TOKENS environment variable not set")
274
print("Please set YUPP_TOKENS environment variable, e.g.:")
275
print("export YUPP_TOKENS='your_token_here'")
276
return False
277
278
return self.fetch_and_save_models()
279
280
281
def main():
282
"""Main entry point"""
283
manager = YuppModelManager()
284
success = manager.run_interactive()
285
286
if success:
287
print("Operation completed successfully")
288
else:
289
print("Operation failed")
290
return 1
291
292
return 0
293
294
295
if __name__ == "__main__":
296
exit(main())