notionary 0.3.1__py3-none-any.whl → 0.4.1__py3-none-any.whl

notionary/database/client.py

@@ -1,4 +1,6 @@
-from notionary.blocks.rich_text.rich_text_markdown_converter import RichTextToMarkdownConverter
+from notionary.blocks.rich_text.rich_text_markdown_converter import (
+    RichTextToMarkdownConverter,
+)
 from notionary.database.schemas import (
     NotionDatabaseDto,
     NotionDatabaseUpdateDto,
@@ -15,14 +17,20 @@ class NotionDatabaseHttpClient(NotionHttpClient):
         response = await self.get(f"databases/{self._database_id}")
         return NotionDatabaseDto.model_validate(response)
 
-    async def patch_database(self, update_database_dto: NotionDatabaseUpdateDto) -> NotionDatabaseDto:
+    async def patch_database(
+        self, update_database_dto: NotionDatabaseUpdateDto
+    ) -> NotionDatabaseDto:
         update_database_dto_dict = update_database_dto.model_dump(exclude_none=True)
 
-        response = await self.patch(f"databases/{self._database_id}", data=update_database_dto_dict)
+        response = await self.patch(
+            f"databases/{self._database_id}", data=update_database_dto_dict
+        )
         return NotionDatabaseDto.model_validate(response)
 
     async def update_database_title(self, title: str) -> NotionDatabaseDto:
-        from notionary.blocks.rich_text.markdown_rich_text_converter import MarkdownRichTextConverter
+        from notionary.blocks.rich_text.markdown_rich_text_converter import (
+            MarkdownRichTextConverter,
+        )
 
         markdown_rich_text_formatter = MarkdownRichTextConverter()
         database_rich_text = await markdown_rich_text_formatter.to_rich_text(title)
@@ -31,13 +39,23 @@ class NotionDatabaseHttpClient(NotionHttpClient):
         return await self.patch_database(database_title_update_dto)
 
     async def update_database_description(self, description: str) -> str:
-        from notionary.blocks.rich_text.markdown_rich_text_converter import MarkdownRichTextConverter
+        from notionary.blocks.rich_text.markdown_rich_text_converter import (
+            MarkdownRichTextConverter,
+        )
 
         markdown_to_rich_text_converter = MarkdownRichTextConverter()
-        rich_text_description = await markdown_to_rich_text_converter.to_rich_text(description)
+        rich_text_description = await markdown_to_rich_text_converter.to_rich_text(
+            description
+        )
 
-        database_description_update_dto = NotionDatabaseUpdateDto(description=rich_text_description)
-        update_database_response = await self.patch_database(database_description_update_dto)
+        database_description_update_dto = NotionDatabaseUpdateDto(
+            description=rich_text_description
+        )
+        update_database_response = await self.patch_database(
+            database_description_update_dto
+        )
 
         rich_text_to_markdown_converter = RichTextToMarkdownConverter()
-        return await rich_text_to_markdown_converter.to_markdown(update_database_response.description)
+        return await rich_text_to_markdown_converter.to_markdown(
+            update_database_response.description
+        )

notionary/database/database_metadata_update_client.py

@@ -2,7 +2,9 @@ from typing import override
 
 from notionary.database.schemas import NotionDatabaseDto
 from notionary.http.client import NotionHttpClient
-from notionary.shared.entity.entity_metadata_update_client import EntityMetadataUpdateClient
+from notionary.shared.entity.entity_metadata_update_client import (
+    EntityMetadataUpdateClient,
+)
 from notionary.shared.entity.schemas import NotionEntityUpdateDto
 
 
@@ -12,8 +14,14 @@ class DatabaseMetadataUpdateClient(NotionHttpClient, EntityMetadataUpdateClient)
         self._database_id = database_id
 
     @override
-    async def patch_metadata(self, updated_data: NotionEntityUpdateDto) -> NotionDatabaseDto:
-        updated_data_dict = updated_data.model_dump(exclude_unset=True, exclude_none=True)
+    async def patch_metadata(
+        self, updated_data: NotionEntityUpdateDto
+    ) -> NotionDatabaseDto:
+        updated_data_dict = updated_data.model_dump(
+            exclude_unset=True, exclude_none=True
+        )
 
-        response_dict = await self.patch(f"databases/{self._database_id}", data=updated_data_dict)
+        response_dict = await self.patch(
+            f"databases/{self._database_id}", data=updated_data_dict
+        )
         return NotionDatabaseDto.model_validate(response_dict)

notionary/database/schemas.py

@@ -2,7 +2,7 @@ from pydantic import BaseModel, Field
 
 from notionary.blocks.rich_text.models import RichText
 from notionary.shared.entity.schemas import EntityResponseDto
-from notionary.shared.models.cover import NotionCover
+from notionary.shared.models.file import File
 from notionary.shared.models.icon import Icon
 
 
@@ -24,6 +24,6 @@ class NotionDatabaseDto(EntityResponseDto):
 class NotionDatabaseUpdateDto(BaseModel):
     title: list[RichText] | None = None
     icon: Icon | None = None
-    cover: NotionCover | None = None
+    cover: File | None = None
     archived: bool | None = None
     description: list[RichText] | None = None

notionary/database/service.py

@@ -1,13 +1,15 @@
-from __future__ import annotations
-
 import asyncio
 from collections.abc import Awaitable, Callable
 from typing import Self
 
-from notionary.blocks.rich_text.rich_text_markdown_converter import RichTextToMarkdownConverter
+from notionary.blocks.rich_text.rich_text_markdown_converter import (
+    RichTextToMarkdownConverter,
+)
 from notionary.data_source.service import NotionDataSource
 from notionary.database.client import NotionDatabaseHttpClient
-from notionary.database.database_metadata_update_client import DatabaseMetadataUpdateClient
+from notionary.database.database_metadata_update_client import (
+    DatabaseMetadataUpdateClient,
+)
 from notionary.database.schemas import NotionDatabaseDto
 from notionary.shared.entity.dto_parsers import (
     extract_description,
@@ -16,7 +18,7 @@ from notionary.shared.entity.dto_parsers import (
 from notionary.shared.entity.service import Entity
 from notionary.workspace.query.service import WorkspaceQueryService
 
-type DataSourceFactory = Callable[[str], Awaitable[NotionDataSource]]
+type _DataSourceFactory = Callable[[str], Awaitable[NotionDataSource]]
 
 
 class NotionDatabase(Entity):
@@ -73,7 +75,8 @@ class NotionDatabase(Entity):
         client: NotionDatabaseHttpClient,
     ) -> Self:
         title, description = await asyncio.gather(
-            extract_title(dto, rich_text_converter), extract_description(dto, rich_text_converter)
+            extract_title(dto, rich_text_converter),
+            extract_description(dto, rich_text_converter),
         )
 
         metadata_update_client = DatabaseMetadataUpdateClient(database_id=dto.id)
@@ -104,7 +107,7 @@ class NotionDatabase(Entity):
 
     async def get_data_sources(
         self,
-        data_source_factory: DataSourceFactory = NotionDataSource.from_id,
+        data_source_factory: _DataSourceFactory = NotionDataSource.from_id,
     ) -> list[NotionDataSource]:
         if self._data_sources is None:
             self._data_sources = await self._load_data_sources(data_source_factory)
@@ -112,7 +115,7 @@ class NotionDatabase(Entity):
 
     async def _load_data_sources(
         self,
-        data_source_factory: DataSourceFactory,
+        data_source_factory: _DataSourceFactory,
     ) -> list[NotionDataSource]:
         tasks = [data_source_factory(ds_id) for ds_id in self._data_source_ids]
         return list(await asyncio.gather(*tasks))
@@ -122,5 +125,7 @@ class NotionDatabase(Entity):
         self._title = result.title[0].plain_text if result.title else ""
 
     async def set_description(self, description: str) -> None:
-        updated_description = await self.client.update_database_description(description=description)
+        updated_description = await self.client.update_database_description(
+            description=description
+        )
         self._description = updated_description

notionary/exceptions/__init__.py

@@ -7,10 +7,23 @@ from .api import (
     NotionServerError,
     NotionValidationError,
 )
-from .base import NotionaryError
-from .block_parsing import InsufficientColumnsError, InvalidColumnRatioSumError, UnsupportedVideoFormatError
+from .base import NotionaryException
+from .block_parsing import (
+    InsufficientColumnsError,
+    InvalidColumnRatioSumError,
+    UnsupportedVideoFormatError,
+)
 from .data_source import DataSourcePropertyNotFound, DataSourcePropertyTypeError
-from .properties import AccessPagePropertyWithoutDataSourceError, PagePropertyNotFoundError, PagePropertyTypeError
+from .file_upload import (
+    FileSizeException,
+    NoFileExtensionException,
+    UnsupportedFileTypeException,
+)
+from .properties import (
+    AccessPagePropertyWithoutDataSourceError,
+    PagePropertyNotFoundError,
+    PagePropertyTypeError,
+)
 from .search import DatabaseNotFound, DataSourceNotFound, EntityNotFound, PageNotFound
 
 __all__ = [
@@ -20,8 +33,10 @@ __all__ = [
     "DataSourcePropertyTypeError",
     "DatabaseNotFound",
     "EntityNotFound",
+    "FileSizeException",
     "InsufficientColumnsError",
     "InvalidColumnRatioSumError",
+    "NoFileExtensionException",
     "NotionApiError",
     "NotionAuthenticationError",
     "NotionConnectionError",
@@ -29,9 +44,10 @@ __all__ = [
     "NotionResourceNotFoundError",
     "NotionServerError",
     "NotionValidationError",
-    "NotionaryError",
+    "NotionaryException",
     "PageNotFound",
     "PagePropertyNotFoundError",
     "PagePropertyTypeError",
+    "UnsupportedFileTypeException",
     "UnsupportedVideoFormatError",
 ]

notionary/exceptions/api.py

@@ -1,7 +1,7 @@
-from notionary.exceptions.base import NotionaryError
+from notionary.exceptions.base import NotionaryException
 
 
-class NotionApiError(NotionaryError):
+class NotionApiError(NotionaryException):
     def __init__(
         self,
         message: str,

notionary/exceptions/base.py

@@ -1,2 +1,2 @@
-class NotionaryError(Exception):
+class NotionaryException(Exception):
     pass

notionary/exceptions/block_parsing.py

@@ -1,19 +1,23 @@
-from notionary.exceptions.base import NotionaryError
+from notionary.exceptions.base import NotionaryException
 
 RATIO_TOLERANCE = 0.0001
 
 
-class InsufficientColumnsError(NotionaryError):
+class InsufficientColumnsError(NotionaryException):
     def __init__(self, column_count: int) -> None:
         self.column_count = column_count
-        super().__init__(f"Columns container must contain at least 2 column blocks, but only {column_count} found")
+        super().__init__(
+            f"Columns container must contain at least 2 column blocks, but only {column_count} found"
+        )
 
 
-class InvalidColumnRatioSumError(NotionaryError):
+class InvalidColumnRatioSumError(NotionaryException):
     def __init__(self, total: float, tolerance: float = RATIO_TOLERANCE) -> None:
         self.total = total
         self.tolerance = tolerance
-        super().__init__(f"Width ratios must sum to 1.0 (±{tolerance}), but sum is {total}")
+        super().__init__(
+            f"Width ratios must sum to 1.0 (±{tolerance}), but sum is {total}"
+        )
 
 
 class UnsupportedVideoFormatError(ValueError):

notionary/exceptions/data_source/builder.py

@@ -8,11 +8,11 @@ from notionary.data_source.query.schema import (
     Operator,
     StringOperator,
 )
-from notionary.exceptions.base import NotionaryError
+from notionary.exceptions.base import NotionaryException
 from notionary.shared.properties.type import PropertyType
 
 
-class QueryBuilderError(NotionaryError):
+class QueryBuilderError(NotionaryException):
     def __init__(self, message: str, property_name: str | None = None) -> None:
         self.property_name = property_name
         super().__init__(message)
@@ -67,7 +67,11 @@ class MissingRequiredValue(QueryBuilderError):
     def __init__(
         self,
         property_name: str,
-        operator: StringOperator | NumberOperator | BooleanOperator | DateOperator | ArrayOperator,
+        operator: StringOperator
+        | NumberOperator
+        | BooleanOperator
+        | DateOperator
+        | ArrayOperator,
     ) -> None:
         self.operator = operator
 
@@ -79,7 +83,11 @@ class ValueNotAllowedForOperator(QueryBuilderError):
     def __init__(
         self,
         property_name: str,
-        operator: StringOperator | NumberOperator | BooleanOperator | DateOperator | ArrayOperator,
+        operator: StringOperator
+        | NumberOperator
+        | BooleanOperator
+        | DateOperator
+        | ArrayOperator,
     ) -> None:
         self.operator = operator
 
@@ -144,9 +152,7 @@ class NoPropertySelected(QueryBuilderError):
 
 class EmptyOrGroupError(QueryBuilderError):
     def __init__(self) -> None:
-        message = (
-            "Cannot create an OR group with no conditions. Add at least one filter condition before using .or_where()"
-        )
+        message = "Cannot create an OR group with no conditions. Add at least one filter condition before using .or_where()"
         super().__init__(message)
 
 

notionary/exceptions/data_source/properties.py

@@ -1,9 +1,9 @@
 import difflib
 
-from notionary.exceptions.base import NotionaryError
+from notionary.exceptions.base import NotionaryException
 
 
-class DataSourcePropertyNotFound(NotionaryError):
+class DataSourcePropertyNotFound(NotionaryException):
     def __init__(
         self,
         property_name: str,
@@ -28,7 +28,9 @@ class DataSourcePropertyNotFound(NotionaryError):
         super().__init__(message)
 
 
-class DataSourcePropertyTypeError(NotionaryError):
-    def __init__(self, property_name: str, expected_type: str, actual_type: str) -> None:
+class DataSourcePropertyTypeError(NotionaryException):
+    def __init__(
+        self, property_name: str, expected_type: str, actual_type: str
+    ) -> None:
         message = f"Property '{property_name}' has the wrong type. Expected: '{expected_type}', found: '{actual_type}'."
         super().__init__(message)

notionary/exceptions/file_upload.py

@@ -0,0 +1,76 @@
+from notionary.exceptions.base import NotionaryException
+
+
+class UnsupportedFileTypeException(NotionaryException):
+    def __init__(
+        self,
+        extension: str,
+        filename: str,
+        supported_extensions_by_category: dict[str, list[str]],
+    ):
+        supported_exts = []
+        for category, extensions in supported_extensions_by_category.items():
+            supported_exts.append(f"{category}: {', '.join(extensions[:5])}...")
+
+        supported_info = "\n  ".join(supported_exts)
+        super().__init__(
+            f"File '{filename}' has unsupported extension '{extension}'.\n"
+            f"Supported file types by category:\n  {supported_info}"
+        )
+        self.extension = extension
+        self.filename = filename
+
+
+class NoFileExtensionException(NotionaryException):
+    def __init__(self, filename: str):
+        super().__init__(
+            f"File '{filename}' has no extension. Files must have a valid extension to determine their type."
+        )
+        self.filename = filename
+
+
+class FileSizeException(NotionaryException):
+    def __init__(self, filename: str, file_size_bytes: int, max_size_bytes: int):
+        file_size_mb = file_size_bytes / (1024 * 1024)
+        max_size_mb = max_size_bytes / (1024 * 1024)
+        super().__init__(
+            f"File '{filename}' is too large ({file_size_mb:.2f} MB). Maximum allowed size is {max_size_mb:.2f} MB."
+        )
+        self.filename = filename
+        self.file_size_bytes = file_size_bytes
+        self.max_size_bytes = max_size_bytes
+
+
+class FileNotFoundError(NotionaryException):
+    def __init__(self, file_path: str):
+        super().__init__(f"File does not exist: {file_path}")
+        self.file_path = file_path
+
+
+class FilenameTooLongError(NotionaryException):
+    def __init__(self, filename: str, filename_bytes: int, max_filename_bytes: int):
+        super().__init__(
+            f"Filename too long: {filename_bytes} bytes (max {max_filename_bytes}). Filename: {filename}"
+        )
+        self.filename = filename
+        self.filename_bytes = filename_bytes
+        self.max_filename_bytes = max_filename_bytes
+
+
+class UploadFailedError(NotionaryException):
+    def __init__(self, file_upload_id: str, reason: str | None = None):
+        message = f"Upload failed for file_upload_id: {file_upload_id}"
+        if reason:
+            message += f". Reason: {reason}"
+        super().__init__(message)
+        self.file_upload_id = file_upload_id
+        self.reason = reason
+
+
+class UploadTimeoutError(NotionaryException):
+    def __init__(self, file_upload_id: str, timeout_seconds: int):
+        super().__init__(
+            f"Upload timeout after {timeout_seconds}s for file_upload_id: {file_upload_id}"
+        )
+        self.file_upload_id = file_upload_id
+        self.timeout_seconds = timeout_seconds

notionary/exceptions/properties.py

@@ -1,11 +1,11 @@
 import difflib
 from typing import ClassVar
 
-from notionary.exceptions.base import NotionaryError
+from notionary.exceptions.base import NotionaryException
 from notionary.shared.models.parent import ParentType
 
 
-class PagePropertyNotFoundError(NotionaryError):
+class PagePropertyNotFoundError(NotionaryException):
     def __init__(
         self,
         page_url: str,
@@ -31,7 +31,7 @@ class PagePropertyNotFoundError(NotionaryError):
         super().__init__(message)
 
 
-class PagePropertyTypeError(NotionaryError):
+class PagePropertyTypeError(NotionaryException):
     def __init__(
         self,
         property_name: str,
@@ -41,7 +41,7 @@ class PagePropertyTypeError(NotionaryError):
         super().__init__(message)
 
 
-class AccessPagePropertyWithoutDataSourceError(NotionaryError):
+class AccessPagePropertyWithoutDataSourceError(NotionaryException):
     _PARENT_DESCRIPTIONS: ClassVar[dict[ParentType, str]] = {
         ParentType.WORKSPACE: "the workspace itself",
         ParentType.PAGE_ID: "another page",
@@ -50,7 +50,9 @@ class AccessPagePropertyWithoutDataSourceError(NotionaryError):
     }
 
     def __init__(self, parent_type: ParentType) -> None:
-        parent_desc = self._PARENT_DESCRIPTIONS.get(parent_type, f"its parent type is '{parent_type}'")
+        parent_desc = self._PARENT_DESCRIPTIONS.get(
+            parent_type, f"its parent type is '{parent_type}'"
+        )
         message = (
             f"Cannot access properties other than title because this page's parent is {parent_desc}. "
             "To use operations like property reading/writing, you need to use a page whose parent is a data source."

notionary/exceptions/search.py

@@ -1,8 +1,10 @@
-from notionary.exceptions.base import NotionaryError
+from notionary.exceptions.base import NotionaryException
 
 
-class EntityNotFound(NotionaryError):
-    def __init__(self, entity_type: str, query: str, available_titles: list[str] | None = None) -> None:
+class EntityNotFound(NotionaryException):
+    def __init__(
+        self, entity_type: str, query: str, available_titles: list[str] | None = None
+    ) -> None:
         self.entity_type = entity_type
         self.query = query
         self.available_titles = available_titles or []
@@ -33,15 +35,17 @@ class DatabaseNotFound(EntityNotFound):
         super().__init__("database", query, available_titles)
 
 
-class NoUsersInWorkspace(NotionaryError):
+class NoUsersInWorkspace(NotionaryException):
     def __init__(self, user_type: str) -> None:
         self.user_type = user_type
         message = f"No '{user_type}' users found in the workspace."
         super().__init__(message)
 
 
-class UserNotFound(NotionaryError):
-    def __init__(self, user_type: str, query: str, available_names: list[str] | None = None) -> None:
+class UserNotFound(NotionaryException):
+    def __init__(
+        self, user_type: str, query: str, available_names: list[str] | None = None
+    ) -> None:
         self.user_type = user_type
         self.query = query
         self.available_names = available_names or []

notionary/file_upload/__init__.py

@@ -0,0 +1,4 @@
+from .query import FileUploadQuery, FileUploadQueryBuilder
+from .service import NotionFileUpload
+
+__all__ = ["FileUploadQuery", "FileUploadQueryBuilder", "NotionFileUpload"]