github-overlord 0.6.3__tar.gz → 0.6.5__tar.gz

{github_overlord-0.6.3 → github_overlord-0.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: github-overlord
-Version: 0.6.3
+Version: 0.6.5
 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.35.1,<2.0.0)
+Requires-Dist: openai (>=1.35.3,<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.6.3 → github_overlord-0.6.5}/github_overlord/__init__.py

@@ -10,7 +10,11 @@ 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.stale_commenter import (
+    check_for_stale_comments,
+    inspect_repo_for_stale_prs,
+    is_stale_comment,
+)
 from github_overlord.utils import log
 
 AUTOMATIC_MERGE_MESSAGE = "Automatically merged with GitHub overlord"
@@ -156,11 +160,14 @@ def cli():
     pass
 
 
-def extract_repo_reference_from_github_url(url: str):
+def extract_repo_reference_from_github_url(url: str | None):
     """
     Extract the owner and repo from a GitHub URL
     """
 
+    if url is None:
+        return None
+
     # convert 'https://github.com/iloveitaly/todoist-digest/pulls' to 'iloveitaly/todoist-digest'
     if "github.com" in url:
         match = re.search(r"github\.com/([^/]+)/([^/]+)", url)
@@ -186,6 +193,7 @@ def dependabot(token, dry_run, repo):
     """
 
     repo = extract_repo_reference_from_github_url(repo)
+
     main(token, dry_run, repo)
 
 
@@ -199,14 +207,25 @@ def dependabot(token, dry_run, repo):
 @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)
+    assert token, "GitHub token is required"
+    # TODO should assert on openai setup
 
     github = Github(token)
-    login = github.get_user().login
+    user = github.get_user()
+    login = user.login
+
+    repo = extract_repo_reference_from_github_url(repo)
+
+    if repo:
+        inspect_repo_for_stale_prs(dry_run, login, github.get_repo(repo))
+        return
+
+    # TODO this isn't perfect because you may be a contributor :/
+    user.get_repos(type="public") | fp.filter(
+        lambda repo: repo.owner.login != login
+    ) | fp.map(fp.partial(inspect_repo_for_stale_prs, dry_run, login)) | fp.to_list()
 
-    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()
+    log.info("stale PR check complete")
 
 
 def notifications(token, dry_run):

{github_overlord-0.6.3 → github_overlord-0.6.5}/github_overlord/stale_commenter.py

@@ -1,13 +1,27 @@
 import json
 
+import funcy_pipe as fp
+from github import Github
 from github.IssueComment import IssueComment
 from github.PullRequest import PullRequest
+from github.Repository import Repository
 from openai import OpenAI
 
 from github_overlord.utils import log
 
 
-def check_for_stale_comments(pr: PullRequest):
+def inspect_repo_for_stale_prs(dry_run: bool, login: str, repo: Repository):
+    log.debug("inspecting repo for stale PRs", repo=repo.full_name)
+
+    return (
+        repo.get_pulls(state="open")
+        | fp.filter(lambda pr: pr.user.login == login)
+        | fp.map(fp.partial(check_for_stale_comments, dry_run))
+        | fp.to_list()
+    )
+
+
+def check_for_stale_comments(dry_run: bool, pr: PullRequest):
     """
     Look at PRs which you have written:
 
@@ -42,7 +56,9 @@ def check_for_stale_comments(pr: PullRequest):
     log.info(
         "comment indicates stale state, commenting", url=pr.html_url, comment=comment
     )
-    # pr.create_issue_comment(comment)
+
+    if not dry_run:
+        pr.create_issue_comment(comment)
 
 
 def is_stale_comment(comment: IssueComment):
@@ -56,8 +72,8 @@ A GitHub pull request comment will be included with the author name. Determine i
 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."
+    "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.
@@ -65,8 +81,13 @@ Adjust the comment wording slightly.
 If the comment does not indicate that the pull request will be closed, respond with:
 
 {
-"stale": "no",
+    "stale": "no",
 }
+
+Do not:
+
+* Ask for an update. This sound demanding.
+* Mention that the pull request will be closed.
 """
     comment_markdown = """
 Author: {comment.user.login}

{github_overlord-0.6.3 → github_overlord-0.6.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "github-overlord"
-version = "0.6.3"
+version = "0.6.5"
 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.35.1"
+openai = "^1.35.3"
 
 [tool.poetry.scripts]
 github-overlord = "github_overlord:cli"