muffin-rest 7.3.2__py3-none-any.whl → 7.3.4__py3-none-any.whl

muffin_rest/filters.py

@@ -38,9 +38,9 @@ class Filter(Mutate):
         "$nor": lambda v, c: not any(f(v, c) for f in v),
     }
     operators["<"] = operators["$lt"]
-    operators["<="] = operators["$le"]
+    operators["<="] = operators["$lte"] = operators["$le"]
     operators[">"] = operators["$gt"]
-    operators[">="] = operators["$ge"]
+    operators[">="] = operators["$gte"] = operators["$ge"]
     operators["=="] = operators["$eq"]
     operators["!="] = operators["$ne"]
     operators["<<"] = operators["$in"]

muffin_rest/peewee/options.py

@@ -1,4 +1,4 @@
-from typing import Optional, Type
+from typing import Type
 
 import peewee as pw
 from marshmallow_peewee import ModelSchema
@@ -27,7 +27,7 @@ class PWRESTOptions(RESTOptions):
     base_property: str = "model"
 
     model: Type[pw.Model]
-    model_pk: Optional[pw.Field] = None
+    model_pk: pw.Field
 
     manager: Manager
 
@@ -38,7 +38,7 @@ class PWRESTOptions(RESTOptions):
         """Prepare meta options."""
         meta = self.model._meta  # type: ignore[]
         self.name = self.name or meta.table_name.lower()
-        self.model_pk = self.model_pk or meta.primary_key
+        self.model_pk = getattr(self, "model_pk", None) or meta.primary_key
         manager = getattr(self, "manager", getattr(self.model, "_manager", None))
         if manager is None:
             raise RuntimeError("Peewee-AIO ORM Manager is not available")

muffin_rest/peewee/schemas.py

@@ -2,31 +2,7 @@ import marshmallow as ma
 from marshmallow_peewee import DefaultConverter
 from muffin_peewee.fields import IntEnumField, StrEnumField, URLField
 
-
-class EnumField(ma.fields.Field):
-    default_error_messages = {
-        "unknown": "Must be one of: {choices}.",
-    }
-
-    def __init__(self, enum, **kwargs):
-        self.enum = enum
-        self.choices_text = ", ".join([str(c.value) for c in enum])
-        super().__init__(**kwargs)
-
-    def _serialize(self, value, attr, obj, **kwargs):
-        if value is None:
-            return None
-
-        try:
-            return value.value
-        except AttributeError:
-            raise ma.ValidationError(f"{obj}: {attr} value is invalid: {value}") from None
-
-    def _deserialize(self, value, attr, data, **kwargs):
-        try:
-            return self.enum(value)
-        except ValueError as error:
-            raise self.make_error("unknown", choices=self.choices_text) from error
+from muffin_rest.schemas import EnumField
 
 
 @DefaultConverter.register(StrEnumField)

muffin_rest/schemas.py

@@ -0,0 +1,27 @@
+import marshmallow as ma
+
+
+class EnumField(ma.fields.Field):
+    default_error_messages = {
+        "unknown": "Must be one of: {choices}.",
+    }
+
+    def __init__(self, enum, **kwargs):
+        self.enum = enum
+        self.choices_text = ", ".join([str(c.value) for c in enum])
+        super().__init__(**kwargs)
+
+    def _serialize(self, value, attr, obj, **kwargs):
+        if value is None:
+            return None
+
+        try:
+            return value.value
+        except AttributeError:
+            raise ma.ValidationError(f"{obj}: {attr} value is invalid: {value}") from None
+
+    def _deserialize(self, value, attr, data, **kwargs):
+        try:
+            return self.enum(value)
+        except ValueError as error:
+            raise self.make_error("unknown", choices=self.choices_text) from error

muffin_rest/sqlalchemy/__init__.py

@@ -77,7 +77,7 @@ class SARESTOptions(RESTOptions):
     schema_base: Type[SQLAlchemyAutoSchema] = SQLAlchemyAutoSchema
 
     table: sa.Table
-    table_pk: Optional[sa.Column] = None
+    table_pk: sa.Column
     database: Database
 
     base_property = "table"
@@ -88,7 +88,7 @@ class SARESTOptions(RESTOptions):
             raise ValueError("'SARESTHandler.Meta.database' is required")
 
         self.name = self.name or self.table.name
-        self.table_pk = self.table_pk or self.table.c.id
+        self.table_pk = getattr(self, "table_pk", None) or self.table.c.id
 
         super().setup(cls)
 

{muffin_rest-7.3.2.dist-info → muffin_rest-7.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: muffin-rest
-Version: 7.3.2
+Version: 7.3.4
 Summary: The package provides enhanced support for writing REST APIs with Muffin framework
 Home-page: https://github.com/klen/muffin-rest
 License: MIT
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Provides-Extra: peewee
 Provides-Extra: sqlalchemy

{muffin_rest-7.3.2.dist-info → muffin_rest-7.3.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 muffin_rest/__init__.py,sha256=NBZeOEJgQHtFFhVgd9d0fpApFRgU405sbm0cu1y1MOU,1242
 muffin_rest/api.py,sha256=gCqRb5PgKEMkE84Y0ZnJw_laVRmVWZRxzBqBv0ns6w8,3882
 muffin_rest/errors.py,sha256=TIXSADZYSwx70dOVPRAzuNwGLfpLuzZZ1ugMZMwIGDo,1169
-muffin_rest/filters.py,sha256=M__nZ1z_eCWysvFrLcJm4mguzFGcaNXb1yI9T13lkEQ,5583
+muffin_rest/filters.py,sha256=lMnPMdy7h0nB9bH-Nf5Hv_qenAGzG0V3ULpizTK3OnM,5623
 muffin_rest/handler.py,sha256=LcPFFH01nwe2tYKYbq-KVDX5UBVMlaRmeisJ_s4jsCo,10035
 muffin_rest/marshmallow.py,sha256=hHPLTLdaSz5jTLWBqyHeOwo2xfBv7aMIuJFD_trHRuE,715
 muffin_rest/mongo/__init__.py,sha256=unoEAKCU9H3EKhQqKGosn02tTS3H5nPOcTd3THM4Qs8,4675
@@ -16,22 +16,23 @@ muffin_rest/peewee/__init__.py,sha256=94DSj_ftT6fbPksHlBv40AH2HWaiZommUFOMN2jd9a
 muffin_rest/peewee/filters.py,sha256=ziqpD7uH9vzx_yHKUpOYmduNmM8w-8b7CtRaSoCqECU,2382
 muffin_rest/peewee/handler.py,sha256=O84-TmiyNyEhEamTh-DY93ds0hZJzVG8_yekRpF9p3k,5359
 muffin_rest/peewee/openapi.py,sha256=ZZuh7nJVuK9cTJqtOJ_XASe9iJgter-xIjj9YJ8xszI,1111
-muffin_rest/peewee/options.py,sha256=02E8yOXHaHl0smKV8qI6er7YS3IcuroDPl7GR_YuLjo,1489
-muffin_rest/peewee/schemas.py,sha256=6xaNxKFpdXjoiPFI9yc0tBN7B535A2IFLRE9x6unrZM,1215
+muffin_rest/peewee/options.py,sha256=F-UjCbz5rAIXt-D_MtmriiYkOL7wsri6FRt7WCNZzyo,1480
+muffin_rest/peewee/schemas.py,sha256=w6jBziUp40mOOjkz_4RCXuY0x5ZDIe9Ob25k1FnZSfc,469
 muffin_rest/peewee/sorting.py,sha256=jLU9d9h8uCV61NbsjkdhDLvh0lCK_6Os-0kIOI-pKwc,1983
 muffin_rest/peewee/types.py,sha256=cgCXhpGHkImKwudA1lulZHz5oJswHH168AiW5MhZRCM,155
 muffin_rest/peewee/utils.py,sha256=wXeneVE1IZl1ROnY28re73H62Y1_tEmoEQYzPhuOyBI,702
 muffin_rest/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 muffin_rest/redoc.html,sha256=GtuHIMvTuSi8Ro6bgI-G8VB94AljMyfjcZseqtBmGCY,559
+muffin_rest/schemas.py,sha256=FiNUuI7b70zgbg0F0p-CLUSpGmij9uBZDq9fUn9I_q4,814
 muffin_rest/sorting.py,sha256=Z3echqt8ve-p1f7iOVYlFFVsA3ShCXVaXDkVMFTC6tQ,2887
-muffin_rest/sqlalchemy/__init__.py,sha256=chT2-3TLKTRfL24ZVNJguE0tkAOHGvEe_mi5_takZXY,6361
+muffin_rest/sqlalchemy/__init__.py,sha256=WYxb5d4eQqXeT8MwpgdiItAjrOdFm-_5GaG-xtWQ4lk,6362
 muffin_rest/sqlalchemy/filters.py,sha256=bTT7ndx_d0YaDSviDfpzwN9T46dQrV9WbeG8YH9KVBg,2466
 muffin_rest/sqlalchemy/sorting.py,sha256=YlFKpIet4TUy7fJ2UBLC8b9lAOwY66QBpPDDApbyh8M,1643
 muffin_rest/sqlalchemy/types.py,sha256=JnIw44XJ2ClWzOv-mTUrvFw1JPxAlvdX_jf7r4zau-s,204
 muffin_rest/swagger.html,sha256=2uGLu_KpkYf925KnDKHBJmV9pm6OHn5C3BWScESsUS8,1736
 muffin_rest/types.py,sha256=vy55ShzMcvs9zXjFpdjWlagv09dMrcmxb2-U4hTL3NM,521
 muffin_rest/utils.py,sha256=WT87AHXvBFBzBVTkwsYmDXgG3ZX1wNKFo4SOUJ9JiQY,2095
-muffin_rest-7.3.2.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
-muffin_rest-7.3.2.dist-info/METADATA,sha256=ufe9-G1eK1ZVPh316H2sZHYHmeKued4wsICKZQj4l00,4126
-muffin_rest-7.3.2.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-muffin_rest-7.3.2.dist-info/RECORD,,
+muffin_rest-7.3.4.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
+muffin_rest-7.3.4.dist-info/METADATA,sha256=bvw-BTahZcC0_w6SdPkpcpWhnH9jwqM14G6ybxLAfqU,4177
+muffin_rest-7.3.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+muffin_rest-7.3.4.dist-info/RECORD,,

{muffin_rest-7.3.2.dist-info → muffin_rest-7.3.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.7.0
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any