muffin-rest 7.3.1__tar.gz → 7.3.3__tar.gz

{muffin_rest-7.3.1 → muffin_rest-7.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: muffin-rest
-Version: 7.3.1
+Version: 7.3.3
 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.1 → muffin_rest-7.3.3}/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"]
@@ -138,8 +138,8 @@ class Filters(Mutator):
                 data = json_loads(raw_data)
                 assert isinstance(data, dict)
                 mutations = self.mutations
-                for name in data:
-                    if name in mutations:
+                for name in mutations:
+                    if name in data:
                         ops, collection = await mutations[name].apply(collection, data)
                         filters[name] = ops
 

{muffin_rest-7.3.1 → muffin_rest-7.3.3}/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-7.3.1 → muffin_rest-7.3.3}/muffin_rest/sorting.py

@@ -35,7 +35,6 @@ class Sort(Mutate):
 
 
 class Sorting(Mutator):
-
     """Build sorters for handlers."""
 
     MUTATE_CLASS = Sort
@@ -54,9 +53,11 @@ class Sorting(Mutator):
         sorting = {}
         if data:
             collection = self.prepare(collection)
-            for name, desc in to_sort(data.split(",")):
-                sort = self.mutations.get(name)
-                if sort:
+            sorting = dict(to_sort(data.split(",")))
+            for name in self.mutations:
+                sort = self.mutations[name]
+                if name in sorting:
+                    desc = sorting[name]
                     collection = await sort.apply(collection, desc=desc)
                     sorting[sort.name] = desc
 

{muffin_rest-7.3.1 → muffin_rest-7.3.3}/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.1 → muffin_rest-7.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "muffin-rest"
-version = "7.3.1"
+version = "7.3.3"
 description = "The package provides enhanced support for writing REST APIs with Muffin framework"
 readme = "README.rst"
 homepage = "https://github.com/klen/muffin-rest"