tracktolib 0.61.1__tar.gz → 0.62.0__tar.gz

{tracktolib-0.61.1 → tracktolib-0.62.0}/PKG-INFO

@@ -1,19 +1,23 @@
 Metadata-Version: 2.4
 Name: tracktolib
-Version: 0.61.1
+Version: 0.62.0
 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.1 → tracktolib-0.62.0}/README.md

@@ -8,15 +8,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**

tracktolib-0.62.0/pyproject.toml

@@ -0,0 +1,123 @@
+[project]
+name = "tracktolib"
+version = "0.62.0"
+authors = [
+    { email = "julien.brayere@tracktor.fr" }
+]
+description = "Utility library for python"
+license = "MIT"
+readme = "README.md"
+homepage = "https://github.com/tracktor/tracktolib"
+repository = "https://github.com/tracktor/tracktolib"
+keywords = ["utility"]
+classifiers = [
+    "Operating System :: OS Independent"
+]
+include = [
+    "LICENSE"
+]
+requires-python = ">=3.12,<4.0"
+
+dependencies = []
+
+[project.optional-dependencies]
+logs = ["python-json-logger>=3.2.1"]
+pg-sync = ["psycopg>=3.1.12"]
+s3-minio = [
+    "minio>=7.2.0",
+    # Needed for minio, otherwise it raises ModuleNotFoundError: No module named 'Crypto.Cipher'
+    "pycryptodome>=3.20.0",
+]
+s3 = ["aiobotocore>=2.9.0"]
+tests = ["deepdiff>=8.1.0"]
+http = ["httpx>=0.25.0"]
+api = [
+    "fastapi>=0.103.2",
+    "pydantic>=2",
+]
+pg = [
+    "asyncpg>=0.27.0",
+    "rich>=13.6.0",
+]
+
+[dependency-groups]
+dev = [
+    "pytest-cov>=7.0.0,<8",
+    "pytest>=9.0.1,<10",
+    "pyright>=1.1.371",
+    "ruff>=0.14.5",
+    "pydantic>=2.12.4",
+    # Issue for mac with trackit version of multidict
+    "multidict>=6.0.5",
+    "fastapi>=0.111.1",
+    "httpx>=0.27.0",
+    "psycopg>=3.2.1",
+    "minio>=7.2.7",
+    "pycryptodome>=3.23.0",
+    "aiobotocore==2.15.2",
+    "python-json-logger>=3.2.0",
+    "pre-commit>=4.4.0",
+]
+
+bump = [
+    "commitizen>=4.10.0"
+]
+
+[build-system]
+requires = ["uv_build>=0.9.4,<0.10.0"]
+build-backend = "uv_build"
+
+[tool.uv.build-backend]
+module-name = "tracktolib"
+module-root = ""
+
+[tool.pytest.ini_options]
+addopts = "--cov=tracktolib -s -q -x --no-cov-on-fail"
+testpaths = [
+    "tests"
+]
+python_files = "*.py"
+filterwarnings = [
+    "ignore::DeprecationWarning",
+    "ignore::PendingDeprecationWarning"
+]
+
+[tool.pyright]
+include = ["tracktolib", "tests"]
+exclude = []
+
+pythonVersion = "3.13"
+pythonPlatform = "Linux"
+
+[tool.commitizen]
+name = "cz_conventional_commits"
+version = "0.62.0"
+tag_format = "$version"
+version_files = [
+    "pyproject.toml:version"
+]
+bump_message = "release $current_version → $new_version [skip ci]"
+
+
+[tool.ruff]
+line-length = 120
+target-version = "py313"
+
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = [
+    # imported but unused
+    "F401",
+    # unable to detect undefined names
+    "F403",
+    #
+    "F405"
+]
+
+[tool.ruff.lint.flake8-quotes]
+docstring-quotes = "double"
+inline-quotes = "single"
+
+[tool.ruff.lint.flake8-tidy-imports]
+# Disallow all relative imports.
+ban-relative-imports = "all"

tracktolib-0.62.0/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-0.61.1 → tracktolib-0.62.0}/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-0.61.1 → tracktolib-0.62.0}/tracktolib/pg/query.py

@@ -105,8 +105,8 @@ class PGQuery(Generic[K, V]):
     def columns(self):
         return [f'"{x}"' for x in self.keys] if self.quote_columns else self.keys
 
-    def iter_values(self) -> Iterator[tuple]:
-        _keys = self.keys
+    def iter_values(self, keys: list[K] | None = None) -> Iterator[tuple]:
+        _keys = keys if keys is not None else self.keys
         for _item in self.items:
             yield tuple(_item[k] for k in _keys)
 
@@ -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
@@ -264,7 +264,12 @@ class PGUpdateQuery(PGQuery):
     def values(self):
         if not self._values:
             raise ValueError("No values found")
-        return self._values if len(self.items) == 1 else super().values
+        if len(self.items) == 1:
+            return self._values
+        _where_keys = self.where_keys or []
+        _keys_not_where = [k for k in self.keys if k not in _where_keys]
+        values = list(self.iter_values(keys=_keys_not_where + _where_keys))
+        return values
 
     def _get_where_query(self) -> str:
         if self.where:

{tracktolib-0.61.1 → tracktolib-0.62.0}/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.1/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.

tracktolib-0.61.1/pyproject.toml

@@ -1,116 +0,0 @@
-[tool.poetry]
-name = "tracktolib"
-version = "0.61.1"
-description = "Utility library for python"
-authors = ["Julien Brayere <julien.brayere@tracktor.fr>"]
-license = "MIT"
-readme = "README.md"
-homepage = "https://github.com/tracktor/tracktolib"
-repository = "https://github.com/tracktor/tracktolib"
-keywords = ["utility"]
-classifiers = [
-    "Operating System :: OS Independent"
-]
-include = [
-    "LICENSE"
-]
-
-[tool.poetry.dependencies]
-python = ">=3.12,<4.0"
-
-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 = ">=8.1.0", optional = true }
-httpx = { version = ">=0.25.0", optional = true }
-fastapi = { version = ">=0.103.2", optional = true }
-pydantic = { version = ">=2", optional = true }
-asyncpg = ">=0.27.0"
-rich = { version = ">=13.6.0", optional = true }
-
-[tool.poetry.extras]
-logs = ["python-json-logger"]
-pg-sync = ["psycopg"]
-s3-minio = ["minio", "pycryptodome"]
-s3 = ["aiobotocore"]
-tests = ["deepdiff"]
-http = ["httpx"]
-api = ["fastapi", "pydantic"]
-pg = ["asyncpg", "rich"]
-
-[tool.poetry.group.dev.dependencies]
-commitizen = "^3.11.0"
-pytest-cov = "^5.0.0"
-pytest = "^8.2.2"
-pyright = "^1.1.371"
-ruff = "^0.5.2"
-pydantic = "^2.8.2"
-# Issue for mac with trackit version of multidict
-multidict = "^6.0.5"
-fastapi ="^0.111.1"
-httpx =  "^0.27.0"
-psycopg = "^3.2.1"
-minio = "^7.2.7"
-pycryptodome = "^3.20.0"
-aiobotocore = "2.15.2"
-python-json-logger = "^3.2.0"
-
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.pytest.ini_options]
-addopts = "--cov=tracktolib -s -q -x --no-cov-on-fail"
-testpaths = [
-    "tests"
-]
-python_files = "*.py"
-filterwarnings = [
-    "ignore::DeprecationWarning",
-    "ignore::PendingDeprecationWarning"
-]
-
-[tool.pyright]
-include = ["tracktolib", "tests"]
-exclude = []
-
-pythonVersion = "3.12"
-pythonPlatform = "Linux"
-
-[tool.commitizen]
-name = "cz_conventional_commits"
-version = "0.61.1"
-tag_format = "$version"
-version_files = [
-    "pyproject.toml:version"
-]
-bump_message = "release $current_version → $new_version [skip ci]"
-
-
-[tool.ruff]
-line-length = 120
-target-version = "py312"
-# Waiting for fix: https://github.com/charliermarsh/ruff/issues/282
-#ignore = ["E999"]
-
-[tool.ruff.lint.per-file-ignores]
-"__init__.py" = [
-    # imported but unused
-    "F401",
-    # unable to detect undefined names
-    "F403",
-    #
-    "F405"
-]
-
-[tool.ruff.lint.flake8-quotes]
-docstring-quotes = "double"
-inline-quotes = "single"
-
-[tool.ruff.lint.flake8-tidy-imports]
-# Disallow all relative imports.
-ban-relative-imports = "all"