teleo/teleo-infrastructure
8
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 4

leo: handle non-JSON 200 from Forgejo merge API

Browse source 
Forgejo returns 200 with HTML content-type on successful merge instead
of JSON. Our API helper threw on resp.json(), causing merge to report
failure even though the PR merged. Now treats non-JSON 200 as success.

This was causing PRs #732 and #789 to show as conflict in our DB while
actually merged on Forgejo, and tripping the merge circuit breaker.

Pentagon-Agent: Leo <294C3CA1-0205-4668-82FA-B984D54F48AD>
This commit is contained in:
m3taversal 2026-03-13 17:38:00 +00:00
parent 615af9b53d
commit 410cf32cfe
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/forgejo.py
View file

@ -38,6 +38,12 @@ async def api(method: str, path: str, body: dict = None, token: str = None):
return None return None
if resp.status == 204: if resp.status == 204:
return {} return {}
# Forgejo sometimes returns 200 with HTML (not JSON) on merge success.
# Treat 200 with non-JSON content-type as success rather than error.
content_type = resp.content_type or ""
if "json" not in content_type:
logger.debug("Forgejo API %s %s → %d (non-JSON: %s), treating as success", method, path, resp.status, content_type)
return {}
return await resp.json() return await resp.json()
except Exception as e: except Exception as e:
logger.error("Forgejo API error: %s %s → %s", method, path, e) logger.error("Forgejo API error: %s %s → %s", method, path, e)