tracktolib 0.43.1__py3-none-any.whl → 0.44.0__py3-none-any.whl

tracktolib/api.py

@@ -19,13 +19,13 @@ from typing import (
     get_origin,
 )
 
-from .utils import json_serial, to_camel_case
+from .utils import json_serial
 
 try:
     from fastapi import params, APIRouter
     from fastapi.responses import JSONResponse
-    import pydantic
-    from pydantic import BaseModel
+    from pydantic.alias_generators import to_camel
+    from pydantic import BaseModel, ConfigDict
     import starlette.status
 except ImportError:
     raise ImportError('Please install fastapi, pydantic or tracktolib with "api" to use this module')
@@ -266,18 +266,8 @@ def model_to_list(string: str) -> str:
     return f"Array[{string}]"
 
 
-if pydantic.__version__ < "2.0.0":
-
-    class CamelCaseModel(BaseModel):  # type: ignore
-        class Config:
-            alias_generator = to_camel_case
-            allow_population_by_field_name = True
-
-else:
-
-    class CamelCaseModel(BaseModel):
-        def __init__(self):
-            raise NotImplementedError("Please use pydantic < 2.0.0")
+class CamelCaseModel(BaseModel):
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
 
 
 def check_status(resp, status: int = starlette.status.HTTP_200_OK):

tracktolib/utils.py

@@ -1,4 +1,6 @@
+import asyncio
 import datetime as dt
+import importlib.util
 import itertools
 import mmap
 import os
@@ -7,8 +9,6 @@ from decimal import Decimal
 from ipaddress import IPv4Address, IPv6Address
 from pathlib import Path
 from typing import Iterable, TypeVar, Iterator, Literal, overload, Any
-import importlib.util
-import asyncio
 
 T = TypeVar("T")
 
@@ -85,6 +85,8 @@ def json_serial(obj):
         return str(obj)
     if isinstance(obj, Decimal):
         return str(obj)
+    if hasattr(obj, "__dict__"):
+        return obj.__dict__
     raise TypeError(f"Type '{type(obj)}' not serializable")
 
 

{tracktolib-0.43.1.dist-info → tracktolib-0.44.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tracktolib
-Version: 0.43.1
+Version: 0.44.0
 Summary: Utility library for python
 Home-page: https://github.com/tracktor/tracktolib
 License: MIT
@@ -21,14 +21,14 @@ Provides-Extra: pg-sync
 Provides-Extra: s3
 Provides-Extra: s3-minio
 Provides-Extra: tests
-Requires-Dist: aiobotocore (>=2.6.0); extra == "s3"
+Requires-Dist: aiobotocore (>=2.9.0); extra == "s3"
 Requires-Dist: asyncpg (>=0.27.0); extra == "pg"
 Requires-Dist: deepdiff (>=6.6.0); extra == "tests"
 Requires-Dist: fastapi (>=0.103.2); extra == "api"
 Requires-Dist: httpx (>=0.25.0); extra == "http"
-Requires-Dist: minio (>=7.1.17); extra == "s3-minio"
+Requires-Dist: minio (>=7.2.0); extra == "s3-minio"
 Requires-Dist: psycopg (>=3.1.12); extra == "pg-sync"
-Requires-Dist: pydantic (>=1.10.12); extra == "api"
+Requires-Dist: pydantic (>=2); extra == "api"
 Requires-Dist: python-json-logger (>=2.0.4); extra == "logs"
 Requires-Dist: rich (>=13.6.0); extra == "pg"
 Project-URL: Repository, https://github.com/tracktor/tracktolib

{tracktolib-0.43.1.dist-info → tracktolib-0.44.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
 tracktolib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tracktolib/api.py,sha256=Xfy4iPjvUtvylbOLHEPGcOgMeyc2bF2HeWHoGc4Wb3g,8126
+tracktolib/api.py,sha256=3gYiJbYevXaZppoxKaxEJnxBrKGSGKS1b52FgjquxbM,7919
 tracktolib/http_utils.py,sha256=dqjRJTNCo1qDnvQBTcImw1ibi1LnqETrpWDAU5txBHs,2633
 tracktolib/logs.py,sha256=enezPjBU4v2s8knG_V6kIbQsoyxfNIKEpKVSSkr_2U8,2212
 tracktolib/pg/__init__.py,sha256=32kKBJzIDyppszZMAOSMgM3ggz7Ow0TaNKiMs740gyw,333
@@ -12,8 +12,8 @@ tracktolib/s3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tracktolib/s3/minio.py,sha256=JaRpHOM6NqpMieplp58Fpc7uTh7PItyP8On7jMXhB-Q,1234
 tracktolib/s3/s3.py,sha256=0aPUo3Vnfy5Rk_Qp_y0KkCZa2kuMWw2JU2xrodn7oAE,3486
 tracktolib/tests.py,sha256=FS0uae3ShiiJOD7WE2WEv9h3QwRJCbLDHpe_8Ikc0j0,554
-tracktolib/utils.py,sha256=UqloaVRxTMlm5X2QrwI9O4sLM_RstvWqB0Zb31oAwpE,4825
-tracktolib-0.43.1.dist-info/LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
-tracktolib-0.43.1.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
-tracktolib-0.43.1.dist-info/METADATA,sha256=K4uZJinMv8tdammptWehrZ5S9vkeiUwMvgu506rNiaw,3617
-tracktolib-0.43.1.dist-info/RECORD,,
+tracktolib/utils.py,sha256=xpccH0xx_bH_am6F8kWT8mMiNuv9W6nmsewSwFbmBmY,4886
+tracktolib-0.44.0.dist-info/LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
+tracktolib-0.44.0.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
+tracktolib-0.44.0.dist-info/METADATA,sha256=oZOO7ii9NZ8bBC6V0_r3xl3Z1IqfMMgin4XkagZqseg,3610
+tracktolib-0.44.0.dist-info/RECORD,,