From 6e9e18dd86787cd9a07fb0669bd94a0156cb02a4 Mon Sep 17 00:00:00 2001
From: sinisaos <sinisaos@gmail.com>
Date: Thu, 27 Jul 2023 18:22:01 +0200
Subject: [PATCH 1/9] pydantic_v2_support

---
 admin_ui/package.json                      |  3 +-
 admin_ui/src/components/DurationWidget.vue |  6 ++--
 admin_ui/src/components/InputField.vue     | 41 +++++++++++++++-------
 admin_ui/src/components/RowFilter.vue      |  8 +++++
 admin_ui/src/utils.ts                      | 37 ++++++++++++++-----
 admin_ui/src/views/RowListing.vue          |  7 ++--
 piccolo_admin/endpoints.py                 |  2 +-
 piccolo_admin/example.py                   |  7 ++--
 requirements/requirements.txt              |  6 ++--
 9 files changed, 82 insertions(+), 35 deletions(-)

diff --git a/admin_ui/package.json b/admin_ui/package.json
index 4f34b8cf..eb6b5578 100644
--- a/admin_ui/package.json
+++ b/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"
-}
+}
\ No newline at end of file
diff --git a/admin_ui/src/components/DurationWidget.vue b/admin_ui/src/components/DurationWidget.vue
index a06de629..bd9ce9f0 100644
--- a/admin_ui/src/components/DurationWidget.vue
+++ b/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)
diff --git a/admin_ui/src/components/InputField.vue b/admin_ui/src/components/InputField.vue
index 4616cc9f..6b5411c8 100644
--- a/admin_ui/src/components/InputField.vue
+++ b/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"
@@ -135,19 +150,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"
@@ -181,6 +184,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"
@@ -195,6 +199,7 @@ import {
     APIResponseMessage,
     MediaViewerConfig
 } from "@/interfaces"
+import { secondsToISO8601Duration } from "../utils"
 
 export default Vue.extend({
     props: {
@@ -275,6 +280,16 @@ export default Vue.extend({
         }
     },
     computed: {
+        schema() {
+            console.log(this.$store.state.schema)
+            return this.$store.state.schema
+        },
+        convertDurationToSeconds() {
+            return moment.duration(this.localValue).asSeconds()
+        },
+        convertSecondsToDuration() {
+            return secondsToISO8601Duration(this.localValue)
+        },
         placeholder() {
             if (this.isFilter) {
                 return "All"
diff --git a/admin_ui/src/components/RowFilter.vue b/admin_ui/src/components/RowFilter.vue
index c6a6333a..778c7a1e 100644
--- a/admin_ui/src/components/RowFilter.vue
+++ b/admin_ui/src/components/RowFilter.vue
@@ -20,6 +20,7 @@
 import Vue from "vue"
 import FilterForm from "./FilterForm.vue"
 import { APIResponseMessage } from "../interfaces"
+import { secondsToISO8601Duration } from "../utils"
 
 export default Vue.extend({
     props: {
@@ -62,6 +63,13 @@ export default Vue.extend({
                             : value
                     }
 
+                    if (
+                        this.schema.properties[key]?.anyOf[0].format ==
+                        "duration"
+                    ) {
+                        value = secondsToISO8601Duration(value)
+                    }
+
                     if (value == "null") {
                         json[`${key}__operator`] = "is_null"
                     } else {
diff --git a/admin_ui/src/utils.ts b/admin_ui/src/utils.ts
index dd3e058e..a8a6beb1 100644
--- a/admin_ui/src/utils.ts
+++ b/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()
@@ -104,19 +125,19 @@ export function convertFormValue(params: {
 
     if (value == "null") {
         value = null
-    } else if (schema.properties[key].type == "array") {
+    } else if (schema.properties[key]["anyOf"][0].type == "array") {
         value = JSON.parse(String(value))
-    } else if (schema?.properties[key].format == "uuid" && value == "") {
+    } else if (schema?.properties[key]["anyOf"][0].format == "uuid" && value == "") {
         value = null
-    } else if (schema?.properties[key].format == "email" && value == "") {
+    } else if (schema?.properties[key]["anyOf"][0].format == "email" && value == "") {
         value = null
-    } else if (schema?.properties[key].format == "date-time" && value == "") {
+    } else if (schema?.properties[key]["anyOf"][0].format == "date-time" && value == "") {
         value = null
-    } else if (schema?.properties[key].format == "date" && value == "") {
+    } else if (schema?.properties[key]["anyOf"][0].format == "date" && value == "") {
         value = null
-    } else if (schema?.properties[key].type == "integer" && value == "") {
+    } else if (schema?.properties[key]["anyOf"][0].type == "integer" && value == "") {
         value = null
-    } else if (schema?.properties[key].type == "number" && value == "") {
+    } else if (schema?.properties[key]["anyOf"][0].type == "number" && value == "") {
         value = null
     } else if (
         schema?.properties[key].extra.foreign_key == true &&
diff --git a/admin_ui/src/views/RowListing.vue b/admin_ui/src/views/RowListing.vue
index 40cfb860..373cc283 100644
--- a/admin_ui/src/views/RowListing.vue
+++ b/admin_ui/src/views/RowListing.vue
@@ -323,10 +323,7 @@
                                                     <li>
                                                         <DeleteButton
                                                             :includeTitle="true"
-                                                            class="
-                                                                subtle
-                                                                delete
-                                                            "
+                                                            class="subtle delete"
                                                             v-on:triggered="
                                                                 deleteRow(
                                                                     row[pkName]
@@ -548,7 +545,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"
diff --git a/piccolo_admin/endpoints.py b/piccolo_admin/endpoints.py
index f2d02b09..46874104 100644
--- a/piccolo_admin/endpoints.py
+++ b/piccolo_admin/endpoints.py
@@ -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
diff --git a/piccolo_admin/example.py b/piccolo_admin/example.py
index e880654b..09438363 100644
--- a/piccolo_admin/example.py
+++ b/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 (
@@ -306,7 +306,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")
@@ -318,7 +318,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")
@@ -388,6 +388,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,
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 0ed21a20..aaab121d 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,7 +1,9 @@
-piccolo>=0.104.0
+# TODO - pin to the first Piccolo version with Pydantic V2 support when released 
+piccolo>=0.118.0
+# TODO - pin to the first Piccolo API version with Pydantic V2 support when released 
 piccolo_api>=0.57.0
 uvicorn
 aiofiles>=0.5.0
 Hypercorn
 targ>=0.1.9
-fastapi>=0.87.0,<0.100.0
+fastapi>=0.100.0

From 58d5cda8c4fb6e070c85a3a6099d12f236b274e8 Mon Sep 17 00:00:00 2001
From: sinisaos <sinisaos@gmail.com>
Date: Sat, 12 Aug 2023 07:19:42 +0200
Subject: [PATCH 2/9] improve nullable fields

---
 admin_ui/src/components/InputField.vue |  1 -
 admin_ui/src/utils.ts                  | 33 +++++++++++++++++---------
 requirements/requirements.txt          |  3 +--
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/admin_ui/src/components/InputField.vue b/admin_ui/src/components/InputField.vue
index 6fd248bb..236c43f9 100644
--- a/admin_ui/src/components/InputField.vue
+++ b/admin_ui/src/components/InputField.vue
@@ -282,7 +282,6 @@ export default Vue.extend({
     },
     computed: {
         schema() {
-            console.log(this.$store.state.schema)
             return this.$store.state.schema
         },
         convertDurationToSeconds() {
diff --git a/admin_ui/src/utils.ts b/admin_ui/src/utils.ts
index f4c23e71..180856b5 100644
--- a/admin_ui/src/utils.ts
+++ b/admin_ui/src/utils.ts
@@ -127,26 +127,37 @@ export function convertFormValue(params: {
         value = null
     } else if (schema.properties[key]["anyOf"][0].type == "array") {
         value = JSON.parse(String(value))
-    } else if (schema?.properties[key]["anyOf"][0].format == "uuid" && value == "") {
+    } else if (schema?.properties[key]["anyOf"][0].format == "uuid" &&
+        schema?.properties[key].extra["nullable"] == true
+        && value == "") {
         value = null
-    } else if (schema?.properties[key]["anyOf"][0].format == "email" && value == "") {
+    } else if (schema?.properties[key]["anyOf"][0].format == "email" &&
+        schema?.properties[key].extra["nullable"] == true
+        && value == "") {
         value = null
-    } else if (schema?.properties[key]["anyOf"][0].format == "date-time" && value == "") {
+    } else if (schema?.properties[key]["anyOf"][0].format == "date-time" &&
+        schema?.properties[key].extra["nullable"] == true
+        && value == "") {
         value = null
-    } else if (schema?.properties[key]["anyOf"][0].format == "date" && value == "") {
+    } else if (schema?.properties[key]["anyOf"][0].format == "date" &&
+        schema?.properties[key].extra["nullable"] == true
+        && value == "") {
         value = null
-    } else if (schema?.properties[key]["anyOf"][0].type == "integer" && value == "") {
+    } else if (schema?.properties[key]["anyOf"][0].type == "integer" &&
+        schema?.properties[key].extra["nullable"] == true
+        && value == "") {
         value = null
-    } else if (schema?.properties[key]["anyOf"][0].type == "number" && 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 == ""
-    ) {
+    } else if (schema?.properties[key].format == "json" &&
+        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
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index aaab121d..00bd4f8b 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,5 +1,4 @@
-# TODO - pin to the first Piccolo version with Pydantic V2 support when released 
-piccolo>=0.118.0
+piccolo>=1.0a1
 # TODO - pin to the first Piccolo API version with Pydantic V2 support when released 
 piccolo_api>=0.57.0
 uvicorn

From c1439ae797ffa9119fa67c7d79d4b3d6a2a66ba4 Mon Sep 17 00:00:00 2001
From: sinisaos <sinisaos@gmail.com>
Date: Mon, 4 Sep 2023 20:01:29 +0200
Subject: [PATCH 3/9] update dependencies

---
 piccolo_admin/endpoints.py        | 6 +++---
 requirements/dev-requirements.txt | 6 +++---
 requirements/requirements.txt     | 3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/piccolo_admin/endpoints.py b/piccolo_admin/endpoints.py
index 46874104..4b00fbfb 100644
--- a/piccolo_admin/endpoints.py
+++ b/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] = {},
@@ -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,
             )
@@ -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,
diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt
index cc6491d2..b2df0a3c 100644
--- a/requirements/dev-requirements.txt
+++ b/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
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 00bd4f8b..d751026f 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,6 +1,5 @@
 piccolo>=1.0a1
-# TODO - pin to the first Piccolo API version with Pydantic V2 support when released 
-piccolo_api>=0.57.0
+piccolo_api>=1.0a1
 uvicorn
 aiofiles>=0.5.0
 Hypercorn

From 0c3215157f69251e8c1a43cd71bc5c0ec4d99640 Mon Sep 17 00:00:00 2001
From: sinisaos <sinisaos@gmail.com>
Date: Mon, 4 Sep 2023 20:15:27 +0200
Subject: [PATCH 4/9] downgrade node

---
 requirements/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index d751026f..77465b0a 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -5,3 +5,4 @@ aiofiles>=0.5.0
 Hypercorn
 targ>=0.1.9
 fastapi>=0.100.0
+pydantic[email]>=2.0

From af7bdcc26cf550182ec221f0b8caadbbc0a5117f Mon Sep 17 00:00:00 2001
From: sinisaos <sinisaos@gmail.com>
Date: Mon, 4 Sep 2023 20:29:08 +0200
Subject: [PATCH 5/9] update github actions

---
 .github/workflows/playwright.yaml | 2 +-
 .github/workflows/tests.yaml      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/playwright.yaml b/.github/workflows/playwright.yaml
index 060dc761..aeb50742 100644
--- a/.github/workflows/playwright.yaml
+++ b/.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
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index c70fd23e..d0ae8db0 100644
--- a/.github/workflows/tests.yaml
+++ b/.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

From cf9dc0c6567d7aef07934e6e66419b6459025fcb Mon Sep 17 00:00:00 2001
From: sinisaos <sinisaos@gmail.com>
Date: Tue, 5 Sep 2023 06:29:16 +0200
Subject: [PATCH 6/9] update the dependencies

---
 requirements/requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 77465b0a..d751026f 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -5,4 +5,3 @@ aiofiles>=0.5.0
 Hypercorn
 targ>=0.1.9
 fastapi>=0.100.0
-pydantic[email]>=2.0

From 94549f5fd71cc9deb69089ba41a4fd2a0b3bb0de Mon Sep 17 00:00:00 2001
From: sinisaos <sinisaos@gmail.com>
Date: Tue, 5 Sep 2023 13:41:33 +0200
Subject: [PATCH 7/9] another try with Github CI


From dd050684091e4e8a658e72ab2afc5588dcdb979d Mon Sep 17 00:00:00 2001
From: sinisaos <sinisaos@gmail.com>
Date: Fri, 15 Sep 2023 07:45:13 +0200
Subject: [PATCH 8/9] changes in the convertFormValue function

---
 admin_ui/src/components/RowFilter.vue |  8 --------
 admin_ui/src/utils.ts                 | 17 +++++++++--------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/admin_ui/src/components/RowFilter.vue b/admin_ui/src/components/RowFilter.vue
index 778c7a1e..c6a6333a 100644
--- a/admin_ui/src/components/RowFilter.vue
+++ b/admin_ui/src/components/RowFilter.vue
@@ -20,7 +20,6 @@
 import Vue from "vue"
 import FilterForm from "./FilterForm.vue"
 import { APIResponseMessage } from "../interfaces"
-import { secondsToISO8601Duration } from "../utils"
 
 export default Vue.extend({
     props: {
@@ -63,13 +62,6 @@ export default Vue.extend({
                             : value
                     }
 
-                    if (
-                        this.schema.properties[key]?.anyOf[0].format ==
-                        "duration"
-                    ) {
-                        value = secondsToISO8601Duration(value)
-                    }
-
                     if (value == "null") {
                         json[`${key}__operator`] = "is_null"
                     } else {
diff --git a/admin_ui/src/utils.ts b/admin_ui/src/utils.ts
index efbee576..4a47969c 100644
--- a/admin_ui/src/utils.ts
+++ b/admin_ui/src/utils.ts
@@ -125,33 +125,34 @@ export function convertFormValue(params: {
 
     if (value == "null") {
         value = null
-    } else if (schema.properties[key]["anyOf"][0].type == "array") {
+    } else if (schema?.properties[key].type == "array") {
         value = JSON.parse(String(value))
-    } else if (schema?.properties[key]["anyOf"][0].format == "uuid" &&
+    } else if (schema?.properties[key].format == "uuid" &&
         schema?.properties[key].extra["nullable"] == true
         && value == "") {
         value = null
-    } else if (schema?.properties[key]["anyOf"][0].format == "email" &&
+    } else if (schema?.properties[key].format == "email" &&
         schema?.properties[key].extra["nullable"] == true
         && value == "") {
         value = null
-    } else if (schema?.properties[key]["anyOf"][0].format == "date-time" &&
+    } else if (schema?.properties[key].format == "date-time" &&
         schema?.properties[key].extra["nullable"] == true
         && value == "") {
         value = null
-    } else if (schema?.properties[key]["anyOf"][0].format == "date" &&
+    } else if (schema?.properties[key].format == "date" &&
         schema?.properties[key].extra["nullable"] == true
         && value == "") {
         value = null
-    } else if (schema?.properties[key]["anyOf"][0].type == "integer" &&
+    } else if (schema?.properties[key].format == "json" &&
         schema?.properties[key].extra["nullable"] == true
         && value == "") {
         value = null
-    } else if (schema?.properties[key]["anyOf"][0].type == "number" &&
+    }
+    else if (schema?.properties[key]["anyOf"][0].type == "integer" &&
         schema?.properties[key].extra["nullable"] == true
         && value == "") {
         value = null
-    } else if (schema?.properties[key].format == "json" &&
+    } else if (schema?.properties[key]["anyOf"][0].type == "number" &&
         schema?.properties[key].extra["nullable"] == true
         && value == "") {
         value = null

From 3295af878b4506e1e6ea8f391f11041ba5a8e891 Mon Sep 17 00:00:00 2001
From: sinisaos <sinisaos@gmail.com>
Date: Fri, 15 Sep 2023 08:03:41 +0200
Subject: [PATCH 9/9] fix wrong push

---
 .github/workflows/release.yaml | 2 +-
 CHANGES.rst                    | 8 ++++++++
 piccolo_admin/endpoints.py     | 2 +-
 piccolo_admin/version.txt      | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d17d8f1d..2f5db165 100644
--- a/.github/workflows/release.yaml
+++ b/.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
diff --git a/CHANGES.rst b/CHANGES.rst
index 843e5542..1f904ee2 100644
--- a/CHANGES.rst
+++ b/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
 ------
 
diff --git a/piccolo_admin/endpoints.py b/piccolo_admin/endpoints.py
index 4b00fbfb..f56242f5 100644
--- a/piccolo_admin/endpoints.py
+++ b/piccolo_admin/endpoints.py
@@ -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(
diff --git a/piccolo_admin/version.txt b/piccolo_admin/version.txt
index 78756de3..e8f304f8 100644
--- a/piccolo_admin/version.txt
+++ b/piccolo_admin/version.txt
@@ -1 +1 @@
-0.57.0
\ No newline at end of file
+0.58.0
\ No newline at end of file