rb-commons 0.5.26__py3-none-any.whl → 0.5.28__py3-none-any.whl

rb_commons/orm/managers.py

@@ -141,7 +141,11 @@ class BaseManager(Generic[ModelType]):
         if relationship_attr:
             col = attr
             expr = self._build_comparison(col, operator, value)
-            return relationship_attr.any(expr)
+            prop = relationship_attr.property
+            if getattr(prop, "uselist", False):
+                return relationship_attr.any(expr)
+            else:
+                return relationship_attr.has(expr)
 
         col = getattr(self.model, parts[0], None) if len(parts) == 1 else attr
         return self._build_comparison(col, operator, value)
@@ -233,7 +237,10 @@ class BaseManager(Generic[ModelType]):
             self.filters.append(self._parse_lookup(k, v))
 
         for expr in expressions:
-            self.filters.append(self._q_to_expr(expr) if isinstance(expr, Q) else expr)
+            if isinstance(expr, Q) or isinstance(expr, QJSON):
+                self.filters.append(self._q_to_expr(expr))
+            else:
+                self.filters.append(expr)
 
         return self
 

{rb_commons-0.5.26.dist-info → rb_commons-0.5.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.5.26
+Version: 0.5.28
 Summary: Commons of project and simplified orm based on sqlalchemy.
 Home-page: https://github.com/RoboSell-organization/rb-commons
 Author: Abdulvoris

{rb_commons-0.5.26.dist-info → rb_commons-0.5.28.dist-info}/RECORD

@@ -13,7 +13,7 @@ rb_commons/http/consul.py,sha256=Ioq72VD1jGwoC96set7n2SgxN40olzI-myA2lwKkYi4,186
 rb_commons/http/exceptions.py,sha256=EGRMr1cRgiJ9Q2tkfANbf0c6-zzXf1CD6J3cmCaT_FA,1885
 rb_commons/orm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/orm/exceptions.py,sha256=1aMctiEwrPjyehoXVX1l6ML5ZOhmDkmBISzlTD5ey1Y,509
-rb_commons/orm/managers.py,sha256=le1mQVEr9gIEkd56nCyiEYZNcESqErv6Jsxf1PGhPvA,19761
+rb_commons/orm/managers.py,sha256=bY-yz4clB5lnV3xIGp5HyC4WbTL9HT7KBWQz_cwegDo,20029
 rb_commons/orm/services.py,sha256=71eRcJ4TxZvzNz-hLXo12X4U7PGK54ZfbLAb27AjZi8,1589
 rb_commons/permissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/permissions/role_permissions.py,sha256=4dV89z6ggzLqCCiFYlMp7kQVJRESu6MHpkT5ZNjLo6A,1096
@@ -22,7 +22,7 @@ rb_commons/schemes/jwt.py,sha256=ZKLJ5D3fcEmEKySjzbxEgUcza4K-oPoHr14_Z0r9Yic,249
 rb_commons/schemes/pagination.py,sha256=8VZW1wZGJIPR9jEBUgppZUoB4uqP8ORudHkMwvEJSxg,1866
 rb_commons/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/utils/media.py,sha256=J2Zi0J28DhcVQVzt-myNNVuzj9Msaetul53VjZtdDdc,820
-rb_commons-0.5.26.dist-info/METADATA,sha256=ZfmInMrRweoC6XQhn1Q8YQ9chd4fkyMLZ8t7_lyIPCA,6571
-rb_commons-0.5.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rb_commons-0.5.26.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.5.26.dist-info/RECORD,,
+rb_commons-0.5.28.dist-info/METADATA,sha256=YzqneH6c0aE667Pvsa2Z3PnlRL5ji0XMfVmy9mtsBIE,6571
+rb_commons-0.5.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rb_commons-0.5.28.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.5.28.dist-info/RECORD,,