github-overlord 0.6.9__tar.gz → 0.7.0__tar.gz

{github_overlord-0.6.9 → github_overlord-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: github-overlord
-Version: 0.6.9
+Version: 0.7.0
 Summary: Automatically merge Dependabot PRs in public repositories
 Home-page: https://github.com/iloveitaly/github-overlord
 Keywords: github,dependabot,automation
@@ -13,10 +13,10 @@ 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.3,<2.0.0)
+Requires-Dist: openai (>=1.37.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)
+Requires-Dist: structlog (>=24.4.0,<25.0.0)
 Description-Content-Type: text/markdown
 
 [![Release Notes](https://img.shields.io/github/release/iloveitaly/github-overlord)](https://github.com/iloveitaly/github-overlord/releases) [![Downloads](https://static.pepy.tech/badge/github-overlord/month)](https://pepy.tech/project/github-overlord) [![Python Versions](https://img.shields.io/pypi/pyversions/github-overlord)](https://pypi.org/project/github-overlord) ![GitHub CI Status](https://github.com/iloveitaly/github-overlord/actions/workflows/build_and_publish.yml/badge.svg) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)

{github_overlord-0.6.9 → github_overlord-0.7.0}/github_overlord/__init__.py

@@ -5,6 +5,7 @@ from types import NoneType
 
 import click
 import funcy_pipe as fp
+import funcy as f
 from github import Github
 from github.GithubObject import NotSet
 from github.Notification import Notification
@@ -244,26 +245,82 @@ def keep_alive_prs(token, dry_run, repo):
     log.info("stale PR check complete")
 
 
-def notifications(token, dry_run):
+@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(
+    "--only-unread", is_flag=True, help="Only process a single repository", default=True
+)
+def notifications(token, dry_run, only_unread):
     """
     Look at notifications and mark them as read if they are dependabot notifications
+
+    * Dependabot notifications
+    * Releases on repos I own
+    * Closed (merged, closed) pull requests on repos I own
+    * Closed pull requests that I authored
     """
 
-    g = Github(token)
-    user = g.get_user()
-    notifications = user.get_notifications()
+    github = Github(token)
+    user = github.get_user()
+    login = user.login
+
+    # all includes read notifications AND done notifications :/
+    # there is no way to determine if a notification is marked as done
+    notifications = list(user.get_notifications(all=not only_unread))
+
+    # TODO fix funcy_pipe here
+    released_on_owned_repos = (
+        notifications
+        | fp.filter(
+            lambda n: n.subject.type == "Release"
+            and n.repository.owner.login == login
+            # TODO I think there is a way to convert the instance method to a standard method so it could be mapped
+            #      patchy had some code for this
+        )
+        | fp.map(lambda n: n.mark_as_done())
+        | fp.to_list()
+    )
+
+    def is_dependabot_notification(notification: Notification) -> bool:
+        return notification.get_pull_request().user.login == "dependabot[bot]"
+
+    def is_pull_request(notification: Notification) -> bool:
+        return notification.subject.type == "PullRequest"
 
-    def handle_notification(notification: Notification):
-        pass
+    def is_pull_request_open(notification: Notification) -> bool:
+        return notification.get_pull_request().state == "open"
 
-    # for notification in notifications:
-    #     print(f"Notification: {notification.subject['title']}, Reason: {notification.reason}")
-    #     if not read_only:
-    #         notification.mark_as_read()
+    # TODO github digest has some logic to detect bots, maybev we can use that
+    pull_requests_by_dependabot = (
+        notifications
+        | fp.filter(is_pull_request)
+        | fp.filter(is_dependabot_notification)
+        | fp.map(Notification.mark_as_done)
+        | fp.to_list()
+    )
+
+    # Closed (merged, closed) pull requests that I authored
+    owned_closed_pull_requests = (
+        notifications
+        # PRs that I did not author may still be interesting
+        | fp.where_attr(reason="author")
+        | fp.filter(is_pull_request)
+        # TODO should use `fp`
+        | fp.filter(f.complement(is_pull_request_open))
+        | fp.map(Notification.mark_as_done)
+        | fp.to_list()
+    )
 
 
 cli.add_command(dependabot)
 cli.add_command(keep_alive_prs)
+cli.add_command(notifications)
 
 if __name__ == "__main__":
     cli()

github_overlord-0.7.0/github_overlord/patch.py

@@ -0,0 +1,14 @@
+from github.Notification import Notification
+
+
+def mark_as_done(self) -> None:
+    """
+    :calls: `PATCH /notifications/threads/{id} <https://docs.github.com/en/rest/activity/notifications?apiVersion=2022-11-28#mark-a-thread-as-done>`_
+    """
+    headers, data = self._requester.requestJsonAndCheck(
+        "DELETE",
+        self.url,
+    )
+
+
+Notification.mark_as_done = mark_as_done

{github_overlord-0.6.9 → github_overlord-0.7.0}/github_overlord/utils.py

@@ -60,8 +60,6 @@ def setup():
     # clear thread-local context
     log.clear = structlog.contextvars.clear_contextvars  # type: ignore
 
-    logger = log
-
     configure_logger()
 
     log.debug("application setup")

{github_overlord-0.6.9 → github_overlord-0.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "github-overlord"
-version = "0.6.9"
+version = "0.7.0"
 description = "Automatically merge Dependabot PRs in public repositories"
 authors = ["Michael Bianco <mike@mikebian.co>"]
 readme = "README.md"
@@ -13,9 +13,9 @@ pygithub = "^2.3.0"
 click = "^8.1.7"
 python-decouple-typed = "^3.11.0"
 funcy-pipe = "^0.11.0"
-structlog = "^24.2.0"
+structlog = "^24.4.0"
 apscheduler = "^3.10.4"
-openai = "^1.35.3"
+openai = "^1.37.1"
 
 [tool.poetry.scripts]
 github-overlord = "github_overlord:cli"
@@ -29,8 +29,8 @@ float_to_top = true
 [tool.poetry.group.dev.dependencies]
 isort = "^5.13.2"
 black = "^24.4.2"
-pyright = "^1.1.368"
-pylint = "^3.2.3"
+pyright = "^1.1.373"
+pylint = "^3.2.6"
 
 [build-system]
 requires = ["poetry-core"]