type hint updates, flask-sqlalchemy updates

le717 · Nov 21, 2022 · 542fee0 · 542fee0
1 parent e1d4faa
commit 542fee0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/db/env.py b/db/env.py
@@ -74,7 +74,7 @@ def process_revision_directives(context, revision, directives):
         context.configure(
             connection=connection,
             target_metadata=target_metadata,
-            process_revision_directives=process_revision_directives
+            process_revision_directives=process_revision_directives,
         )
 
         with context.begin_transaction():

diff --git a/src/core/database/linkrot.py b/src/core/database/linkrot.py
@@ -1,5 +1,5 @@
 import re
-from typing import Literal, TypedDict, Union
+from typing import Literal, TypedDict
 
 import requests
 import sys_vars
@@ -38,7 +38,7 @@ def __ping_url(url: str) -> bool:
         return False
 
 
-def __ping_wayback_machine(url: str) -> Union[Literal[False], str]:
+def __ping_wayback_machine(url: str) -> Literal[False] | str:
     """Check the Web Archive for an archived URL."""
     r = requests.get(f"https://archive.org/wayback/available?url={url}").json()
     if not r["archived_snapshots"]:
@@ -55,7 +55,9 @@ def __create(data: WebLink) -> Literal[True]:
 
 
 def __get(uuid: str) -> RottedLinks:
-    return RottedLinks.query.filter_by(id=uuid).first()
+    return (
+        db.session.execute(db.select(RottedLinks).filter_by(id=uuid)).scalars().first()
+    )
 
 
 def __update(data: RottedLinks) -> Literal[True]:

diff --git a/src/core/database/weblink.py b/src/core/database/weblink.py
@@ -58,7 +58,7 @@ def exists(uuid: str) -> bool:
 
 def get(uuid: str) -> Optional[WebLink]:
     """Get a single weblink."""
-    return WebLink.query.filter_by(id=uuid).first()
+    return db.session.execute(db.select(WebLink).filter_by(id=uuid)).scalars().first()
 
 
 def get_all(with_rotted: bool = False, **kwargs: Any) -> list[WebLink]:
@@ -72,7 +72,7 @@ def get_all(with_rotted: bool = False, **kwargs: Any) -> list[WebLink]:
     # Remove all rotted links
     if not with_rotted:
         filters.append(WebLink.is_dead != "1")
-    wbs = WebLink.query.filter(*filters).all()
+    wbs = db.session.execute(db.select(WebLink).filter(*filters)).scalars().all()
 
     # Adjust the title of the link depending on status
     for wb in wbs:

diff --git a/src/core/logger.py b/src/core/logger.py
@@ -2,7 +2,6 @@
 import logging
 from logging.handlers import RotatingFileHandler
 from pathlib import Path
-from typing import Union
 
 from flask import request
 import requests

diff --git a/tests/helpers.py b/tests/helpers.py
@@ -1,6 +1,6 @@
 import json
 from urllib.parse import urlencode
-from typing import Any, Union
+from typing import Any
 
 
 __all__ = [
@@ -27,11 +27,11 @@ def authed_request(*args: str, **kwargs: Any) -> str:
     return f"{endpoint}?{__auth_key(kwargs['auth'])}".replace("//", "/")
 
 
-def from_json(data: str) -> Union[dict, list]:
+def from_json(data: str) -> dict | list:
     return json.loads(data)
 
 
-def to_json(data: Union[dict, list]) -> str:
+def to_json(data: dict | list) -> str:
     return json.dumps(data)