Merge branch 'main' into one-at-a-time

dab_mechanic/wikidata_oauth.py

@@ -1,6 +1,10 @@
+"""Wikidata OAuth."""
+
+import typing
 from urllib.parse import urlencode
 
 from flask import current_app, session
+from requests.models import Response
 from requests_oauthlib import OAuth1Session
 
 WIKI_HOSTNAME = "en.wikipedia.org"
@@ -8,6 +12,8 @@ API_URL = f"https://{WIKI_HOSTNAME}/w/api.php"
 
 TIMEOUT = 20
 
+CallParams = dict[str, str | int]
+
 
 def get_edit_proxy() -> dict[str, str]:
     """Retrieve proxy information from config."""
@@ -18,7 +24,7 @@ def get_edit_proxy() -> dict[str, str]:
         return {}
 
 
-def api_post_request(params: dict[str, str | int]):
+def api_post_request(params: CallParams) -> Response:
     """HTTP Post using Oauth."""
     app = current_app
     client_key = app.config["CLIENT_KEY"]
@@ -30,10 +36,12 @@ def api_post_request(params: dict[str, str | int]):
         resource_owner_secret=session["owner_secret"],
     )
     proxies = get_edit_proxy()
-    return oauth.post(API_URL, data=params, timeout=TIMEOUT, proxies=proxies)
+    r: Response = oauth.post(API_URL, data=params, timeout=TIMEOUT, proxies=proxies)
+    return r
 
 
-def raw_request(params):
+def raw_request(params: CallParams) -> Response:
+    """Raw request."""
     app = current_app
     url = API_URL + "?" + urlencode(params)
     client_key = app.config["CLIENT_KEY"]
@@ -45,42 +53,49 @@ def raw_request(params):
         resource_owner_secret=session["owner_secret"],
     )
     proxies = get_edit_proxy()
-    return oauth.get(url, timeout=TIMEOUT, proxies=proxies)
+    r: Response = oauth.get(url, timeout=TIMEOUT, proxies=proxies)
+    return r
 
 
-def api_request(params):
-    return raw_request(params).json()
+def api_request(params: CallParams) -> dict[str, typing.Any]:
+    """Make API request and return object parsed from JSON."""
+    return typing.cast(dict[str, typing.Any], raw_request(params).json())
 
 
-def get_token():
-    params = {
+def get_token() -> str:
+    """Get csrftoken from MediaWiki API."""
+    params: CallParams = {
         "action": "query",
         "meta": "tokens",
         "format": "json",
         "formatversion": 2,
     }
     reply = api_request(params)
-    token = reply["query"]["tokens"]["csrftoken"]
+    token: str = reply["query"]["tokens"]["csrftoken"]
 
     return token
 
 
-def userinfo_call():
+def userinfo_call() -> dict[str, typing.Any]:
     """Request user information via OAuth."""
-    params = {"action": "query", "meta": "userinfo", "format": "json"}
+    params: CallParams = {"action": "query", "meta": "userinfo", "format": "json"}
     return api_request(params)
 
 
-def get_username():
+def get_username() -> str | None:
+    """Get username for current user."""
     if "owner_key" not in session:
-        return  # not authorized
+        return None  # not authorized
 
     if "username" in session:
+        assert isinstance(session["username"], str)
         return session["username"]
 
     reply = userinfo_call()
     if "query" not in reply:
-        return
-    session["username"] = reply["query"]["userinfo"]["name"]
+        return None
+    username = reply["query"]["userinfo"]["name"]
+    assert isinstance(username, str)
+    session["username"] = username
 
-    return session["username"]
+    return username