Skip to content

Commit dd8a888

Browse files
authored
Merge pull request #593 from sanders41/json-encoder
Fix potential json_encoding date error in pydantic < 2
2 parents b94e181 + d5ad76f commit dd8a888

File tree

1 file changed

+21
-3
lines changed

1 file changed

+21
-3
lines changed

meilisearch_python_async/models/client.py

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,13 @@ def validate_expires_at(cls, v: str) -> Union[datetime, None]:
5353

5454
class Config:
5555
json_encoders = {
56-
datetime: lambda v: None if not v else f"{str(v).split('.')[0].replace(' ', 'T')}Z"
56+
datetime: lambda v: None
57+
if not v
58+
else (
59+
f"{str(v).split('+')[0].replace(' ', 'T')}Z"
60+
if "+" in str(v)
61+
else f"{str(v).split('.')[0].replace(' ', 'T')}Z"
62+
)
5763
}
5864

5965

@@ -111,7 +117,13 @@ class KeyCreate(CamelBase):
111117

112118
class Config:
113119
json_encoders = {
114-
datetime: lambda v: None if not v else f"{str(v).split('.')[0].replace(' ', 'T')}Z"
120+
datetime: lambda v: None
121+
if not v
122+
else (
123+
f"{str(v).split('+')[0].replace(' ', 'T')}Z"
124+
if "+" in str(v)
125+
else f"{str(v).split('.')[0].replace(' ', 'T')}Z"
126+
)
115127
}
116128

117129

@@ -130,7 +142,13 @@ class KeyUpdate(CamelBase):
130142

131143
class Config:
132144
json_encoders = {
133-
datetime: lambda v: None if not v else f"{str(v).split('.')[0].replace(' ', 'T')}Z"
145+
datetime: lambda v: None
146+
if not v
147+
else (
148+
f"{str(v).split('+')[0].replace(' ', 'T')}Z"
149+
if "+" in str(v)
150+
else f"{str(v).split('.')[0].replace(' ', 'T')}Z"
151+
)
134152
}
135153

136154

0 commit comments

Comments
 (0)