g4f 6.9.1__tar.gz → 6.9.2__tar.gz

{g4f-6.9.1/g4f.egg-info → g4f-6.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: g4f
-Version: 6.9.1
+Version: 6.9.2
 Summary: The official gpt4free repository | various collection of powerful language models
 Home-page: https://github.com/xtekky/gpt4free
 Author: Tekky

{g4f-6.9.1 → g4f-6.9.2}/g4f/Provider/Yupp.py

@@ -223,7 +223,7 @@ class Yupp(AsyncGeneratorProvider, ProviderModelMixin):
                 api_key = get_cookies("yupp.ai", False).get("__Secure-yupp.session-token")
             if not api_key:
                 raise MissingAuthError("No Yupp accounts configured. Set YUPP_API_KEY environment variable.")
-            manager = YuppModelManager(api_key=api_key)
+            manager = YuppModelManager(api_key=api_key, session=create_scraper())
             models = manager.client.fetch_models()
             if models:
                 cls.models_tags = {model.get("name"): manager.processor.generate_tags(model) for model in models}
@@ -610,15 +610,14 @@ class Yupp(AsyncGeneratorProvider, ProviderModelMixin):
                     else:
                         continue
 
-                if b"<think>" in line:
-                    m = line_pattern.match(line)
-                    if m:
-                        capturing_ref_id = m.group(1).decode()
-                        capturing_lines = [line]
-                        continue
-
                 match = line_pattern.match(line)
                 if not match:
+                    if b"<think>" in line:
+                        m = line_pattern.match(line)
+                        if m:
+                            capturing_ref_id = m.group(1).decode()
+                            capturing_lines = [line]
+                            continue
                     continue
 
                 chunk_id, chunk_data = match.groups()
@@ -747,7 +746,7 @@ class Yupp(AsyncGeneratorProvider, ProviderModelMixin):
                             ):
                                 stream["quick"].append(chunk)
                             quick_content += content
-                            yield VariantResponse(content)
+                            yield PreviewResponse(content)
 
                 elif chunk_id in [turn_id, persisted_turn_id]:
                     pass
@@ -776,7 +775,7 @@ class Yupp(AsyncGeneratorProvider, ProviderModelMixin):
             if variant_image is not None:
                 yield variant_image
             elif variant_text:
-                yield PreviewResponse(variant_text)
+                yield VariantResponse(variant_text)
             yield JsonResponse(**stream)
             log_debug(f"Finished processing {line_count} lines")
 

{g4f-6.9.1 → g4f-6.9.2}/g4f/Provider/needs_auth/AIBadgr.py

@@ -9,6 +9,7 @@ class AIBadgr(OpenaiTemplate):
     base_url = "https://aibadgr.com/api/v1"
     working = True
     needs_auth = True
+    models_needs_auth = True
     supports_stream = True
     supports_system_message = True
     supports_message_history = True

{g4f-6.9.1 → g4f-6.9.2}/g4f/Provider/yupp/models.py

@@ -17,16 +17,19 @@ class ModelConfig:
 class YuppAPIClient:
     """Yupp API client for fetching model data"""
     
-    def __init__(self, config: ModelConfig = None, api_key: str = None):
+    def __init__(self, config: ModelConfig = None, api_key: str = None, session=None):
         self.config = config or ModelConfig()
-        self.session = requests.Session()
         self.api_key = api_key
-        self._setup_session()
+        if session is None:
+            self.session = requests.Session()
+            self._setup_session()
+        else:
+            self.session = session
+        self._set_cookies()
 
     def _setup_session(self) -> None:
         """Setup session with headers and cookies"""
         self.session.headers.update(self._get_headers())
-        self._set_cookies()
     
     def _get_headers(self) -> Dict[str, str]:
         """Get request headers"""
@@ -224,9 +227,9 @@ class DataManager:
 class YuppModelManager:
     """Main manager class for Yupp model operations"""
     
-    def __init__(self, config: ModelConfig = None, api_key: str = None):
+    def __init__(self, config: ModelConfig = None, api_key: str = None, session=None):
         self.config = config or ModelConfig()
-        self.client = YuppAPIClient(config, api_key)
+        self.client = YuppAPIClient(config, api_key, session)
         self.processor = ModelProcessor()
         self.data_manager = DataManager()
     

{g4f-6.9.1 → g4f-6.9.2/g4f.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: g4f
-Version: 6.9.1
+Version: 6.9.2
 Summary: The official gpt4free repository | various collection of powerful language models
 Home-page: https://github.com/xtekky/gpt4free
 Author: Tekky