ultralytics-actions 0.0.31__py3-none-any.whl → 0.0.32__py3-none-any.whl

actions/__init__.py

@@ -22,4 +22,4 @@
 #     ├── test_summarize_pr.py
 #     └── ...
 
-__version__ = "0.0.31"
+__version__ = "0.0.32"

actions/summarize_pr.py

@@ -20,13 +20,8 @@ SUMMARY_START = (
 )
 
 
-def generate_merge_message(pr_author, contributors, pr_summary=None):
+def generate_merge_message(pr_summary=None, pr_credit=None):
     """Generates a thank-you message for merged PR contributors."""
-    contributors_str = ", ".join(f"@{c}" for c in contributors if c != pr_author)
-    mention_str = f"@{pr_author}"
-    if contributors_str:
-        mention_str += f" and {contributors_str}"
-
     messages = [
         {
             "role": "system",
@@ -34,10 +29,10 @@ def generate_merge_message(pr_author, contributors, pr_summary=None):
         },
         {
             "role": "user",
-            "content": f"Write a friendly thank you for a merged PR by these GitHub contributors: {mention_str}. "
+            "content": f"Write a friendly thank you for a merged GitHub PR by {pr_credit}. "
             f"Context from PR:\n{pr_summary}\n\n"
             f"Start with the exciting message that this PR is now merged, and weave in an inspiring quote "
-            f"from a famous figure in science, philosophy or stoicism. "
+            f"from a famous figure from science, art, philosophy or stoicism. "
             f"Keep the message concise yet relevant to the specific contributions in this PR. "
             f"We want the contributors to feel their effort is appreciated and will make a difference in the world.",
         },
@@ -45,15 +40,15 @@ def generate_merge_message(pr_author, contributors, pr_summary=None):
     return get_completion(messages)
 
 
-def post_merge_message(pr_number, pr_author, contributors, summary):
+def post_merge_message(pr_number, summary, pr_credit):
     """Posts thank you message on PR after merge."""
-    message = generate_merge_message(pr_author, contributors, summary)
+    message = generate_merge_message(summary, pr_credit)
     comment_url = f"{GITHUB_API_URL}/repos/{GITHUB_REPOSITORY}/issues/{pr_number}/comments"
     response = requests.post(comment_url, json={"body": message}, headers=GITHUB_HEADERS)
     return response.status_code == 201
 
 
-def generate_issue_comment(pr_url, pr_summary):
+def generate_issue_comment(pr_url, pr_summary, pr_credit):
     """Generates a personalized issue comment using based on the PR context."""
     messages = [
         {
@@ -62,15 +57,16 @@ def generate_issue_comment(pr_url, pr_summary):
         },
         {
             "role": "user",
-            "content": f"Write a GitHub issue comment announcing a potential fix has been merged in linked PR {pr_url}\n\n"
+            "content": f"Write a GitHub issue comment announcing a potential fix for this issue is now merged in linked PR {pr_url} by {pr_credit}\n\n"
             f"Context from PR:\n{pr_summary}\n\n"
             f"Include:\n"
             f"1. An explanation of key changes from the PR that may resolve this issue\n"
-            f"2. Options for testing if PR changes have resolved this issue:\n"
+            f"2. Credit to the PR author and contributors\n"
+            f"3. Options for testing if PR changes have resolved this issue:\n"
             f"   - pip install git+https://github.com/ultralytics/ultralytics.git@main # test latest changes\n"
             f"   - or await next official PyPI release\n"
-            f"3. Request feedback on whether the PR changes resolve the issue\n"
-            f"4. Thank 🙏 for reporting the issue and welcome any further feedback if the issue persists\n\n",
+            f"4. Request feedback on whether the PR changes resolve the issue\n"
+            f"5. Thank 🙏 for reporting the issue and welcome any further feedback if the issue persists\n\n",
         },
     ]
     return get_completion(messages)
@@ -129,49 +125,60 @@ def update_pr_description(repo_name, pr_number, new_summary, max_retries=2):
 
 
 def label_fixed_issues(pr_number, pr_summary):
-    """Labels issues closed by this PR when merged, notifies users, and returns PR contributors."""
+    """Labels issues closed by PR when merged, notifies users, returns PR contributors."""
     query = """
 query($owner: String!, $repo: String!, $pr_number: Int!) {
     repository(owner: $owner, name: $repo) {
         pullRequest(number: $pr_number) {
-            closingIssuesReferences(first: 50) {
-                nodes {
-                    number
-                }
-            }
+            closingIssuesReferences(first: 50) { nodes { number } }
             url
             body
             author { login, __typename }
-            reviews(first: 50) {
-                nodes { author { login, __typename } }
-            }
-            comments(first: 50) {
-                nodes { author { login, __typename } }
-            }
+            reviews(first: 50) { nodes { author { login, __typename } } }
+            comments(first: 50) { nodes { author { login, __typename } } }
+            commits(first: 100) { nodes { commit { author { user { login } }, committer { user { login } } } } }
         }
     }
 }
 """
-
     owner, repo = GITHUB_REPOSITORY.split("/")
     variables = {"owner": owner, "repo": repo, "pr_number": pr_number}
     graphql_url = "https://api.github.com/graphql"
     response = requests.post(graphql_url, json={"query": query, "variables": variables}, headers=GITHUB_HEADERS)
+
     if response.status_code != 200:
         print(f"Failed to fetch linked issues. Status code: {response.status_code}")
         return [], None
 
     try:
         data = response.json()["data"]["repository"]["pullRequest"]
-        comments = data["reviews"]["nodes"] + data["comments"]["nodes"]  # merge lists
+        comments = data["reviews"]["nodes"] + data["comments"]["nodes"]
+        token_username = get_github_username()  # get GITHUB_TOKEN username
         author = data["author"]["login"] if data["author"]["__typename"] != "Bot" else None
 
         # Get unique contributors from reviews and comments
         contributors = {x["author"]["login"] for x in comments if x["author"]["__typename"] != "Bot"}
-        contributors.discard(author)  # Remove author from contributors list
+
+        # Add commit authors and committers that have GitHub accounts linked
+        for commit in data["commits"]["nodes"]:
+            commit_data = commit["commit"]
+            for user_type in ["author", "committer"]:
+                if user := commit_data[user_type].get("user"):
+                    if login := user.get("login"):
+                        contributors.add(login)
+
+        contributors.discard(author)
+        contributors.discard(token_username)
+
+        # Write credit string
+        pr_credit = ""  # i.e. "@user1 with contributions from @user2, @user3"
+        if author and author != token_username:
+            pr_credit += f"@{author}"
+        if contributors:
+            pr_credit += (" with contributions from " if pr_credit else "") + ", ".join(f"@{c}" for c in contributors)
 
         # Generate personalized comment
-        comment = generate_issue_comment(pr_url=data["url"], pr_summary=pr_summary)
+        comment = generate_issue_comment(pr_url=data["url"], pr_summary=pr_summary, pr_credit=pr_credit)
 
         # Update linked issues
         for issue in data["closingIssuesReferences"]["nodes"]:
@@ -192,7 +199,7 @@ query($owner: String!, $repo: String!, $pr_number: Int!) {
                     f"Comment status: {comment_response.status_code}"
                 )
 
-        return contributors, author
+        return pr_credit
     except KeyError as e:
         print(f"Error parsing GraphQL response: {e}")
         return [], None
@@ -228,14 +235,12 @@ def main():
     # Update linked issues and post thank you message if merged
     if PR.get("merged"):
         print("PR is merged, labeling fixed issues...")
-        contributors, author = label_fixed_issues(pr_number, summary)
+        pr_credit = label_fixed_issues(pr_number, summary)
         print("Removing TODO label from PR...")
         remove_todos_on_merge(pr_number)
-        username = get_github_username()  # get GITHUB_TOKEN username
-        if author and author != username:
+        if pr_credit:
             print("Posting PR author thank you message...")
-            contributors.discard(username)
-            post_merge_message(pr_number, author, contributors, summary)
+            post_merge_message(pr_number, summary, pr_credit)
 
 
 if __name__ == "__main__":

{ultralytics_actions-0.0.31.dist-info → ultralytics_actions-0.0.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ultralytics-actions
-Version: 0.0.31
+Version: 0.0.32
 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.0.31.dist-info → ultralytics_actions-0.0.32.dist-info}/RECORD

@@ -1,15 +1,15 @@
-actions/__init__.py,sha256=kAPobcXxiL7I2adwsrgwoeB1k4Ggq3Cxzv9bczTfiDY,749
+actions/__init__.py,sha256=fsXAqPALIJ8ixqg50W8n_vgFPI61MnTVMp54zIX08b8,749
 actions/first_interaction.py,sha256=ehHkFwWr-14LgesGmO4lOthu8z626FgvV9e6fiyzN8Q,17648
-actions/summarize_pr.py,sha256=SNFihHfE0c8kUf5moEnbbxh02hZMvwXboMPzbv1lJ34,10580
+actions/summarize_pr.py,sha256=wCNpdHM7MIsIYUFK8W1Ama_ctV8OF4_6hf4QvY6zPFg,11067
 actions/summarize_release.py,sha256=l8NBdTAXLysfNKl1Kf_1tyuBRmeEBLyzTDXS6s5_eQg,8350
 actions/update_markdown_code_blocks.py,sha256=WBNcMD_KKsZS-qSPBn6O1G0ggQ_VrT-jTQffbg7xH_M,6369
 actions/utils/__init__.py,sha256=e3vKraD3_YpFiVUn3B3KR0diqG1ZrXMV9eXQYikObxo,1025
 actions/utils/common_utils.py,sha256=XT8GG0SWBtlZLruA0nKrY4AJpkitvPbM8zndE8etuDo,3548
 actions/utils/github_utils.py,sha256=QBNBx_qb3cbMwYmAQqEmUmGj33jir8Hjc6dr8Jk3vws,6286
 actions/utils/openai_utils.py,sha256=CU0FdeUW6qeZsxYCC2NUcGjns7w6hDvT8PwaRlG7j9E,1829
-ultralytics_actions-0.0.31.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-ultralytics_actions-0.0.31.dist-info/METADATA,sha256=M43Kuf8z0NzboSKAYXFhUBxLqWDdxGexwcu4c401x7E,10591
-ultralytics_actions-0.0.31.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ultralytics_actions-0.0.31.dist-info/entry_points.txt,sha256=GowvOFplj0C7JmsjbKcbpgLpdf2r921pcaOQkAHWZRA,378
-ultralytics_actions-0.0.31.dist-info/top_level.txt,sha256=5apM5x80QlJcGbACn1v3fkmIuL1-XQCKcItJre7w7Tw,8
-ultralytics_actions-0.0.31.dist-info/RECORD,,
+ultralytics_actions-0.0.32.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+ultralytics_actions-0.0.32.dist-info/METADATA,sha256=Fq-Ggn3aFoMBQ7iMMcuSXhmw7ZQ1LiT_HpMdUaYWDUk,10591
+ultralytics_actions-0.0.32.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ultralytics_actions-0.0.32.dist-info/entry_points.txt,sha256=GowvOFplj0C7JmsjbKcbpgLpdf2r921pcaOQkAHWZRA,378
+ultralytics_actions-0.0.32.dist-info/top_level.txt,sha256=5apM5x80QlJcGbACn1v3fkmIuL1-XQCKcItJre7w7Tw,8
+ultralytics_actions-0.0.32.dist-info/RECORD,,