From 9748d15cbf72dd6fce50c51fd5c3e9073d5ddf3e Mon Sep 17 00:00:00 2001 From: Paul Sanders Date: Wed, 19 Jul 2023 21:53:47 -0400 Subject: [PATCH 1/2] Fix potential json_encoding date error and truncation in pydantic < 2 --- meilisearch/models/key.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/meilisearch/models/key.py b/meilisearch/models/key.py index 977afe7a..9db786f8 100644 --- a/meilisearch/models/key.py +++ b/meilisearch/models/key.py @@ -38,7 +38,11 @@ class Config: json_encoders = { datetime: lambda v: None if not v - else f"{str(v).split('.', maxsplit=1)[0].replace(' ', 'T')}Z" + else ( + f"{str(v).split('+')[0].replace(' ', 'T')}Z" + if "+" in str(v) + else f"{str(v).replace(' ', 'T')}Z" + ) } @@ -103,7 +107,11 @@ class Config: json_encoders = { datetime: lambda v: None if not v - else f"{str(v).split('.', maxsplit=1)[0].replace(' ', 'T')}Z" + else ( + f"{str(v).split('+')[0].replace(' ', 'T')}Z" + if "+" in str(v) + else f"{str(v).replace(' ', 'T')}Z" + ) } From 1fbdc34b769f1fa189be306575bff2081fa09d4f Mon Sep 17 00:00:00 2001 From: Paul Sanders Date: Wed, 19 Jul 2023 22:53:44 -0400 Subject: [PATCH 2/2] Make pylint happy --- meilisearch/models/key.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meilisearch/models/key.py b/meilisearch/models/key.py index 9db786f8..ee88c4bf 100644 --- a/meilisearch/models/key.py +++ b/meilisearch/models/key.py @@ -39,7 +39,7 @@ class Config: datetime: lambda v: None if not v else ( - f"{str(v).split('+')[0].replace(' ', 'T')}Z" + f"{str(v).split('+', maxsplit=1)[0].replace(' ', 'T')}Z" if "+" in str(v) else f"{str(v).replace(' ', 'T')}Z" ) @@ -108,7 +108,7 @@ class Config: datetime: lambda v: None if not v else ( - f"{str(v).split('+')[0].replace(' ', 'T')}Z" + f"{str(v).split('+', maxsplit=1)[0].replace(' ', 'T')}Z" if "+" in str(v) else f"{str(v).replace(' ', 'T')}Z" )