Core: Switches database driver from psycopg2 to psycopg

TYPE: Feature
LINK: OGC-3039

Author: Daverball

setup.cfg

@@ -117,7 +117,7 @@ install_requires =
     pglast
     phonenumbers
     polib
-    psycopg2
+    psycopg[c]
     purl
     pycurl
     pyparsing
@@ -209,7 +209,6 @@ mypy =
     types-passlib
     types-polib
     types-psutil
-    types-psycopg2
     types-pycurl
     types-pysaml2
     types-python-dateutil

src/onegov/activity/collections/attendee.py

@@ -9,9 +9,10 @@
     from datetime import date
     from onegov.user import User
     from sqlalchemy.orm import Query
+    from uuid import UUID  # noqa: F401
 
 
-class AttendeeCollection(GenericCollection[Attendee]):
+class AttendeeCollection(GenericCollection[Attendee, 'UUID']):
 
     @property
     def model_class(self) -> type[Attendee]:

src/onegov/activity/collections/booking.py

@@ -23,7 +23,7 @@
     ]
 
 
-class BookingCollection(GenericCollection[Booking]):
+class BookingCollection(GenericCollection[Booking, 'UUID']):
 
     def __init__(
         self,

src/onegov/activity/collections/occasion.py

@@ -12,9 +12,10 @@
     from collections.abc import Sequence
     from datetime import datetime
     from onegov.activity.models import Activity, BookingPeriod
+    from uuid import UUID  # noqa: F401
 
 
-class OccasionCollection(GenericCollection[Occasion]):
+class OccasionCollection(GenericCollection[Occasion, 'UUID']):
 
     @property
     def model_class(self) -> type[Occasion]:

src/onegov/activity/collections/period.py

@@ -7,9 +7,10 @@
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from datetime import date
+    from uuid import UUID  # noqa: F401
 
 
-class BookingPeriodCollection(GenericCollection[BookingPeriod]):
+class BookingPeriodCollection(GenericCollection[BookingPeriod, 'UUID']):
 
     @property
     def model_class(self) -> type[BookingPeriod]:

src/onegov/activity/collections/publication_request.py

@@ -3,8 +3,14 @@
 from onegov.activity.models.publication_request import PublicationRequest
 from onegov.core.collection import GenericCollection
 
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from uuid import UUID  # noqa: F401
 
-class PublicationRequestCollection(GenericCollection[PublicationRequest]):
+
+class PublicationRequestCollection(
+    GenericCollection[PublicationRequest, 'UUID']
+):
 
     @property
     def model_class(self) -> type[PublicationRequest]:

src/onegov/activity/collections/volunteer.py

@@ -74,7 +74,7 @@ class ReportRowWithoutVolunteer(NamedTuple):
     type ReportRow = ReportRowWithVolunteer | ReportRowWithoutVolunteer
 
 
-class VolunteerCollection(GenericCollection[Volunteer]):
+class VolunteerCollection(GenericCollection[Volunteer, 'UUID']):
 
     def __init__(
         self,

src/onegov/agency/api.py

@@ -10,6 +10,7 @@
 from onegov.api import ApiEndpoint, ApiInvalidParamException
 from onegov.api.utils import is_authorized
 from onegov.gis import Coordinates
+from uuid import UUID
 
 
 from typing import Any
@@ -97,7 +98,7 @@ def get_modified_iso_format(item: TimestampMixin) -> str:
     return item.last_change.isoformat()
 
 
-class PersonApiEndpoint(ApiEndpoint['ExtendedPerson'], ApisMixin):
+class PersonApiEndpoint(ApiEndpoint['ExtendedPerson', UUID], ApisMixin):
     request: CoreRequest
     app: AgencyApp
     endpoint = 'people'
@@ -106,6 +107,7 @@ class PersonApiEndpoint(ApiEndpoint['ExtendedPerson'], ApisMixin):
         'last_name': None
     } | dict.fromkeys(UPDATE_FILTER_PARAMS, UPDATE_FILTER_PROMPT)
     form_class = AuthenticatedPersonMutationForm
+    pk_type = UUID
 
     @property
     def title(self) -> str:
@@ -211,14 +213,15 @@ def apply_changes(
         do_report_person_change(item, form.meta.request, form)
 
 
-class AgencyApiEndpoint(ApiEndpoint['ExtendedAgency'], ApisMixin):
+class AgencyApiEndpoint(ApiEndpoint['ExtendedAgency', int], ApisMixin):
     request: CoreRequest
     app: AgencyApp
     endpoint = 'agencies'
     filters = {
         'parent': None,
         'title': None
     } | dict.fromkeys(UPDATE_FILTER_PARAMS, UPDATE_FILTER_PROMPT)
+    pk_type = int
 
     @property
     def title(self) -> str:
@@ -229,7 +232,7 @@ def collection(self) -> PaginatedAgencyCollection:
         result = PaginatedAgencyCollection(
             self.session,
             page=self.page or 0,
-            parent=self.get_filter('parent', None, False),
+            parent=self.get_filter('parent', None, False, coerce=int),
             joinedload=['organigram', 'parent'],
             undefer=['content']
         )
@@ -279,7 +282,7 @@ def item_links(self, item: ExtendedAgency) -> dict[str, Any]:
 
 
 class MembershipApiEndpoint(
-    ApiEndpoint['ExtendedAgencyMembership'],
+    ApiEndpoint['ExtendedAgencyMembership', UUID],
     ApisMixin
 ):
 
@@ -290,14 +293,15 @@ class MembershipApiEndpoint(
         'agency': None,
         'person': None
     } | dict.fromkeys(UPDATE_FILTER_PARAMS, UPDATE_FILTER_PROMPT)
+    pk_type = UUID
 
     @property
     def collection(self) -> PaginatedMembershipCollection:
         result = PaginatedMembershipCollection(
             self.session,
             page=self.page or 0,
-            agency=self.get_filter('agency'),
-            person=self.get_filter('person'),
+            agency=self.get_filter('agency', coerce=int),
+            person=self.get_filter('person', coerce=UUID),
         )
 
         for key, values in self.extra_parameters.items():

src/onegov/agency/app.py

@@ -219,13 +219,13 @@ def get_editor_assets() -> Iterator[str]:
 
 @AgencyApp.setting(section='api', name='endpoints')
 def get_api_endpoints_handler(
-) -> Callable[[AgencyRequest], Iterator[ApiEndpoint[Any]]]:
+) -> Callable[[AgencyRequest], Iterator[ApiEndpoint[Any, Any]]]:
 
     def get_api_endpoints(
             request: AgencyRequest,
             page: int = 0,
             extra_parameters: dict[str, Any] | None = None
-    ) -> Iterator[ApiEndpoint[Any]]:
+    ) -> Iterator[ApiEndpoint[Any, Any]]:
         yield AgencyApiEndpoint(request, extra_parameters, page)
         yield PersonApiEndpoint(request, extra_parameters, page)
         yield MembershipApiEndpoint(request, extra_parameters, page)

src/onegov/agency/collections/agencies.py

@@ -21,11 +21,11 @@
 
     class FilterParams(TypedDict, total=False):
         title: str | None
-        updated_gt: datetime | str | None
-        updated_ge: datetime | str | None
-        updated_eq: datetime | str | None
-        updated_le: datetime | str | None
-        updated_lt: datetime | str | None
+        updated_gt: datetime | None
+        updated_ge: datetime | None
+        updated_eq: datetime | None
+        updated_le: datetime | None
+        updated_lt: datetime | None
 
 
 class ExtendedAgencyCollection(AdjacencyListCollection[ExtendedAgency]):
@@ -47,23 +47,23 @@ def __init__(
 
 
 class PaginatedAgencyCollection(
-    GenericCollection[ExtendedAgency],
+    GenericCollection[ExtendedAgency, int],
     Pagination[ExtendedAgency]
 ):
 
     def __init__(
         self,
         session: Session,
         page: int = 0,
-        parent: str | Literal[False] | None = None,
+        parent: int | Literal[False] | None = None,
         exclude_hidden: bool = True,
         joinedload: Collection[str] | None = None,
         title: str | None = None,
-        updated_gt: datetime | str | None = None,
-        updated_ge: datetime | str | None = None,
-        updated_eq: datetime | str | None = None,
-        updated_le: datetime | str | None = None,
-        updated_lt: datetime | str | None = None,
+        updated_gt: datetime | None = None,
+        updated_ge: datetime | None = None,
+        updated_eq: datetime | None = None,
+        updated_le: datetime | None = None,
+        updated_lt: datetime | None = None,
         undefer: Collection[str] | None = None
     ) -> None: