tracktolib 0.64.0__tar.gz → 0.65.1__tar.gz

{tracktolib-0.64.0 → tracktolib-0.65.1}/PKG-INFO

@@ -1,11 +1,15 @@
 Metadata-Version: 2.4
 Name: tracktolib
-Version: 0.64.0
+Version: 0.65.1
 Summary: Utility library for python
 Keywords: utility
 Author-email: julien.brayere@tracktor.fr
 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'
@@ -36,21 +40,25 @@ Description-Content-Type: text/markdown
 [![Latest PyPI version](https://img.shields.io/pypi/v/tracktolib?logo=pypi)](https://pypi.python.org/pypi/tracktolib)
 [![CircleCI](https://circleci.com/gh/Tracktor/tracktolib/tree/master.svg?style=shield)](https://app.circleci.com/pipelines/github/Tracktor/tracktolib?branch=master)
 
-Utility library for python
+Utility library for Python 3.12+
 
-# Installation
+## Installation
 
-Just run:
+```bash
+uv add tracktolib
+```
+
+With specific extras:
 
 ```bash
-uv add tracktolib@latest 
+uv add tracktolib[pg,api]
 ```
 
-# Utilities
+## Modules
 
-- **log**
+### logs
 
-Utility functions for logging.
+Utility functions to initialize logging formatting and streams.
 
 ```python
 import logging
@@ -60,56 +68,87 @@ logger = logging.getLogger()
 formatter, stream_handler = init_logging(logger, 'json', version='0.0.1')
 ```
 
-- **pg**
+### pg
 
-Utility functions for [asyncpg](https://github.com/MagicStack/asyncpg)
+Async PostgreSQL helpers using [asyncpg](https://github.com/MagicStack/asyncpg).
 
-- **pg-sync**
+```bash
+uv add tracktolib[pg]
+```
 
-Utility functions based on psycopg such as `fetch_one`, `insert_many`, `fetch_count` ...
+### pg-sync
 
-To use the functions, create a `Connection` using psycopg: `conn = psycopg2.connect()`
+Sync PostgreSQL helpers using [psycopg](https://www.psycopg.org/psycopg3/) (v3).
 
-*fetch_one*
+```bash
+uv add tracktolib[pg-sync]
+```
 
 ```python
-from tracktolib.pg.pg_sync import (
-    insert_many, fetch_one, fetch_count, fetch_all
-)
+from psycopg import connect
+from tracktolib.pg_sync import insert_many, fetch_one, fetch_count, fetch_all
+
+conn = connect('postgresql://user:pass@localhost/db')
 
 data = [
     {'foo': 'bar', 'value': 1},
     {'foo': 'baz', 'value': 2}
 ]
-insert_many(conn, 'public.test', data)  # Will insert the 2 dict
+insert_many(conn, 'public.test', data)
+
 query = 'SELECT foo from public.test order by value asc'
-value = fetch_one(conn, query, required=True)  # Will return {'foo': 'bar'}, raise an error is not found
+value = fetch_one(conn, query, required=True)  # {'foo': 'bar'}, raises if not found
+
 assert fetch_count(conn, 'public.test') == 2
+
 query = 'SELECT * from public.test order by value asc'
 assert fetch_all(conn, query) == data
+```
+
+### s3
+
+Async S3 helpers using [aiobotocore](https://github.com/aio-libs/aiobotocore).
 
+```bash
+uv add tracktolib[s3]
 ```
 
-- **tests**
+### s3-minio
 
-Utility functions for testing
+S3 helpers using [minio](https://min.io/docs/minio/linux/developers/python/API.html).
 
-- **s3-minio**
+```bash
+uv add tracktolib[s3-minio]
+```
 
-Utility functions for [minio](https://min.io/docs/minio/linux/developers/python/API.html)
+### http
 
-- **s3**
+HTTP client helpers using [httpx](https://www.python-httpx.org/).
 
-Utility functions for [aiobotocore](https://github.com/aio-libs/aiobotocore)
+```bash
+uv add tracktolib[http]
+```
 
-- **logs**
+### api
 
-Utility functions to initialize the logging formatting and streams
+FastAPI utilities using [fastapi](https://fastapi.tiangolo.com/) and [pydantic](https://docs.pydantic.dev/).
 
-- **http**
+```bash
+uv add tracktolib[api]
+```
 
-Utility functions using [httpx](https://www.python-httpx.org/)
+### notion
 
-- **api**
+Notion API helpers using [niquests](https://github.com/jawah/niquests).
 
-Utility functions using [fastapi](https://fastapi.tiangolo.com/)
+```bash
+uv add tracktolib[notion]
+```
+
+### tests
+
+Testing utilities using [deepdiff](https://github.com/seperman/deepdiff).
+
+```bash
+uv add tracktolib[tests]
+```

tracktolib-0.65.1/README.md

@@ -0,0 +1,118 @@
+# Tracktolib
+
+[![Python versions](https://img.shields.io/pypi/pyversions/tracktolib)](https://pypi.python.org/pypi/tracktolib)
+[![Latest PyPI version](https://img.shields.io/pypi/v/tracktolib?logo=pypi)](https://pypi.python.org/pypi/tracktolib)
+[![CircleCI](https://circleci.com/gh/Tracktor/tracktolib/tree/master.svg?style=shield)](https://app.circleci.com/pipelines/github/Tracktor/tracktolib?branch=master)
+
+Utility library for Python 3.12+
+
+## Installation
+
+```bash
+uv add tracktolib
+```
+
+With specific extras:
+
+```bash
+uv add tracktolib[pg,api]
+```
+
+## Modules
+
+### logs
+
+Utility functions to initialize logging formatting and streams.
+
+```python
+import logging
+from tracktolib.logs import init_logging
+
+logger = logging.getLogger()
+formatter, stream_handler = init_logging(logger, 'json', version='0.0.1')
+```
+
+### pg
+
+Async PostgreSQL helpers using [asyncpg](https://github.com/MagicStack/asyncpg).
+
+```bash
+uv add tracktolib[pg]
+```
+
+### pg-sync
+
+Sync PostgreSQL helpers using [psycopg](https://www.psycopg.org/psycopg3/) (v3).
+
+```bash
+uv add tracktolib[pg-sync]
+```
+
+```python
+from psycopg import connect
+from tracktolib.pg_sync import insert_many, fetch_one, fetch_count, fetch_all
+
+conn = connect('postgresql://user:pass@localhost/db')
+
+data = [
+    {'foo': 'bar', 'value': 1},
+    {'foo': 'baz', 'value': 2}
+]
+insert_many(conn, 'public.test', data)
+
+query = 'SELECT foo from public.test order by value asc'
+value = fetch_one(conn, query, required=True)  # {'foo': 'bar'}, raises if not found
+
+assert fetch_count(conn, 'public.test') == 2
+
+query = 'SELECT * from public.test order by value asc'
+assert fetch_all(conn, query) == data
+```
+
+### s3
+
+Async S3 helpers using [aiobotocore](https://github.com/aio-libs/aiobotocore).
+
+```bash
+uv add tracktolib[s3]
+```
+
+### s3-minio
+
+S3 helpers using [minio](https://min.io/docs/minio/linux/developers/python/API.html).
+
+```bash
+uv add tracktolib[s3-minio]
+```
+
+### http
+
+HTTP client helpers using [httpx](https://www.python-httpx.org/).
+
+```bash
+uv add tracktolib[http]
+```
+
+### api
+
+FastAPI utilities using [fastapi](https://fastapi.tiangolo.com/) and [pydantic](https://docs.pydantic.dev/).
+
+```bash
+uv add tracktolib[api]
+```
+
+### notion
+
+Notion API helpers using [niquests](https://github.com/jawah/niquests).
+
+```bash
+uv add tracktolib[notion]
+```
+
+### tests
+
+Testing utilities using [deepdiff](https://github.com/seperman/deepdiff).
+
+```bash
+uv add tracktolib[tests]
+```

{tracktolib-0.64.0 → tracktolib-0.65.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tracktolib"
-version = "0.64.0"
+version = "0.65.1"
 authors = [
     { email = "julien.brayere@tracktor.fr" }
 ]
@@ -11,7 +11,11 @@ homepage = "https://github.com/tracktor/tracktolib"
 repository = "https://github.com/tracktor/tracktolib"
 keywords = ["utility"]
 classifiers = [
-    "Operating System :: OS Independent"
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 include = [
     "LICENSE"
@@ -87,12 +91,12 @@ filterwarnings = [
 include = ["tracktolib", "tests"]
 exclude = []
 
-pythonVersion = "3.13"
+pythonVersion = "3.14"
 pythonPlatform = "Linux"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.64.0"
+version = "0.65.1"
 tag_format = "$version"
 version_files = [
     "pyproject.toml:version"
@@ -102,7 +106,7 @@ bump_message = "release $current_version → $new_version [skip ci]"
 
 [tool.ruff]
 line-length = 120
-target-version = "py313"
+target-version = "py314"
 
 
 [tool.ruff.lint.per-file-ignores]

{tracktolib-0.64.0 → tracktolib-0.65.1}/tracktolib/notion/fetch.py

@@ -1,5 +1,5 @@
 import os
-from typing import Any
+from typing import Any, Literal
 
 try:
     import niquests
@@ -20,6 +20,19 @@ from .models import (
     UserListResponse,
 )
 
+# API version constants
+API_VERSION_2022_06_28 = "2022-06-28"
+API_VERSION_2025_09_03 = "2025-09-03"
+DEFAULT_API_VERSION = API_VERSION_2025_09_03
+
+ApiVersion = Literal["2022-06-28", "2025-09-03"]
+
+
+def _use_data_source_api(api_version: str) -> bool:
+    """Check if the API version uses data_source endpoints (2025-09-03+)."""
+    return api_version >= "2025-09-03"
+
+
 __all__ = (
     # Auth helpers
     "get_notion_headers",
@@ -181,6 +194,19 @@ async def fetch_page(session: niquests.AsyncSession, page_id: str) -> Page:
     return response.json()  # type: ignore[return-value]
 
 
+def _convert_parent_for_api_version(parent: dict[str, Any], api_version: str) -> dict[str, Any]:
+    """Convert parent dict between database_id and data_source_id based on API version."""
+    if _use_data_source_api(api_version):
+        # Convert database_id to data_source_id for new API
+        if "database_id" in parent:
+            return {"data_source_id": parent["database_id"]}
+    else:
+        # Convert data_source_id to database_id for old API
+        if "data_source_id" in parent:
+            return {"database_id": parent["data_source_id"]}
+    return parent
+
+
 async def create_page(
     session: niquests.AsyncSession,
     *,
@@ -189,10 +215,18 @@ async def create_page(
     children: list[dict[str, Any]] | None = None,
     icon: dict[str, Any] | None = None,
     cover: dict[str, Any] | None = None,
+    api_version: ApiVersion | None = None,
 ) -> Page:
-    """Create a new page."""
+    """Create a new page.
+
+    For API version 2025-09-03+, parent should use {"data_source_id": "..."}.
+    For older API versions, parent should use {"database_id": "..."}.
+    The function will automatically convert between the two formats.
+    """
+    _api_version = api_version or session.headers.get("Notion-Version", DEFAULT_API_VERSION)
+    converted_parent = _convert_parent_for_api_version(parent, _api_version)
     payload: dict[str, Any] = {
-        "parent": parent,
+        "parent": converted_parent,
         "properties": properties,
     }
     if children:
@@ -235,9 +269,24 @@ async def update_page(
 # Databases endpoints
 
 
-async def fetch_database(session: niquests.AsyncSession, database_id: str) -> Database:
-    """Retrieve a database by ID."""
-    response = await session.get(f"{NOTION_API_URL}/v1/databases/{database_id}")
+async def fetch_database(
+    session: niquests.AsyncSession,
+    database_id: str,
+    *,
+    api_version: ApiVersion | None = None,
+) -> Database:
+    """Retrieve a database/data source by ID.
+
+    For API version 2025-09-03+, uses /v1/data_sources/{id} endpoint.
+    For older API versions, uses /v1/databases/{id} endpoint.
+    """
+    _api_version = api_version or session.headers.get("Notion-Version", DEFAULT_API_VERSION)
+    if _use_data_source_api(_api_version):
+        endpoint = f"{NOTION_API_URL}/v1/data_sources/{database_id}"
+    else:
+        endpoint = f"{NOTION_API_URL}/v1/databases/{database_id}"
+
+    response = await session.get(endpoint)
     response.raise_for_status()
     return response.json()  # type: ignore[return-value]
 
@@ -250,8 +299,14 @@ async def query_database(
     sorts: list[dict[str, Any]] | None = None,
     start_cursor: str | None = None,
     page_size: int | None = None,
+    api_version: ApiVersion | None = None,
 ) -> PageListResponse:
-    """Query a database."""
+    """Query a database/data source.
+
+    For API version 2025-09-03+, uses /v1/data_sources/{id}/query endpoint.
+    For older API versions, uses /v1/databases/{id}/query endpoint.
+    """
+    _api_version = api_version or session.headers.get("Notion-Version", DEFAULT_API_VERSION)
     payload: dict[str, Any] = {}
     if filter:
         payload["filter"] = filter
@@ -262,7 +317,12 @@ async def query_database(
     if page_size:
         payload["page_size"] = page_size
 
-    response = await session.post(f"{NOTION_API_URL}/v1/databases/{database_id}/query", json=payload or None)
+    if _use_data_source_api(_api_version):
+        endpoint = f"{NOTION_API_URL}/v1/data_sources/{database_id}/query"
+    else:
+        endpoint = f"{NOTION_API_URL}/v1/databases/{database_id}/query"
+
+    response = await session.post(endpoint, json=payload or None)
     response.raise_for_status()
     return response.json()  # type: ignore[return-value]
 
@@ -312,6 +372,23 @@ async def fetch_append_block_children(
 # Search endpoint
 
 
+def _convert_search_filter_for_api_version(filter: dict[str, Any], api_version: str) -> dict[str, Any]:
+    """Convert search filter value between 'database' and 'data_source' based on API version."""
+    if "value" not in filter:
+        return filter
+
+    filter_copy = filter.copy()
+    if _use_data_source_api(api_version):
+        # Convert 'database' to 'data_source' for new API
+        if filter_copy.get("value") == "database":
+            filter_copy["value"] = "data_source"
+    else:
+        # Convert 'data_source' to 'database' for old API
+        if filter_copy.get("value") == "data_source":
+            filter_copy["value"] = "database"
+    return filter_copy
+
+
 async def fetch_search(
     session: niquests.AsyncSession,
     *,
@@ -320,13 +397,20 @@ async def fetch_search(
     sort: dict[str, Any] | None = None,
     start_cursor: str | None = None,
     page_size: int | None = None,
+    api_version: ApiVersion | None = None,
 ) -> SearchResponse:
-    """Search pages and databases."""
+    """Search pages and databases/data sources.
+
+    For API version 2025-09-03+, filter value 'database' is automatically
+    converted to 'data_source'. For older versions, 'data_source' is
+    converted to 'database'.
+    """
+    _api_version = api_version or session.headers.get("Notion-Version", DEFAULT_API_VERSION)
     payload: dict[str, Any] = {}
     if query:
         payload["query"] = query
     if filter:
-        payload["filter"] = filter
+        payload["filter"] = _convert_search_filter_for_api_version(filter, _api_version)
     if sort:
         payload["sort"] = sort
     if start_cursor:

{tracktolib-0.64.0 → tracktolib-0.65.1}/tracktolib/notion/models.py

@@ -126,12 +126,19 @@ class PageParent(TypedDict):
 
 
 class DatabaseParent(TypedDict):
-    """Database parent."""
+    """Database parent (deprecated in API 2025-09-03, use DataSourceParent)."""
 
     type: Literal["database_id"]
     database_id: str
 
 
+class DataSourceParent(TypedDict):
+    """Data source parent (API 2025-09-03+)."""
+
+    type: Literal["data_source_id"]
+    data_source_id: str
+
+
 class WorkspaceParent(TypedDict):
     """Workspace parent."""
 
@@ -146,7 +153,7 @@ class BlockParent(TypedDict):
     block_id: str
 
 
-Parent = PageParent | DatabaseParent | WorkspaceParent | BlockParent
+Parent = PageParent | DatabaseParent | DataSourceParent | WorkspaceParent | BlockParent
 
 
 # Page types

tracktolib-0.64.0/README.md

@@ -1,83 +0,0 @@
-# Tracktolib
-
-[![Python versions](https://img.shields.io/pypi/pyversions/tracktolib)](https://pypi.python.org/pypi/tracktolib)
-[![Latest PyPI version](https://img.shields.io/pypi/v/tracktolib?logo=pypi)](https://pypi.python.org/pypi/tracktolib)
-[![CircleCI](https://circleci.com/gh/Tracktor/tracktolib/tree/master.svg?style=shield)](https://app.circleci.com/pipelines/github/Tracktor/tracktolib?branch=master)
-
-Utility library for python
-
-# Installation
-
-Just run:
-
-```bash
-uv add tracktolib@latest 
-```
-
-# Utilities
-
-- **log**
-
-Utility functions for logging.
-
-```python
-import logging
-from tracktolib.logs import init_logging
-
-logger = logging.getLogger()
-formatter, stream_handler = init_logging(logger, 'json', version='0.0.1')
-```
-
-- **pg**
-
-Utility functions for [asyncpg](https://github.com/MagicStack/asyncpg)
-
-- **pg-sync**
-
-Utility functions based on psycopg such as `fetch_one`, `insert_many`, `fetch_count` ...
-
-To use the functions, create a `Connection` using psycopg: `conn = psycopg2.connect()`
-
-*fetch_one*
-
-```python
-from tracktolib.pg.pg_sync import (
-    insert_many, fetch_one, fetch_count, fetch_all
-)
-
-data = [
-    {'foo': 'bar', 'value': 1},
-    {'foo': 'baz', 'value': 2}
-]
-insert_many(conn, 'public.test', data)  # Will insert the 2 dict
-query = 'SELECT foo from public.test order by value asc'
-value = fetch_one(conn, query, required=True)  # Will return {'foo': 'bar'}, raise an error is not found
-assert fetch_count(conn, 'public.test') == 2
-query = 'SELECT * from public.test order by value asc'
-assert fetch_all(conn, query) == data
-
-```
-
-- **tests**
-
-Utility functions for testing
-
-- **s3-minio**
-
-Utility functions for [minio](https://min.io/docs/minio/linux/developers/python/API.html)
-
-- **s3**
-
-Utility functions for [aiobotocore](https://github.com/aio-libs/aiobotocore)
-
-- **logs**
-
-Utility functions to initialize the logging formatting and streams
-
-- **http**
-
-Utility functions using [httpx](https://www.python-httpx.org/)
-
-- **api**
-
-Utility functions using [fastapi](https://fastapi.tiangolo.com/)