tracktolib 0.48.1__py3-none-any.whl → 0.49.1__py3-none-any.whl

tracktolib/api.py

@@ -44,7 +44,7 @@ def Depends(
     use_cache: bool = True,
 ) -> D:
     """TODO: add support for __call__ (maybe see https://github.com/python/typing/discussions/1106 ?)"""
-    return params.Depends(dependency, use_cache=use_cache)  # pyright: ignore [reportGeneralTypeIssues]
+    return params.Depends(dependency, use_cache=use_cache)  # pyright: ignore [reportReturnType]
 
 
 B = TypeVar("B", bound=BaseModel | None | Sequence[BaseModel])

tracktolib/http_utils.py

@@ -22,8 +22,7 @@ async def download_file(
     on_response: Callable[[httpx.Response], None] | None = None,
     params: QueryParamTypes | None = None,
     headers: dict[str, str] | None = None,
-):
-    ...
+): ...
 
 
 @typing.overload
@@ -37,8 +36,7 @@ async def download_file(
     on_response: Callable[[httpx.Response], None] | None = None,
     params: QueryParamTypes | None = None,
     headers: dict[str, str] | None = None,
-):
-    ...
+): ...
 
 
 async def download_file(

tracktolib/logs.py

@@ -33,8 +33,7 @@ def init_logging(
     version: str,
     *,
     stream_handler: logging.StreamHandler | None = None,
-) -> tuple[CustomJsonFormatter, logging.StreamHandler]:
-    ...
+) -> tuple[CustomJsonFormatter, logging.StreamHandler]: ...
 
 
 @overload
@@ -44,8 +43,7 @@ def init_logging(
     version: str,
     *,
     stream_handler: logging.StreamHandler | None = None,
-) -> tuple[logging.Formatter, logging.StreamHandler]:
-    ...
+) -> tuple[logging.Formatter, logging.StreamHandler]: ...
 
 
 def init_logging(

tracktolib/pg/query.py

@@ -321,8 +321,7 @@ async def insert_many(
 @overload
 async def insert_returning(
     conn: _Connection, table: str, item: dict, returning: str, on_conflict: OnConflict | None = None, fill: bool = False
-) -> Any | None:
-    ...
+) -> Any | None: ...
 
 
 @overload
@@ -333,8 +332,7 @@ async def insert_returning(
     returning: list[str],
     on_conflict: OnConflict | None = None,
     fill: bool = False,
-) -> asyncpg.Record | None:
-    ...
+) -> asyncpg.Record | None: ...
 
 
 async def insert_returning(
@@ -388,8 +386,7 @@ async def update_returning(
     where: str | None = None,
     keys: list[str] | None = None,
     start_from: int | None = None,
-) -> Any | None:
-    ...
+) -> Any | None: ...
 
 
 @overload
@@ -403,8 +400,7 @@ async def update_returning(
     where: str | None = None,
     keys: list[str] | None = None,
     start_from: int | None = None,
-) -> asyncpg.Record | None:
-    ...
+) -> asyncpg.Record | None: ...
 
 
 @overload
@@ -418,8 +414,7 @@ async def update_returning(
     where: str | None = None,
     keys: list[str] | None = None,
     start_from: int | None = None,
-) -> asyncpg.Record | None:
-    ...
+) -> asyncpg.Record | None: ...
 
 
 async def update_returning(

tracktolib/pg_sync.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Iterable, Any, overload, Literal, cast
+from typing import Iterable, Any, overload, Literal, cast, Optional
 
 from typing_extensions import LiteralString
 
@@ -18,6 +18,7 @@ from .pg_utils import get_tmp_table_query
 def fetch_all(engine: Connection, query: LiteralString, *data) -> list[dict]:
     with engine.cursor(row_factory=dict_row) as cur:
         resp = (cur.execute(query) if not data else cur.execute(query, data)).fetchall()
+    engine.commit()
     return resp
 
 
@@ -27,28 +28,26 @@ def fetch_count(engine: Connection, table: str, *args, where: str | None = None)
         query = f"{query} WHERE {where}"
     with engine.cursor() as cur:
         count = cur.execute(cast(LiteralString, query), params=args).fetchone()
-
+    engine.commit()
     return count[0] if count else None
 
 
 @overload
-def fetch_one(engine: Connection, query: Query, *args, required: Literal[False]) -> dict | None:
-    ...
+def fetch_one(engine: Connection, query: Query, *args, required: Literal[False]) -> dict | None: ...
 
 
 @overload
-def fetch_one(engine: Connection, query: Query, *args, required: Literal[True]) -> dict:
-    ...
+def fetch_one(engine: Connection, query: Query, *args, required: Literal[True]) -> dict: ...
 
 
 @overload
-def fetch_one(engine: Connection, query: Query, *args) -> dict | None:
-    ...
+def fetch_one(engine: Connection, query: Query, *args) -> dict | None: ...
 
 
 def fetch_one(engine: Connection, query: Query, *args, required: bool = False) -> dict | None:
     with engine.cursor(row_factory=dict_row) as cur:
         _data = cur.execute(query, args).fetchone()
+    engine.commit()
     if required and not _data:
         raise ValueError("No value found for query")
     return _data
@@ -121,7 +120,7 @@ def insert_csv(
     schema: LiteralString,
     table: LiteralString,
     csv_path: Path,
-    query: Query | None = None,
+    query: Optional[Query] = None,
     *,
     exclude_columns: Iterable[str] | None = None,
     delimiter: LiteralString = ",",

tracktolib/s3/minio.py

@@ -10,6 +10,8 @@ except ImportError:
 def download_bucket(minio: Minio, bucket_name: str, output_dir: Path) -> list[Path]:
     files = []
     for obj in minio.list_objects(bucket_name, recursive=True):
+        if obj.object_name is None:
+            raise ValueError("object_name is empty")
         data = minio.get_object(bucket_name, obj.object_name)
         _file = output_dir / obj.object_name
         _file.parent.mkdir(exist_ok=True, parents=True)
@@ -22,7 +24,11 @@ def download_bucket(minio: Minio, bucket_name: str, output_dir: Path) -> list[Pa
 
 
 def bucket_rm(minio: Minio, bucket_name: str):
-    names = [DeleteObject(x.object_name) for x in minio.list_objects(bucket_name, recursive=True)]
+    names = [
+        DeleteObject(x.object_name)
+        for x in minio.list_objects(bucket_name, recursive=True)
+        if x.object_name is not None
+    ]
     errors = minio.remove_objects(bucket_name, names)
     errors = list(errors)
     if errors:
@@ -31,4 +37,4 @@ def bucket_rm(minio: Minio, bucket_name: str):
 
 
 def upload_object(minio: Minio, bucket_name: str, object_name: str, path: Path):
-    minio.fput_object(bucket_name, object_name, path.absolute())
+    minio.fput_object(bucket_name, object_name, str(path.absolute()))

tracktolib/tests.py

@@ -1,6 +1,5 @@
 import pprint
 from typing import Iterable
-import warnings
 
 try:
     import deepdiff
@@ -8,11 +7,6 @@ except ImportError:
     raise ImportError('Please install deepdiff or tracktolib with "tests" to use this module')
 
 
-def get_uuid(i: int = 0):
-    warnings.warn("Please use uuid.UUID(int=i) instead", DeprecationWarning)
-    return f"00000000-0000-0000-0000-000000{i:06}"
-
-
 def assert_equals(d1: dict | Iterable, d2: dict | Iterable, *, ignore_order: bool = False):
     diff = deepdiff.DeepDiff(d1, d2, ignore_order=ignore_order)
     assert not diff, pprint.pprint(diff)

tracktolib/utils.py

@@ -58,18 +58,15 @@ def import_module(path: Path):
 
 
 @overload
-def get_chunks(it: Iterable[T], size: int, *, as_list: Literal[False]) -> Iterator[Iterable[T]]:
-    ...
+def get_chunks(it: Iterable[T], size: int, *, as_list: Literal[False]) -> Iterator[Iterable[T]]: ...
 
 
 @overload
-def get_chunks(it: Iterable[T], size: int, *, as_list: Literal[True]) -> Iterator[list[T]]:
-    ...
+def get_chunks(it: Iterable[T], size: int, *, as_list: Literal[True]) -> Iterator[list[T]]: ...
 
 
 @overload
-def get_chunks(it: Iterable[T], size: int) -> Iterator[list[T]]:
-    ...
+def get_chunks(it: Iterable[T], size: int) -> Iterator[list[T]]: ...
 
 
 def get_chunks(it: Iterable[T], size: int, *, as_list: bool = True) -> Iterator[Iterable[T]]:
@@ -125,13 +122,11 @@ def to_camel_case(string: str) -> str:
 
 
 @overload
-def dict_to_camel(d: dict) -> dict:
-    ...
+def dict_to_camel(d: dict) -> dict: ...
 
 
 @overload
-def dict_to_camel(d: list[dict]) -> list[dict]:
-    ...
+def dict_to_camel(d: list[dict]) -> list[dict]: ...
 
 
 def dict_to_camel(d: dict | list):
@@ -152,13 +147,11 @@ def dict_to_camel(d: dict | list):
 
 
 @overload
-def rm_keys(data: dict, keys: list[str]) -> dict:
-    ...
+def rm_keys(data: dict, keys: list[str]) -> dict: ...
 
 
 @overload
-def rm_keys(data: list[dict], keys: list[str]) -> list[dict]:
-    ...
+def rm_keys(data: list[dict], keys: list[str]) -> list[dict]: ...
 
 
 def rm_keys(data: dict | list[dict], keys: list[str]):

{tracktolib-0.48.1.dist-info → tracktolib-0.49.1.dist-info}/METADATA

@@ -1,18 +1,17 @@
 Metadata-Version: 2.1
 Name: tracktolib
-Version: 0.48.1
+Version: 0.49.1
 Summary: Utility library for python
 Home-page: https://github.com/tracktor/tracktolib
 License: MIT
 Keywords: utility
 Author: Julien Brayere
 Author-email: julien.brayere@tracktor.fr
-Requires-Python: >=3.10,<4.0
+Requires-Python: >=3.12,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: api
 Provides-Extra: http
 Provides-Extra: logs
@@ -21,16 +20,17 @@ Provides-Extra: pg-sync
 Provides-Extra: s3
 Provides-Extra: s3-minio
 Provides-Extra: tests
-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.2.0); extra == "s3-minio"
-Requires-Dist: psycopg (>=3.1.12); extra == "pg-sync"
-Requires-Dist: pydantic (>=2); extra == "api"
-Requires-Dist: python-json-logger (>=2.0.4); extra == "logs"
-Requires-Dist: rich (>=13.6.0); extra == "pg"
+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.2.0) ; extra == "s3-minio"
+Requires-Dist: psycopg (>=3.1.12) ; extra == "pg-sync"
+Requires-Dist: pycryptodome (>=3.20.0) ; extra == "s3-minio"
+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
 Description-Content-Type: text/markdown
 
@@ -80,7 +80,7 @@ To use the functions, create a `Connection` using psycopg: `conn = psycopg2.conn
 *fetch_one*
 
 ```python
-from pg.pg_sync import (
+from tracktolib.pg.pg_sync import (
     insert_many, fetch_one, fetch_count, fetch_all
 )
 

tracktolib-0.49.1.dist-info/RECORD

@@ -0,0 +1,19 @@
+LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
+tracktolib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tracktolib/api.py,sha256=xArVgRj_g7bw2tEDbjC9qs9f55b9X0-kJoc8-s1rsYo,9616
+tracktolib/http_utils.py,sha256=c10JGmHaBw3VSDMYhz2dvVw2lo4PUAq1xMub74I7xDc,2625
+tracktolib/logs.py,sha256=M5RZ8OYKgLEBJeC1AwUCSRbFAH09hwdTjjs-AQ9QGg8,2204
+tracktolib/pg/__init__.py,sha256=32kKBJzIDyppszZMAOSMgM3ggz7Ow0TaNKiMs740gyw,333
+tracktolib/pg/query.py,sha256=KESY4g0XePUrRIakygmzhPP2vIOfJGWc2PAZsIj_PfI,13580
+tracktolib/pg/utils.py,sha256=cL24KEt4SWJQ7LJPzaO3c8Xg0ZLmjhn22DtTWg86nwc,6324
+tracktolib/pg_sync.py,sha256=z6EB0hELq6t129gnVnX0rNXv2McZXxI8khy-TEG65Ag,5165
+tracktolib/pg_utils.py,sha256=8DDlZVSgfNie9M-zL7wilFufXMMvSPw5d7aIDs_pQCM,1976
+tracktolib/s3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tracktolib/s3/minio.py,sha256=wMEjkSes9Fp39fD17IctALpD6zB2xwDRQEmO7Vzan3g,1387
+tracktolib/s3/s3.py,sha256=d0Q63Zb62ef4jAt05zQwpgYvAoxHC9kSQuHzzK90VvE,4825
+tracktolib/tests.py,sha256=Pbc4yGQrIWFLBEgX-kDBxhMCqH-bfOJtkH2agvaM6ZQ,382
+tracktolib/utils.py,sha256=jwLww8bqDu8zEip9uN4yW0lE5_YMWfrAHYtagr8sYOA,5295
+tracktolib-0.49.1.dist-info/LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
+tracktolib-0.49.1.dist-info/METADATA,sha256=_HBMlEoVz25S6viwoubRgSxNhZjG51Madd4d3A0F-XA,3641
+tracktolib-0.49.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+tracktolib-0.49.1.dist-info/RECORD,,

{tracktolib-0.48.1.dist-info → tracktolib-0.49.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.3.2
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any

tracktolib-0.48.1.dist-info/RECORD

@@ -1,19 +0,0 @@
-LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
-tracktolib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tracktolib/api.py,sha256=UaALaBPTbWICGVxzZIxvSVVWi_DjMzfjtB_vGc-K7sI,9623
-tracktolib/http_utils.py,sha256=dqjRJTNCo1qDnvQBTcImw1ibi1LnqETrpWDAU5txBHs,2633
-tracktolib/logs.py,sha256=enezPjBU4v2s8knG_V6kIbQsoyxfNIKEpKVSSkr_2U8,2212
-tracktolib/pg/__init__.py,sha256=32kKBJzIDyppszZMAOSMgM3ggz7Ow0TaNKiMs740gyw,333
-tracktolib/pg/query.py,sha256=cOmMhAjCDvcNJpIDh2OJP3AQK-Ax-dZQpNj5nZTk06Y,13600
-tracktolib/pg/utils.py,sha256=cL24KEt4SWJQ7LJPzaO3c8Xg0ZLmjhn22DtTWg86nwc,6324
-tracktolib/pg_sync.py,sha256=pjeHuLmBAkof16FhPXfFyK4nfThEnsISF3US5lzBw-0,5105
-tracktolib/pg_utils.py,sha256=8DDlZVSgfNie9M-zL7wilFufXMMvSPw5d7aIDs_pQCM,1976
-tracktolib/s3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tracktolib/s3/minio.py,sha256=JaRpHOM6NqpMieplp58Fpc7uTh7PItyP8On7jMXhB-Q,1234
-tracktolib/s3/s3.py,sha256=d0Q63Zb62ef4jAt05zQwpgYvAoxHC9kSQuHzzK90VvE,4825
-tracktolib/tests.py,sha256=FS0uae3ShiiJOD7WE2WEv9h3QwRJCbLDHpe_8Ikc0j0,554
-tracktolib/utils.py,sha256=usiUYVwMa43RvqpKJmQDmzhvfahSVMW0OAcyVWWfPkg,5323
-tracktolib-0.48.1.dist-info/LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
-tracktolib-0.48.1.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
-tracktolib-0.48.1.dist-info/METADATA,sha256=HbP82J7Y04AIb7oBa1WGbgUSUXBCNfkFe7QeQQoBSQo,3610
-tracktolib-0.48.1.dist-info/RECORD,,