copilot adapted workflow

simonge · simonge · commit f8f1cb6ac550 · 2025-10-29T10:50:54.000Z
diff --git a/benchmarks/lowq2_reconstruction/PRfunctions.py b/benchmarks/lowq2_reconstruction/PRfunctions.py
@@ -270,4 +270,197 @@ def find_existing_bot_comment(repo_owner, repo_name, pr_number, bot_comment_base
             return comment['id']
     
     print("No existing bot comment found")
-    return None
+    return None
+
+def create_commit_with_marker_for_suggestion(repo_owner, repo_name, pr_number, xml_file, line_number, github_token):
+    """Create a minimal commit that adds the XML file to PR changes to enable suggestions"""
+    print(f"Creating minimal commit to enable suggestions on {xml_file}...")
+    
+    headers = {
+        'Accept': 'application/vnd.github+json',
+        'Authorization': f'token {github_token}'
+    }
+    
+    # Get PR info to get the branch
+    pr_info = get_pr_info(repo_owner, repo_name, pr_number, github_token)
+    if not pr_info:
+        return False
+        
+    branch_name = pr_info['head']['ref']
+    head_sha = pr_info['head']['sha']
+    
+    print(f"Target branch: {branch_name}")
+    print(f"Current head: {head_sha}")
+    
+    # Get current file content
+    file_content = get_file_content(repo_owner, repo_name, xml_file, head_sha, github_token)
+    if not file_content:
+        print(f"❌ Could not get content for {xml_file}")
+        return False
+    
+    # Get the current file SHA (required for updates)
+    file_url = f"https://api.github.com/repos/{repo_owner}/{repo_name}/contents/{xml_file}?ref={head_sha}"
+    response = requests.get(file_url, headers=headers)
+    
+    if response.status_code != 200:
+        print(f"❌ Could not get file SHA: {response.status_code}")
+        return False
+        
+    file_sha = response.json().get('sha')
+    
+    # Add a minimal comment to the line that will be suggested
+    lines = file_content.split('\n')
+    if line_number <= len(lines):
+        # Add a comment at the end of the target line
+        target_line = lines[line_number - 1]  # Convert to 0-based index
+        
+        # Check if comment already exists
+        if '<!-- calibration-update-marker -->' not in target_line:
+            lines[line_number - 1] = target_line + ' <!-- calibration-update-marker -->'
+            updated_content = '\n'.join(lines)
+            
+            print(f"Adding marker comment to line {line_number}")
+            
+            # Create the commit
+            commit_data = {
+                'message': '[skip ci] Add calibration update marker\n\nMinimal change to enable calibration suggestions.',
+                'content': base64.b64encode(updated_content.encode()).decode(),
+                'sha': file_sha,
+                'branch': branch_name
+            }
+            
+            commit_url = f"https://api.github.com/repos/{repo_owner}/{repo_name}/contents/{xml_file}"
+            response = requests.put(commit_url, headers=headers, json=commit_data)
+            
+            if response.status_code in [200, 201]:
+                print("✅ Minimal commit created successfully")
+                return True
+            else:
+                print(f"❌ Failed to create minimal commit: {response.status_code}")
+                print(f"   Response: {response.text}")
+                return False
+        else:
+            print("ℹ️ Marker comment already exists")
+            return True
+    else:
+        print(f"❌ Line number {line_number} is out of range")
+        return False
+
+def create_pr_suggestion_with_prep(repo_owner, repo_name, pr_number, calibration_file, xml_file, new_url, github_token):
+    """Create PR suggestion with preparation if needed"""
+    print(f"Creating PR suggestion with preparation for #{pr_number}...")
+    
+    # Get current PR info
+    pr_info = get_pr_info(repo_owner, repo_name, pr_number, github_token)
+    if not pr_info:
+        return False
+    
+    head_sha = pr_info['head']['sha']
+    
+    # Get file content and find the line to update
+    file_content = get_file_content(repo_owner, repo_name, xml_file, head_sha, github_token)
+    if not file_content:
+        return False
+    
+    line_number, suggested_line = find_and_update_epic_fileloader_url(file_content, calibration_file, new_url)
+    if not line_number or not suggested_line:
+        print(f"❌ Could not find calibration line to update in {xml_file}")
+        return False
+    
+    # Check if XML file is already in the PR changes
+    headers = {
+        'Accept': 'application/vnd.github+json',
+        'Authorization': f'token {github_token}'
+    }
+    
+    files_url = f"https://api.github.com/repos/{repo_owner}/{repo_name}/pulls/{pr_number}/files"
+    response = requests.get(files_url, headers=headers)
+    
+    if response.status_code == 200:
+        changed_files = response.json()
+        file_paths = [f['filename'] for f in changed_files]
+        
+        if xml_file not in file_paths:
+            print(f"📝 {xml_file} is not in PR changes, creating minimal commit to enable suggestions...")
+            
+            # Create minimal commit to add file to PR
+            success = create_commit_with_marker_for_suggestion(repo_owner, repo_name, pr_number, xml_file, line_number, github_token)
+            
+            if not success:
+                print("❌ Failed to create minimal commit, falling back to regular comment")
+                return create_pr_comment_fallback(repo_owner, repo_name, pr_number, calibration_file, new_url, github_token)
+            
+            # Wait a moment for GitHub to process the commit
+            import time
+            time.sleep(3)
+            
+            # Get updated PR info with new head SHA
+            pr_info = get_pr_info(repo_owner, repo_name, pr_number, github_token)
+            if not pr_info:
+                return False
+                
+            head_sha = pr_info['head']['sha']
+            
+            # Get updated file content (now with the marker comment)
+            file_content = get_file_content(repo_owner, repo_name, xml_file, head_sha, github_token)
+            if not file_content:
+                return False
+            
+            # Re-find the line (it should be the same, but content is slightly different)
+            line_number, suggested_line = find_and_update_epic_fileloader_url(file_content, calibration_file, new_url)
+            if not line_number or not suggested_line:
+                print(f"❌ Could not find calibration line after minimal commit")
+                return False
+            
+            # Remove the marker comment from the suggested line
+            suggested_line = suggested_line.replace(' <!-- calibration-update-marker -->', '')
+            
+            print(f"✅ XML file now in PR changes, proceeding with suggestion")
+        else:
+            print(f"✅ {xml_file} already in PR changes")
+    else:
+        print(f"❌ Could not get PR files: {response.status_code}")
+        return False
+    
+    # Now create the proper code suggestion
+    return create_pr_suggestion(repo_owner, repo_name, pr_number, calibration_file,
+                              xml_file, line_number, suggested_line, head_sha, github_token)
+
+def create_pr_comment_fallback(repo_owner, repo_name, pr_number, calibration_file, new_url, github_token):
+    """Fallback: Create a regular PR comment when suggestions aren't possible"""
+    print(f"Creating fallback PR comment...")
+    
+    headers = {
+        'Accept': 'application/vnd.github+json',
+        'Authorization': f'token {github_token}'
+    }
+    
+    timestamp = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S UTC")
+    
+    comment_body = f"""🤖 **Automated Calibration `{calibration_file}` Update**
+
+A new calibration has been generated and is ready for use.
+
+**New URL:** `{new_url}`
+**Last updated:** {timestamp}
+
+**Manual Update Required:**
+Please update the XML configuration to use the new calibration URL.
+
+```xml
+url:{new_url}
+```
+
+Look for the existing `{Path(calibration_file).name}` entry and update its URL."""
+    
+    comment_url = f"https://api.github.com/repos/{repo_owner}/{repo_name}/issues/{pr_number}/comments"
+    comment_data = {'body': comment_body}
+    
+    response = requests.post(comment_url, headers=headers, json=comment_data)
+    
+    if response.status_code == 201:
+        print("✅ Fallback PR comment created successfully")
+        return response.json()
+    else:
+        print(f"❌ Failed to create fallback comment: {response.status_code}")
+        return None
diff --git a/benchmarks/lowq2_reconstruction/makePRSuggestion.py b/benchmarks/lowq2_reconstruction/makePRSuggestion.py
@@ -44,32 +44,13 @@
 
 # =============================================================================
 
-content = get_file_content(repo_owner, repo_name, xml_file, pr_info['head']['sha'], github_token)
-if not content:
-    print("Failed to retrieve file content. Exiting.")
-    sys.exit(1)
-
-# =============================================================================
-
-# Parse the XML content and find the line to update
-line_number, suggested_line = find_and_update_epic_fileloader_url(content, calibration_file, new_url)
-
-# =============================================================================
+# Create the PR review with suggestion (includes prep if needed)
+response = create_pr_suggestion_with_prep(repo_owner, repo_name, pr_number, calibration_file, xml_file, new_url, github_token)
 
-if line_number is not None and suggested_line is not None:
-    print(f"✅ Found URL to update in {xml_file} at line {line_number}")
-    print(f"   Suggested change: {suggested_line.strip()}")
-    
-    # Create the PR review with suggestion
-    response = create_pr_suggestion(repo_owner, repo_name, pr_number, calibration_file, xml_file, line_number, suggested_line, pr_info['head']['sha'], github_token)
-    
-    if response:
-        print("🎉 PR suggestion completed successfully!")
-    else:
-        print("❌ Failed to create PR suggestion")
-        sys.exit(1)
+if response:
+    print("🎉 PR suggestion completed successfully!")
 else:
-    print(f"❌ Failed to find URL to update in {xml_file}")
+    print("❌ Failed to create PR suggestion")
     sys.exit(1)
 
 # =============================================================================
