work in progress

Author: rustyconover

pyproject.toml

@@ -40,6 +40,7 @@ dev-dependencies = [
     "pytest-xdist>=3.6.1",
     "ruff>=0.6.2",
     "moto>=5.1.4",
+    "mypy-boto3-s3>=1.38.44",
 ]
 
 [tool.rye.include]

requirements-dev.lock

@@ -12,27 +12,27 @@
 -e file:.
 annotated-types==0.7.0
     # via pydantic
-boto3==1.38.9
+boto3==1.38.46
     # via moto
     # via query-farm-server-base
-botocore==1.38.9
+botocore==1.38.46
     # via boto3
     # via moto
     # via s3transfer
 cache3==0.4.3
     # via query-farm-server-base
-certifi==2025.4.26
+certifi==2025.6.15
     # via requests
     # via sentry-sdk
 cffi==1.17.1
     # via cryptography
 charset-normalizer==3.4.2
     # via requests
-click==8.1.8
+click==8.2.1
     # via query-farm-server-base
-coverage==7.8.0
+coverage==7.9.1
     # via pytest-cov
-cryptography==44.0.3
+cryptography==45.0.4
     # via moto
 execnet==2.1.1
     # via pytest-xdist
@@ -54,42 +54,47 @@ levenshtein==0.27.1
 markupsafe==3.0.2
     # via jinja2
     # via werkzeug
-moto==5.1.4
-msgpack==1.1.0
+moto==5.1.6
+msgpack==1.1.1
     # via query-farm-server-base
-mypy==1.15.0
+mypy==1.16.1
     # via pytest-mypy
 mypy-boto3-dynamodb==1.38.4
     # via query-farm-server-base
-mypy-boto3-s3==1.38.0
+mypy-boto3-s3==1.38.44
     # via query-farm-server-base
 mypy-extensions==1.1.0
     # via mypy
 packaging==25.0
     # via pytest
-pluggy==1.5.0
+pathspec==0.12.1
+    # via mypy
+pluggy==1.6.0
     # via pytest
+    # via pytest-cov
 prettytable==3.16.0
     # via query-farm-server-base
 pyarrow==20.0.0
     # via query-farm-server-base
 pycparser==2.22
     # via cffi
-pydantic==2.11.4
+pydantic==2.11.7
     # via query-farm-server-base
 pydantic-core==2.33.2
     # via pydantic
-pytest==8.3.5
+pygments==2.19.2
+    # via pytest
+pytest==8.4.1
     # via pytest-cov
     # via pytest-env
     # via pytest-mypy
     # via pytest-parallel
     # via pytest-xdist
-pytest-cov==6.1.1
+pytest-cov==6.2.1
 pytest-env==1.1.5
 pytest-mypy==1.0.1
 pytest-parallel==0.1.1
-pytest-xdist==3.6.1
+pytest-xdist==3.7.0
 python-dateutil==2.9.0.post0
     # via botocore
     # via moto
@@ -99,30 +104,30 @@ pyyaml==6.0.2
     # via responses
 rapidfuzz==3.13.0
     # via levenshtein
-requests==2.32.3
+requests==2.32.4
     # via moto
     # via responses
 responses==0.25.7
     # via moto
-ruff==0.11.8
-s3transfer==0.12.0
+ruff==0.12.1
+s3transfer==0.13.0
     # via boto3
-sentry-sdk==2.27.0
+sentry-sdk==2.32.0
     # via query-farm-server-base
 six==1.17.0
     # via python-dateutil
-structlog==25.3.0
+structlog==25.4.0
     # via query-farm-server-base
 tblib==3.1.0
     # via pytest-parallel
-typing-extensions==4.13.2
+typing-extensions==4.14.0
     # via mypy
     # via pydantic
     # via pydantic-core
     # via typing-inspection
-typing-inspection==0.4.0
+typing-inspection==0.4.1
     # via pydantic
-urllib3==2.4.0
+urllib3==2.5.0
     # via botocore
     # via requests
     # via responses

requirements.lock

@@ -12,16 +12,16 @@
 -e file:.
 annotated-types==0.7.0
     # via pydantic
-boto3==1.38.9
+boto3==1.38.46
     # via query-farm-server-base
-botocore==1.38.9
+botocore==1.38.46
     # via boto3
     # via s3transfer
 cache3==0.4.3
     # via query-farm-server-base
-certifi==2025.4.26
+certifi==2025.6.15
     # via sentry-sdk
-click==8.1.8
+click==8.2.1
     # via query-farm-server-base
 fuzzywuzzy==0.18.0
     # via query-farm-server-base
@@ -30,17 +30,17 @@ jmespath==1.0.1
     # via botocore
 levenshtein==0.27.1
     # via python-levenshtein
-msgpack==1.1.0
+msgpack==1.1.1
     # via query-farm-server-base
 mypy-boto3-dynamodb==1.38.4
     # via query-farm-server-base
-mypy-boto3-s3==1.38.0
+mypy-boto3-s3==1.38.44
     # via query-farm-server-base
 prettytable==3.16.0
     # via query-farm-server-base
 pyarrow==20.0.0
     # via query-farm-server-base
-pydantic==2.11.4
+pydantic==2.11.7
     # via query-farm-server-base
 pydantic-core==2.33.2
     # via pydantic
@@ -50,21 +50,21 @@ python-levenshtein==0.27.1
     # via query-farm-server-base
 rapidfuzz==3.13.0
     # via levenshtein
-s3transfer==0.12.0
+s3transfer==0.13.0
     # via boto3
-sentry-sdk==2.27.0
+sentry-sdk==2.32.0
     # via query-farm-server-base
 six==1.17.0
     # via python-dateutil
-structlog==25.3.0
+structlog==25.4.0
     # via query-farm-server-base
-typing-extensions==4.13.2
+typing-extensions==4.14.0
     # via pydantic
     # via pydantic-core
     # via typing-inspection
-typing-inspection==0.4.0
+typing-inspection==0.4.1
     # via pydantic
-urllib3==2.4.0
+urllib3==2.5.0
     # via botocore
     # via sentry-sdk
 wcwidth==0.2.13

src/query_farm_server_base/auth_manager.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import Any, Generic, TypeVar
+from typing import Any, TypeVar
 
 import structlog
 
@@ -14,7 +14,7 @@
 
 
 # This is your virtual base class
-class AuthManager(ABC, Generic[AccountType, TokenType]):
+class AuthManager[AccountType: auth.Account, TokenType: auth.AccountToken](ABC):
     @abstractmethod
     def allow_anonymous_access(self) -> bool:
         """Return True if anonymous access is allowed."""

src/query_farm_server_base/auth_manager_naive.py

@@ -32,9 +32,7 @@ def __init__(
 
     def data_for_token(self, token: str) -> TokenType:
         if self.tokens.get(token) is None:
-            self.upsert_token(
-                self._token_type(token=token, account_id=token, email="example@example.com")
-            )
+            self.upsert_token(self._token_type(token=token, account_id=token))
             self.upsert_account(
                 self._account_type(
                     account_id=token, email="example@example.com", name="Dynamic Account"