Spaces:
Sleeping
Sleeping
Revert "fix: remove duplicate thinking block extraction as payload[4] already contains full formatted reasoning"
Browse filesThis reverts commit 9020ac0acf9c6b5e8b4181f0fd6ad87d24cbaba2.
- gemini_web2api.py +30 -0
gemini_web2api.py
CHANGED
|
@@ -579,6 +579,7 @@ def extract_response_text(raw: str) -> str:
|
|
| 579 |
frames = _scan_complete_wrb_frames(raw)
|
| 580 |
|
| 581 |
texts = []
|
|
|
|
| 582 |
for elem in frames:
|
| 583 |
try:
|
| 584 |
if not isinstance(elem, list) or len(elem) < 3 or elem[0] != "wrb.fr":
|
|
@@ -588,6 +589,25 @@ def extract_response_text(raw: str) -> str:
|
|
| 588 |
continue
|
| 589 |
payload = json.loads(rp)
|
| 590 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 591 |
# Extract final text
|
| 592 |
if isinstance(payload, list) and len(payload) > 4 and payload[4]:
|
| 593 |
for part in payload[4]:
|
|
@@ -606,7 +626,17 @@ def extract_response_text(raw: str) -> str:
|
|
| 606 |
text = t
|
| 607 |
break
|
| 608 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 609 |
final_response = clean_gemini_text(text)
|
|
|
|
|
|
|
|
|
|
| 610 |
return final_response
|
| 611 |
|
| 612 |
|
|
|
|
| 579 |
frames = _scan_complete_wrb_frames(raw)
|
| 580 |
|
| 581 |
texts = []
|
| 582 |
+
think_texts = []
|
| 583 |
for elem in frames:
|
| 584 |
try:
|
| 585 |
if not isinstance(elem, list) or len(elem) < 3 or elem[0] != "wrb.fr":
|
|
|
|
| 589 |
continue
|
| 590 |
payload = json.loads(rp)
|
| 591 |
|
| 592 |
+
# Extract thinking block (if any)
|
| 593 |
+
if isinstance(payload, list) and len(payload) > 26 and payload[26]:
|
| 594 |
+
current_think = []
|
| 595 |
+
def _extract_think(data):
|
| 596 |
+
if isinstance(data, str) and len(data) > 0 and data not in ("python", "text"):
|
| 597 |
+
current_think.append(data.strip())
|
| 598 |
+
elif isinstance(data, list):
|
| 599 |
+
for item in data:
|
| 600 |
+
_extract_think(item)
|
| 601 |
+
elif isinstance(data, dict):
|
| 602 |
+
for k, v in data.items():
|
| 603 |
+
if isinstance(v, (list, dict, str)):
|
| 604 |
+
_extract_think(v)
|
| 605 |
+
_extract_think(payload[26])
|
| 606 |
+
if current_think:
|
| 607 |
+
# filter out empty strings and join
|
| 608 |
+
filtered_think = [t for t in current_think if t]
|
| 609 |
+
think_texts.append("\n\n".join(filtered_think))
|
| 610 |
+
|
| 611 |
# Extract final text
|
| 612 |
if isinstance(payload, list) and len(payload) > 4 and payload[4]:
|
| 613 |
for part in payload[4]:
|
|
|
|
| 626 |
text = t
|
| 627 |
break
|
| 628 |
|
| 629 |
+
# Take the last non-empty thinking text
|
| 630 |
+
think_text = ""
|
| 631 |
+
for t in reversed(think_texts):
|
| 632 |
+
if t.strip():
|
| 633 |
+
think_text = t
|
| 634 |
+
break
|
| 635 |
+
|
| 636 |
final_response = clean_gemini_text(text)
|
| 637 |
+
if think_text:
|
| 638 |
+
final_response = f"<think>\n{think_text}\n</think>\n\n{final_response}"
|
| 639 |
+
|
| 640 |
return final_response
|
| 641 |
|
| 642 |
|