utils-flask-sqlalchemy 0.3.2__tar.gz → 0.3.4__tar.gz

{utils-flask-sqlalchemy-0.3.2/src/utils_flask_sqlalchemy.egg-info → utils-flask-sqlalchemy-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utils-flask-sqlalchemy
-Version: 0.3.2
+Version: 0.3.4
 Summary: Python lib of tools for Flask and SQLAlchemy
 Home-page: https://github.com/PnX-SI/Utils-Flask-SQLAlchemy
 Maintainer: Parcs nationaux des Écrins et des Cévennes

utils-flask-sqlalchemy-0.3.4/VERSION

@@ -0,0 +1 @@
+0.3.4

{utils-flask-sqlalchemy-0.3.2 → utils-flask-sqlalchemy-0.3.4}/requirements.in

@@ -3,3 +3,4 @@ flask-sqlalchemy
 flask-migrate
 marshmallow
 python-dateutil
+sqlalchemy>=1.3,<2

{utils-flask-sqlalchemy-0.3.2 → utils-flask-sqlalchemy-0.3.4}/src/utils_flask_sqla/generic.py

@@ -1,12 +1,13 @@
 from itertools import chain
 from warnings import warn
 
-from sqlalchemy import MetaData
+from dateutil import parser
 from flask_sqlalchemy import SQLAlchemy
-from .errors import UtilsSqlaError
+from sqlalchemy import MetaData
 from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.types import Integer, Date, DateTime, Numeric, Boolean
-from dateutil import parser
+from sqlalchemy.types import Boolean, Date, DateTime, Integer, Numeric
+
+from .errors import UtilsSqlaError
 
 
 def testDataType(value, sqlType, paramName):
@@ -198,10 +199,12 @@ class GenericQuery:
         if param_name.startswith("filter_d_"):
             col = self.view.tableDef.columns[param_name[12:]]
             col_type = col.type.__class__.__name__
-            test_type = testDataType(param_value, DateTime, col)
+            test_type = testDataType(param_value, DateTime, col) and testDataType(
+                param_value, Integer, col
+            )
             if test_type:
                 raise UtilsSqlaError(message=test_type)
-            if col_type in ("Date", "DateTime", "TIMESTAMP"):
+            if col_type in ("Date", "DateTime", "TIMESTAMP", "INTEGER"):
                 if param_name.startswith("filter_d_up_"):
                     query = query.filter(col >= param_value)
                 if param_name.startswith("filter_d_lo_"):
@@ -225,7 +228,7 @@ class GenericQuery:
         # Ordonnancement
         # L'ordonnancement se base actuellement sur une seule colonne
         #   et prend la forme suivante : nom_colonne[:ASC|DESC]
-        if parameters.get("orderby", None).replace(" ", ""):
+        if parameters.get("orderby", "").replace(" ", ""):
             order_by = parameters.get("orderby")
             col, *sort = order_by.split(":")
             if col in self.view.tableDef.columns.keys():
@@ -235,26 +238,37 @@ class GenericQuery:
             return query.order_by(ordel_col)
         return query
 
-    def query(self):
+    def raw_query(self, process_filter=True):
         """
-        Lance la requete et retourne l'objet sqlalchemy
+        Renvoie la requete 'brute' (sans .all)
+        - process_filter: application des filtres (et du sort)
         """
+
         q = self.DB.session.query(self.view.tableDef)
-        nb_result_without_filter = q.count()
+
+        if not process_filter:
+            return q
 
         if self.filters:
             unordered_q = self.build_query_filters(q, self.filters)
             q = self.build_query_order(unordered_q, self.filters)
-            nb_results = unordered_q.count()
-        else:
-            nb_results = q.count()
 
-        # Si la limite spécifiée est égale à -1
-        # les paramètres limit et offset ne sont pas pris en compte
-        if self.limit == -1:
-            data = q.all()
-        else:
-            data = q.limit(self.limit).offset(self.offset * self.limit).all()
+        if self.limit != -1:
+            q.limit(self.limit).offset(self.offset * self.limit)
+
+        return q
+
+    def query(self):
+        """
+        Lance la requete et retourne l'objet sqlalchemy
+        """
+        q = self.raw_query(process_filter=False)
+        nb_result_without_filter = q.count()
+
+        q = self.raw_query()
+        nb_results = q.count() if self.filters else nb_result_without_filter
+
+        data = q.all()
 
         return data, nb_result_without_filter, nb_results
 

{utils-flask-sqlalchemy-0.3.2 → utils-flask-sqlalchemy-0.3.4}/src/utils_flask_sqla/response.py

@@ -75,7 +75,6 @@ def csv_resp(fn):
 
 
 def to_csv_resp(filename, data, columns, separator=";"):
-
     headers = Headers()
     headers.add("Content-Type", "text/plain")
     headers.add("Content-Disposition", "attachment", filename="export_%s.csv" % filename)

{utils-flask-sqlalchemy-0.3.2 → utils-flask-sqlalchemy-0.3.4}/src/utils_flask_sqla/schema.py

@@ -23,6 +23,12 @@ class SmartRelationshipsMixin:
                 nested_fields.add(name)
             elif field.metadata.get("exclude", False):
                 excluded_fields.add(name)
+            elif (
+                hasattr(self.opts, "model")
+                and hasattr(self.opts.model.__mapper__.column_attrs, name)
+                and getattr(self.opts.model.__mapper__.column_attrs, name).deferred
+            ):
+                excluded_fields.add(name)
             else:
                 included_fields.add(name)
 

{utils-flask-sqlalchemy-0.3.2 → utils-flask-sqlalchemy-0.3.4}/src/utils_flask_sqla/serializers.py

@@ -369,8 +369,7 @@ def get_serializable_decorator(fields=[], exclude=[], stringify=True):
             # gestion des relationships
             frel = get_cls_db_relationships()
 
-            for (rel, uselist, Model) in frel:
-
+            for rel, uselist, Model in frel:
                 if rel not in dict_in:
                     continue
 
@@ -409,13 +408,7 @@ def get_serializable_decorator(fields=[], exclude=[], stringify=True):
                 v_obj = []
 
                 for data in values:
-
-                    id_value = data.get(id_field_name)
-
-                    # si id_value est null
-                    # creation -> on supprime id_value
-                    if not id_value:
-                        data.pop(id_field_name)
+                    id_value = data.pop(id_field_name, None)
 
                     res = (
                         # si on a une id -> on recupère dans la liste preload_res_with_ids

{utils-flask-sqlalchemy-0.3.2 → utils-flask-sqlalchemy-0.3.4}/src/utils_flask_sqla/tests/test_schema.py

@@ -4,7 +4,7 @@ import marshmallow as ma
 from marshmallow.fields import Nested
 from marshmallow_sqlalchemy import SQLAlchemyAutoSchema, auto_field
 from sqlalchemy import Column, Integer, String, ForeignKey
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import relationship, deferred
 from sqlalchemy.ext.hybrid import hybrid_property
 from flask_sqlalchemy import SQLAlchemy
 
@@ -388,3 +388,21 @@ class TestSmartRelationshipsMixin:
                 },
             },
         )
+
+    def test_deferred_field(self):
+        class DeferredModel(db.Model):
+            pk = db.Column(db.Integer, primary_key=True)
+            a = db.Column(db.String)
+            b = deferred(db.Column(db.String))
+
+        class DeferredSchema(SmartRelationshipsMixin, SQLAlchemyAutoSchema):
+            class Meta:
+                model = DeferredModel
+
+        d = DeferredModel(pk=1, a="A", b="B")
+
+        TestCase().assertDictEqual(DeferredSchema().dump(d), {"pk": 1, "a": "A"})
+        TestCase().assertDictEqual(
+            DeferredSchema(only=["+b"]).dump(d), {"pk": 1, "a": "A", "b": "B"}
+        )
+        TestCase().assertDictEqual(DeferredSchema(only=["b"]).dump(d), {"b": "B"})

{utils-flask-sqlalchemy-0.3.2 → utils-flask-sqlalchemy-0.3.4/src/utils_flask_sqlalchemy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utils-flask-sqlalchemy
-Version: 0.3.2
+Version: 0.3.4
 Summary: Python lib of tools for Flask and SQLAlchemy
 Home-page: https://github.com/PnX-SI/Utils-Flask-SQLAlchemy
 Maintainer: Parcs nationaux des Écrins et des Cévennes

{utils-flask-sqlalchemy-0.3.2 → utils-flask-sqlalchemy-0.3.4}/src/utils_flask_sqlalchemy.egg-info/requires.txt

@@ -3,6 +3,7 @@ flask-sqlalchemy
 flask-migrate
 marshmallow
 python-dateutil
+sqlalchemy<2,>=1.3
 
 [tests]
 pytest

utils-flask-sqlalchemy-0.3.2/VERSION

@@ -1 +0,0 @@
-0.3.2