about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@fakecake.org>2026-06-22 18:48:52 +0300
committerAndrew Dolgov <fox@fakecake.org>2026-06-22 18:48:52 +0300
commit63bb470241bff43d7f59c8c1d3a937c558abe097 (patch)
tree0b11bc424d5cc5daf9de765f7084c1d9fe540816
parent74e1d273fe017060e7610cc9b67c136d9d6b5a3a (diff)
downloadthe-epube-63bb470241bff43d7f59c8c1d3a937c558abe097.tar.gz
the-epube-63bb470241bff43d7f59c8c1d3a937c558abe097.tar.xz
discussions api
-rw-r--r--review_mr.py29
1 files changed, 18 insertions, 11 deletions
diff --git a/review_mr.py b/review_mr.py
index 2a8c0c6..4489e27 100644
--- a/review_mr.py
+++ b/review_mr.py
@@ -274,7 +274,7 @@ def post_comment(
 ) -> None:
     """Post a plain MR note (fallback when no line annotations)."""
     url = (
-        f"{server_url}/api/v4/projects/{project_id}/merge_requests/{mr_iid}/notes"
+        f"{server_url}/api/v4/projects/{project_id}/merge_requests/{mr_iid}/discussions"
     )
     payload = {"body": f"### AI Code Review Summary\n\n{body}"}
     _api_post(url, {"PRIVATE-TOKEN": token}, payload)
@@ -363,14 +363,16 @@ def _fetch_position_metadata(
     # Fallback: get MR info and parse diff text for line numbers
     mr_url = f"{server_url}/api/v4/projects/{project_id}/merge_requests/{mr_iid}"
     mr = _api_get(mr_url, {"PRIVATE-TOKEN": token})
-    sha = mr.get("sha", "")
-    print(f"  (Fallback: using MR-level SHA {sha[:8]}...)", file=sys.stderr)
+    diff_refs = mr.get("diff_refs", {})
+    base_sha = diff_refs.get("base_sha", mr.get("sha", ""))
+    head_sha = diff_refs.get("head_sha", mr.get("sha", ""))
+    print(f"  (Fallback: base_sha={base_sha[:8]}... head_sha={head_sha[:8]}...)", file=sys.stderr)
 
     diffs_url = (
         f"{server_url}/api/v4/projects/{project_id}/merge_requests/{mr_iid}/diffs"
     )
     diffs = _api_get(diffs_url, {"PRIVATE-TOKEN": token})
-    lookup = _build_positions_from_diff(diffs, sha, sha)
+    lookup = _build_positions_from_diff(diffs, base_sha, head_sha)
     return lookup
 
 
@@ -408,9 +410,9 @@ def post_annotations(
     server_url: str,
     annotations: list[LineAnnotation],
 ) -> None:
-    """Post line annotations on the MR using GitLab's position API."""
+    """Post line annotations on the MR using GitLab's Discussions API."""
     url = (
-        f"{server_url}/api/v4/projects/{project_id}/merge_requests/{mr_iid}/notes"
+        f"{server_url}/api/v4/projects/{project_id}/merge_requests/{mr_iid}/discussions"
     )
 
     print("  Fetching diff position metadata...")
@@ -445,13 +447,18 @@ def post_annotations(
                 print(f"    Posting: file={ann.file} line={ann.line} pos={position}", file=sys.stderr)
                 result = _api_post(url, {"PRIVATE-TOKEN": token}, payload)
                 # Check if the comment was created with a position
-                has_position = result.get("position") is not None
-                is_system = result.get("system") is True
+                # Discussions API returns {notes: [{position: ..., body: ...}]}
+                notes = result.get("notes", [])
+                if notes:
+                    has_position = notes[0].get("position") is not None
+                    is_system = notes[0].get("system") is True
+                else:
+                    has_position = result.get("position") is not None
+                    is_system = result.get("system") is True
                 if not has_position or is_system:
-                    print(f"    WARNING: GitLab returned comment WITHOUT position field "
+                    print(f"    WARNING: inline annotation NOT created "
                           f"(has_position={has_position}, system={is_system}). "
-                          f"This means the inline annotation was NOT created. "
-                          f"The position may be invalid or the token lacks permissions.",
+                          f"Response keys: {list(result.keys())}",
                           file=sys.stderr)
                 print(f"  Annotated {ann.file}:{ann.line}")
                 posted += 1