easyapi-django 1.1.2__tar.gz → 1.1.4__tar.gz

{easyapi_django-1.1.2/easyapi_django.egg-info → easyapi_django-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easyapi-django
-Version: 1.1.2
+Version: 1.1.4
 Summary: Zero-effort MCP server (and REST API) generator from Django models.
 Author-email: Stamatios Stamou Jr <bushier.outsets.0c@icloud.com>
 License-Expression: MIT

{easyapi_django-1.1.2 → easyapi_django-1.1.4}/easyapi/base.py

@@ -29,6 +29,7 @@ from .exception import HTTPException
 from .helpers import (
     LOCAL_HOST,
     get_edit_related,
+    get_list_related_selects,
     get_related_objects,
     get_tz,
     method_not_allowed,
@@ -1243,7 +1244,9 @@ class BaseResource(CoreResource):
             start = 0
 
         if self.list_related_fields:
-            self.queryset = self.queryset.select_related(*self.list_related_fields.keys())
+            self.queryset = self.queryset.select_related(
+                *get_list_related_selects(self.list_related_fields)
+            )
 
         prefetch_fields = self.list_prefetch_related.keys() if self.list_prefetch_related else []
         if prefetch_fields:

{easyapi_django-1.1.2 → easyapi_django-1.1.4}/easyapi/filters.py

@@ -446,7 +446,8 @@ class Filter(object):
                         value = timezone.now() - timedelta(days=int(value))
                     except ValueError:
                         if len(value) > 10:
-                            value = datetime.strptime(value, '%Y-%m-%d')
+                            from django.utils.dateparse import parse_datetime as _parse_dt
+                            value = _parse_dt(value) or datetime.strptime(value[:10], '%Y-%m-%d')
                         else:
                             value = datetime.strptime(value, '%Y-%m-%d').date()
 
@@ -592,7 +593,10 @@ class Filter(object):
 
                 # Decide whether to compare against empty values
                 elif operator in ['isnull', 'isnotnull'] and coalesce:
-                    boolean = True if operator == 'isnull' else False
+                    if operator == 'isnull':
+                        boolean = value if isinstance(value, bool) else True
+                    else:
+                        boolean = not value if isinstance(value, bool) else False
                     if _type in ['123', 'date', 'fk']:
                         _filter = Q(**{'{}__isnull'.format(field): boolean})
                     else:

{easyapi_django-1.1.2 → easyapi_django-1.1.4}/easyapi/helpers.py

@@ -2,6 +2,8 @@ import re
 import zoneinfo
 from functools import reduce
 
+from django.core.exceptions import ObjectDoesNotExist
+
 from .exception import HTTPException
 
 
@@ -95,6 +97,59 @@ def get_edit_related(args, field):
     return args
 
 
+def safe_related_getattr(obj, attr):
+    if obj is None:
+        return None
+    try:
+        return getattr(obj, attr, None)
+    except ObjectDoesNotExist:
+        return None
+
+
+def set_nested_related_field(result, obj, field):
+    current_obj = obj
+    current_result = result
+    parts = field.split('__')
+
+    for index, part in enumerate(parts):
+        value = safe_related_getattr(current_obj, part)
+        last = index == len(parts) - 1
+
+        if last:
+            current_result[part] = value
+            return
+
+        if value is None:
+            current_result[part] = None
+            return
+
+        existing = current_result.get(part)
+        if not isinstance(existing, dict):
+            existing = {}
+            current_result[part] = existing
+
+        current_obj = value
+        current_result = existing
+
+
+def get_list_related_selects(list_related_fields):
+    selects = []
+
+    def add(path):
+        if path and path not in selects:
+            selects.append(path)
+
+    for key, fields in list_related_fields.items():
+        add(key)
+        for field in fields:
+            if not isinstance(field, str) or '__' not in field:
+                continue
+            related_path = '__'.join(field.split('__')[:-1])
+            add(f'{key}__{related_path}')
+
+    return selects
+
+
 def get_related_objects(args, model):
     obj = args[0]
     result = args[1]
@@ -102,16 +157,19 @@ def get_related_objects(args, model):
     parent = args[3]
     related_models = args[4]
     related_fields = args[5]
-    model_obj = getattr(obj, model, None)
+    model_obj = safe_related_getattr(obj, model)
 
     if count == 0:
         if model not in related_models:
             related_models[model] = []
 
-        if model_obj:
+        if model_obj is not None:
             result[model] = {}
             for field in related_fields[parent]:
-                result[model][field] = getattr(model_obj, field, None)
+                if isinstance(field, str) and '__' in field:
+                    set_nested_related_field(result[model], model_obj, field)
+                else:
+                    result[model][field] = safe_related_getattr(model_obj, field)
                 related_models[model].append(field)
         else:
             result[model] = None

{easyapi_django-1.1.2 → easyapi_django-1.1.4/easyapi_django.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easyapi-django
-Version: 1.1.2
+Version: 1.1.4
 Summary: Zero-effort MCP server (and REST API) generator from Django models.
 Author-email: Stamatios Stamou Jr <bushier.outsets.0c@icloud.com>
 License-Expression: MIT

{easyapi_django-1.1.2 → easyapi_django-1.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "easyapi-django"
-version = "1.1.2"
+version = "1.1.4"
 authors = [
   { name="Stamatios Stamou Jr", email="bushier.outsets.0c@icloud.com" },
 ]