sqladmin 0.8.0__py3-none-any.whl → 0.10.0__py3-none-any.whl

sqladmin/templates/details.html

@@ -3,7 +3,7 @@
 <div class="col-12">
   <div class="card">
     <div class="card-header">
-      <h3 class="card-title">{{ model_view.pk_column.name }}: {{ model_view.get_attr_value(model, model_view.pk_column) }}</h3>
+      <h3 class="card-title">{{ model_view.pk_column.name }}: {{ model_view.get_prop_value(model, model_view.pk_column) }}</h3>
     </div>
     <div class="card-body border-bottom py-3">
       <div class="table-responsive">
@@ -15,11 +15,11 @@
             </tr>
           </thead>
           <tbody>
-            {% for name, attr in model_view._details_attrs %}
+            {% for name, prop in model_view._details_props %}
             <tr>
               <td>{{ name }}</td>
-              {% set value, formatted_value = model_view.get_detail_value(model, attr) %}
-              {% if attr in model_view._relations %}
+              {% set value, formatted_value = model_view.get_detail_value(model, prop) %}
+              {% if prop in model_view._relation_props %}
               {% if is_list( value ) %}
               <td>
               {% for elem, formatted_elem in zip(value, formatted_value) %}
@@ -27,7 +27,7 @@
               {% endfor %}
               </td>
               {% else %}
-              <td><a href="{{ model_view._url_for_details_with_attr(request, model, attr) }}">{{ formatted_value }}</a></td>
+              <td><a href="{{ model_view._url_for_details_with_prop(request, model, prop) }}">{{ formatted_value }}</a></td>
               {% endif %}
               {% else %}
               <td>{{ formatted_value }}</td>
@@ -46,7 +46,7 @@
           </div>
           {% if model_view.can_delete %}
           <div class="col-md-1">
-            <a href="#" data-name="{{ model_view.name }}" data-pk="{{ model_view.get_attr_value(model, model_view.pk_column) }}" data-url="{{ model_view._url_for_delete(request, model) }}" data-bs-toggle="modal" data-bs-target="#modal-delete" class="btn btn-danger">
+            <a href="#" data-name="{{ model_view.name }}" data-pk="{{ model_view.get_prop_value(model, model_view.pk_column) }}" data-url="{{ model_view._url_for_delete(request, model) }}" data-bs-toggle="modal" data-bs-target="#modal-delete" class="btn btn-danger">
               Delete
             </a>
           </div>

sqladmin/templates/edit.html

@@ -6,7 +6,7 @@
       <h3 class="card-title">Edit {{ model_view.name }}</h3>
     </div>
     <div class="card-body border-bottom py-3">
-      <form action="{{ request.url }}" method="POST">
+      <form action="{{ request.url }}" method="POST" enctype="multipart/form-data">
         <fieldset class="form-fieldset">
           {% for field in form %}
           <div class="mb-3 form-group row">

sqladmin/templates/list.html

@@ -63,15 +63,15 @@
           <tr>
             <th class="w-1"><input class="form-check-input m-0 align-middle" type="checkbox" aria-label="Select all" id="select-all"></th>
             <th class="w-1"></th>
-            {% for name, attr in model_view._list_attrs %}
+            {% for name, prop in model_view._list_props %}
             <th>
-              {% if attr in model_view._sort_fields %}
-              {% if request.query_params.get("sortBy") == attr.key and request.query_params.get("sort") == "asc" %}
+              {% if prop.key in model_view._sort_fields %}
+              {% if request.query_params.get("sortBy") == prop.key and request.query_params.get("sort") == "asc" %}
               <a href="{{ request.url.include_query_params(sort='desc') }}"><i class="fa-solid fa-arrow-down"></i> {{ name }}</a>
-              {% elif request.query_params.get("sortBy") == attr.key and request.query_params.get("sort") == "desc" %}
+              {% elif request.query_params.get("sortBy") == prop.key and request.query_params.get("sort") == "desc" %}
               <a href="{{ request.url.include_query_params(sort='asc') }}"><i class="fa-solid fa-arrow-up"></i> {{ name }}</a>
               {% else %}
-              <a href="{{ request.url.include_query_params(sortBy=attr.key, sort='asc') }}">{{ name }}</a>
+              <a href="{{ request.url.include_query_params(sortBy=prop.key, sort='asc') }}">{{ name }}</a>
               {% endif %}
               {% else %}
               {{ name }}
@@ -84,7 +84,7 @@
           {% for row in pagination.rows %}
           <tr>
             <td>
-              <input type="hidden" value="{{ model_view.get_attr_value(row, model_view.pk_column) }}">
+              <input type="hidden" value="{{ model_view.get_prop_value(row, model_view.pk_column) }}">
               <input class="form-check-input m-0 align-middle select-box" type="checkbox" aria-label="Select item">
             </td>
             <td class="text-end">
@@ -99,14 +99,14 @@
               </a>
               {% endif %}
               {% if model_view.can_delete %}
-              <a href="#" data-name="{{ model_view.name }}" data-pk="{{ model_view.get_attr_value(row, model_view.pk_column) }}" data-url="{{ model_view._url_for_delete(request, row) }}" data-bs-toggle="modal" data-bs-target="#modal-delete" title="Delete">
+              <a href="#" data-name="{{ model_view.name }}" data-pk="{{ model_view.get_prop_value(row, model_view.pk_column) }}" data-url="{{ model_view._url_for_delete(request, row) }}" data-bs-toggle="modal" data-bs-target="#modal-delete" title="Delete">
                 <span class="me-1"><i class="fa-solid fa-trash"></i></span>
               </a>
               {% endif %}
             </td>
-            {% for name, column in model_view._list_attrs %}
+            {% for name, column in model_view._list_props %}
             {% set value, formatted_value = model_view.get_list_value(row, column) %}
-            {% if column in model_view._relations %}
+            {% if column in model_view._relation_props %}
             {% if is_list( value ) %}
             <td>
             {% for elem, formatted_elem in zip(value, formatted_value) %}
@@ -114,7 +114,7 @@
             {% endfor %}
             </td>
             {% else %}
-            <td><a href="{{ model_view._url_for_details_with_attr(request, row, column) }}">{{ formatted_value }}</a></td>
+            <td><a href="{{ model_view._url_for_details_with_prop(request, row, column) }}">{{ formatted_value }}</a></td>
             {% endif %}
             {% else %}
             <td>{{ formatted_value }}</td>

sqladmin/widgets.py

@@ -1,13 +1,15 @@
 import json
-from typing import Any, Dict
+from typing import Any
 
 from markupsafe import Markup
 from wtforms import Field, widgets
 from wtforms.widgets import html_params
 
 __all__ = [
+    "AjaxSelect2Widget",
     "DatePickerWidget",
     "DateTimePickerWidget",
+    "Select2TagsWidget",
     "TimePickerWidget",
 ]
 
@@ -68,3 +70,30 @@ class AjaxSelect2Widget(widgets.Select):
                 kwargs["data-json"] = json.dumps([data])
 
         return Markup(f"<select {html_params(name=field.name, **kwargs)}></select>")
+
+
+class Select2TagsWidget(widgets.Select):
+    def __call__(self, field: Field, **kwargs: Any) -> str:
+        kwargs.setdefault("data-role", "select2-tags")
+        kwargs.setdefault("data-json", json.dumps(field.data))
+        return super().__call__(field, **kwargs)
+
+
+class FileInputWidget(widgets.FileInput):
+    """
+    File input widget with clear checkbox.
+    """
+
+    def __call__(self, field: Field, **kwargs: Any) -> str:
+        file_input = super().__call__(field, **kwargs)
+        checkbox_id = f"{field.id}_checkbox"
+        checkbox_label = Markup(
+            f'<label class="form-check-label" for="{checkbox_id}">Clear</label>'
+        )
+        checkbox_input = Markup(
+            f'<input class="form-check-input" type="checkbox" id="{checkbox_id}" name="{checkbox_id}">'  # noqa: E501
+        )
+        checkbox = Markup(
+            f'<div class="form-check">{checkbox_input}{checkbox_label}</div>'
+        )
+        return file_input + checkbox

{sqladmin-0.8.0.dist-info → sqladmin-0.10.0.dist-info}/METADATA

@@ -1,14 +1,15 @@
 Metadata-Version: 2.1
 Name: sqladmin
-Version: 0.8.0
+Version: 0.10.0
 Summary: SQLAlchemy admin for FastAPI and Starlette
 Project-URL: Documentation, https://aminalaee.dev/sqladmin
 Project-URL: Issues, https://github.com/aminalaee/sqladmin/issues
 Project-URL: Source, https://github.com/aminalaee/sqladmin
 Author-email: Amin Alaee <mohammadamin.alaee@gmail.com>
+License-Expression: BSD-3-Clause
 License-File: LICENSE.md
 Keywords: admin,fastapi,sqlalchemy,starlette
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
@@ -21,7 +22,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Internet :: WWW/HTTP
 Requires-Python: >=3.7
-Requires-Dist: sqlalchemy<1.5,>=1.4
+Requires-Dist: sqlalchemy>=1.4
 Requires-Dist: starlette[full]
 Requires-Dist: typing-extensions>=4.0; python_version < '3.8'
 Requires-Dist: wtforms<4,>=3
@@ -83,6 +84,11 @@ $ pip install sqladmin
 
 ---
 
+## Screenshots
+
+<img width="1492" alt="sqladmin-1" src="https://user-images.githubusercontent.com/19784933/208232730-0114a155-2740-4e89-9d73-64a4e51a5cf5.png">
+<img width="1492" alt="sqladmin-2" src="https://user-images.githubusercontent.com/19784933/208232731-6d783dde-b93e-41c0-911b-3d1c3c73f1d5.png">
+
 ## Quickstart
 
 Let's define an example SQLAlchemy model:

{sqladmin-0.8.0.dist-info → sqladmin-0.10.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
-sqladmin/__init__.py,sha256=1imqHe-i74s92Gj3N5aA1YHAGbSrsFMgsXMu4ZSGkwM,223
-sqladmin/_queries.py,sha256=kXkFXYTcUCoivAgVOC9jaaFHKeB_FngJOho0L0RZo1Y,7991
-sqladmin/_types.py,sha256=sCIKqC3jbW2OBoLAcSi8kXBwKpd78kG4kWD-cSVH9S0,278
-sqladmin/_validators.py,sha256=W5PUaWCrK0d5Wi1MUxf8RNe7HOuJPjf1Uq12lBtTYIg,888
-sqladmin/ajax.py,sha256=n3zPHAWC2m3v34QUV2XV8HhG4zZHW6vwkXcKvIgTZDA,2479
-sqladmin/application.py,sha256=S_x5xlXmxGtMJt9_cVHDLMh66pUo06VOofVOPJpfaFI,19962
-sqladmin/authentication.py,sha256=bPUxMgJJUglNAM7s_PZkKNmWVp0J3Vf12TfwwRQd6vs,2027
+sqladmin/__init__.py,sha256=BcFoQ3KjLGs4Sh3evnyrQABVOiysdvUnIfc_4Xo5Dbg,224
+sqladmin/_queries.py,sha256=maNxo8ZWHJys3XvqB5QLLQfMibUvmFEZ4Ufjd_rsN4I,8227
+sqladmin/_types.py,sha256=REixpHnnD4Qytug58b5hbY9B8MsNbZqWI2bJ8jUhCeI,277
+sqladmin/_validators.py,sha256=w0siGhZQq4MD__lu9Edua9DgMOoKET_kk-alpARFHIM,1604
+sqladmin/ajax.py,sha256=WcukKZXTwGM8TUSyQbYYMiHiMeBlwpVA6Cp862rs4ic,2473
+sqladmin/application.py,sha256=xdDsT2pcRAPIKC11d9JncSSOhp1W1kQXa84O2kooS_w,21094
+sqladmin/authentication.py,sha256=p6xqVhYlCd0jM6kHdCFGHnOfdIBwcpXqYqpeoj5STIg,2202
 sqladmin/exceptions.py,sha256=804ZRBRXh05zobafOHIdwmOeEK-cXZ3sQBu0OHSjtxI,210
-sqladmin/fields.py,sha256=PxN6F5u-POrggML1DBd5nU4YLMZavRh4Gk4MfGKsy-4,10703
+sqladmin/fields.py,sha256=rWqrXW722gOYlTFSG9y_Kjs3HlfOUWHynDJBd-lB0i8,11864
 sqladmin/formatters.py,sha256=K06la0mm9-Bs5UA9L6KGJC_X_lV3UHdJ3ENI6j9j2Zg,480
-sqladmin/forms.py,sha256=nFl4ubCHGCp6LmZeBugLgpCFhkKoL3FSfFy6HUumAd8,18264
-sqladmin/helpers.py,sha256=C1XJ5IgQGxLU4owMc8YDaJFCp1o6WzDzGhhM6n0ppNA,3969
-sqladmin/models.py,sha256=MYK9XUNbjeZIuSXHhatyf_77YjSjcGQSeXnhEEUQHbk,35151
+sqladmin/forms.py,sha256=kPHx-_VSxENicKM1_Pdmyg02frwOI17ixbytyA6mNlQ,19603
+sqladmin/helpers.py,sha256=GRSxbi_anqZOyjQaJomYJi96dODPAF_D1FnTHufPX-c,6193
+sqladmin/models.py,sha256=OjrNzMvxNnbsE2yI8hWzrLuJx8vfWg4IuI6UJRBeb6s,35169
 sqladmin/pagination.py,sha256=AmaZ5xNgPdBqTURYdOltz5IcSz8pY4qGQsr8evpUtHk,2256
 sqladmin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sqladmin/widgets.py,sha256=0GHzrtX6zmkeFjs-AdOa69cDC4mpm-_-a2RMuNM-f0w,2004
+sqladmin/widgets.py,sha256=NQZH7byJbUaY8O_U-1iv0W0Btiu3LuUuBRmhe58Ur2M,3019
 sqladmin/statics/css/flatpickr.min.css,sha256=GzSkJVLJbxDk36qko2cnawOGiqz_Y8GsQv_jMTUrx1Q,16166
 sqladmin/statics/css/fontawesome.min.css,sha256=z9NKRrVjN9Zj8OCp7yFV4PlxGOqT4AaJCOy-rnQ7Rig,68945
 sqladmin/statics/css/main.css,sha256=G1fZ4-mnRIXSXEXNHIAMGyegV-46bSYxjxwmwud30IE,46
@@ -23,23 +23,23 @@ sqladmin/statics/css/tabler.min.css,sha256=dHSje6bwxNEXwFv0QkwGUwjjrJb5pIgiltBrU
 sqladmin/statics/js/bootstrap.min.js,sha256=5dHuQEbO64HT5DMJ0FO0I7hwGOYMTPDdjufF0-npBGU,62399
 sqladmin/statics/js/flatpickr.min.js,sha256=P3cmJKYotkCthfbkx0ci27L0y3mp2ZlCJ-RrV3oOsDE,58060
 sqladmin/statics/js/jquery.min.js,sha256=_xUj-3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej_m4,89501
-sqladmin/statics/js/main.js,sha256=hHOHsHkWNahjtc9-Ua0Av1RGQAy4jfFFuVBwq6EA3Ds,3466
+sqladmin/statics/js/main.js,sha256=2lRY5ws_9urCFsOU5ryp7ZkyM-w-flXBSEAxUsxXxBM,3831
 sqladmin/statics/js/popper.min.js,sha256=wZjZsjDhPsJ8oPi__hLJzWmP9Fj30Vm0c_9jALIiyjE,19167
 sqladmin/statics/js/select2.full.min.js,sha256=XG_auAy4aieWldzMImofrFDiySK-pwJC7aoo9St7rS0,79212
 sqladmin/statics/js/tabler.min.js,sha256=l-Tz5LXKidfgYBYmcKJIjSYCoa0iVcSW03rLL2oXJcU,137925
 sqladmin/statics/webfonts/fa-solid-900.ttf,sha256=F4IVa_ogVNtCkne0LxQymKHOA0N8BeJ3nKeHURKxnTw,303480
 sqladmin/statics/webfonts/fa-solid-900.woff2,sha256=GwmfiMBu0IaYclYcFX8OycvhM6CTnZ7OTuHh9UvUaD0,126828
 sqladmin/templates/base.html,sha256=mY3cL4oxSUpp4map0KqfcSiXFpYfiUY8dCMys_sASCo,1739
-sqladmin/templates/create.html,sha256=tLHupg0Wycvo6ahMCH0TvQ-B-wZHTE-KWdWaeSWjD5Q,1702
-sqladmin/templates/details.html,sha256=-DhCynXIoH1K--blS6-7tLyQuxCm1P4M_6E5_0e02gI,2569
-sqladmin/templates/edit.html,sha256=7O-EHP_Na7jpgmf-NffRqK4cYs9AiaSsZ7i8F6jrpuQ,1876
+sqladmin/templates/create.html,sha256=gcnlfR6zuZpO2WuvOuHrLwyYniLSexA7An6egviTu34,1732
+sqladmin/templates/details.html,sha256=7MIUvbVtB51BIwAqg08jSItNTIfXSlcbkID5Tai_SM4,2574
+sqladmin/templates/edit.html,sha256=BZ365fBBo62qkR_aGotDFx5yrdoCOTdkQagD4oL87MA,1906
 sqladmin/templates/error.html,sha256=DGmfAYQB5eYpo1nfK_rDa1-YQ93OR5CKRkWl7x--ajE,282
 sqladmin/templates/index.html,sha256=4JMiiNqyHkriMjaXFgaJ1OGqPMEQKFZVr3bzZUzU_zU,63
 sqladmin/templates/layout.html,sha256=rFMc-m77oVjL9anf6i8PmZlzUHmU_E6Dphu-WP0Tawo,2821
-sqladmin/templates/list.html,sha256=bMMxcwRs1QirxB8LE86a_IfVAw64obPoPGfKk2e-Eww,8458
+sqladmin/templates/list.html,sha256=QlnpuvnY4BbTbLPt0PymrDG0bcAo4-8RIYaaX3X0sNY,8467
 sqladmin/templates/login.html,sha256=owaAUlVpHS1bmPXDVPRvKvGWMbWW8K8xsIaagLYp3wQ,1475
 sqladmin/templates/modals/delete.html,sha256=8K4iNkszaG3Qopt22OLTXxsLCsDidzjhtPQchyBwVLI,1093
-sqladmin-0.8.0.dist-info/METADATA,sha256=TR6rcJ9p0MWeDUx2pBDk621Nb6-u-fnn85vkaEf2qDM,4706
-sqladmin-0.8.0.dist-info/WHEEL,sha256=NaLmgHHW_f9jTvv_wRh9vcK7c7EK9o5fwsIXMOzoGgM,87
-sqladmin-0.8.0.dist-info/licenses/LICENSE.md,sha256=4zzpHQMPtND4hzIgJA5qnb4R_wRBWJlYGqNrZolBeP8,1488
-sqladmin-0.8.0.dist-info/RECORD,,
+sqladmin-0.10.0.dist-info/METADATA,sha256=48ehxl49nFEuOn8YJi8qyb1iMPfcequilFDwSbrMy5o,5039
+sqladmin-0.10.0.dist-info/WHEEL,sha256=Fd6mP6ydyRguakwUJ05oBE7fh2IPxgtDN9IwHJ9OqJQ,87
+sqladmin-0.10.0.dist-info/licenses/LICENSE.md,sha256=4zzpHQMPtND4hzIgJA5qnb4R_wRBWJlYGqNrZolBeP8,1488
+sqladmin-0.10.0.dist-info/RECORD,,

{sqladmin-0.8.0.dist-info → sqladmin-0.10.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.11.1
+Generator: hatchling 1.13.0
 Root-Is-Purelib: true
 Tag: py3-none-any