feat: wip

klen · Jun 7, 2024 · fae03ac · fae03ac
1 parent cf9e2ab
commit fae03ac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/muffin_rest/filters.py b/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"]

diff --git a/muffin_rest/peewee/options.py b/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 @@ def setup(self, cls):
         """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")

diff --git a/muffin_rest/sqlalchemy/__init__.py b/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 @@ def setup(self, cls):
             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)