tracktolib 0.52.0__py3-none-any.whl → 0.54.0__py3-none-any.whl

tracktolib/logs.py

@@ -3,7 +3,7 @@ from typing import Literal, overload, Any, TypeGuard
 from dataclasses import dataclass
 
 try:
-    from pythonjsonlogger import jsonlogger
+    from pythonjsonlogger.json import JsonFormatter
 except ImportError:
     raise ImportError('Please install pythonjsonlogger or tracktolib with "log" to use this module')
 
@@ -11,7 +11,7 @@ LogFormat = Literal["json", "console"]
 
 
 @dataclass
-class CustomJsonFormatter(jsonlogger.JsonFormatter):
+class CustomJsonFormatter(JsonFormatter):
     version: str
 
     def __init__(self, version: str, *args, **kwargs):

tracktolib/pg_sync.py

@@ -15,6 +15,21 @@ except ImportError:
 from .pg_utils import get_tmp_table_query
 
 
+__all__ = (
+    "clean_tables",
+    "drop_db",
+    "fetch_all",
+    "fetch_count",
+    "fetch_one",
+    "get_insert_data",
+    "get_tables",
+    "insert_many",
+    "insert_one",
+    "insert_csv",
+    "set_seq_max",
+)
+
+
 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()
@@ -59,7 +74,7 @@ def _parse_value(v):
     return v
 
 
-def _get_insert_data(table: LiteralString, data: list[dict]) -> tuple[LiteralString, list[tuple[Any, ...]]]:
+def get_insert_data(table: LiteralString, data: list[dict]) -> tuple[LiteralString, list[tuple[Any, ...]]]:
     keys = data[0].keys()
     _values = ",".join("%s" for _ in range(0, len(keys)))
     query = f"INSERT INTO {table} as t ({','.join(keys)}) VALUES ({_values})"
@@ -67,17 +82,37 @@ def _get_insert_data(table: LiteralString, data: list[dict]) -> tuple[LiteralStr
 
 
 def insert_many(engine: Connection, table: LiteralString, data: list[dict]):
-    query, _data = _get_insert_data(table, data)
+    query, _data = get_insert_data(table, data)
     with engine.cursor() as cur:
         _ = cur.executemany(query, _data)
     engine.commit()
 
 
-def insert_one(engine: Connection, table: LiteralString, data: dict):
-    query, _data = _get_insert_data(table, [data])
-    with engine.cursor() as cur:
+@overload
+def insert_one(engine: Connection, table: LiteralString, data: dict, returning: None = None) -> None: ...
+
+
+@overload
+def insert_one(engine: Connection, table: LiteralString, data: dict, returning: list[LiteralString]) -> dict: ...
+
+
+def insert_one(
+    engine: Connection, table: LiteralString, data: dict, returning: list[LiteralString] | None = None
+) -> dict | None:
+    query, _data = get_insert_data(table, [data])
+    _is_returning = False
+    if returning:
+        query = f"{query} RETURNING {','.join(returning)}"
+        _is_returning = True
+
+    with engine.cursor(row_factory=dict_row) as cur:
         _ = cur.execute(query, _data[0])
+        if _is_returning:
+            resp = cur.fetchone()
+        else:
+            resp = None
     engine.commit()
+    return resp
 
 
 def drop_db(conn: Connection, db_name: LiteralString):

tracktolib/s3/s3.py

@@ -150,6 +150,7 @@ async def list_files(
     search_query: str | None = None,
     max_items: int | None = None,
     page_size: int | None = None,
+    starting_token: str | None = None,
 ) -> list[S3Item]:
     """
     See https://jmespath.org/ for the search query syntax.
@@ -158,9 +159,11 @@ async def list_files(
     paginator = client.get_paginator("list_objects")
     config = {}
     if max_items is not None:
-        config["max_items"] = max_items
+        config["MaxItems"] = max_items
     if page_size is not None:
-        config["page_size"] = page_size
+        config["PageSize"] = page_size
+    if starting_token is not None:
+        config["StartingToken"] = starting_token
 
     page_iterator = paginator.paginate(Bucket=bucket, Prefix=path, PaginationConfig=config if config else {})
     filtered_iterator = page_iterator.search(search_query) if search_query else page_iterator

tracktolib/tests.py

@@ -2,7 +2,7 @@ import pprint
 from typing import Iterable
 
 try:
-    import deepdiff
+    import deepdiff.diff as deepdiff
 except ImportError:
     raise ImportError('Please install deepdiff or tracktolib with "tests" to use this module')
 

{tracktolib-0.52.0.dist-info → tracktolib-0.54.0.dist-info}/METADATA

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: tracktolib
-Version: 0.52.0
+Version: 0.54.0
 Summary: Utility library for python
-Home-page: https://github.com/tracktor/tracktolib
 License: MIT
 Keywords: utility
 Author: Julien Brayere
@@ -23,15 +22,16 @@ 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: deepdiff (>=8.1.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: python-json-logger (>=3.2.1) ; extra == "logs"
 Requires-Dist: rich (>=13.6.0) ; extra == "pg"
+Project-URL: Homepage, https://github.com/tracktor/tracktolib
 Project-URL: Repository, https://github.com/tracktor/tracktolib
 Description-Content-Type: text/markdown
 

{tracktolib-0.52.0.dist-info → tracktolib-0.54.0.dist-info}/RECORD

@@ -1,19 +1,18 @@
-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/logs.py,sha256=xgfRDnviZPr9qinSOgab8neIWPv9Rj2xzDHnIBvWQcU,2201
 tracktolib/pg/__init__.py,sha256=j67e3B3gBbCHLD20QBybptmNdbbVMzNhZE6XjIPuKVo,349
 tracktolib/pg/query.py,sha256=MBYOTL9aLnYRBhaLy8-P6uGNXOmyluejNyUdt3Gfx5M,14504
 tracktolib/pg/utils.py,sha256=cL24KEt4SWJQ7LJPzaO3c8Xg0ZLmjhn22DtTWg86nwc,6324
-tracktolib/pg_sync.py,sha256=z6EB0hELq6t129gnVnX0rNXv2McZXxI8khy-TEG65Ag,5165
+tracktolib/pg_sync.py,sha256=QSvt5C92UTcc6EhtjrdUe6eDs7m9mIyBYclzQo9wKGQ,5959
 tracktolib/pg_utils.py,sha256=VXPpy1jGq6aCgTlfFJDIrq6JDujR83JN5ZRiCi8Lx4E,2582
 tracktolib/s3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tracktolib/s3/minio.py,sha256=wMEjkSes9Fp39fD17IctALpD6zB2xwDRQEmO7Vzan3g,1387
-tracktolib/s3/s3.py,sha256=I2fT3C9pIm9pM0V96O_wbYg_bPJX35ryzx05G3EgZus,5816
-tracktolib/tests.py,sha256=Pbc4yGQrIWFLBEgX-kDBxhMCqH-bfOJtkH2agvaM6ZQ,382
+tracktolib/s3/s3.py,sha256=0HbSAPoaup5-W4LK54zRCjrQ5mr8OWR-N9WjW99Q4aw,5937
+tracktolib/tests.py,sha256=gKE--epQjgMZGXc5ydbl4zjOdmwztJS42UMV0p4hXEA,399
 tracktolib/utils.py,sha256=ysTBF9V35fVXQVBPk0kfE_84SGRxzrayqmg9RbtoJq4,5761
-tracktolib-0.52.0.dist-info/LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
-tracktolib-0.52.0.dist-info/METADATA,sha256=peqROd6d1t-a0mXJFJjgqy0mc7trrpLb8-l4nYANf5s,3692
-tracktolib-0.52.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-tracktolib-0.52.0.dist-info/RECORD,,
+tracktolib-0.54.0.dist-info/LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
+tracktolib-0.54.0.dist-info/METADATA,sha256=vGG2EzYa0cjUemdBQXkywKgVitQ1J6zbAWKsVrcjbL8,3704
+tracktolib-0.54.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+tracktolib-0.54.0.dist-info/RECORD,,

{tracktolib-0.52.0.dist-info → tracktolib-0.54.0.dist-info}/WHEEL

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

tracktolib-0.52.0.dist-info/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Julien Brayere
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.