tracktolib 0.52.0__tar.gz → 0.54.0__tar.gz

{tracktolib-0.52.0 → tracktolib-0.54.0}/PKG-INFO

@@ -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 → tracktolib-0.54.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tracktolib"
-version = "0.52.0"
+version = "0.54.0"
 description = "Utility library for python"
 authors = ["Julien Brayere <julien.brayere@tracktor.fr>"]
 license = "MIT"
@@ -18,13 +18,13 @@ include = [
 [tool.poetry.dependencies]
 python = ">=3.12,<4.0"
 
-python-json-logger = { version = ">=2.0.4", optional = true }
+python-json-logger = { version = ">=3.2.1", optional = true }
 psycopg = { version = ">=3.1.12", optional = true }
 minio = { version = ">=7.2.0", optional = true }
 # Needed for minio, otherwise it raises ModuleNotFoundError: No module named 'Crypto.Cipher'
 pycryptodome =  { version = ">=3.20.0", optional = true }
 aiobotocore = { version = ">=2.9.0", optional = true }
-deepdiff = { version = ">=6.6.0", optional = true }
+deepdiff = { version = ">=8.1.0", optional = true }
 httpx = { version = ">=0.25.0", optional = true }
 fastapi = { version = ">=0.103.2", optional = true }
 pydantic = { version = ">=2", optional = true }
@@ -55,8 +55,7 @@ httpx =  "^0.27.0"
 psycopg = "^3.2.1"
 minio = "^7.2.7"
 pycryptodome = "^3.20.0"
-aiobotocore = "^2.13.1"
-deepdiff = "^8.0.1"
+aiobotocore = "2.15.2"
 python-json-logger = "^3.2.0"
 
 
@@ -84,7 +83,7 @@ pythonPlatform = "Linux"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.52.0"
+version = "0.54.0"
 tag_format = "$version"
 version_files = [
     "pyproject.toml:version"

{tracktolib-0.52.0 → tracktolib-0.54.0}/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-0.52.0 → tracktolib-0.54.0}/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-0.52.0 → tracktolib-0.54.0}/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-0.52.0 → tracktolib-0.54.0}/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')