ultralytics-actions 0.1.7__tar.gz → 0.1.9__tar.gz

{ultralytics_actions-0.1.7 → ultralytics_actions-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ultralytics-actions
-Version: 0.1.7
+Version: 0.1.9
 Summary: Ultralytics Actions for GitHub automation and PR management.
 Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>

{ultralytics_actions-0.1.7 → ultralytics_actions-0.1.9}/actions/__init__.py

@@ -23,4 +23,4 @@
 #     ├── test_summarize_pr.py
 #     └── ...
 
-__version__ = "0.1.7"
+__version__ = "0.1.9"

{ultralytics_actions-0.1.7 → ultralytics_actions-0.1.9}/actions/review_pr.py

@@ -30,9 +30,10 @@ SKIP_PATTERNS = [
 ]
 
 
-def parse_diff_files(diff_text: str) -> dict:
-    """Parse diff to extract file paths, valid line numbers, and line content for comments (both sides)."""
+def parse_diff_files(diff_text: str) -> tuple[dict, str]:
+    """Parse diff and return file mapping with line numbers AND augmented diff with explicit line numbers."""
     files, current_file, new_line, old_line = {}, None, 0, 0
+    augmented_lines = []
 
     for line in diff_text.split("\n"):
         if line.startswith("diff --git"):
@@ -41,23 +42,31 @@ def parse_diff_files(diff_text: str) -> dict:
             new_line, old_line = 0, 0
             if current_file:
                 files[current_file] = {"RIGHT": {}, "LEFT": {}}
+            augmented_lines.append(line)
         elif line.startswith("@@") and current_file:
-            # Extract both old and new line numbers
             match = re.search(r"@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)?", line)
             if match:
                 old_line, new_line = int(match.group(1)), int(match.group(2))
+            augmented_lines.append(line)
         elif current_file and (new_line > 0 or old_line > 0):
             if line.startswith("+") and not line.startswith("+++"):
-                files[current_file]["RIGHT"][new_line] = line[1:]  # Added line (right/new side)
+                files[current_file]["RIGHT"][new_line] = line[1:]
+                augmented_lines.append(f"R{new_line:>5} {line}")  # Prefix with RIGHT line number
                 new_line += 1
             elif line.startswith("-") and not line.startswith("---"):
-                files[current_file]["LEFT"][old_line] = line[1:]  # Removed line (left/old side)
+                files[current_file]["LEFT"][old_line] = line[1:]
+                augmented_lines.append(f"L{old_line:>5} {line}")  # Prefix with LEFT line number
                 old_line += 1
-            elif not line.startswith("\\"):  # Context line (ignore "No newline" markers)
+            elif not line.startswith("\\"):
+                augmented_lines.append(f"       {line}")  # Context line, no number
                 new_line += 1
                 old_line += 1
+            else:
+                augmented_lines.append(line)
+        else:
+            augmented_lines.append(line)
 
-    return files
+    return files, "\n".join(augmented_lines)
 
 
 def generate_pr_review(repository: str, diff_text: str, pr_title: str, pr_description: str) -> dict:
@@ -65,7 +74,7 @@ def generate_pr_review(repository: str, diff_text: str, pr_title: str, pr_descri
     if not diff_text:
         return {"comments": [], "summary": "No changes detected in diff"}
 
-    diff_files = parse_diff_files(diff_text)
+    diff_files, augmented_diff = parse_diff_files(diff_text)
     if not diff_files:
         return {"comments": [], "summary": "No files with changes detected in diff"}
 
@@ -82,7 +91,7 @@ def generate_pr_review(repository: str, diff_text: str, pr_title: str, pr_descri
         return {"comments": [], "summary": f"All {skipped_count} changed files are generated/vendored (skipped review)"}
 
     file_list = list(diff_files.keys())
-    diff_truncated = len(diff_text) > MAX_PROMPT_CHARS
+    diff_truncated = len(augmented_diff) > MAX_PROMPT_CHARS
     lines_changed = sum(len(sides["RIGHT"]) + len(sides["LEFT"]) for sides in diff_files.values())
 
     content = (
@@ -108,17 +117,19 @@ def generate_pr_review(repository: str, diff_text: str, pr_title: str, pr_descri
         "- Avoid triple backticks (```) in suggestions as they break markdown formatting\n"
         "- It's better to flag an issue without a suggestion than provide a wrong or uncertain fix\n\n"
         "LINE NUMBERS:\n"
-        "- You MUST extract line numbers directly from the @@ hunk headers in the diff below\n"
-        "- RIGHT (added +): Find @@ lines, use numbers after +N (e.g., @@ -10,5 +20,7 @@ means RIGHT starts at line 20)\n"
-        "- LEFT (removed -): Find @@ lines, use numbers after -N (e.g., @@ -10,5 +20,7 @@ means LEFT starts at line 10)\n"
-        "- Count forward from hunk start: + lines increment RIGHT, - lines increment LEFT, context lines increment both\n"
-        "- CRITICAL: Using line numbers not in the diff will cause your comment to be rejected\n"
-        "- Suggestions only work on RIGHT (added) lines, never on LEFT (removed) lines\n\n"
+        "- Each line in the diff is prefixed with its line number for clarity:\n"
+        "  R  123 +added code     <- RIGHT side (new file), line 123\n"
+        "  L   45 -removed code   <- LEFT side (old file), line 45\n"
+        "         context line    <- context (no number needed)\n"
+        "- Extract the number after R or L prefix to get the exact line number\n"
+        "- Use 'side': 'RIGHT' for R-prefixed lines, 'side': 'LEFT' for L-prefixed lines\n"
+        "- Suggestions only work on RIGHT lines, never on LEFT lines\n"
+        "- CRITICAL: Only use line numbers that you see explicitly prefixed in the diff\n\n"
         "Return JSON: "
         '{"comments": [{"file": "exact/path", "line": N, "side": "RIGHT", "severity": "HIGH", "message": "..."}], "summary": "..."}\n\n'
         "Rules:\n"
-        "- Verify line numbers from @@ hunks: +N for RIGHT (added), -N for LEFT (removed)\n"
-        "- Exact paths (no ./), 'side' field defaults to RIGHT if omitted\n"
+        "- Extract line numbers from R#### or L#### prefixes in the diff\n"
+        "- Exact paths (no ./), 'side' field must match R (RIGHT) or L (LEFT) prefix\n"
         "- Severity: CRITICAL, HIGH, MEDIUM, LOW, SUGGESTION\n"
         f"- Files changed: {len(file_list)} ({', '.join(file_list[:10])}{'...' if len(file_list) > 10 else ''})\n"
         f"- Lines changed: {lines_changed}\n"
@@ -132,19 +143,26 @@ def generate_pr_review(repository: str, diff_text: str, pr_title: str, pr_descri
                 f"Review this PR in https://github.com/{repository}:\n"
                 f"Title: {pr_title}\n"
                 f"Description: {remove_html_comments(pr_description or '')[:1000]}\n\n"
-                f"Diff:\n{diff_text[:MAX_PROMPT_CHARS]}\n\n"
+                f"Diff:\n{augmented_diff[:MAX_PROMPT_CHARS]}\n\n"
                 "Now review this diff according to the rules above. Return JSON with comments array and summary."
             ),
         },
     ]
 
+    # Debug: print prompts sent to AI
+    # print(f"\nSystem prompt (first 1000 chars):\n{messages[0]['content'][:2000]}...\n")
+    # print(f"\nUser prompt (first 1000 chars):\n{messages[1]['content'][:2000]}...\n")
+
     try:
-        response = get_completion(messages, reasoning_effort="medium", model="gpt-5-codex")
+        response = get_completion(messages, reasoning_effort="low", model="gpt-5-codex")
 
         json_str = re.search(r"```(?:json)?\s*(\{.*?\})\s*```", response, re.DOTALL)
         review_data = json.loads(json_str.group(1) if json_str else response)
         print(json.dumps(review_data, indent=2))
-        print(f"AI generated {len(review_data.get('comments', []))} comments")
+
+        # Count comments BEFORE filtering (for COMMENT vs APPROVE decision)
+        comments_before_filtering = len(review_data.get("comments", []))
+        print(f"AI generated {comments_before_filtering} comments")
 
         # Validate, filter, and deduplicate comments
         unique_comments = {}
@@ -158,20 +176,14 @@ def generate_pr_review(repository: str, diff_text: str, pr_title: str, pr_descri
                 print(f"Filtered out {file_path}:{line_num} (file not in diff)")
                 continue
             if line_num not in diff_files[file_path].get(side, {}):
-                # Try other side if not found
-                other_side = "LEFT" if side == "RIGHT" else "RIGHT"
-                if line_num in diff_files[file_path].get(other_side, {}):
-                    print(f"Switching {file_path}:{line_num} from {side} to {other_side}")
-                    c["side"] = other_side
-                    side = other_side
-                    # GitHub rejects suggestions on removed lines
-                    if side == "LEFT" and c.get("suggestion"):
-                        print(f"Dropping suggestion for {file_path}:{line_num} - LEFT side doesn't support suggestions")
-                        c.pop("suggestion", None)
-                else:
-                    available = {s: list(diff_files[file_path][s].keys())[:10] for s in ["RIGHT", "LEFT"]}
-                    print(f"Filtered out {file_path}:{line_num} (available: {available})")
-                    continue
+                available = {s: list(diff_files[file_path][s].keys())[:10] for s in ["RIGHT", "LEFT"]}
+                print(f"Filtered out {file_path}:{line_num} (side={side}, available: {available})")
+                continue
+
+            # GitHub rejects suggestions on removed lines
+            if side == "LEFT" and c.get("suggestion"):
+                print(f"Dropping suggestion for {file_path}:{line_num} - LEFT side doesn't support suggestions")
+                c.pop("suggestion", None)
 
             # Validate start_line if provided - drop start_line for suggestions (single-line only)
             if start_line:
@@ -195,6 +207,7 @@ def generate_pr_review(repository: str, diff_text: str, pr_title: str, pr_descri
         review_data.update(
             {
                 "comments": list(unique_comments.values()),
+                "comments_before_filtering": comments_before_filtering,
                 "diff_files": diff_files,
                 "diff_truncated": diff_truncated,
                 "skipped_files": skipped_count,
@@ -251,27 +264,11 @@ def post_review_summary(event: Action, review_data: dict, review_number: int) ->
     comments = review_data.get("comments", [])
     summary = review_data.get("summary") or ""
 
-    # Don't approve if error occurred or if there are critical/high severity issues
+    # Don't approve if error occurred, inline comments exist, or critical/high severity issues
     has_error = not summary or ERROR_MARKER in summary
+    has_inline_comments = review_data.get("comments_before_filtering", 0) > 0
     has_issues = any(c.get("severity") not in ["LOW", "SUGGESTION", None] for c in comments)
-    requests_changes = any(
-        phrase in summary.lower()
-        for phrase in [
-            "please",
-            "should",
-            "must",
-            "raise",
-            "needs",
-            "before merging",
-            "fix",
-            "error",
-            "issue",
-            "problem",
-            "warning",
-            "concern",
-        ]
-    )
-    event_type = "COMMENT" if (has_error or has_issues or requests_changes) else "APPROVE"
+    event_type = "COMMENT" if (has_error or has_inline_comments or has_issues) else "APPROVE"
 
     body = (
         f"## {review_title}\n\n"
@@ -296,10 +293,8 @@ def post_review_summary(event: Action, review_data: dict, review_number: int) ->
             continue
 
         severity = comment.get("severity") or "SUGGESTION"
-        comment_body = f"{EMOJI_MAP.get(severity, '💭')} **{severity}**: {(comment.get('message') or '')[:1000]}"
-
-        # Get side (LEFT for removed lines, RIGHT for added lines)
         side = comment.get("side", "RIGHT")
+        comment_body = f"{EMOJI_MAP.get(severity, '💭')} **{severity}**: {(comment.get('message') or '')[:1000]}"
 
         if suggestion := comment.get("suggestion"):
             suggestion = suggestion[:1000]  # Clip suggestion length
@@ -316,15 +311,13 @@ def post_review_summary(event: Action, review_data: dict, review_number: int) ->
             if start_line < line:
                 review_comment["start_line"] = start_line
                 review_comment["start_side"] = side
-                print(f"Multi-line comment: {file_path}:{start_line}-{line} ({side})")
 
         review_comments.append(review_comment)
 
     # Submit review with inline comments
-    payload = {"commit_id": commit_sha, "body": body, "event": event_type}
+    payload = {"commit_id": commit_sha, "body": body.strip(), "event": event_type}
     if review_comments:
         payload["comments"] = review_comments
-        print(f"Posting review with {len(review_comments)} inline comments")
 
     event.post(
         f"{GITHUB_API_URL}/repos/{event.repository}/pulls/{pr_number}/reviews",

{ultralytics_actions-0.1.7 → ultralytics_actions-0.1.9}/actions/utils/github_utils.py

@@ -131,7 +131,7 @@ class Action:
 
         if self.verbose:
             elapsed = r.elapsed.total_seconds()
-            print(f"{'✓' if success else '✗'} {method.upper()} {url} → {r.status_code} ({elapsed:.1f}s)")
+            print(f"{'✓' if success else '✗'} {method.upper()} {url} → {r.status_code} ({elapsed:.1f}s)", flush=True)
             if not success:
                 try:
                     print(f"  ❌ Error: {r.json().get('message', 'Unknown error')}")

{ultralytics_actions-0.1.7 → ultralytics_actions-0.1.9}/actions/utils/openai_utils.py

@@ -161,8 +161,9 @@ def get_completion(
                 continue
             raise
         except requests.exceptions.HTTPError as e:
-            if attempt < 2 and e.response and e.response.status_code >= 500:
-                print(f"Server error {e.response.status_code}, retrying in {2**attempt}s")
+            status_code = getattr(e.response, "status_code", 0) if e.response else 0
+            if attempt < 2 and status_code >= 500:
+                print(f"Server error {status_code}, retrying in {2**attempt}s")
                 time.sleep(2**attempt)
                 continue
             raise

{ultralytics_actions-0.1.7 → ultralytics_actions-0.1.9}/ultralytics_actions.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ultralytics-actions
-Version: 0.1.7
+Version: 0.1.9
 Summary: Ultralytics Actions for GitHub automation and PR management.
 Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>