Update app.py

app.py

@@ -814,18 +814,36 @@ async def auth_callback(request: Request):
 
         cfg = OAUTH_CONFIGS.get(service, OAUTH_CONFIGS["google"])
         token_url = cfg["token_url"]
-        payload = {
-            "client_id": cfg["client_id"],
-            "client_secret": cfg["client_secret"],
-            "code": code,
-            "grant_type": "authorization_code",
-            "redirect_uri": REDIRECT_URI
-        }
-        headers = {"Accept": "application/json"}
 
-        async with httpx.AsyncClient() as client:
-            res = await client.post(token_url, data=payload, headers=headers)
-            token_data = res.json()
+        if service == "notion":
+            auth_str = f"{cfg['client_id']}:{cfg['client_secret']}"
+            encoded_auth = base64.b64encode(auth_str.encode()).decode()
+            headers = {
+                "Authorization": f"Basic {encoded_auth}",
+                "Content-Type": "application/json",
+                "Notion-Version": "2022-06-28"
+            }
+            payload = {
+                "grant_type": "authorization_code",
+                "code": code,
+                "redirect_uri": REDIRECT_URI
+            }
+            async with httpx.AsyncClient() as client:
+                res = await client.post(token_url, json=payload, headers=headers)
+                token_data = res.json()
+        else:
+            payload = {
+                "client_id": cfg["client_id"],
+                "client_secret": cfg["client_secret"],
+                "code": code,
+                "grant_type": "authorization_code",
+                "redirect_uri": REDIRECT_URI
+            }
+            headers = {"Accept": "application/json"}
+
+            async with httpx.AsyncClient() as client:
+                res = await client.post(token_url, data=payload, headers=headers)
+                token_data = res.json()
 
         if "access_token" in token_data or "token" in token_data:
             await save_token_to_supabase(user_id, service, token_data)
@@ -914,7 +932,7 @@ async def generate(request: Request):
 
                                         if content and not has_tool_call:
                                             yield json.dumps({"answer": content}) + "\n"
-                                except json.JSONDecodeError:
+                                me:
                                     continue
 
                     if has_tool_call and tool_calls_acc: