tracktolib 0.65.0__py3-none-any.whl → 0.65.1__py3-none-any.whl

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/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.65.0.dist-info → tracktolib-0.65.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tracktolib
-Version: 0.65.0
+Version: 0.65.1
 Summary: Utility library for python
 Keywords: utility
 Author-email: julien.brayere@tracktor.fr

{tracktolib-0.65.0.dist-info → tracktolib-0.65.1.dist-info}/RECORD

@@ -3,8 +3,8 @@ tracktolib/api.py,sha256=ZLMgjH3Y8r3MpXc8m3IuZbzTj3fgrZKZORtSVgbuP-M,10221
 tracktolib/http_utils.py,sha256=c10JGmHaBw3VSDMYhz2dvVw2lo4PUAq1xMub74I7xDc,2625
 tracktolib/logs.py,sha256=D2hx6urXl5l4PBGP8mCpcT4GX7tJeFfNY-7oBfHczBU,2191
 tracktolib/notion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tracktolib/notion/fetch.py,sha256=zIhFo9T18eS75l0wZN_WaXD51OUxTsgvFuvqk3R87o4,9974
-tracktolib/notion/models.py,sha256=D-px7Ht2xoXKKZICuEkZhRwVBvVCaKCvhpzPtVVYawI,5390
+tracktolib/notion/fetch.py,sha256=2GS6L0Xv5UJZhQdqwrUJM11ors5hAH5WdFpuLWhXWTQ,13343
+tracktolib/notion/models.py,sha256=FbTJcK0eA-4phpfjUxyAW7cs5jHZQxB6qqZ75ZcJ7uw,5608
 tracktolib/pg/__init__.py,sha256=Ul_hgwvTXZvQBt7sHKi4ZI-0DDpnXmoFtmVkGRy-1J0,366
 tracktolib/pg/query.py,sha256=zstc-QkBby7e6LybS8ed0d_6QLQNujY2H0lLNXFLNQ8,19366
 tracktolib/pg/utils.py,sha256=ygQn63EBDaEGB0p7P2ibellO2mv-StafanpXKcCUiZU,6324
@@ -15,6 +15,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.65.0.dist-info/WHEEL,sha256=z-mOpxbJHqy3cq6SvUThBZdaLGFZzdZPtgWLcP2NKjQ,79
-tracktolib-0.65.0.dist-info/METADATA,sha256=4Pqiq-4w38C6n7eYaAikT-qo4D_3iie3ueSQsjXGI54,3719
-tracktolib-0.65.0.dist-info/RECORD,,
+tracktolib-0.65.1.dist-info/WHEEL,sha256=z-mOpxbJHqy3cq6SvUThBZdaLGFZzdZPtgWLcP2NKjQ,79
+tracktolib-0.65.1.dist-info/METADATA,sha256=Kr8EquD4NLUsi7Hyadl-Ij2JRB48rnzItX2o0bcLv0Y,3719
+tracktolib-0.65.1.dist-info/RECORD,,