fastadmin 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

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/api/frameworks/django/app/views.py

@@ -1,27 +1,19 @@
-import typing
-
-import jinja2
 from django.http import HttpResponse
 
+from fastadmin.api.helpers import get_template
 from fastadmin.settings import ROOT_DIR, settings
 
 
-def _create_env(directory: str, **env_options: typing.Any) -> "jinja2.Environment":
-    loader = jinja2.FileSystemLoader(directory)
-    env_options.setdefault("loader", loader)
-    env_options.setdefault("autoescape", True)
-
-    return jinja2.Environment(**env_options)  # noqa: S701
-
-
-async def index(request):
+def index(request):
     """This method is used to render index page.
 
     :params request: a request object.
     :return: A response object.
     """
-    env = _create_env(ROOT_DIR / "templates")
-    template = env.get_template("index.html")
-    content = template.render({"request": request, "settings": settings})
-
-    return HttpResponse(content)
+    template = get_template(
+        ROOT_DIR / "templates" / "index.html",
+        {
+            "ADMIN_PREFIX": settings.ADMIN_PREFIX,
+        },
+    )
+    return HttpResponse(template)

fastadmin/api/frameworks/fastapi/views.py

@@ -1,21 +1,25 @@
 import logging
 
-from fastapi import APIRouter, Request
+from fastapi import APIRouter
 from fastapi.responses import HTMLResponse
-from fastapi.templating import Jinja2Templates
 
+from fastadmin.api.helpers import get_template
 from fastadmin.settings import ROOT_DIR, settings
 
 logger = logging.getLogger(__name__)
 router = APIRouter()
-templates = Jinja2Templates(directory=ROOT_DIR / "templates")
 
 
 @router.get("/", response_class=HTMLResponse)
-async def index(request: Request):
+def index():
     """This method is used to render index page.
 
     :params request: a request object.
     :return: A response object.
     """
-    return templates.TemplateResponse("index.html", {"request": request, "settings": settings})
+    return get_template(
+        ROOT_DIR / "templates" / "index.html",
+        {
+            "ADMIN_PREFIX": settings.ADMIN_PREFIX,
+        },
+    )

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)
 
@@ -25,7 +25,6 @@ app = Blueprint(
     url_prefix="/parent",
     static_url_path="/static",
     static_folder=ROOT_DIR / "static",
-    template_folder=ROOT_DIR / "templates",
 )
 app.register_blueprint(views_router)
 app.register_blueprint(api_router)

fastadmin/api/frameworks/flask/views.py

@@ -1,8 +1,9 @@
 import logging
 
-from flask import Blueprint, render_template, request
+from flask import Blueprint
 
-from fastadmin.settings import settings
+from fastadmin.api.helpers import get_template
+from fastadmin.settings import ROOT_DIR, settings
 
 logger = logging.getLogger(__name__)
 views_router = Blueprint(
@@ -17,4 +18,9 @@ def index():
 
     :return: A response object.
     """
-    return render_template("index.html", request=request, settings=settings)
+    return get_template(
+        ROOT_DIR / "templates" / "index.html",
+        {
+            "ADMIN_PREFIX": settings.ADMIN_PREFIX,
+        },
+    )

fastadmin/api/helpers.py

@@ -1,5 +1,6 @@
 import base64
 import binascii
+from pathlib import Path
 from uuid import UUID
 
 from fastadmin.models.schemas import ModelFieldWidgetSchema
@@ -78,3 +79,11 @@ def is_valid_base64(value: str) -> bool:
         return True
     except binascii.Error:
         return False
+
+
+def get_template(template: Path, context: dict) -> str:
+    with Path.open(template, "r") as file:
+        content = file.read()
+        for key, value in context.items():
+            content = content.replace(f"{{{{{key}}}}}", value)
+        return content

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/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/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/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">