pydantic v2 support

.github/workflows/playwright.yaml

@@ -20,7 +20,7 @@ jobs:
       - name: "Setup Node"
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 16
       - name: "Install all dependencies"
         run: |
           python -m pip install --upgrade pip

.github/workflows/release.yaml

@@ -17,7 +17,7 @@ jobs:
                   python-version: 3.11
             - uses: actions/setup-node@v3
               with:
-                  node-version: 18
+                  node-version: 16
             - name: "Install dependencies"
               run: |
                   pip install -r requirements/dev-requirements.txt

.github/workflows/tests.yaml

@@ -18,6 +18,7 @@ jobs:
             - name: Install dependencies
               run: |
                   python -m pip install --upgrade pip
+                  pip install -r requirements/requirements.txt
                   pip install -r requirements/dev-requirements.txt
                   pip install -r requirements/test-requirements.txt
             - name: Lint

CHANGES.rst

@@ -1,6 +1,14 @@
 Changes
 =======
 
+0.58.0
+------
+
+The default rate limiting is now more aggressive. This can be overridden using
+the ``rate_limit_provider`` argument of ``create_admin``.
+
+-------------------------------------------------------------------------------
+
 0.57.0
 ------
 

admin_ui/package.json

@@ -23,6 +23,7 @@
         "is-svg": "^4.3.1",
         "js-cookie": "^2.2.1",
         "json-bigint": "^1.0.0",
+        "moment": "^2.29.4",
         "ssri": "^8.0.1",
         "vue": "^2.7.14",
         "vue-class-component": "^7.2.6",
@@ -57,4 +58,4 @@
         "vue-template-compiler": "^2.6.12"
     },
     "license": "ISC"
-}
+}

admin_ui/src/components/DurationWidget.vue

@@ -47,7 +47,9 @@
     </div>
 </template>
 
-<script>
+<script lang="ts">
+import { secondsToISO8601Duration } from "../utils"
+
 const MINUTE = 60
 const HOUR = MINUTE * 60
 const DAY = HOUR * 24
@@ -83,7 +85,7 @@ export default {
                 this.hours * HOUR +
                 this.days * DAY +
                 this.weeks * WEEK
-            this.$emit("newTimedelta", timedelta)
+            this.$emit("newTimedelta", secondsToISO8601Duration(timedelta))
         },
         setupValues(timedelta) {
             this.weeks = Math.floor(timedelta / WEEK)

admin_ui/src/components/InputField.vue

@@ -89,6 +89,21 @@
                 ></textarea>
             </div>
 
+            <div v-else-if="format == 'duration'">
+                <template>
+                    <OperatorField :columnName="columnName" v-if="isFilter" />
+                    <DurationWidget
+                        v-bind:timedelta="convertDurationToSeconds"
+                        v-on:newTimedelta="localValue = $event"
+                    />
+                    <input
+                        type="hidden"
+                        v-bind:name="columnName"
+                        :value="convertSecondsToDuration"
+                    />
+                </template>
+            </div>
+
             <div v-else-if="format == 'json'">
                 <textarea
                     v-model="localValue"
@@ -136,19 +151,7 @@
         </template>
 
         <template v-else-if="type == 'number'">
-            <template v-if="format == 'time-delta'">
-                <OperatorField :columnName="columnName" v-if="isFilter" />
-                <DurationWidget
-                    v-bind:timedelta="localValue"
-                    v-on:newTimedelta="localValue = $event"
-                />
-                <input
-                    type="hidden"
-                    v-bind:name="columnName"
-                    v-model="localValue"
-                />
-            </template>
-            <template v-else>
+            <template>
                 <OperatorField :columnName="columnName" v-if="isFilter" />
                 <input
                     type="text"
@@ -182,6 +185,7 @@
 import Vue, { PropType } from "vue"
 import axios from "axios"
 import flatPickr from "vue-flatpickr-component"
+import moment from "moment"
 import { VueEditor } from "vue2-editor"
 
 import ArrayWidget from "./ArrayWidget.vue"
@@ -196,6 +200,7 @@ import {
     APIResponseMessage,
     MediaViewerConfig
 } from "@/interfaces"
+import { secondsToISO8601Duration } from "../utils"
 
 export default Vue.extend({
     props: {
@@ -276,6 +281,15 @@ export default Vue.extend({
         }
     },
     computed: {
+        schema() {
+            return this.$store.state.schema
+        },
+        convertDurationToSeconds() {
+            return moment.duration(this.localValue).asSeconds()
+        },
+        convertSecondsToDuration() {
+            return secondsToISO8601Duration(this.localValue)
+        },
         placeholder() {
             if (this.isFilter) {
                 return "All"

admin_ui/src/utils.ts

@@ -1,7 +1,17 @@
 import { Schema, OrderByConfig } from "@/interfaces"
 import router from "./router"
+import moment from 'moment'
 
-export function readableInterval(timeRange: number) {
+/**
+ * We need to parse ISO 8601 duration string (e.g. P17DT14706S) to 
+ * seconds and then convert to human readable interval.
+ *
+ * @param timeValue ISO 8601 duration string which we need to parse.
+ * @returns A string of nicelly formated timeValue
+ */
+export function readableInterval(timeValue: string) {
+    const parsedTimeValue = moment.duration(timeValue)
+    const timeRange = parsedTimeValue.asSeconds()
     if (timeRange === 0) {
         return "0 seconds"
     }
@@ -30,6 +40,17 @@ export function readableInterval(timeRange: number) {
     )
 }
 
+/**
+ * We need to convert interval from seconds to ISO 8601 duration 
+ * string (e.g. P17DT14706S) for form fields.
+ *
+ * @param value interval seconds which we need to convert.
+ * @returns ISO 8601 duration string
+ */
+export function secondsToISO8601Duration(value: number) {
+    return moment.duration(value, 'seconds').toISOString()
+}
+
 export function titleCase(value: string) {
     return value
         .toLowerCase()
@@ -106,32 +127,43 @@ export function convertFormValue(params: {
         value = null
     } else if (schema?.properties[key].type == "array") {
         value = JSON.parse(String(value))
-    } else if (schema?.properties[key].format == "uuid" && value == "") {
+    } else if (schema?.properties[key].format == "uuid" &&
+        schema?.properties[key].extra["nullable"] == true
+        && value == "") {
         value = null
-    } else if (schema?.properties[key].format == "email" && value == "") {
+    } else if (schema?.properties[key].format == "email" &&
+        schema?.properties[key].extra["nullable"] == true
+        && value == "") {
         value = null
-    } else if (schema?.properties[key].format == "date-time" && value == "") {
+    } else if (schema?.properties[key].format == "date-time" &&
+        schema?.properties[key].extra["nullable"] == true
+        && value == "") {
         value = null
-    } else if (schema?.properties[key].format == "date" && value == "") {
+    } else if (schema?.properties[key].format == "date" &&
+        schema?.properties[key].extra["nullable"] == true
+        && value == "") {
         value = null
-    } else if (schema?.properties[key].type == "integer" && value == "") {
+    } else if (schema?.properties[key].format == "json" &&
+        schema?.properties[key].extra["nullable"] == true
+        && value == "") {
         value = null
-    } else if (schema?.properties[key].type == "number" && value == "") {
+    }
+    else if (schema?.properties[key]["anyOf"][0].type == "integer" &&
+        schema?.properties[key].extra["nullable"] == true
+        && value == "") {
         value = null
-    } else if (
-        schema?.properties[key].type == "string" &&
-        schema?.properties[key].nullable &&
-        value == ""
-    ) {
+    } else if (schema?.properties[key]["anyOf"][0].type == "number" &&
+        schema?.properties[key].extra["nullable"] == true
+        && value == "") {
         value = null
     } else if (
-        schema?.properties[key].format == "json" &&
-        schema?.properties[key].nullable &&
-        value == ""
-    ) {
+        schema?.properties[key]["anyOf"][0].type == "string" &&
+        schema?.properties[key].extra["nullable"] == true
+        && value == "") {
         value = null
     } else if (
         schema?.properties[key].extra.foreign_key == true &&
+        schema?.properties[key].extra["nullable"] == true &&
         value == ""
     ) {
         value = null

admin_ui/src/views/RowListing.vue

@@ -326,10 +326,7 @@
                                                     <li>
                                                         <DeleteButton
                                                             :includeTitle="true"
-                                                            class="
-                                                                subtle
-                                                                delete
-                                                            "
+                                                            class="subtle delete"
                                                             v-on:triggered="
                                                                 deleteRow(
                                                                     row[pkName]
@@ -551,7 +548,7 @@ export default Vue.extend({
             return this.schema.properties[name]["type"] == "boolean"
         },
         isInterval(name: string): boolean {
-            return this.schema.properties[name]["format"] == "time-delta"
+            return this.schema.properties[name]["format"] == "duration"
         },
         isJSON(name: string): boolean {
             return this.schema.properties[name]["format"] == "json"

piccolo_admin/endpoints.py

@@ -398,7 +398,7 @@ def __init__(
         production: bool = False,
         site_name: str = "Piccolo Admin",
         default_language_code: str = "auto",
-        translations: t.List[Translation] = None,
+        translations: t.Optional[t.List[Translation]] = None,
         allowed_hosts: t.Sequence[str] = [],
         debug: bool = False,
         sidebar_links: t.Dict[str, str] = {},
@@ -656,7 +656,7 @@ def __init__(
 
         if not rate_limit_provider:
             rate_limit_provider = InMemoryLimitProvider(
-                limit=1000, timespan=300
+                limit=100, timespan=300
             )
 
         public_app.mount(
@@ -802,7 +802,7 @@ async def store_file(
 
         try:
             file_key = await media_storage.store_file(
-                file_name=file.filename,
+                file_name=str(file.filename),
                 file=file.file,
                 user=request.user.user,
             )
@@ -879,7 +879,7 @@ def get_single_form_schema(self, form_slug: str) -> t.Dict[str, t.Any]:
         if form_config is None:
             raise HTTPException(status_code=404, detail="No such form found")
         else:
-            return form_config.pydantic_model.schema()
+            return form_config.pydantic_model.model_json_schema()
 
     async def post_single_form(
         self, request: Request, form_slug: str
@@ -1047,7 +1047,7 @@ def create_admin(
     production: bool = False,
     site_name: str = "Piccolo Admin",
     default_language_code: str = "auto",
-    translations: t.List[Translation] = None,
+    translations: t.Optional[t.List[Translation]] = None,
     auto_include_related: bool = True,
     allowed_hosts: t.Sequence[str] = [],
     debug: bool = False,

piccolo_admin/example.py

@@ -45,7 +45,7 @@
 from piccolo_api.media.local import LocalMediaStorage
 from piccolo_api.media.s3 import S3MediaStorage
 from piccolo_api.session_auth.tables import SessionsBase
-from pydantic import BaseModel, validator
+from pydantic import BaseModel, field_validator
 from starlette.requests import Request
 
 from piccolo_admin.endpoints import (
@@ -309,7 +309,7 @@ class BusinessEmailModel(BaseModel):
     title: str = "Enquiry"
     content: str
 
-    @validator("email")
+    @field_validator("email")
     def validate_email(cls, v):
         if "@" not in v:
             raise ValueError("not valid email")
@@ -321,7 +321,7 @@ class BookingModel(BaseModel):
     name: str
     notes: str = "N/A"
 
-    @validator("email")
+    @field_validator("email")
     def validate_email(cls, v):
         if "@" not in v:
             raise ValueError("not valid email")
@@ -391,6 +391,7 @@ def booking_endpoint(request: Request, data: BookingModel) -> str:
         Movie._meta.primary_key,
         Movie.name,
         Movie.rating,
+        Movie.duration,
         Movie.director,
         Movie.poster,
         Movie.tags,

piccolo_admin/version.txt

@@ -1 +1 @@
-0.57.0
+0.58.0

requirements/dev-requirements.txt

@@ -1,7 +1,7 @@
-black==21.12b0
-isort==5.10.1
+black==23.7.0
+isort==5.12.0
 twine==4.0.0
-mypy==0.942
+mypy==1.5.1
 pip-upgrader==1.4.15
 wheel==0.37.1
 python-dotenv==0.20.0

requirements/requirements.txt

@@ -1,7 +1,7 @@
-piccolo>=0.104.0
-piccolo_api>=0.57.0
+piccolo>=1.0a1
+piccolo_api>=1.0a1
 uvicorn
 aiofiles>=0.5.0
 Hypercorn
 targ>=0.1.9
-fastapi>=0.87.0,<0.100.0
+fastapi>=0.100.0