chore: update to fastapi

domi41 · domi41 · commit 6150f61ed5da · 2025-05-31T02:59:29.000+02:00
never mind, it can't be done properly for now
dropping this
diff --git a/INSTALL.md b/INSTALL.md
@@ -1,3 +1,4 @@
+# Install
 
 ## Install using Docker
 
diff --git a/README.md b/README.md
@@ -28,7 +28,6 @@ You certainly want to apply the database migrations with:
     ./docker/migrate.sh
 
 
-
 ## Run the tests
 
     ./docker/test.sh
diff --git a/app/crud.py b/app/crud.py
@@ -227,7 +227,7 @@ def _check_if_ref_exists(db: Session, ref: str):
 
 
 def create_election(
-    db: Session, election: schemas.ElectionCreate
+    db: Session, election: schemas.ElectionCreate,
 ) -> schemas.ElectionGet:
     # We create first the election
     # without candidates and grades
@@ -236,7 +236,7 @@ def create_election(
         raise errors.InconsistentDatabaseError("Can not create election")
     election_ref = str(db_election.ref)
 
-    # Then, we add separatly candidates and grades
+    # Then, we add separately candidates and grades
     for candidate in election.candidates:
         params = candidate.model_dump()
         candidate = schemas.CandidateCreate(**params)
diff --git a/app/database.py b/app/database.py
@@ -1,7 +1,9 @@
 from __future__ import annotations
+
+from contextvars import ContextVar
 from urllib.parse import quote
 from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker, declarative_base
+from sqlalchemy.orm import sessionmaker, declarative_base, Session
 from .settings import settings
 
 
@@ -19,7 +21,7 @@
     engine = create_engine(database_url)
 
 SessionLocal: sessionmaker = sessionmaker(  # type: ignore
-    autocommit=False, autoflush=False, bind=engine
+    autocommit=False, autoflush=False, bind=engine,
 )
 
 Base = declarative_base()
@@ -31,3 +33,5 @@ def get_db():
         yield db
     finally:
         db.close()
+
+db_session: ContextVar[Session] = ContextVar('db_session')
diff --git a/app/main.py b/app/main.py
@@ -77,7 +77,7 @@ async def inconsistent_database_exception_handler(
     return JSONResponse(
         status_code=500,
         content={
-            "message": f"A serious error has occured with {exc.name}. {exc.details or ''}"
+            "message": f"A serious error has occurred with {exc.name}. {exc.details or ''}"
         },
     )
 
diff --git a/app/settings.py b/app/settings.py
@@ -3,7 +3,10 @@
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 class Settings(BaseSettings):
-    model_config = SettingsConfigDict(env_file=".env", extra="ignore")	
+    model_config = SettingsConfigDict(
+        env_file=".env.local",
+        extra="ignore",
+    )
 
     sqlite: bool = False
 
diff --git a/election/models.py b/election/models.py
diff --git a/election/serializers.py b/election/serializers.py
diff --git a/election/urls.py b/election/urls.py
diff --git a/election/views.py b/election/views.py
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -6,4 +6,23 @@ alembic==1.8.1
 types-python-jose==3.3.4
 types-python-dateutil==2.8.2
 mypy==1.15.0
-httpx>=0.22.0
+httpx>=0.22.0
+
+# Test Runners
+#nose==1.3.7
+behave==1.2.6
+#django-nose==1.4.6
+#behave-django==1.3.0
+
+# Assertion library
+pyhamcrest==2.0.2
+#git+git://github.com/domi41/PyHamcrest@hack-i18n#egg=pyhamcrest
+
+# Test Metrics
+coverage>=4.5.1
+
+# Natural Language Processor for numbers
+text2num>=2.2.0
+
+# Markup language for humans
+#PyYAML==5.3.1
diff --git a/requirements.txt b/requirements.txt
@@ -4,24 +4,6 @@ sqlalchemy==2.0.40
 pydantic==2.11.3
 psycopg2==2.9.5
 git+https://github.com/MieuxVoter/majority-judgment-library-python
-python-jose==3.3.0
+python-jose==3.4.0
 python-dateutil==2.8.2
 pydantic-settings==2.9.1
-
-# Test Runners
-nose==1.3.7
-#django-nose==1.4.6
-#behave-django==1.3.0
-
-# Assertion library
-#pyhamcrest==2.0.2
-git+git://github.com/domi41/PyHamcrest@hack-i18n#egg=pyhamcrest
-
-# Test Metrics
-coverage>=4.5.1
-
-# Natural Language Processor for numbers
-text2num>=2.2.0
-
-# Markup language for humans
-PyYAML==5.3.1
diff --git a/tests/acceptance/environment.py b/tests/acceptance/environment.py
@@ -3,6 +3,7 @@
 https://behave.readthedocs.io/en/latest/api.html#environment-file-functions
 """
 
+from behave.runner import Context
 from locale import setlocale, LC_TIME
 
 from steps.context_main import reset_context as reset_main_context
@@ -20,7 +21,7 @@
 # and calling it again with "re" after your step def.  (it uses a `global`)
 
 
-def before_all(context):
+def before_all(context: Context):
     """
     Ran before the whole shooting match.
     """
@@ -34,8 +35,8 @@ def before_feature(context, feature):
     context_locale = guess_locale(context)
     setlocale(LC_TIME, "%s.UTF-8" % context_locale)
     # REQUIRES CUSTOM FORK OF HAMCREST
-    from hamcrest import set_locale as set_hamcrest_locale
-    set_hamcrest_locale(context_locale)
+    # from hamcrest import set_locale as set_hamcrest_locale
+    # set_hamcrest_locale(context_locale)
     ##################################
 
 
diff --git a/tests/acceptance/steps/context_main.py b/tests/acceptance/steps/context_main.py
@@ -12,5 +12,6 @@
 
 
 def reset_context(context):
+    context.users = dict()
     context.that_user = None
     context.that_poll = None
diff --git a/tests/acceptance/steps/steps_esoteric_scrutin.py b/tests/acceptance/steps/steps_esoteric_scrutin.py
@@ -4,28 +4,47 @@
 """
 
 from behave import given, when, then, step
+from fastapi import Depends
 from hamcrest import assert_that, equal_to
 from datetime import datetime as clock, timedelta
 
-from election.models import Election
+from sqlalchemy.orm import Session
+# from sqlalchemy.testing import db
+
+from app import schemas
+from app.crud import create_election, create_candidate
+# from app.database import get_db, db_session
+from app.models import Grade
+# from app.models import Election, Candidate
 
 from tools_nlp import parse_amount, parse_yaml
 from tools_dbal import count_polls
 
 
-###############################################################################
+# db: Session = Depends(get_db)
 
 
 # @given
 @step(u"un(?: autre)? scrutin comme suit *:?")
 def there_is_a_poll_like_so(context):
     data = parse_yaml(context)
-    poll = Election()
-    poll.title = data.get('title')
-    poll.candidates = data.get('candidates')
-    poll.num_grades = data.get('grades', 7)
-    poll.finish_at = (timedelta(seconds=data.get('duration', 3600)) + clock.now()).timestamp()
-    poll.save()
+    # db: Session = Depends(get_db)
+    poll = create_election(
+        db=db,
+        election=schemas.ElectionCreate(
+            name=data.get('title'),
+            candidates=data.get('candidates'),
+            grades=data.get('grades', [
+                Grade(name="Excellent", description="", value=6),
+                Grade(name="Très Bien", description="", value=5),
+                Grade(name="Bien", description="", value=4),
+                Grade(name="Assez Bien", description="", value=3),
+                Grade(name="Passable", description="", value=2),
+                Grade(name="Insuffisant", description="", value=1),
+                Grade(name="À Rejeter", description="", value=0),
+            ]),
+        ),
+    )
     context.that_poll = poll
 
 
diff --git a/tests/acceptance/steps/steps_esoteric_user.py b/tests/acceptance/steps/steps_esoteric_user.py
@@ -32,4 +32,4 @@ def create_citizen_named(context, name):
 @step(u"(?:qu')?il(?: ne)? devrait y avoir (?P<amount>.+) citoyen(?:[⋅.-]?ne?|)s? dans la base de données")
 def there_should_be_n_users(context, amount):
     amount = parse_amount(context, amount)
-    assert_that(count_users(), equal_to(amount))
+    assert_that(count_users(context), equal_to(amount))
diff --git a/tests/acceptance/steps/toolbox.py b/tests/acceptance/steps/toolbox.py
@@ -3,9 +3,10 @@
 Not sure this is the python way.
 """
 
-from django.test import Client
-
+# from httpx import Client
+from fastapi.testclient import TestClient as Client
 
+from app.main import app
 # Keep these, it is used by those who import toolbox
 from tools_dbal import *
 from tools_nlp import *
@@ -19,7 +20,7 @@ class Actor(object):
     def __init__(self, name=None) -> None:
         super().__init__()
         self.name = name
-        self.client = Client()
+        self.client = Client(app)
         self.last_response = None
 
     def adjust_path(self, path):
diff --git a/tests/acceptance/steps/tools_dbal.py b/tests/acceptance/steps/tools_dbal.py
@@ -1,43 +1,53 @@
 """
 Local database abstraction layer for step defs.
 """
+from behave.runner import Context
+from fastapi import Depends
+from sqlalchemy.orm import Session
+# from sqlalchemy.testing import db
 
+from app import errors
+from app.crud import get_election
+from app.database import get_db
+from app.models import Election
 
-from django.contrib.auth.models import User
-from election.models import Election
 
+db: Session = Depends(get_db)
 
-def make_user(context, username):
-    return User.objects.create_user(
-        username=username,
-        email='user@test.mieuxvoter.fr',
-        password=username
-    )
 
+class User:
+    def __init__(self, username):
+        self.username = username
 
-def count_users():
-    return User.objects.count()
 
+def make_user(context: Context, username):
+    user = User(username)
+    context.users[username] = user
+    return user
 
-def count_polls():  # TBD: "scrutin" translates to "poll"?
-    return Election.objects.count()
 
+def count_users(context: Context):
+    return len(context.users.items())
 
-def find_user(identifier, relax=False):
-    user = User.objects.get(username=identifier)
+
+def find_user(context: Context, username: str, relax=False):
+    user = context.users.get(username, None)
     if user is not None:
         return user
     if not relax:
-        raise ValueError("No user found matching `%s`." % identifier)
+        raise ValueError("No user found matching `%s`." % username)
     return None
 
 
+def count_polls():
+    return db.query(Election).count()
+
+
 def find_poll(identifier, relax=False):
-    poll = Election.objects.get(title=identifier)
-    if poll is not None:
-        return poll
-    if not relax:
-        raise ValueError("No poll found matching `%s`." % identifier)
+    try:
+        return get_election(db, identifier)
+    except errors.NotFoundError:
+        if not relax:
+            raise ValueError("No poll found matching `%s`." % identifier)
     return None
 
-
diff --git a/tests/acceptance/steps/tools_nlp.py b/tests/acceptance/steps/tools_nlp.py
@@ -3,12 +3,14 @@
 """
 
 import re
+
+from behave.runner import Context
 from text_to_num import text2num
 
 from tools_i18n import guess_locale
 
 
-def parse_amount(context, amount_string):
+def parse_amount(context: Context, amount_string):
     """
     - Multilingual (hopefully) EN - FR - …
     - Tailored for Gherkin features and behave
@@ -24,7 +26,8 @@ def parse_amount(context, amount_string):
         if re.match("^no(?:ne)?$", amount_string):
             return 0
 
-    return text2num(text=amount_string, lang=language, relaxed=True)
+    # return text2num(text=amount_string, lang=language, relaxed=True)
+    return text2num(text=amount_string, lang=language)
 
 
 def parse_yaml(context, with_i18n=True):

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# Install`
`1`	`2`
`2`	`3`	`## Install using Docker`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ async def inconsistent_database_exception_handler(`
`77`	`77`	`return JSONResponse(`
`78`	`78`	`status_code=500,`
`79`	`79`	`content={`
`80`		`- "message": f"A serious error has occured with {exc.name}. {exc.details or ''}"`
	`80`	`+ "message": f"A serious error has occurred with {exc.name}. {exc.details or ''}"`
`81`	`81`	`},`
`82`	`82`	`)`
`83`	`83`