libres 0.8.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

libres/__init__.py

@@ -5,7 +5,7 @@ from libres.db import new_scheduler
 
 registry = create_default_registry()
 
-__version__ = '0.8.0'
+__version__ = '0.9.1'
 __all__ = (
     'new_scheduler',
     'registry'

libres/context/core.py

@@ -61,15 +61,15 @@ class ContextServicesMixin:
 
     @cached_property
     def is_allocation_exposed(self) -> Callable[[Allocation], bool]:
-        return self.context.get_service('exposure').is_allocation_exposed
+        return self.context.get_service('exposure').is_allocation_exposed  # type: ignore[no-any-return]
 
     @cached_property
     def generate_uuid(self) -> Callable[[str], UUID]:
-        return self.context.get_service('uuid_generator')
+        return self.context.get_service('uuid_generator')  # type: ignore[no-any-return]
 
     @cached_property
     def validate_email(self) -> Callable[[str], bool]:
-        return self.context.get_service('email_validator')
+        return self.context.get_service('email_validator')  # type: ignore[no-any-return]
 
     def clear_cache(self) -> None:
         """ Clears the cache of the mixin. """
@@ -91,12 +91,12 @@ class ContextServicesMixin:
 
     @property
     def session_provider(self) -> SessionProvider:
-        return self.context.get_service('session_provider')
+        return self.context.get_service('session_provider')  # type: ignore[no-any-return]
 
     @property
     def session(self) -> Session:
         """ Returns the current session. """
-        return self.session_provider.session()
+        return self.session_provider.session()  # type: ignore[no-any-return]
 
     def close(self) -> None:
         """ Closes the current session. """

libres/context/registry.py

@@ -82,6 +82,8 @@ class Registry:
     """
 
     contexts: dict[str, Context]
+    # FIXME: Why do we allow this to be None? Do we make use
+    #        of this anywhere?
     master_context: Context | None = None
 
     def __init__(self) -> None:
@@ -98,7 +100,7 @@ class Registry:
         if not hasattr(self.local, 'current_context'):
             self.local.current_context = self.master_context
 
-        return self.local.current_context
+        return self.local.current_context  # type: ignore[no-any-return]
 
     def is_existing_context(self, name: str) -> bool:
         return name in self.contexts

libres/db/models/allocation.py

@@ -34,14 +34,18 @@ if TYPE_CHECKING:
     from collections.abc import Iterator
     from sedate.types import TzInfoOrName
     from sqlalchemy.orm import Query
+    from typing import NamedTuple
     from typing_extensions import Self
 
-    from libres.db.models import Reservation, ReservedSlot
+    from libres.db.models import ReservedSlot
     from libres.modules.rasterizer import Raster
 
     _OptDT1 = TypeVar('_OptDT1', 'datetime | None', datetime, None)
     _OptDT2 = TypeVar('_OptDT2', 'datetime | None', datetime, None)
 
+    class _ReservationIdRow(NamedTuple):
+        id: int
+
 
 class Allocation(TimestampMixin, ORMBase, OtherModels):
     """Describes a timespan within which one or many timeslots can be
@@ -114,7 +118,7 @@ class Allocation(TimestampMixin, ORMBase, OtherModels):
     timezone: Column[str | None] = Column(types.String())
 
     #: Custom data reserved for the user
-    data: Column[Any | None] = Column(
+    data: Column[dict[str, Any] | None] = Column(
         JSON(),
         nullable=True
     )
@@ -470,7 +474,7 @@ class Allocation(TimestampMixin, ORMBase, OtherModels):
             return self.display_start(timezone), self.display_end(timezone)
 
     @property
-    def pending_reservations(self) -> Query[Reservation]:
+    def pending_reservations(self) -> Query[_ReservationIdRow]:
         """ Returns the pending reservations query for this allocation.
         As the pending reservations target the group and not a specific
         allocation this function returns the same value for masters and
@@ -482,6 +486,7 @@ class Allocation(TimestampMixin, ORMBase, OtherModels):
         )
 
         Reservation = self.models.Reservation  # noqa: N806
+        query: Query[_ReservationIdRow]
         query = object_session(self).query(Reservation.id)
         query = query.filter(Reservation.target == self.group)
         query = query.filter(Reservation.status == 'pending')
@@ -794,7 +799,9 @@ class Allocation(TimestampMixin, ORMBase, OtherModels):
         if self.is_master:
             return self
         else:
-            query = object_session(self).query(Allocation)
+            # FIXME: This should either query `self.__class__` or
+            #        we need to return `Allocation` rather than `Self`
+            query: Query[Self] = object_session(self).query(Allocation)
             query = query.filter(Allocation._start == self._start)
             query = query.filter(Allocation.resource == self.mirror_of)
 
@@ -818,7 +825,9 @@ class Allocation(TimestampMixin, ORMBase, OtherModels):
             assert self.is_master
             return [self]
 
-        query = object_session(self).query(Allocation)
+        # FIXME: This should either query `self.__class__` or
+        #        we need to return `Allocation` rather than `Self`
+        query: Query[Self] = object_session(self).query(Allocation)
         query = query.filter(Allocation.mirror_of == self.mirror_of)
         query = query.filter(Allocation._start == self._start)
 

libres/db/models/reservation.py

@@ -96,7 +96,7 @@ class Reservation(TimestampMixin, ORMBase, OtherModels):
         nullable=False
     )
 
-    data: Column[Any | None] = deferred(
+    data: Column[dict[str, Any] | None] = deferred(
         Column(
             JSON(),
             nullable=True
@@ -148,7 +148,7 @@ class Reservation(TimestampMixin, ORMBase, OtherModels):
         # order by date
         query = query.order_by(Allocation._start)
 
-        return query
+        return query  # type: ignore[no-any-return]
 
     def display_start(
         self,
@@ -212,4 +212,4 @@ class Reservation(TimestampMixin, ORMBase, OtherModels):
         # A reservation is deemed autoapprovable if no allocation
         # requires explicit approval
 
-        return object_session(self).query(~query.exists()).scalar()
+        return object_session(self).query(~query.exists()).scalar()  # type: ignore[no-any-return]

libres/db/models/types/json_type.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
-from json import loads, dumps
-from sqlalchemy.types import TypeDecorator, TEXT
+from sqlalchemy.ext.mutable import MutableDict
+from sqlalchemy.types import TypeDecorator
+from sqlalchemy.dialects.postgresql import JSONB
 
 
 from typing import Any
@@ -9,43 +10,37 @@ from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from sqlalchemy.engine import Dialect
 
-    _Base = TypeDecorator[Any]
+    _Base = TypeDecorator[dict[str, Any]]
 else:
     _Base = TypeDecorator
 
 
 class JSON(_Base):
-    """Like the default JSON, but using the json serializer from the dialect
-    (postgres) each time the value is read, even if it never left the ORM. The
-    default json type will only do it when the record is read from the
-    database.
+    """ A JSONB based type that coerces None's to empty dictionaries.
+
+    That is, this JSONB column cannot be `'null'::jsonb`. It could
+    still be `NULL` though, if it's nullable and never explicitly
+    set. But on the Python end you should always see a dictionary.
 
     """
 
-    # Use TEXT for now to stay compatible with Postgres 9.1. In the future
-    # this will be replaced by JSON (or JSONB) though that requires that we
-    # require a later Postgres release. For now we stay backwards compatible
-    # with a version that's still widely used (9.1).
-    impl = TEXT
+    impl = JSONB
 
-    def process_bind_param(
+    def process_bind_param(  # type:ignore[override]
         self,
-        value: Any,
+        value: dict[str, Any] | None,
         dialect: Dialect
-    ) -> str | None:
-
-        if value is not None:
-            value = (dialect._json_serializer or dumps)(value)  # type:ignore
+    ) -> dict[str, Any]:
 
-        return value
+        return {} if value is None else value
 
     def process_result_value(
         self,
-        value: str | None,
+        value: dict[str, Any] | None,
         dialect: Dialect
-    ) -> Any | None:
+    ) -> dict[str, Any]:
+
+        return {} if value is None else value
 
-        if value is not None:
-            value = (dialect._json_deserializer or loads)(value)  # type:ignore
 
-        return value
+MutableDict.associate_with(JSON)  # type:ignore[no-untyped-call]

libres/db/scheduler.py

@@ -269,7 +269,7 @@ class Scheduler(ContextServicesMixin):
         allocations = allocations.with_entities(Allocation.id)
         allocations = allocations.filter(Allocation.group.in_(groups))
 
-        query = self.managed_allocations()
+        query: Query[Allocation] = self.managed_allocations()
         query = query.join(ReservedSlot)
         query = query.filter(
             ReservedSlot.reservation_token == token
@@ -306,7 +306,10 @@ class Scheduler(ContextServicesMixin):
     ) -> list[tuple[datetime, datetime]]:
 
         query = self.allocations_by_group(group)
-        dates_query = query.with_entities(Allocation._start, Allocation._end)
+        dates_query: Query[tuple[datetime, datetime]] = query.with_entities(
+            Allocation._start,
+            Allocation._end
+        )
         return dates_query.all()
 
     def allocation_mirrors_by_master(
@@ -336,7 +339,7 @@ class Scheduler(ContextServicesMixin):
         query = self.allocations_by_ids(ids)
         query = query.filter(Allocation.approve_manually == True)
 
-        return self.session.query(query.exists()).scalar()
+        return self.session.query(query.exists()).scalar()  # type: ignore[no-any-return]
 
     def allocate(
         self,
@@ -1273,8 +1276,9 @@ class Scheduler(ContextServicesMixin):
         # reservation twice on a single session
         if session_id:
             found = self.queries.reservations_by_session(session_id)
-            found = found.with_entities(Reservation.target, Reservation.start)
-            found_set = set(found)
+            found_set: set[tuple[UUID, datetime | None]] = set(
+                found.with_entities(Reservation.target, Reservation.start)
+            )
 
             for reservation in reservations:
                 if (reservation.target, reservation.start) in found_set:
@@ -1625,8 +1629,6 @@ class Scheduler(ContextServicesMixin):
         assert start
         assert end
 
-        start, end = self._prepare_range(start, end)
-
         assert whole_day in ('yes', 'no', 'any')
         assert groups in ('yes', 'no', 'any')
 
@@ -1641,7 +1643,7 @@ class Scheduler(ContextServicesMixin):
         else:
             day_numbers = None
 
-        query = self.allocations_in_range(start, end)
+        query = self.allocations_in_range(*self._prepare_range(start, end))
         query = query.order_by(Allocation._start)
 
         allocations = []
@@ -1653,13 +1655,19 @@ class Scheduler(ContextServicesMixin):
 
             if not self.is_allocation_exposed(allocation):
                 continue
-
-            s = datetime.combine(allocation.start.date(), start.time())
-            e = datetime.combine(allocation.end.date(), end.time())
-
-            # the raw dates will be UTC
-            s = sedate.replace_timezone(s, 'UTC')
-            e = sedate.replace_timezone(e, 'UTC')
+            allocation_start = allocation.display_start()
+            # NOTE: We want the correct timezone, but we don't want the
+            #       date to be on the next day for a full-day reservation
+            #       so we skip the microsecond addition
+            allocation_end = sedate.to_timezone(allocation.end, self.timezone)
+            s = sedate.standardize_date(datetime.combine(
+                allocation_start.date(),
+                start.time()
+            ), self.timezone)
+            e = sedate.standardize_date(datetime.combine(
+                allocation_end.date(),
+                end.time()
+            ), self.timezone)
 
             if not allocation.overlaps(s, e):
                 continue

{libres-0.8.0.dist-info → libres-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: libres
-Version: 0.8.0
+Version: 0.9.1
 Summary: A library to reserve things
 Home-page: http://github.com/seantis/libres/
 Author: Denis Krienbühl
@@ -51,13 +51,14 @@ Requires-Dist: types-psycopg2; extra == "mypy"
 Requires-Dist: types-python-dateutil; extra == "mypy"
 Requires-Dist: types-pytz; extra == "mypy"
 Requires-Dist: typing-extensions; extra == "mypy"
+Dynamic: license-file
 
 Libres
 ======
 
 Libres is a reservations management library to reserve things like tables at
-a restaurant or tickets at an event. It works with Python 3.8+
-and requires Postgresql 9.1+.
+a restaurant or tickets at an event. It works with Python 3.9+
+and requires Postgresql 9.2+.
 
 `Documentation <http://libres.readthedocs.org/en/latest/>`_ | `Source <http://github.com/seantis/libres/>`_ | `Bugs <http://github.com/seantis/libres/issues>`_
 
@@ -141,6 +142,28 @@ After this, create a new release on Github.
 Changelog
 ---------
 
+0.9.1 (05.08.2025)
+~~~~~~~~~~~~~~~~~~~
+
+- Fixes bug in `Scheduler.search_allocations` when the searched
+  time range contains multiple DST <-> ST transitions.
+  [Daverball]
+
+0.9.0 (23.05.2025)
+~~~~~~~~~~~~~~~~~~~
+
+- Replaces `JSON` database type with `JSONB`, this means
+  Postgres as a backend is not required. You will also need
+  to write a migration for existing JSON columns. You may use
+  the following recipe using an alembic `Operations` object::
+
+    operations.alter_column(
+      'table_name',
+      'column_name',
+      type_=JSON,
+      postgresql_using='"column_name"::jsonb'
+    )
+
 0.8.0 (15.01.2025)
 ~~~~~~~~~~~~~~~~~~~
 

{libres-0.8.0.dist-info → libres-0.9.1.dist-info}/RECORD

@@ -1,24 +1,24 @@
 libres/.gitignore,sha256=tyWYoDW7-zMdsfiJIVONRWJ5JmqJCTHzBOsi_rkIYZg,49
-libres/__init__.py,sha256=2QrrbMI8BVca59DEOOBgREHXCcaj7cVNT4lvHfmsRnA,243
+libres/__init__.py,sha256=d2iNp33yOxIx7AAvW064M_9oiCtEl9Zxr1WVwK8Vl1U,243
 libres/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 libres/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-libres/context/core.py,sha256=a-T7hCQPjLdCBYNk3PXaBJ41Kp8-TDPYSSgJjbEj9VY,7198
+libres/context/core.py,sha256=AZMmFVqTVSkK3pomhoamLWOeqynY23g_uf32yjhgrRQ,7353
 libres/context/exposure.py,sha256=0krsky3XYplG7Uf5oLlQgdXp6XuEDjN2JGe3ljgLM14,287
-libres/context/registry.py,sha256=Dhgp-0mv_YRKoXOS7kgJR9I71VRdlGmpeC6fPHARa-k,4863
+libres/context/registry.py,sha256=JfV-QccpDbAEq154aHu7_-hznr5kXYY58czZ-0-m8vA,4986
 libres/context/session.py,sha256=bVvZ7cvSKffGrzxpDM7vKrGgwAPWRoS4No6HK1--xlg,2488
 libres/context/settings.py,sha256=IkdG67QUUuk_sQMXiwsJgelrsbx6M-7f72uJBA2JoJA,1374
 libres/db/__init__.py,sha256=Fks6T8aEacYVvXB9U1v182zKX7SuEUAkC5hTK50AuQk,145
 libres/db/queries.py,sha256=mVLMcFh7tbAOOp8fveB1T-ZBt0X3hQiaN5Krt5Mmhhs,10917
-libres/db/scheduler.py,sha256=urxmtrAppwqtZG34TKeV33GWkf8FtPoR7vmirkNJ0uc,64217
+libres/db/scheduler.py,sha256=Pg-bgyrMgCE54K7sXxChNw_NTIdviCZSO7_X0LG0o34,64711
 libres/db/models/__init__.py,sha256=IL52K-0tg_v6zuiiE2k4UQNqneeb8CLUUVo_t_OBU-g,325
-libres/db/models/allocation.py,sha256=Myv0uSvaZobEp2cJ4HJNrhHi44dgir9zowj8eBv6GXg,28577
+libres/db/models/allocation.py,sha256=Zi-H3HGz4Xt9VhwUZmoUMc8xGr8rPBNiHGumnYcjlwI,29005
 libres/db/models/base.py,sha256=Y2Lc60vJ1Du73D0sLozVNi1TfhtrQ3i_64NV7hsnc4g,117
 libres/db/models/other.py,sha256=REg6GlJo58eAubu4MzJqNtWqoEJrq_hTGeOs7XYU5BQ,791
-libres/db/models/reservation.py,sha256=kPumvHkskqOOKrO-nT4W7dNGbyK4T6USd42TbFWy4j4,5792
+libres/db/models/reservation.py,sha256=GmDf9r_Sr0ZOQG2q-GbOtDTeJkOa8FJSi2tpWYk_hEA,5865
 libres/db/models/reserved_slot.py,sha256=_r8RUHlaQHDgo14oO5mPUyfS8pI4jmrP-_l5HzuCPwA,3090
 libres/db/models/timestamp.py,sha256=EsuxdQSUsPCkHb1F7HdrDevWZ5wDWerDFRIhqfhefNw,1301
 libres/db/models/types/__init__.py,sha256=8fx7ecDasCKsCJxGjt4qP5BbDJCG88dJRa0nzD6IetY,186
-libres/db/models/types/json_type.py,sha256=cvSYlTmAcZRBHgyd86Bd3TlB3pDeBBODudUuO_s8gMQ,1357
+libres/db/models/types/json_type.py,sha256=ko6K4YRWERWCpg0wYzuwJ_u-VLJ4K3j3ksJ7cGyiMzw,1137
 libres/db/models/types/utcdatetime.py,sha256=4Wlk0Yc6e3PljOjngUGuYvo8jps76RYVkCEwmPygzsY,1285
 libres/db/models/types/uuid_type.py,sha256=sesgyF65JV0Zh2ty7rSeALpZxKjVg1Y68_Pv7gJAuAo,1675
 libres/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -26,8 +26,8 @@ libres/modules/errors.py,sha256=afcvKDfu7XYnGt6CfTG1gpmCaoMTPgtxwmTe2Cyz9qc,2146
 libres/modules/events.py,sha256=-YHwFJKory8RSIRTths5LBn92sodEPkhARH_a1Xml3c,5299
 libres/modules/rasterizer.py,sha256=-KYG03YkaPNnyohl_HrEJZqdHrhmGesbLgxxPahNTCc,3155
 libres/modules/utils.py,sha256=W5Kuu9LhhUWZMKLAhw7DmQEuNYb9aXWpW_HXCn62lhU,1871
-libres-0.8.0.dist-info/LICENSE,sha256=w1rojULT3naueSnr4r62MSQipL4VPtsfEcTFmSKpVuI,1069
-libres-0.8.0.dist-info/METADATA,sha256=35WiUS7fsECvLwm6KhlDutJS5l7EAdM3swvB7QPzLug,9603
-libres-0.8.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-libres-0.8.0.dist-info/top_level.txt,sha256=Exs6AnhZc0UTcsD5Ylyx1P89j19hJ4Dy13jxQyZwi3k,7
-libres-0.8.0.dist-info/RECORD,,
+libres-0.9.1.dist-info/licenses/LICENSE,sha256=w1rojULT3naueSnr4r62MSQipL4VPtsfEcTFmSKpVuI,1069
+libres-0.9.1.dist-info/METADATA,sha256=e-7a5dHP6OCJ5ob5wsH1-Wk4pr0qVMMZDU3wtzd4Y98,10222
+libres-0.9.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+libres-0.9.1.dist-info/top_level.txt,sha256=Exs6AnhZc0UTcsD5Ylyx1P89j19hJ4Dy13jxQyZwi3k,7
+libres-0.9.1.dist-info/RECORD,,

{libres-0.8.0.dist-info → libres-0.9.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any