fix: allow all client args to be null (#5)

Author: jbristow

nodestream_github/client/githubclient.py

@@ -3,6 +3,7 @@
 An async client for accessing GitHub.
 """
 
+import json
 import logging
 from collections.abc import AsyncGenerator
 from enum import Enum
@@ -27,6 +28,7 @@
 DEFAULT_MAX_RETRIES = 20
 DEFAULT_PAGE_SIZE = 100
 DEFAULT_MAX_RETRY_WAIT_SECONDS = 300  # 5 minutes
+DEFAULT_GITHUB_HOST = "api.github.com"
 
 
 logger = get_plugin_logger(__name__)
@@ -41,36 +43,39 @@ def __init__(self, url: str | httpx.URL):
         super().__init__(f"Rate limited when calling {url}")
 
 
+def _safe_get_json_error_message(response: httpx.Response) -> str:
+    try:
+        return response.json().get("message")
+    except AttributeError:
+        # ignore if no message
+        return json.dumps(response.json())
+    except ValueError:
+        # ignore if no json
+        return response.text
+
+
 def _fetch_problem(title: str, e: httpx.HTTPError):
-    if isinstance(e, httpx.HTTPStatusError):
-        error_message = None
-        try:
-            error_message = e.response.json().get("message")
-        except AttributeError:
-            # ignore if no message
-            pass
-        except ValueError:
-            # ignore if no json
-            pass
-
-        logger.warning(
-            "%s %s - %s%s",
-            e.response.status_code,
-            e.response.reason_phrase,
-            e.request.url.path,
-            f" - {error_message}" if error_message else "",
-            stacklevel=2,
-        )
-    else:
-        logger.warning("Problem fetching %s", title, exc_info=e, stacklevel=2)
+    match e:
+        case httpx.HTTPStatusError(response=response):
+            error_message = _safe_get_json_error_message(response)
+            logger.warning(
+                "%s %s - %s%s",
+                response.status_code,
+                response.reason_phrase,
+                e.request.url.path,
+                f" - {error_message}" if error_message else "",
+                stacklevel=2,
+            )
+        case _:
+            logger.warning("Problem fetching %s", title, exc_info=e, stacklevel=2)
 
 
 class GithubRestApiClient:
     def __init__(
         self,
-        auth_token: str,
-        github_hostname: str = "api.github.com",
         *,
+        auth_token: str | None = None,
+        github_hostname: str | None = None,
         user_agent: str | None = None,
         per_page: int | None = None,
         max_retries: int | None = None,
@@ -90,15 +95,18 @@ def __init__(
             raise ValueError(msg)
 
         self._auth_token = auth_token
-        if github_hostname != "api.github.com":
-            self._base_url = f"https://{github_hostname}/api/v3"
-        else:
+        if github_hostname == "api.github.com" or github_hostname is None:
             self._base_url = "https://api.github.com"
+        else:
+            self._base_url = f"https://{github_hostname}/api/v3"
+
         self._per_page = per_page
         self._limit_storage = MemoryStorage()
+        if not self.auth_token:
+            logger.warning("Missing auth_token.")
         self._default_headers = httpx.Headers({
             "Accept": "application/vnd.github+json",
-            "Authorization": "Bearer " + self.auth_token,
+            "Authorization": f"Bearer {self.auth_token}",
             "X-GitHub-Api-Version": "2022-11-28",
         })
         if user_agent:

nodestream_github/github_teams.yaml

@@ -14,7 +14,6 @@
         node_id: !jmespath 'node_id'
       additional_indexes:
         - slug
-        - name
         - html_url
     - type: properties
       properties:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nodestream-plugin-github"
-version = "0.13.1-beta.3"
+version = "0.13.1-beta.4"
 description = ""
 authors = ["Jon Bristow <[email protected]>"]
 packages = [

tests/client/test_githubclient.py

@@ -83,3 +83,8 @@ async def test_pagination(httpx_mock: HTTPXMock):
 
     items = [item async for item in client._get_paginated("example")]
     assert items == ["a", "b", "c", "d"]
+
+
+def test_all_null_args():
+    # noinspection PyTypeChecker
+    assert GithubRestApiClient(auth_token=None, github_hostname=None)