Merge pull request #559 from sanders41/pydantic2

Fix issue with Pydantic version check

Author: sanders41

meilisearch_python_async/client.py

@@ -389,7 +389,7 @@ async def create_key(self, key: KeyCreate) -> Key:
         """
         # The json.loads(key.json()) is because Pydantic can't serialize a date in a Python dict,
         # but can when converting to a json string.
-        if is_pydantic_2:
+        if is_pydantic_2():
             response = await self._http_requests.post("keys", json.loads(key.model_dump_json(by_alias=True)))  # type: ignore[attr-defined]
         else:  # pragma: no cover
             response = await self._http_requests.post("keys", json.loads(key.json(by_alias=True)))  # type: ignore[attr-defined]
@@ -499,7 +499,7 @@ async def update_key(self, key: KeyUpdate) -> Key:
         """
         # The json.loads(key.json()) is because Pydantic can't serialize a date in a Python dict,
         # but can when converting to a json string.
-        if is_pydantic_2:
+        if is_pydantic_2():
             payload = {  # type: ignore[attr-defined]
                 k: v
                 for k, v in json.loads(key.model_dump_json(by_alias=True)).items()
@@ -543,7 +543,7 @@ async def multi_search(self, queries: list[SearchParams]) -> list[SearchResultsW
             >>>     search_results = await client.search(queries)
         """
         url = "multi-search"
-        if is_pydantic_2:
+        if is_pydantic_2():
             response = await self._http_requests.post(
                 url, body={"queries": [x.model_dump(by_alias=True) for x in queries]}  # type: ignore[attr-defined]
             )

meilisearch_python_async/index.py

@@ -1478,7 +1478,7 @@ async def update_settings(self, body: MeilisearchSettings) -> TaskInfo:
             >>>     index = client.index("movies")
             >>>     await index.update_settings(new_settings)
         """
-        if is_pydantic_2:
+        if is_pydantic_2():
             body_dict = {k: v for k, v in body.model_dump(by_alias=True).items() if v is not None}  # type: ignore[attr-defined]
         else:  # pragma: no cover
             body_dict = {k: v for k, v in body.dict(by_alias=True).items() if v is not None}  # type: ignore[attr-defined]
@@ -2189,7 +2189,7 @@ async def update_typo_tolerance(self, typo_tolerance: TypoTolerance) -> TaskInfo
         """
         url = f"{self._settings_url}/typo-tolerance"
 
-        if is_pydantic_2:
+        if is_pydantic_2():
             response = await self._http_requests.patch(url, typo_tolerance.model_dump(by_alias=True))  # type: ignore[attr-defined]
         else:  # pragma: no cover
             response = await self._http_requests.patch(url, typo_tolerance.dict(by_alias=True))  # type: ignore[attr-defined]
@@ -2265,7 +2265,7 @@ async def update_faceting(self, faceting: Faceting) -> TaskInfo:
         """
         url = f"{self._settings_url}/faceting"
 
-        if is_pydantic_2:
+        if is_pydantic_2():
             response = await self._http_requests.patch(url, faceting.model_dump(by_alias=True))  # type: ignore[attr-defined]
         else:  # pragma: no cover
             response = await self._http_requests.patch(url, faceting.dict(by_alias=True))  # type: ignore[attr-defined]
@@ -2342,7 +2342,7 @@ async def update_pagination(self, settings: Pagination) -> TaskInfo:
         """
         url = f"{self._settings_url}/pagination"
 
-        if is_pydantic_2:
+        if is_pydantic_2():
             response = await self._http_requests.patch(url, settings.model_dump(by_alias=True))  # type: ignore[attr-defined]
         else:  # pragma: no cover
             response = await self._http_requests.patch(url, settings.dict(by_alias=True))  # type: ignore[attr-defined]

meilisearch_python_async/models/client.py

@@ -13,7 +13,7 @@ class ClientStats(CamelBase):
     last_update: Optional[datetime] = None
     indexes: Optional[Dict[str, IndexStats]] = None
 
-    if is_pydantic_2:
+    if is_pydantic_2():
 
         @pydantic.field_validator("last_update", mode="before")  # type: ignore[attr-defined]
         @classmethod
@@ -36,7 +36,7 @@ class _KeyBase(CamelBase):
     indexes: List[str]
     expires_at: Optional[datetime] = None
 
-    if is_pydantic_2:
+    if is_pydantic_2():
         model_config = pydantic.ConfigDict(ser_json_timedelta="iso8601")  # type: ignore[typeddict-unknown-key]
 
         @pydantic.field_validator("expires_at", mode="before")  # type: ignore[attr-defined]
@@ -62,7 +62,7 @@ class Key(_KeyBase):
     created_at: datetime
     updated_at: Optional[datetime] = None
 
-    if is_pydantic_2:
+    if is_pydantic_2():
 
         @pydantic.field_validator("created_at", mode="before")  # type: ignore[attr-defined]
         @classmethod
@@ -104,7 +104,7 @@ class KeyCreate(CamelBase):
     indexes: List[str]
     expires_at: Optional[datetime] = None
 
-    if is_pydantic_2:
+    if is_pydantic_2():
         model_config = pydantic.ConfigDict(ser_json_timedelta="iso8601")  # type: ignore[typeddict-unknown-key]
 
     else:  # pragma: no cover
@@ -123,7 +123,7 @@ class KeyUpdate(CamelBase):
     indexes: Optional[List[str]] = None
     expires_at: Optional[datetime] = None
 
-    if is_pydantic_2:
+    if is_pydantic_2():
         model_config = pydantic.ConfigDict(ser_json_timedelta="iso8601")  # type: ignore[typeddict-unknown-key]
 
     else:  # pragma: no cover

meilisearch_python_async/models/index.py

@@ -16,7 +16,7 @@ class IndexInfo(IndexBase):
     created_at: datetime
     updated_at: datetime
 
-    if is_pydantic_2:
+    if is_pydantic_2():
 
         @pydantic.field_validator("created_at", mode="before")  # type: ignore[attr-defined]
         @classmethod

meilisearch_python_async/models/task.py

@@ -24,7 +24,7 @@ class TaskStatus(TaskId):
     started_at: Optional[datetime]
     finished_at: Optional[datetime]
 
-    if is_pydantic_2:
+    if is_pydantic_2():
 
         @pydantic.field_validator("enqueued_at", mode="before")  # type: ignore[attr-defined]
         @classmethod
@@ -76,7 +76,7 @@ class TaskInfo(CamelBase):
     task_type: Union[str, Dict[str, Any]] = Field(..., alias="type")
     enqueued_at: datetime
 
-    if is_pydantic_2:
+    if is_pydantic_2():
 
         @pydantic.field_validator("enqueued_at", mode="before")  # type: ignore[attr-defined]
         @classmethod