fastadmin 0.2.1__tar.gz → 0.2.2__tar.gz

{fastadmin-0.2.1 → fastadmin-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastadmin
-Version: 0.2.1
+Version: 0.2.2
 Summary: 
 Home-page: https://github.com/vsdudakov/fastadmin
 License: MIT
@@ -43,11 +43,12 @@ Description-Content-Type: text/markdown
 
 ## Admin Dashboard App for FastAPI/Flask/Django
 
-[![Build Status](https://github.com/vsdudakov/fastadmin/workflows/CI/badge.svg?branch=main)](https://github.com/vsdudakov/fastadmin/workflows/CI/badge.svg?branch=main)
 [![codecov](https://codecov.io/gh/vsdudakov/fastadmin/branch/main/graph/badge.svg?token=RNGX5HOW3T)](https://codecov.io/gh/vsdudakov/fastadmin)
 [![License](https://img.shields.io/github/license/vsdudakov/fastadmin)](https://github.com/vsdudakov/fastadmin/blob/master/LICENSE)
 [![PyPi](https://badgen.net/pypi/v/fastadmin)](https://pypi.org/project/fastadmin/)
 [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3100/)
+[![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3110/)
+[![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3120/)
 
 ## Screenshots
 

{fastadmin-0.2.1 → fastadmin-0.2.2}/README.md

@@ -1,10 +1,11 @@
 ## Admin Dashboard App for FastAPI/Flask/Django
 
-[![Build Status](https://github.com/vsdudakov/fastadmin/workflows/CI/badge.svg?branch=main)](https://github.com/vsdudakov/fastadmin/workflows/CI/badge.svg?branch=main)
 [![codecov](https://codecov.io/gh/vsdudakov/fastadmin/branch/main/graph/badge.svg?token=RNGX5HOW3T)](https://codecov.io/gh/vsdudakov/fastadmin)
 [![License](https://img.shields.io/github/license/vsdudakov/fastadmin)](https://github.com/vsdudakov/fastadmin/blob/master/LICENSE)
 [![PyPi](https://badgen.net/pypi/v/fastadmin)](https://pypi.org/project/fastadmin/)
 [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3100/)
+[![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3110/)
+[![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3120/)
 
 ## Screenshots
 

{fastadmin-0.2.1 → fastadmin-0.2.2}/fastadmin/api/frameworks/django/app/api.py

@@ -1,7 +1,7 @@
 import json
 import logging
 from dataclasses import asdict
-from datetime import datetime
+from datetime import datetime, time
 from functools import wraps
 from uuid import UUID
 
@@ -23,7 +23,7 @@ api_service = ApiService()
 
 class JsonEncoder(DjangoJSONEncoder):
     def default(self, o):
-        if isinstance(o, datetime):
+        if isinstance(o, datetime | time):
             return o.isoformat()
         if isinstance(o, UUID):
             return str(o)

{fastadmin-0.2.1 → fastadmin-0.2.2}/fastadmin/api/frameworks/flask/app.py

@@ -1,5 +1,5 @@
 import logging
-from datetime import date
+from datetime import date, time
 
 from flask import Blueprint
 from flask.json.provider import DefaultJSONProvider
@@ -14,7 +14,7 @@ logger = logging.getLogger(__name__)
 
 class JSONProvider(DefaultJSONProvider):
     def default(self, o):
-        if isinstance(o, date):
+        if isinstance(o, date | time):
             return o.isoformat()
         return super().default(o)
 

{fastadmin-0.2.1 → fastadmin-0.2.2}/fastadmin/models/base.py

@@ -1,4 +1,5 @@
 import csv
+import datetime
 import inspect
 import json
 from collections.abc import Sequence
@@ -383,6 +384,17 @@ class BaseModelAdmin:
 
         return obj_dict
 
+    def deserialize_value(self, field: ModelFieldWidgetSchema, value: Any) -> Any:
+        if not value:
+            return value
+        match field.form_widget_type:
+            case WidgetType.TimePicker:
+                return datetime.datetime.fromisoformat(value).time()
+            case WidgetType.DatePicker | WidgetType.DateTimePicker:
+                return datetime.datetime.fromisoformat(value)
+            case _:
+                return value
+
     async def get_list(
         self,
         offset: int | None = None,
@@ -434,7 +446,11 @@ class BaseModelAdmin:
         m2m_fields = self.get_model_fields_with_widget_types(with_m2m=True)
         upload_fields = self.get_model_fields_with_widget_types(with_upload=True)
 
-        fields_payload = {field.column_name: payload[field.name] for field in fields if field.name in payload}
+        fields_payload = {
+            field.column_name: self.deserialize_value(field, payload[field.name])
+            for field in fields
+            if field.name in payload
+        }
         obj = await self.orm_save_obj(id, fields_payload)
         if not obj:
             return None

{fastadmin-0.2.1 → fastadmin-0.2.2}/fastadmin/models/helpers.py

@@ -62,7 +62,7 @@ def get_admin_model(orm_model_cls: str | Any) -> ModelAdmin | None:
         model_name_prefix = admin_model.model_name_prefix
         if model_name_prefix:
             model_name = f"{model_name_prefix}.{model_name}"
-        if orm_model_cls in model_name:
+        if orm_model_cls == model_name:
             return admin_model
     return None
 

{fastadmin-0.2.1 → fastadmin-0.2.2}/fastadmin/models/orms/ponyorm.py

@@ -233,7 +233,6 @@ class PonyORMMixin:
         :return: A tuple of list of objects and total count.
         """
 
-        # import pdb; pdb.set_trace()
         qs = select(m for m in self.model_cls)
         if filters:
             for field_with_condition, value in filters.items():

{fastadmin-0.2.1 → fastadmin-0.2.2}/fastadmin/static/index.html

@@ -7,8 +7,8 @@
     <meta name="description" content="Fast Admin"/>
     <title>Fast Admin</title>
     <script>
-      window.SERVER_DOMAIN = 'http://localhost:8080';
-      window.SERVER_URL = 'http://localhost:8080/admin/api';
+      window.SERVER_DOMAIN = 'http://localhost:8000';
+      window.SERVER_URL = 'http://localhost:8000/admin/api';
     </script>
     <script type="module" crossorigin src="/index.min.js"></script>
     <link rel="stylesheet" crossorigin href="/index.min.css">