dflango 0.2.2__tar.gz → 0.2.4__tar.gz

{dflango-0.2.2/dflango.egg-info → dflango-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dflango
-Version: 0.2.2
+Version: 0.2.4
 Summary: Django-like utilities for Flask applications
 Author-email: Martino Scarcia <martino.scarcia@hybrissoftware.it>
 License-Expression: MIT

{dflango-0.2.2 → dflango-0.2.4}/dflango/__init__.py

@@ -2,7 +2,7 @@
 dflango - Django-like utilities for Flask applications
 """
 
-__version__ = "0.2.2"
+__version__ = "0.2.4"
 
 from dflango.core import DFlango, get_dflango, get_db
 from dflango.schemas import ModelSchema, UtcDateTimeField, EnumField

{dflango-0.2.2 → dflango-0.2.4}/dflango/commands/load_fixtures.py

@@ -31,8 +31,42 @@ def get_model_by_name(name):
     return None
 
 
-def load_fixtures_from_file(filepath):
-    """Loads fixtures from a single JSON file."""
+def _get_models_from_file(filepath):
+    """Extract unique model classes referenced in a fixture file."""
+    try:
+        with open(filepath, "r") as f:
+            data = json.load(f)
+    except Exception:
+        return set()
+
+    models = set()
+    for entry in data:
+        model_name = entry.get("model")
+        model_class = get_model_by_name(model_name)
+        if model_class:
+            models.add(model_class)
+    return models
+
+
+def _model_has_data(model_class):
+    """Check if a model table already has at least one record."""
+    db = get_db()
+    return db.session.query(model_class).first() is not None
+
+
+def load_fixtures_from_file(filepath, force=False):
+    """Loads fixtures from a single JSON file.
+    
+    If force=False (default), skips the file if all models referenced
+    in it already have data in the database.
+    """
+    if not force:
+        models = _get_models_from_file(filepath)
+        if models and all(_model_has_data(m) for m in models):
+            filename = os.path.basename(filepath)
+            logging.info(f"Skipping {filename}: all models already have data.")
+            return
+
     try:
         with open(filepath, "r") as f:
             data = json.load(f)
@@ -110,15 +144,20 @@ def load_fixtures_from_file(filepath):
 
 @click.command(name="load-fixtures")
 @click.argument("filename", required=False)
+@click.option("--force", is_flag=True, default=False,
+              help="Force loading even if models already have data.")
 @with_appcontext
-def load_fixtures_command(filename=None):
+def load_fixtures_command(filename=None, force=False):
     """
     Loads fixtures from a JSON file or from all JSON files in the 'fixtures' directory.
+
+    By default, skips fixture files whose models already have data in the database.
+    Use --force to load regardless (upsert by primary key).
     """
     logging.info(f"Loading fixtures from {FIXTURES_DIR}")
 
     if filename:
-        load_fixtures_from_file(filename)
+        load_fixtures_from_file(filename, force=force)
     else:
         if not os.path.exists(FIXTURES_DIR) or not os.path.isdir(FIXTURES_DIR):
             logging.error(f"Fixtures directory '{FIXTURES_DIR}' not found!")
@@ -135,4 +174,4 @@ def load_fixtures_command(filename=None):
         logging.info(f"files: {json_files}")
 
         for json_file in json_files:
-            load_fixtures_from_file(os.path.join(FIXTURES_DIR, json_file))
+            load_fixtures_from_file(os.path.join(FIXTURES_DIR, json_file), force=force)

{dflango-0.2.2 → dflango-0.2.4}/dflango/schemas/fields.py

@@ -1,20 +1,26 @@
 # Built-in
-from datetime import timezone
+from datetime import datetime, timezone
 
 # Third-party
 from marshmallow import fields
 
 
 class UtcDateTimeField(fields.DateTime):
-    def __init__(
-        self,
-        **kwargs,
-    ) -> None:
-        super().__init__(**kwargs)
-        self.format = "%Y-%m-%dT%H:%M:%SZ"
+
+    def _serialize(self, value, attr, obj, **kwargs):
+        if value is None:
+            return None
+        if value.tzinfo is None:
+            value = value.replace(tzinfo=timezone.utc)
+        return value.astimezone(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
 
     def _deserialize(self, value, attr, data, **kwargs):
-        dt = super()._deserialize(value, attr, data, **kwargs)
+        if not value:
+            raise self.make_error("invalid", input=value, obj_type=datetime)
+        try:
+            dt = datetime.fromisoformat(str(value).replace("Z", "+00:00"))
+        except (ValueError, AttributeError, TypeError) as error:
+            raise self.make_error("invalid", input=value, obj_type=datetime) from error
         if dt.tzinfo is None:
             return dt.replace(tzinfo=timezone.utc)
         return dt.astimezone(timezone.utc)

{dflango-0.2.2 → dflango-0.2.4/dflango.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dflango
-Version: 0.2.2
+Version: 0.2.4
 Summary: Django-like utilities for Flask applications
 Author-email: Martino Scarcia <martino.scarcia@hybrissoftware.it>
 License-Expression: MIT

{dflango-0.2.2 → dflango-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dflango"
-version = "0.2.2"
+version = "0.2.4"
 description = "Django-like utilities for Flask applications"
 readme = "README.md"
 requires-python = ">=3.8"