tracktolib 0.61.2__py3-none-any.whl → 0.62.1__py3-none-any.whl

tracktolib/__init__.py

@@ -0,0 +1,8 @@
+from importlib import metadata
+
+try:
+    __version__ = metadata.version("padmy")
+except metadata.PackageNotFoundError:
+    __version__ = "0.0.0"
+
+__all__ = ("__version__",)

tracktolib/logs.py

@@ -1,6 +1,6 @@
 import logging
-from typing import Literal, overload, Any, TypeGuard
 from dataclasses import dataclass
+from typing import Literal, overload, Any, TypeGuard
 
 try:
     from pythonjsonlogger.json import JsonFormatter
@@ -18,12 +18,12 @@ class CustomJsonFormatter(JsonFormatter):
         self.version: str = version
         super().__init__(*args, **kwargs)
 
-    def add_fields(self, log_record: dict[str, Any], record: logging.LogRecord, message_dict: dict[str, Any]):
-        super(CustomJsonFormatter, self).add_fields(log_record, record, message_dict)
+    def add_fields(self, log_data: dict[str, Any], record: logging.LogRecord, message_dict: dict[str, Any]):
+        super(CustomJsonFormatter, self).add_fields(log_data, record, message_dict)
 
-        log_record.pop("color_message", None)
-        if not log_record.get("version"):
-            log_record["version"] = self.version
+        log_data.pop("color_message", None)
+        if not log_data.get("version"):
+            log_data["version"] = self.version
 
 
 @overload

tracktolib/pg/query.py

@@ -217,7 +217,7 @@ def get_update_fields(
         fields.append(
             f"{_col} = ${_counter}"
             if k not in _merge_keys
-            else f"{_col} = COALESCE(t.{_col}, JSONB_BUILD_OBJECT()) || " f"${_counter}"
+            else f"{_col} = COALESCE(t.{_col}, JSONB_BUILD_OBJECT()) || ${_counter}"
         )
         counter += 1
     return ",\n".join(fields), values + where_values
@@ -225,10 +225,14 @@ def get_update_fields(
 
 @dataclass
 class PGUpdateQuery(PGQuery):
-    """Value to start the arguments from:
-    For instance, with a value of 10, the first argument will be $11
+    """
+    Postgresql UPDATE query generator
     """
 
+    """
+    Value to start the arguments from:
+    For instance, with a value of 10, the first argument will be $11
+    """
     start_from: int | None = None
     """Keys to use for the WHERE clause. Theses fields will not be updated"""
     where_keys: list[str] | None = None
@@ -239,6 +243,8 @@ class PGUpdateQuery(PGQuery):
     return_keys: bool = False
     """Values to update using merge (like {}::jsonb || {}::jsonb)"""
     merge_keys: list[str] | None = None
+    """If True, the query is for many items and values will be a list of tuples"""
+    is_many: bool = False
 
     _update_fields: str | None = field(init=False, default=None)
     _values: list | None = field(init=False, default=None)
@@ -264,7 +270,7 @@ class PGUpdateQuery(PGQuery):
     def values(self):
         if not self._values:
             raise ValueError("No values found")
-        if len(self.items) == 1:
+        if len(self.items) == 1 and not self.is_many:
             return self._values
         _where_keys = self.where_keys or []
         _keys_not_where = [k for k in self.keys if k not in _where_keys]
@@ -516,7 +522,13 @@ async def update_many(
     query_callback: QueryCallback[PGUpdateQuery] | None = None,
 ):
     query = PGUpdateQuery(
-        table=table, items=items, start_from=start_from, where_keys=keys, where=where, merge_keys=merge_keys
+        table=table,
+        items=items,
+        start_from=start_from,
+        where_keys=keys,
+        where=where,
+        merge_keys=merge_keys,
+        is_many=True,
     )
     if query_callback is not None:
         query_callback(query)

tracktolib/pg/utils.py

@@ -130,7 +130,7 @@ async def upsert_csv(
 
         missing_cols = set(_columns) - set(infos.keys())
         if missing_cols:
-            raise ValueError(f'Could not find the following columns in the table: {",".join(missing_cols)}')
+            raise ValueError(f"Could not find the following columns in the table: {','.join(missing_cols)}")
 
         async with conn.transaction():
             _tmp_table, _tmp_query, _insert_query = get_tmp_table_query(

{tracktolib-0.61.2.dist-info → tracktolib-0.62.1.dist-info}/METADATA

@@ -1,19 +1,23 @@
 Metadata-Version: 2.4
 Name: tracktolib
-Version: 0.61.2
+Version: 0.62.1
 Summary: Utility library for python
-License: MIT
-License-File: LICENSE
 Keywords: utility
-Author: Julien Brayere
 Author-email: julien.brayere@tracktor.fr
-Requires-Python: >=3.12,<4.0
-Classifier: License :: OSI Approved :: MIT License
+License-Expression: MIT
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
+Requires-Dist: fastapi>=0.103.2 ; extra == 'api'
+Requires-Dist: pydantic>=2 ; extra == 'api'
+Requires-Dist: httpx>=0.25.0 ; extra == 'http'
+Requires-Dist: python-json-logger>=3.2.1 ; extra == 'logs'
+Requires-Dist: asyncpg>=0.27.0 ; extra == 'pg'
+Requires-Dist: rich>=13.6.0 ; extra == 'pg'
+Requires-Dist: psycopg>=3.1.12 ; extra == 'pg-sync'
+Requires-Dist: aiobotocore>=2.9.0 ; extra == 's3'
+Requires-Dist: minio>=7.2.0 ; extra == 's3-minio'
+Requires-Dist: pycryptodome>=3.20.0 ; extra == 's3-minio'
+Requires-Dist: deepdiff>=8.1.0 ; extra == 'tests'
+Requires-Python: >=3.12, <4.0
 Provides-Extra: api
 Provides-Extra: http
 Provides-Extra: logs
@@ -22,19 +26,6 @@ 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 (>=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 (>=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
@@ -47,15 +38,12 @@ Utility library for python
 
 # Installation
 
-You can choose to not install all the dependencies by specifying
-the [extra](https://python-poetry.org/docs/cli/#options-4) parameter such as:
+Just run:
 
 ```bash
-poetry add tracktolib@latest -E pg-sync -E tests --group dev 
+uv add tracktolib@latest 
 ```
 
-Here we only install the utilities using `psycopg` (pg-sync) and `deepdiff` (tests) for the dev environment.
-
 # Utilities
 
 - **log**
@@ -123,4 +111,3 @@ Utility functions using [httpx](https://www.python-httpx.org/)
 - **api**
 
 Utility functions using [fastapi](https://fastapi.tiangolo.com/)
-

{tracktolib-0.61.2.dist-info → tracktolib-0.62.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
-tracktolib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tracktolib/__init__.py,sha256=Q9d6h2lNjcYzxvfJ3zlNcpiP_Ak0T3TBPWINzZNrhu0,173
 tracktolib/api.py,sha256=ZLMgjH3Y8r3MpXc8m3IuZbzTj3fgrZKZORtSVgbuP-M,10221
 tracktolib/http_utils.py,sha256=c10JGmHaBw3VSDMYhz2dvVw2lo4PUAq1xMub74I7xDc,2625
-tracktolib/logs.py,sha256=xgfRDnviZPr9qinSOgab8neIWPv9Rj2xzDHnIBvWQcU,2201
+tracktolib/logs.py,sha256=D2hx6urXl5l4PBGP8mCpcT4GX7tJeFfNY-7oBfHczBU,2191
 tracktolib/pg/__init__.py,sha256=Ul_hgwvTXZvQBt7sHKi4ZI-0DDpnXmoFtmVkGRy-1J0,366
-tracktolib/pg/query.py,sha256=_Rx_VdG7KDM6HDswxT80DYBbvrSiaXq25QPB3hIZXvw,16445
-tracktolib/pg/utils.py,sha256=cL24KEt4SWJQ7LJPzaO3c8Xg0ZLmjhn22DtTWg86nwc,6324
+tracktolib/pg/query.py,sha256=_wL9MQU_z8Sk0ZOYGVE0TjUbwBZ1OJJuEq2jlmWoeeM,16693
+tracktolib/pg/utils.py,sha256=ygQn63EBDaEGB0p7P2ibellO2mv-StafanpXKcCUiZU,6324
 tracktolib/pg_sync.py,sha256=MKDaV7dYsRy59Y0EE5RGZL0DlZ-RUdBeaN9eSBwiQJg,6718
 tracktolib/pg_utils.py,sha256=ArYNdf9qsdYdzGEWmev8tZpyx8_1jaGGdkfYkauM7UM,2582
 tracktolib/s3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -12,7 +12,6 @@ tracktolib/s3/minio.py,sha256=wMEjkSes9Fp39fD17IctALpD6zB2xwDRQEmO7Vzan3g,1387
 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.61.2.dist-info/METADATA,sha256=l7TYZ2iOLimA-mE-Q56VQMIqy6URHTEMxT_19VJUjQg,3777
-tracktolib-0.61.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-tracktolib-0.61.2.dist-info/licenses/LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
-tracktolib-0.61.2.dist-info/RECORD,,
+tracktolib-0.62.1.dist-info/WHEEL,sha256=3id4o64OvRm9dUknh3mMJNcfoTRK08ua5cU6DFyVy-4,79
+tracktolib-0.62.1.dist-info/METADATA,sha256=dKxWZjdrwg0x4Hak-Wux5mQcjfT2ZL0in7ZQp_dyaXo,3053
+tracktolib-0.62.1.dist-info/RECORD,,

tracktolib-0.62.1.dist-info/WHEEL

@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: uv 0.9.13
+Root-Is-Purelib: true
+Tag: py3-none-any

tracktolib-0.61.2.dist-info/WHEEL

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

tracktolib-0.61.2.dist-info/licenses/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.