github-overlord 0.4.4__tar.gz → 0.5.0__tar.gz

{github_overlord-0.4.4 → github_overlord-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: github-overlord
-Version: 0.4.4
+Version: 0.5.0
 Summary: Automatically merge Dependabot PRs in public repositories
 Home-page: https://github.com/iloveitaly/github-overlord
 Keywords: github,dependabot,automation
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: apscheduler (>=3.10.4,<4.0.0)
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: funcy-pipe (>=0.11.0,<0.12.0)
-Requires-Dist: openai (>=1.33.0,<2.0.0)
+Requires-Dist: openai (>=1.35.1,<2.0.0)
 Requires-Dist: pygithub (>=2.3.0,<3.0.0)
 Requires-Dist: python-decouple-typed (>=3.11.0,<4.0.0)
 Requires-Dist: structlog (>=24.2.0,<25.0.0)

{github_overlord-0.4.4 → github_overlord-0.5.0}/github_overlord/__init__.py

@@ -7,8 +7,10 @@ import click
 import funcy_pipe as fp
 from github import Github
 from github.GithubObject import NotSet
+from github.Notification import Notification
 from github.PullRequest import PullRequest
 
+from github_overlord.stale_commenter import check_for_stale_comments, is_stale_comment
 from github_overlord.utils import log
 
 AUTOMATIC_MERGE_MESSAGE = "Automatically merged with GitHub overlord"
@@ -154,6 +156,21 @@ def cli():
     pass
 
 
+def extract_repo_reference_from_github_url(url: str):
+    """
+    Extract the owner and repo from a GitHub URL
+    """
+
+    # convert 'https://github.com/iloveitaly/todoist-digest/pulls' to 'iloveitaly/todoist-digest'
+    if "github.com" in url:
+        match = re.search(r"github\.com/([^/]+)/([^/]+)", url)
+
+        if match:
+            url = f"{match.group(1)}/{match.group(2)}"
+
+    return url
+
+
 @click.command()
 @click.option(
     "--token",
@@ -168,47 +185,50 @@ def dependabot(token, dry_run, repo):
     Automatically merge dependabot PRs in public repos that have passed CI checks
     """
 
-    if repo:
-        # convert 'https://github.com/iloveitaly/todoist-digest/pulls' to 'iloveitaly/todoist-digest'
-        if "github.com" in repo:
-            match = re.search(r"github\.com/([^/]+)/([^/]+)", repo)
-
-            if match:
-                repo = f"{match.group(1)}/{match.group(2)}"
-
+    repo = extract_repo_reference_from_github_url(repo)
     main(token, dry_run, repo)
 
 
-def pr_bumper():
-    """
-    Look at PRs which you have written:
+@click.command()
+@click.option(
+    "--token",
+    help="GitHub token, can also be set via GITHUB_TOKEN",
+    default=os.getenv("GITHUB_TOKEN"),
+)
+# TODO move this into the parent command
+@click.option("--dry-run", is_flag=True, help="Run script without merging PRs")
+@click.option("--repo", help="Only process a single repository")
+def keep_alive_prs(token, dry_run, repo):
+    repo = extract_repo_reference_from_github_url(repo)
 
-    1. There are bots out there which will close the PR if there are is no activity, even if there is no activity from
-       the maintainer. This will keep the PR open by adding a comment.
-    2. PRs that are not merged, been open for at least 30 days, with no comments from the maintainer.
-    """
+    github = Github(token)
+    login = github.get_user().login
 
-    pass
+    github.get_repo(repo).get_pulls(state="open") | fp.filter(
+        lambda pr: pr.user.login == login
+    ) | fp.map(check_for_stale_comments) | fp.to_list()
 
 
-"""
-    token = token or os.getenv('GITHUB_TOKEN')
-    if not token:
-        raise ValueError("GitHub token must be provided either as an option or via the GITHUB_TOKEN environment variable")
+def notifications(token, dry_run):
+    """
+    Look at notifications and mark them as read if they are dependabot notifications
+    """
 
     g = Github(token)
     user = g.get_user()
     notifications = user.get_notifications()
 
-    for notification in notifications:
-        print(f"Notification: {notification.subject['title']}, Reason: {notification.reason}")
-        if not read_only:
-            notification.mark_as_read()
+    def handle_notification(notification: Notification):
+        pass
 
-"""
+    # for notification in notifications:
+    #     print(f"Notification: {notification.subject['title']}, Reason: {notification.reason}")
+    #     if not read_only:
+    #         notification.mark_as_read()
 
 
 cli.add_command(dependabot)
+cli.add_command(keep_alive_prs)
 
 if __name__ == "__main__":
     cli()

github_overlord-0.5.0/github_overlord/stale_commenter.py

@@ -0,0 +1,97 @@
+import json
+
+from github.IssueComment import IssueComment
+from github.PullRequest import PullRequest
+from openai import OpenAI
+
+from github_overlord.utils import log
+
+
+def check_for_stale_comments(pr: PullRequest):
+    """
+    Look at PRs which you have written:
+
+    1. There are bots out there which will close the PR if there are is no activity, even if there is no activity from
+       the maintainer. This will keep the PR open by adding a comment.
+    2. PRs that are not merged, been open for at least 30 days, with no comments from the maintainer.
+
+    """
+
+    log.debug("checking for stale comments", url=pr.html_url)
+
+    # PR comments are comments on the cod3
+    issue = pr.as_issue()
+    comments = list(issue.get_comments())
+
+    if len(comments) == 0:
+        return
+
+    last_comment = comments[-1]
+
+    # TODO this will need to be changed
+    if last_comment.user.login != "github-actions[bot]":
+        log.debug("Last comment is not from github-actions[bot]", url=pr.html_url)
+        return
+
+    is_stale, comment = is_stale_comment(last_comment)
+
+    if not is_stale:
+        log.debug("comment does not indicate stale state", url=pr.html_url)
+        return
+
+    log.info(
+        "comment indicates stale state, commenting", url=pr.html_url, comment=comment
+    )
+    # pr.create_issue_comment(comment)
+
+
+def is_stale_comment(comment: IssueComment):
+    """
+    Check if the comment indicates that the PR will be automatically closed if there is no activity
+    """
+
+    prompt = """
+A GitHub pull request comment will be included with the author name. Determine if this comment indicates that if there is no activity
+(more commits, comments, etc) the pull request will be closed. If the comment indicates that the pull
+request will be closed, respond with a JSON object like:
+
+{
+"stale": "yes",
+"comment": "Friendly reminder on this pull request! Let me know what else may need to be done here."
+}
+
+Adjust the comment wording slightly.
+
+If the comment does not indicate that the pull request will be closed, respond with:
+
+{
+"stale": "no",
+}
+"""
+    comment_markdown = """
+Author: {comment.user.login}
+
+{comment.body}
+"""
+    client = OpenAI()
+
+    response = client.chat.completions.create(
+        messages=[
+            {
+                "role": "system",
+                "content": prompt,
+            },
+            {
+                "role": "user",
+                "content": comment_markdown,
+            },
+        ],
+        model="gpt-3.5-turbo",
+        response_format={"type": "json_object"},
+    )
+
+    # TODO got to be a helper for this instead
+    message = response.choices[0].message
+    response_dict = json.loads(message.content)
+
+    return (response_dict["stale"] == "yes", response_dict.get("comment"))

{github_overlord-0.4.4 → github_overlord-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "github-overlord"
-version = "0.4.4"
+version = "0.5.0"
 description = "Automatically merge Dependabot PRs in public repositories"
 authors = ["Michael Bianco <mike@mikebian.co>"]
 readme = "README.md"
@@ -15,7 +15,7 @@ python-decouple-typed = "^3.11.0"
 funcy-pipe = "^0.11.0"
 structlog = "^24.2.0"
 apscheduler = "^3.10.4"
-openai = "^1.33.0"
+openai = "^1.35.1"
 
 [tool.poetry.scripts]
 github-overlord = "github_overlord:cli"
@@ -29,7 +29,7 @@ float_to_top = true
 [tool.poetry.group.dev.dependencies]
 isort = "^5.13.2"
 black = "^24.4.2"
-pyright = "^1.1.366"
+pyright = "^1.1.368"
 pylint = "^3.2.3"
 
 [build-system]