VibesAI-api 1.4.0__tar.gz → 1.4.2__tar.gz

{vibesai_api-1.4.0 → vibesai_api-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: VibesAI-api
-Version: 1.4.0
+Version: 1.4.2
 Summary: Unofficial Python API client for vibes.ai
 Author-email: Ashiq Hussain Mir <imsrenpsycho@gmail.com>
 License: MIT

{vibesai_api-1.4.0 → vibesai_api-1.4.2}/VibesAI_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: VibesAI-api
-Version: 1.4.0
+Version: 1.4.2
 Summary: Unofficial Python API client for vibes.ai
 Author-email: Ashiq Hussain Mir <imsrenpsycho@gmail.com>
 License: MIT

{vibesai_api-1.4.0 → vibesai_api-1.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "VibesAI-api"
-version = "1.4.0"
+version = "1.4.2"
 description = "Unofficial Python API client for vibes.ai"
 readme = "README.md"
 license = { text = "MIT" }

{vibesai_api-1.4.0 → vibesai_api-1.4.2}/tests/test_all.py

@@ -42,9 +42,9 @@ class TestImports(unittest.TestCase):
         for name in vibes_api.__all__:
             self.assertTrue(hasattr(vibes_api, name), f"Missing export: {name}")
 
-    def test_version_is_1_4_0(self):
+    def test_version_is_1_4_2(self):
         import vibes_api
-        self.assertEqual(vibes_api.__version__, "1.4.0")
+        self.assertEqual(vibes_api.__version__, "1.4.2")
 
     def test_no_syntax_errors(self):
         import vibes_api.client

{vibesai_api-1.4.0 → vibesai_api-1.4.2}/vibes_api/__init__.py

@@ -94,7 +94,7 @@ from .ingredients import (
 )
 from .composition import Composition
 
-__version__ = "1.4.0"
+__version__ = "1.4.2"
 __all__ = [
     # Client
     "VibesClient",

{vibesai_api-1.4.0 → vibesai_api-1.4.2}/vibes_api/client.py

@@ -264,6 +264,10 @@ class VibesClient:
 
         Returns True if the session was successfully restored.
         """
+        # Don't retry re-login if we're already in the middle of one
+        if self._session_expired:
+            return False
+
         self._session_expired = True
 
         if self.on_session_expired:
@@ -272,9 +276,10 @@ class VibesClient:
             except Exception:
                 pass
 
-        if self.auto_relogin:
+        if self.auto_relogin and self.auth_meta_cookies:
             new_cookie = self._attempt_oidc_relogin()
             if new_cookie:
+                # _set_cookie resets _session_expired to False
                 self._set_cookie(new_cookie)
                 if self.on_cookie_refresh:
                     try:
@@ -283,33 +288,31 @@ class VibesClient:
                         pass
                 return True
 
+        # Reset the flag so future 401s can attempt re-login again
+        self._session_expired = False
         return False
 
     def _attempt_oidc_relogin(self) -> Optional[str]:
         """Attempt to re-login via the OIDC flow using auth.meta.com cookies.
 
-        This follows the full OIDC redirect chain:
-        1. vibes.ai/api/meta-oidc/start → gets oauth_csrf_token cookie
-        2. auth.meta.com/oidc → gets authorization code (using auth cookies)
-        3. auth.meta.ai/ecto → exchanges code for vibes.ai callback URL
-        4. vibes.ai/api/meta-oidc/callback → creates new session
-
-        Requires ``auth_meta_cookies`` to be set (auth.meta.com cookies).
+        Follows the full OIDC redirect chain using requests.get() (not Session)
+        to avoid cookie/header interference between steps.
 
         Returns the new meta_session cookie value, or None if re-login failed.
         """
         if not self.auth_meta_cookies:
             return None
 
+        ua = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36"
+
         for attempt in range(3):
             try:
-                # Step 1: Start OIDC flow at vibes.ai (get CSRF token + redirect URL)
-                s1 = requests.Session()
-                s1.headers.update({
-                    "User-Agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36",
-                    "Cookie": f"meta_session={self._current_meta_session};cookie_ack=true",
-                })
-                r1 = s1.get(f"{self.base_url}/api/meta-oidc/start", allow_redirects=False, timeout=15)
+                # Step 1: Start OIDC flow at vibes.ai
+                r1 = requests.get(
+                    f"{self.base_url}/api/meta-oidc/start",
+                    headers={"User-Agent": ua, "Cookie": "cookie_ack=true"},
+                    allow_redirects=False, timeout=15,
+                )
                 if r1.status_code not in (302, 307):
                     if attempt < 2:
                         time.sleep(5)
@@ -321,70 +324,68 @@ class VibesClient:
 
                 # Extract oauth_csrf_token from Set-Cookie
                 csrf_token = None
-                set_cookie = r1.headers.get("Set-Cookie", "")
-                for part in set_cookie.split(";"):
-                    part = part.strip()
-                    if part.startswith("oauth_csrf_token="):
-                        csrf_token = part[len("oauth_csrf_token="):]
+                for part in r1.headers.get("Set-Cookie", "").split(";"):
+                    if part.strip().startswith("oauth_csrf_token="):
+                        csrf_token = part.strip()[len("oauth_csrf_token="):]
                         break
 
-                # Step 2: auth.meta.com — use ONLY auth.meta.com cookies (no vibes.ai cookies)
-                s2 = requests.Session()
-                s2.headers.update({
-                    "User-Agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36",
-                    "Cookie": self.auth_meta_cookies,
-                })
-                r2 = s2.get(redirect_url, allow_redirects=False, timeout=15)
+                # Step 2: auth.meta.com (with auth.meta.com cookies only)
+                r2 = requests.get(
+                    redirect_url,
+                    headers={"User-Agent": ua, "Cookie": self.auth_meta_cookies},
+                    allow_redirects=False, timeout=15,
+                )
                 if r2.status_code not in (302, 307):
-                    if attempt < 2:
-                        time.sleep(5)
-                        continue
+                    # 400 = auth.meta.com rate limited or cookies expired
+                    # Don't retry — makes rate limiting worse
                     return None
                 redirect2 = r2.headers.get("Location", "")
                 if not redirect2 or "code=" not in redirect2:
                     return None
 
-                # Step 3: auth.meta.ai/ecto (code exchange) — no cookies needed
-                s3 = requests.Session()
-                s3.headers.update({
-                    "User-Agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36",
-                })
-                r3 = s3.get(redirect2, allow_redirects=False, timeout=15)
+                # Step 3: auth.meta.ai/ecto (code exchange)
+                r3 = requests.get(
+                    redirect2,
+                    headers={"User-Agent": ua},
+                    allow_redirects=False, timeout=15,
+                )
                 if r3.status_code not in (302, 307):
                     return None
                 redirect3 = r3.headers.get("Location", "")
                 if not redirect3 or "vibes.ai" not in redirect3:
                     return None
 
-                # Step 4: vibes.ai callback — need vibes.ai cookies + CSRF token
-                s4 = requests.Session()
-                s4.headers.update({
-                    "User-Agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36",
-                })
-                callback_cookie = f"meta_session={self._current_meta_session};cookie_ack=true"
+                # Step 4: vibes.ai callback (CSRF token only, no old session)
+                callback_cookie = "cookie_ack=true"
                 if csrf_token:
                     callback_cookie += f";oauth_csrf_token={csrf_token}"
-                s4.headers.update({"Cookie": callback_cookie})
-                r4 = s4.get(redirect3, allow_redirects=False, timeout=15)
+                r4 = requests.get(
+                    redirect3,
+                    headers={"User-Agent": ua, "Cookie": callback_cookie},
+                    allow_redirects=False, timeout=15,
+                )
+
+                # Check Set-Cookie for new meta_session
+                set_cookie = r4.headers.get("Set-Cookie", "").replace(",", ";")
+                for part in set_cookie.split(";"):
+                    part = part.strip()
+                    if part.startswith("meta_session="):
+                        val = part[len("meta_session="):]
+                        if val and val != "deleted" and val != self._current_meta_session:
+                            return val
 
-                # Step 5: Follow final redirect
-                r5 = None
+                # Step 5: Follow final redirect if no cookie in step 4
                 final_redirect = r4.headers.get("Location", "")
                 if final_redirect and "error=" not in final_redirect:
                     if not final_redirect.startswith("http"):
                         final_redirect = f"{self.base_url}{final_redirect}"
-                    s4.headers.update({"Cookie": f"meta_session={self._current_meta_session};cookie_ack=true"})
-                    r5 = s4.get(final_redirect, allow_redirects=True, timeout=15)
-
-                # Check for new meta_session in Set-Cookie headers from step 4 and 5
-                responses = [r4]
-                if r5 is not None:
-                    responses.append(r5)
-                for resp in responses:
-                    set_cookie = resp.headers.get("Set-Cookie", "")
-                    # Multiple cookies are separated by comma — replace with semicolon for parsing
-                    set_cookie = set_cookie.replace(",", ";")
-                    for part in set_cookie.split(";"):
+                    r5 = requests.get(
+                        final_redirect,
+                        headers={"User-Agent": ua, "Cookie": "cookie_ack=true"},
+                        allow_redirects=True, timeout=15,
+                    )
+                    set_cookie_5 = r5.headers.get("Set-Cookie", "").replace(",", ";")
+                    for part in set_cookie_5.split(";"):
                         part = part.strip()
                         if part.startswith("meta_session="):
                             val = part[len("meta_session="):]
@@ -514,9 +515,10 @@ class VibesClient:
         except VibesAPIError as e:
             if e.status == 401 and not self._session_expired:
                 if self._handle_401():
-                    # Session was restored — retry the request
+                    # Session was restored — retry the request ONCE
                     resp = self.session.get(self._url(path), params=params, timeout=self.timeout, **kw)
                     return self._check(resp)
+            # Re-login failed or not enabled — raise the original error
             raise
 
     def _post(self, path: str, json_body: Optional[dict] = None, **kw) -> dict: