tracktolib 0.43.2__tar.gz → 0.44.0__tar.gz

{tracktolib-0.43.2 → tracktolib-0.44.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tracktolib
-Version: 0.43.2
+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,<3); 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.2 → tracktolib-0.44.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tracktolib"
-version = "0.43.2"
+version = "0.44.0"
 description = "Utility library for python"
 authors = ["Julien Brayere <julien.brayere@tracktor.fr>"]
 license = "MIT"
@@ -20,12 +20,12 @@ python = ">=3.10,<4.0"
 
 python-json-logger = { version = ">=2.0.4", optional = true }
 psycopg = { version = ">=3.1.12", optional = true }
-minio = { version = ">=7.1.17", optional = true }
-aiobotocore = { version = ">=2.6.0", optional = true }
+minio = { version = ">=7.2.0", optional = true }
+aiobotocore = { version = ">=2.9.0", optional = true }
 deepdiff = { version = ">=6.6.0", optional = true }
 httpx = { version = ">=0.25.0", optional = true }
 fastapi = { version = ">=0.103.2", optional = true }
-pydantic = { version = ">=1.10.12,<3", optional = true }
+pydantic = { version = ">=2", optional = true }
 asyncpg = ">=0.27.0"
 rich = { version = ">=13.6.0", optional = true }
 
@@ -45,13 +45,9 @@ pyright = "^1.1.284"
 commitizen = "^3.11.0"
 pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
-pydantic = ">=1.10.2,<3"
+pydantic = ">=2,<3"
 ruff = "^0.1.6"
 
-[tool.poetry.group.pydantic-v2.dependencies]
-pydantic = ">=2"
-
-
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
@@ -74,7 +70,7 @@ pythonPlatform = "Linux"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.43.2"
+version = "0.44.0"
 tag_format = "$version"
 version_files = [
     "pyproject.toml:version"

{tracktolib-0.43.2 → tracktolib-0.44.0}/setup.py

@@ -9,18 +9,18 @@ package_data = \
 
 extras_require = \
 {':extra == "pg"': ['asyncpg>=0.27.0'],
- 'api': ['fastapi>=0.103.2', 'pydantic>=1.10.12,<3'],
+ 'api': ['fastapi>=0.103.2', 'pydantic>=2'],
  'http': ['httpx>=0.25.0'],
  'logs': ['python-json-logger>=2.0.4'],
  'pg': ['rich>=13.6.0'],
  'pg-sync': ['psycopg>=3.1.12'],
- 's3': ['aiobotocore>=2.6.0'],
- 's3-minio': ['minio>=7.1.17'],
+ 's3': ['aiobotocore>=2.9.0'],
+ 's3-minio': ['minio>=7.2.0'],
  'tests': ['deepdiff>=6.6.0']}
 
 setup_kwargs = {
     'name': 'tracktolib',
-    'version': '0.43.2',
+    'version': '0.44.0',
     'description': 'Utility library for python',
     'long_description': "# Tracktolib\n\n[![Python versions](https://img.shields.io/pypi/pyversions/tracktolib)](https://pypi.python.org/pypi/tracktolib)\n[![Latest PyPI version](https://img.shields.io/pypi/v/tracktolib?logo=pypi)](https://pypi.python.org/pypi/tracktolib)\n[![CircleCI](https://circleci.com/gh/Tracktor/tracktolib/tree/master.svg?style=shield)](https://app.circleci.com/pipelines/github/Tracktor/tracktolib?branch=master)\n\nUtility library for python\n\n# Installation\n\nYou can choose to not install all the dependencies by specifying\nthe [extra](https://python-poetry.org/docs/cli/#options-4) parameter such as:\n\n```bash\npoetry add tracktolib@latest -E pg-sync -E tests --group dev \n```\n\nHere we only install the utilities using `psycopg` (pg-sync) and `deepdiff` (tests) for the dev environment.\n\n# Utilities\n\n- **log**\n\nUtility functions for logging.\n\n```python\nimport logging\nfrom tracktolib.logs import init_logging\n\nlogger = logging.getLogger()\nformatter, stream_handler = init_logging(logger, 'json', version='0.0.1')\n```\n\n- **pg**\n\nUtility functions for [asyncpg](https://github.com/MagicStack/asyncpg)\n\n- **pg-sync**\n\nUtility functions based on psycopg such as `fetch_one`, `insert_many`, `fetch_count` ...\n\nTo use the functions, create a `Connection` using psycopg: `conn = psycopg2.connect()`\n\n*fetch_one*\n\n```python\nfrom pg.pg_sync import (\n    insert_many, fetch_one, fetch_count, fetch_all\n)\n\ndata = [\n    {'foo': 'bar', 'value': 1},\n    {'foo': 'baz', 'value': 2}\n]\ninsert_many(conn, 'public.test', data)  # Will insert the 2 dict\nquery = 'SELECT foo from public.test order by value asc'\nvalue = fetch_one(conn, query, required=True)  # Will return {'foo': 'bar'}, raise an error is not found\nassert fetch_count(conn, 'public.test') == 2\nquery = 'SELECT * from public.test order by value asc'\nassert fetch_all(conn, query) == data\n\n```\n\n- **tests**\n\nUtility functions for testing\n\n- **s3-minio**\n\nUtility functions for [minio](https://min.io/docs/minio/linux/developers/python/API.html)\n\n- **s3**\n\nUtility functions for [aiobotocore](https://github.com/aio-libs/aiobotocore)\n\n- **logs**\n\nUtility functions to initialize the logging formatting and streams\n\n- **http**\n\nUtility functions using [httpx](https://www.python-httpx.org/)\n\n- **api**\n\nUtility functions using [fastapi](https://fastapi.tiangolo.com/)\n",
     'author': 'Julien Brayere',

{tracktolib-0.43.2 → tracktolib-0.44.0}/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,19 +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:
-    from pydantic import ConfigDict
-    from pydantic.alias_generators import to_camel
-
-    class CamelCaseModel(BaseModel):
-        model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
+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-0.43.2 → tracktolib-0.44.0}/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")