tracktolib 0.48.1__tar.gz → 0.49.1__tar.gz

{tracktolib-0.48.1 → tracktolib-0.49.1}/PKG-INFO

@@ -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.48.1 → tracktolib-0.49.1}/README.md

@@ -44,7 +44,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.48.1 → tracktolib-0.49.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tracktolib"
-version = "0.48.1"
+version = "0.49.1"
 description = "Utility library for python"
 authors = ["Julien Brayere <julien.brayere@tracktor.fr>"]
 license = "MIT"
@@ -16,11 +16,13 @@ include = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<4.0"
+python = ">=3.12,<4.0"
 
 python-json-logger = { version = ">=2.0.4", 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 }
 httpx = { version = ">=0.25.0", optional = true }
@@ -29,11 +31,10 @@ 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"]
+s3-minio = ["minio", "pycryptodome"]
 s3 = ["aiobotocore"]
 tests = ["deepdiff"]
 http = ["httpx"]
@@ -41,14 +42,20 @@ api = ["fastapi", "pydantic"]
 pg = ["asyncpg", "rich"]
 
 [tool.poetry.group.dev.dependencies]
-pyright = "^1.1.284"
 commitizen = "^3.11.0"
-pytest = "^7.2.0"
-pytest-cov = "^4.0.0"
-pydantic = ">=2,<3"
-ruff = "^0.1.6"
+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"
+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.13.1"
 
 [build-system]
 requires = ["poetry-core"]
@@ -60,19 +67,21 @@ testpaths = [
     "tests"
 ]
 python_files = "*.py"
-filterwarnings = ["ignore:::.*minio.api*",
-    "ignore:.*urllib3.contrib.pyopenssl.*:DeprecationWarning"]
+filterwarnings = [
+    "ignore::DeprecationWarning",
+    "ignore::PendingDeprecationWarning"
+]
 
 [tool.pyright]
 include = ["tracktolib", "tests"]
 exclude = []
 
-pythonVersion = "3.10"
+pythonVersion = "3.12"
 pythonPlatform = "Linux"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.48.1"
+version = "0.49.1"
 tag_format = "$version"
 version_files = [
     "pyproject.toml:version"
@@ -82,11 +91,11 @@ bump_message = "release $current_version → $new_version [skip ci]"
 
 [tool.ruff]
 line-length = 120
-target-version = "py310"
+target-version = "py312"
 # Waiting for fix: https://github.com/charliermarsh/ruff/issues/282
-ignore = ["E999"]
+#ignore = ["E999"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "__init__.py" = [
     # imported but unused
     "F401",
@@ -96,10 +105,10 @@ ignore = ["E999"]
     "F405"
 ]
 
-[tool.ruff.flake8-quotes]
+[tool.ruff.lint.flake8-quotes]
 docstring-quotes = "double"
 inline-quotes = "single"
 
-[tool.ruff.flake8-tidy-imports]
+[tool.ruff.lint.flake8-tidy-imports]
 # Disallow all relative imports.
 ban-relative-imports = "all"

{tracktolib-0.48.1 → tracktolib-0.49.1}/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-0.48.1 → tracktolib-0.49.1}/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-0.48.1 → tracktolib-0.49.1}/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-0.48.1 → tracktolib-0.49.1}/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-0.48.1 → tracktolib-0.49.1}/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-0.48.1 → tracktolib-0.49.1}/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-0.48.1 → tracktolib-0.49.1}/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-0.48.1 → tracktolib-0.49.1}/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/setup.py

@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['tracktolib', 'tracktolib.pg', 'tracktolib.s3']
-
-package_data = \
-{'': ['*']}
-
-extras_require = \
-{':extra == "pg"': ['asyncpg>=0.27.0'],
- 'api': ['fastapi>=0.103.2', 'pydantic>=2'],
- 'http': ['httpx>=0.25.0'],
- 'logs': ['python-json-logger>=2.0.4'],
- 'pg': ['rich>=13.6.0'],
- 'pg-sync': ['psycopg>=3.1.12'],
- 's3': ['aiobotocore>=2.9.0'],
- 's3-minio': ['minio>=7.2.0'],
- 'tests': ['deepdiff>=6.6.0']}
-
-setup_kwargs = {
-    'name': 'tracktolib',
-    'version': '0.48.1',
-    'description': 'Utility library for python',
-    'long_description': "# Tracktolib\n\n[![Python versions](https://img.shields.io/pypi/pyversions/tracktolib)](https://pypi.python.org/pypi/tracktolib)\n[![Latest PyPI version](https://img.shields.io/pypi/v/tracktolib?logo=pypi)](https://pypi.python.org/pypi/tracktolib)\n[![CircleCI](https://circleci.com/gh/Tracktor/tracktolib/tree/master.svg?style=shield)](https://app.circleci.com/pipelines/github/Tracktor/tracktolib?branch=master)\n\nUtility library for python\n\n# Installation\n\nYou can choose to not install all the dependencies by specifying\nthe [extra](https://python-poetry.org/docs/cli/#options-4) parameter such as:\n\n```bash\npoetry add tracktolib@latest -E pg-sync -E tests --group dev \n```\n\nHere we only install the utilities using `psycopg` (pg-sync) and `deepdiff` (tests) for the dev environment.\n\n# Utilities\n\n- **log**\n\nUtility functions for logging.\n\n```python\nimport logging\nfrom tracktolib.logs import init_logging\n\nlogger = logging.getLogger()\nformatter, stream_handler = init_logging(logger, 'json', version='0.0.1')\n```\n\n- **pg**\n\nUtility functions for [asyncpg](https://github.com/MagicStack/asyncpg)\n\n- **pg-sync**\n\nUtility functions based on psycopg such as `fetch_one`, `insert_many`, `fetch_count` ...\n\nTo use the functions, create a `Connection` using psycopg: `conn = psycopg2.connect()`\n\n*fetch_one*\n\n```python\nfrom pg.pg_sync import (\n    insert_many, fetch_one, fetch_count, fetch_all\n)\n\ndata = [\n    {'foo': 'bar', 'value': 1},\n    {'foo': 'baz', 'value': 2}\n]\ninsert_many(conn, 'public.test', data)  # Will insert the 2 dict\nquery = 'SELECT foo from public.test order by value asc'\nvalue = fetch_one(conn, query, required=True)  # Will return {'foo': 'bar'}, raise an error is not found\nassert fetch_count(conn, 'public.test') == 2\nquery = 'SELECT * from public.test order by value asc'\nassert fetch_all(conn, query) == data\n\n```\n\n- **tests**\n\nUtility functions for testing\n\n- **s3-minio**\n\nUtility functions for [minio](https://min.io/docs/minio/linux/developers/python/API.html)\n\n- **s3**\n\nUtility functions for [aiobotocore](https://github.com/aio-libs/aiobotocore)\n\n- **logs**\n\nUtility functions to initialize the logging formatting and streams\n\n- **http**\n\nUtility functions using [httpx](https://www.python-httpx.org/)\n\n- **api**\n\nUtility functions using [fastapi](https://fastapi.tiangolo.com/)\n",
-    'author': 'Julien Brayere',
-    'author_email': 'julien.brayere@tracktor.fr',
-    'maintainer': 'None',
-    'maintainer_email': 'None',
-    'url': 'https://github.com/tracktor/tracktolib',
-    'packages': packages,
-    'package_data': package_data,
-    'extras_require': extras_require,
-    'python_requires': '>=3.10,<4.0',
-}
-
-
-setup(**setup_kwargs)