refactor: replace gn3.auth.db with gn3.sqlite_db_utils and drop all refs to gn3.auth

6 files changed, 2 insertions, 29 deletions

diff --git a/gn3/api/llm.py b/gn3/api/llm.py
index 9a44440..d6cd737 100644
--- a/gn3/api/llm.py
+++ b/gn3/api/llm.py
@@ -12,7 +12,7 @@ from gn3.llms.process import get_gnqa
 from gn3.llms.errors import LLMError
 
 from gn3.oauth2.authorisation import require_token
-from gn3.auth import db
+from gn3 import sqlite_db_utils as db
 
 
 gnqa = Blueprint("gnqa", __name__)
diff --git a/gn3/auth/__init__.py b/gn3/auth/__init__.py
deleted file mode 100644
index d9caec9..0000000
--- a/gn3/auth/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Top-Level `Auth` module"""
diff --git a/gn3/auth/db_utils.py b/gn3/auth/db_utils.py
deleted file mode 100644
index c06b026..0000000
--- a/gn3/auth/db_utils.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""Some common auth db utilities"""
-from typing import Any, Callable
-from flask import current_app
-
-from . import db
-
-def with_db_connection(func: Callable[[db.DbConnection], Any]) -> Any:
-    """
-    Takes a function of one argument `func`, whose one argument is a database
-    connection.
-    """
-    db_uri = current_app.config["AUTH_DB"]
-    with db.connection(db_uri) as conn:
-        return func(conn)
diff --git a/gn3/auth/dictify.py b/gn3/auth/dictify.py
deleted file mode 100644
index f9337f6..0000000
--- a/gn3/auth/dictify.py
+++ /dev/null
@@ -1,12 +0,0 @@
-"""Module for dictifying objects"""
-
-from typing import Any, Protocol
-
-class Dictifiable(Protocol):# pylint: disable=[too-few-public-methods]
-    """Type annotation for generic object with a `dictify` method."""
-    def dictify(self):
-        """Convert the object to a dict"""
-
-def dictify(obj: Dictifiable) -> dict[str, Any]:
-    """Turn `obj` to a dict representation."""
-    return obj.dictify()
diff --git a/gn3/auth/db.py b/gn3/sqlite_db_utils.py
index 5cd230f..5cd230f 100644
--- a/gn3/auth/db.py
+++ b/gn3/sqlite_db_utils.py
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
index 8005c8e..d9d5492 100644
--- a/tests/unit/conftest.py
+++ b/tests/unit/conftest.py
@@ -15,7 +15,7 @@ def fxtr_app():
         testdb = Path(testdir).joinpath(
             f'testdb_{datetime.now().strftime("%Y%m%dT%H%M%S")}')
         app = create_app({
-            "TESTING": True, "AUTH_DB": testdb,
+            "TESTING": True,
             "OAUTH2_ACCESS_TOKEN_GENERATOR": "tests.unit.auth.test_token.gen_token"
         })
         app.testing = True