g4f 6.9.1__py3-none-any.whl → 6.9.3__py3-none-any.whl

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/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/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.dist-info → g4f-6.9.3.dist-info}/METADATA

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

{g4f-6.9.1.dist-info → g4f-6.9.3.dist-info}/RECORD

@@ -31,7 +31,7 @@ g4f/Provider/StringableInference.py,sha256=ZohMZrVAn6G82zrYpLTvELkzfds4nxu09lx7w
 g4f/Provider/TeachAnything.py,sha256=ST87YdOdxtIc5JMaKzGdVy9J9wlhdhYIchRtXBljIBU,2843
 g4f/Provider/WeWordle.py,sha256=ocKEfMYBKWPzv2WoDntn-WC-DkrSg5b_ipL9VYhTgsw,7007
 g4f/Provider/Yqcloud.py,sha256=xzX-G-Lv0pyOHTypSJdavmbm3GPxnL-wRoT3VmjzUIM,3213
-g4f/Provider/Yupp.py,sha256=EKwkInlleFbVuL-9JyWWoDmPiN955vph4O8G1qDwlK4,32350
+g4f/Provider/Yupp.py,sha256=obj5AGZmWGG_ODRxN1YvVMYQLe4-kqX6uEkVNJDNjNs,32399
 g4f/Provider/__init__.py,sha256=l6qxw1XlGgFqTTI2Q8YjlP-Yr17viOiPj1eaU8K9LEo,2782
 g4f/Provider/base_provider.py,sha256=lAd80-2hO1kzs9n9TUKv6fR4zHjSdZBqVErpm_gna9o,199
 g4f/Provider/helper.py,sha256=_4fO_b2U8BnpuF6kijUM4SaFbX2Pcz6mksxK9mVXhP4,111
@@ -57,7 +57,7 @@ g4f/Provider/hf_space/raise_for_status.py,sha256=xoVwrZSwJUvqQkSfeUAMUst8SyobpSK
 g4f/Provider/local/Local.py,sha256=b6vSZcr5CfEXD5GMqNtwCfXNJtKyWKPg3jqBWJEZEwQ,1251
 g4f/Provider/local/Ollama.py,sha256=uefFwppGhqkC4WdbbaxktatJKkHaY7_OEkwBY_VSnSU,3816
 g4f/Provider/local/__init__.py,sha256=cEFsdfkq0bgVAIM__Sxc6WfIoGa3_Ymol26kQb6x14k,73
-g4f/Provider/needs_auth/AIBadgr.py,sha256=_U8o1np6_mU4u-VL1XyyI0vibrwd7HgSSMSY56kbKGY,391
+g4f/Provider/needs_auth/AIBadgr.py,sha256=Oc05Cs-x40sF7tcrAyUqyoZ-TbtmV4wnMIm5aEjQ0xw,420
 g4f/Provider/needs_auth/Anthropic.py,sha256=-8hRSpSGaC3-AzhkuIsf1K1w8ZVKKb_T6Pwy3N8JPak,10200
 g4f/Provider/needs_auth/Azure.py,sha256=NMQyNvPN4qwP6bDFDGfXTaW0pvUCQUJGT7M6Yv25miQ,6152
 g4f/Provider/needs_auth/BingCreateImages.py,sha256=_GrPx7KuttKrQ4IKX0fFwDPVsiCW9xTLycULNClZ6KQ,2066
@@ -139,7 +139,7 @@ g4f/Provider/template/BackendApi.py,sha256=XzzK-Eodit5h__EfJKwak7UDr_WUR3SXif6oR
 g4f/Provider/template/OpenaiTemplate.py,sha256=qjuIORIXyWHE4DRpDNt8MUDtlbGFpPfK17E9g7Msy6U,12393
 g4f/Provider/template/__init__.py,sha256=FmQdc8a8YLN5kW0mos2owDekq01rU0lv7bdmiAW-f5A,77
 g4f/Provider/yupp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-g4f/Provider/yupp/models.py,sha256=ZB1_i9xQXnVKYTWaRkCP4qEBmpCns5lpyd0buC1MhCM,10103
+g4f/Provider/yupp/models.py,sha256=oXMyfnDYievE1q92arOVxrhy_QpsBzICtoZesJUY-Po,10225
 g4f/api/__init__.py,sha256=n482iWw4NSLUnCnOOxGJ_SIN6WpPXhRKJCNFZYnQe1Y,41358
 g4f/api/_logging.py,sha256=7fh8hjDzp6NeMUbuNJ30UnWFu86KA2FEI0EsaIhw1Kc,910
 g4f/api/_tokenizer.py,sha256=0Kbd6sM_8jQ3ph-1jM4JZeBCOAWsAv4iaxzHtdwHqto,286
@@ -210,9 +210,9 @@ g4f/tools/files.py,sha256=bUTbeNp8ujTZQiW3GLTtFcgl3-1AnH3cDyIKHfh6Mjc,23397
 g4f/tools/media.py,sha256=AE9hGVRxQBVZzQ_Ylzeoo2TJUGXSBXO5RbLwj1I2ZTE,4701
 g4f/tools/run_tools.py,sha256=Yb0osWdDt4wUnkvwln4R6qcLapdddC3n2giZMPXWkzM,16662
 g4f/tools/web_search.py,sha256=vAZJD-qy15llsgAbkXzoEltqdFB6TlKLbqDJ1DS-6vs,2086
-g4f-6.9.1.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-g4f-6.9.1.dist-info/METADATA,sha256=YcTywSWTHsz7PGMu1ccHFHPiYC4-3567ATkdKgKTUnI,23255
-g4f-6.9.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-g4f-6.9.1.dist-info/entry_points.txt,sha256=J7Usl6dNjXJlvuzGAUEm6cuDXWpVdGq7SfK-tPoiZSI,67
-g4f-6.9.1.dist-info/top_level.txt,sha256=bMRlTupWYCcLWy80AnnKZkhpBsXsF8gI3BaMhSZSgRo,4
-g4f-6.9.1.dist-info/RECORD,,
+g4f-6.9.3.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+g4f-6.9.3.dist-info/METADATA,sha256=mEgwWwkW3kCL-p0A9h0aEUPWG3rKwWLFE7lts4-VZZw,23255
+g4f-6.9.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+g4f-6.9.3.dist-info/entry_points.txt,sha256=J7Usl6dNjXJlvuzGAUEm6cuDXWpVdGq7SfK-tPoiZSI,67
+g4f-6.9.3.dist-info/top_level.txt,sha256=bMRlTupWYCcLWy80AnnKZkhpBsXsF8gI3BaMhSZSgRo,4
+g4f-6.9.3.dist-info/RECORD,,