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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ultralytics-actions
-Version: 0.1.5
+Version: 0.1.7
 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.5 → ultralytics_actions-0.1.7}/actions/__init__.py

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

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

@@ -8,6 +8,7 @@ import re
 from .utils import GITHUB_API_URL, MAX_PROMPT_CHARS, Action, get_completion, remove_html_comments
 
 REVIEW_MARKER = "🔍 PR Review"
+ERROR_MARKER = "⚠️ Review generation encountered an error"
 EMOJI_MAP = {"CRITICAL": "❗", "HIGH": "⚠️", "MEDIUM": "💡", "LOW": "📝", "SUGGESTION": "💭"}
 SKIP_PATTERNS = [
     r"\.lock$",  # Lock files
@@ -30,25 +31,31 @@ SKIP_PATTERNS = [
 
 
 def parse_diff_files(diff_text: str) -> dict:
-    """Parse diff to extract file paths, valid line numbers, and line content for comments."""
-    files, current_file, current_line = {}, None, 0
+    """Parse diff to extract file paths, valid line numbers, and line content for comments (both sides)."""
+    files, current_file, new_line, old_line = {}, None, 0, 0
 
     for line in diff_text.split("\n"):
         if line.startswith("diff --git"):
             match = re.search(r" b/(.+)$", line)
             current_file = match.group(1) if match else None
-            current_line = 0
+            new_line, old_line = 0, 0
             if current_file:
-                files[current_file] = {}
+                files[current_file] = {"RIGHT": {}, "LEFT": {}}
         elif line.startswith("@@") and current_file:
-            match = re.search(r"@@.*\+(\d+)(?:,\d+)?", line)
-            current_line = int(match.group(1)) if match else 0
-        elif current_file and current_line > 0:
+            # 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))
+        elif current_file and (new_line > 0 or old_line > 0):
             if line.startswith("+") and not line.startswith("+++"):
-                files[current_file][current_line] = line[1:]
-                current_line += 1
-            elif not line.startswith("-"):
-                current_line += 1
+                files[current_file]["RIGHT"][new_line] = line[1:]  # Added line (right/new side)
+                new_line += 1
+            elif line.startswith("-") and not line.startswith("---"):
+                files[current_file]["LEFT"][old_line] = line[1:]  # Removed line (left/old side)
+                old_line += 1
+            elif not line.startswith("\\"):  # Context line (ignore "No newline" markers)
+                new_line += 1
+                old_line += 1
 
     return files
 
@@ -64,8 +71,8 @@ def generate_pr_review(repository: str, diff_text: str, pr_title: str, pr_descri
 
     # Filter out generated/vendored files
     filtered_files = {
-        path: lines
-        for path, lines in diff_files.items()
+        path: sides
+        for path, sides in diff_files.items()
         if not any(re.search(pattern, path) for pattern in SKIP_PATTERNS)
     }
     skipped_count = len(diff_files) - len(filtered_files)
@@ -76,7 +83,7 @@ def generate_pr_review(repository: str, diff_text: str, pr_title: str, pr_descri
 
     file_list = list(diff_files.keys())
     diff_truncated = len(diff_text) > MAX_PROMPT_CHARS
-    lines_changed = sum(len(lines) for lines in diff_files.values())
+    lines_changed = sum(len(sides["RIGHT"]) + len(sides["LEFT"]) for sides in diff_files.values())
 
     content = (
         "You are an expert code reviewer for Ultralytics. Provide detailed inline comments on specific code changes.\n\n"
@@ -100,10 +107,18 @@ def generate_pr_review(repository: str, diff_text: str, pr_title: str, pr_descri
         "- Suggestion content must match the exact indentation of the original line\n"
         "- 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"
         "Return JSON: "
-        '{"comments": [{"file": "exact/path", "line": N, "severity": "HIGH", "message": "...", "suggestion": "..."}], "summary": "..."}\n\n'
+        '{"comments": [{"file": "exact/path", "line": N, "side": "RIGHT", "severity": "HIGH", "message": "..."}], "summary": "..."}\n\n'
         "Rules:\n"
-        "- Only NEW lines (+ in diff), exact paths (no ./), correct line numbers from @@ hunks\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"
         "- 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"
@@ -125,11 +140,10 @@ def generate_pr_review(repository: str, diff_text: str, pr_title: str, pr_descri
 
     try:
         response = get_completion(messages, reasoning_effort="medium", model="gpt-5-codex")
-        print("\n" + "=" * 80 + f"\nFULL AI RESPONSE:\n{response}\n" + "=" * 80 + "\n")
 
         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")
 
         # Validate, filter, and deduplicate comments
@@ -137,11 +151,27 @@ def generate_pr_review(repository: str, diff_text: str, pr_title: str, pr_descri
         for c in review_data.get("comments", []):
             file_path, line_num = c.get("file"), c.get("line", 0)
             start_line = c.get("start_line")
+            side = (c.get("side") or "RIGHT").upper()  # Default to RIGHT (added lines)
 
-            # Validate line numbers are in diff
-            if file_path not in diff_files or line_num not in diff_files[file_path]:
-                print(f"Filtered out {file_path}:{line_num} (available: {list(diff_files.get(file_path, {}))[:10]}...)")
+            # Validate line numbers are in diff (check appropriate side)
+            if file_path not in diff_files:
+                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
 
             # Validate start_line if provided - drop start_line for suggestions (single-line only)
             if start_line:
@@ -151,12 +181,12 @@ def generate_pr_review(repository: str, diff_text: str, pr_title: str, pr_descri
                 elif start_line >= line_num:
                     print(f"Invalid start_line {start_line} >= line {line_num} for {file_path}, dropping start_line")
                     c.pop("start_line", None)
-                elif start_line not in diff_files[file_path]:
+                elif start_line not in diff_files[file_path].get(side, {}):
                     print(f"start_line {start_line} not in diff for {file_path}, dropping start_line")
                     c.pop("start_line", None)
 
-            # Deduplicate by line number
-            key = f"{file_path}:{line_num}"
+            # Deduplicate by line number and side
+            key = f"{file_path}:{side}:{line_num}"
             if key not in unique_comments:
                 unique_comments[key] = c
             else:
@@ -179,7 +209,7 @@ def generate_pr_review(repository: str, diff_text: str, pr_title: str, pr_descri
         error_details = traceback.format_exc()
         print(f"Review generation failed: {e}\n{error_details}")
         summary = (
-            f"⚠️ Review generation encountered an error: `{type(e).__name__}`\n\n"
+            f"{ERROR_MARKER}: `{type(e).__name__}`\n\n"
             f"<details><summary>Debug Info</summary>\n\n```\n{error_details}\n```\n</details>"
         )
         return {"comments": [], "summary": summary}
@@ -219,7 +249,29 @@ def post_review_summary(event: Action, review_data: dict, review_number: int) ->
 
     review_title = f"{REVIEW_MARKER} {review_number}" if review_number > 1 else REVIEW_MARKER
     comments = review_data.get("comments", [])
-    event_type = "COMMENT" if any(c.get("severity") not in ["LOW", "SUGGESTION", None] for c in comments) else "APPROVE"
+    summary = review_data.get("summary") or ""
+
+    # Don't approve if error occurred or if there are critical/high severity issues
+    has_error = not summary or ERROR_MARKER in summary
+    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"
 
     body = (
         f"## {review_title}\n\n"
@@ -246,22 +298,25 @@ def post_review_summary(event: Action, review_data: dict, review_number: int) ->
         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")
+
         if suggestion := comment.get("suggestion"):
             suggestion = suggestion[:1000]  # Clip suggestion length
             if "```" not in suggestion:
                 # Extract original line indentation and apply to suggestion
-                if original_line := review_data.get("diff_files", {}).get(file_path, {}).get(line):
+                if original_line := review_data.get("diff_files", {}).get(file_path, {}).get(side, {}).get(line):
                     indent = len(original_line) - len(original_line.lstrip())
                     suggestion = " " * indent + suggestion.strip()
                 comment_body += f"\n\n**Suggested change:**\n```suggestion\n{suggestion}\n```"
 
         # Build comment with optional start_line for multi-line context
-        review_comment = {"path": file_path, "line": line, "body": comment_body, "side": "RIGHT"}
+        review_comment = {"path": file_path, "line": line, "body": comment_body, "side": side}
         if start_line := comment.get("start_line"):
             if start_line < line:
                 review_comment["start_line"] = start_line
-                review_comment["start_side"] = "RIGHT"
-                print(f"Multi-line comment: {file_path}:{start_line}-{line}")
+                review_comment["start_side"] = side
+                print(f"Multi-line comment: {file_path}:{start_line}-{line} ({side})")
 
         review_comments.append(review_comment)
 

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

@@ -125,21 +125,22 @@ class Action:
 
     def _request(self, method: str, url: str, headers=None, expected_status=None, hard=False, **kwargs):
         """Unified request handler with error checking."""
-        response = getattr(requests, method)(url, headers=headers or self.headers, **kwargs)
+        r = getattr(requests, method)(url, headers=headers or self.headers, **kwargs)
         expected = expected_status or self._default_status[method]
-        success = response.status_code in expected
+        success = r.status_code in expected
 
         if self.verbose:
-            print(f"{'✓' if success else '✗'} {method.upper()} {url} → {response.status_code}")
+            elapsed = r.elapsed.total_seconds()
+            print(f"{'✓' if success else '✗'} {method.upper()} {url} → {r.status_code} ({elapsed:.1f}s)")
             if not success:
                 try:
-                    print(f"  ❌ Error: {response.json().get('message', 'Unknown error')}")
+                    print(f"  ❌ Error: {r.json().get('message', 'Unknown error')}")
                 except Exception:
-                    print(f"  ❌ Error: {response.text[:200]}")
+                    print(f"  ❌ Error: {r.text[:200]}")
 
         if not success and hard:
-            response.raise_for_status()
-        return response
+            r.raise_for_status()
+        return r
 
     def get(self, url, **kwargs):
         """Performs GET request with error handling."""

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

@@ -125,6 +125,8 @@ def get_completion(
 
         try:
             r = requests.post(url, json=data, headers=headers, timeout=600)
+            success = r.status_code == 200
+            print(f"{'✓' if success else '✗'} POST {url} → {r.status_code} ({r.elapsed.total_seconds():.1f}s)")
             r.raise_for_status()
 
             # Parse response

{ultralytics_actions-0.1.5 → ultralytics_actions-0.1.7}/tests/test_github_utils.py

@@ -15,6 +15,7 @@ def test_check_pypi_version():
         with patch("requests.get") as mock_get:
             mock_response = MagicMock()
             mock_response.status_code = 200
+            mock_response.elapsed.total_seconds.return_value = 0.5
             mock_response.json.return_value = {"info": {"version": "0.9.0"}}
             mock_get.return_value = mock_response
 
@@ -43,6 +44,7 @@ def test_action_request_methods():
     with patch("requests.get") as mock_get:
         mock_response = MagicMock()
         mock_response.status_code = 200
+        mock_response.elapsed.total_seconds.return_value = 0.3
         mock_get.return_value = mock_response
 
         action = Action(token="test-token")

{ultralytics_actions-0.1.5 → ultralytics_actions-0.1.7}/tests/test_openai_utils.py

@@ -28,6 +28,7 @@ def test_get_completion(mock_post):
     # Setup mock response with Responses API structure
     mock_response = MagicMock()
     mock_response.status_code = 200
+    mock_response.elapsed.total_seconds.return_value = 1.5
     mock_response.json.return_value = {
         "output": [
             {
@@ -57,6 +58,7 @@ def test_get_completion_with_link_check(mock_check_links, mock_post):
     # Setup mocks with Responses API structure
     mock_response = MagicMock()
     mock_response.status_code = 200
+    mock_response.elapsed.total_seconds.return_value = 2.0
     mock_response.json.return_value = {
         "output": [
             {

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

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