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

notionary/page/properties/service.py

@@ -3,14 +3,16 @@ from __future__ import annotations
 import asyncio
 from typing import TYPE_CHECKING, Never
 
-from notionary.blocks.rich_text.rich_text_markdown_converter import convert_rich_text_to_markdown
+from notionary.blocks.rich_text.rich_text_markdown_converter import (
+    convert_rich_text_to_markdown,
+)
 from notionary.exceptions.properties import (
     AccessPagePropertyWithoutDataSourceError,
     PagePropertyNotFoundError,
     PagePropertyTypeError,
 )
 from notionary.page.properties.client import PagePropertyHttpClient
-from notionary.page.properties.models import (
+from notionary.page.properties.schemas import (
     PageCheckboxProperty,
     PageCreatedTimeProperty,
     PageDateProperty,
@@ -68,23 +70,33 @@ class PagePropertyHandler:
         return await convert_rich_text_to_markdown(title_property.title)
 
     def get_values_of_people_property(self, property_name: str) -> list[str]:
-        people_prop = self._get_typed_property_or_raise(property_name, PagePeopleProperty)
+        people_prop = self._get_typed_property_or_raise(
+            property_name, PagePeopleProperty
+        )
         return [person.name for person in people_prop.people if person.name]
 
     def get_value_of_created_time_property(self, name: str) -> str | None:
-        created_time_property = self._get_typed_property_or_raise(name, PageCreatedTimeProperty)
+        created_time_property = self._get_typed_property_or_raise(
+            name, PageCreatedTimeProperty
+        )
         return created_time_property.created_time
 
     async def get_values_of_relation_property(self, name: str) -> list[str]:
         from notionary import NotionPage
 
-        relation_property = self._get_typed_property_or_raise(name, PageRelationProperty)
+        relation_property = self._get_typed_property_or_raise(
+            name, PageRelationProperty
+        )
         relation_page_ids = [rel.id for rel in relation_property.relation]
-        notion_pages = [await NotionPage.from_id(page_id) for page_id in relation_page_ids]
+        notion_pages = [
+            await NotionPage.from_id(page_id) for page_id in relation_page_ids
+        ]
         return [page.title for page in notion_pages if page]
 
     def get_values_of_multiselect_property(self, name: str) -> list[str]:
-        multiselect_property = self._get_typed_property_or_raise(name, PageMultiSelectProperty)
+        multiselect_property = self._get_typed_property_or_raise(
+            name, PageMultiSelectProperty
+        )
         return [option.name for option in multiselect_property.multi_select]
 
     def get_value_of_url_property(self, name: str) -> str | None:
@@ -96,7 +108,9 @@ class PagePropertyHandler:
         return number_property.number
 
     def get_value_of_checkbox_property(self, name: str) -> bool:
-        checkbox_property = self._get_typed_property_or_raise(name, PageCheckboxProperty)
+        checkbox_property = self._get_typed_property_or_raise(
+            name, PageCheckboxProperty
+        )
         return checkbox_property.checkbox
 
     def get_value_of_date_property(self, name: str) -> str | None:
@@ -104,7 +118,9 @@ class PagePropertyHandler:
         return date_property.date.start if date_property.date else None
 
     async def get_value_of_rich_text_property(self, name: str) -> str:
-        rich_text_property = self._get_typed_property_or_raise(name, PageRichTextProperty)
+        rich_text_property = self._get_typed_property_or_raise(
+            name, PageRichTextProperty
+        )
         return await convert_rich_text_to_markdown(rich_text_property.rich_text)
 
     def get_value_of_email_property(self, name: str) -> str | None:
@@ -112,26 +128,36 @@ class PagePropertyHandler:
         return email_property.email
 
     def get_value_of_phone_number_property(self, name: str) -> str | None:
-        phone_property = self._get_typed_property_or_raise(name, PagePhoneNumberProperty)
+        phone_property = self._get_typed_property_or_raise(
+            name, PagePhoneNumberProperty
+        )
         return phone_property.phone_number
 
     # =========================================================================
     # Options Getters
     # =========================================================================
 
-    async def get_select_options_by_property_name(self, property_name: str) -> list[str]:
+    async def get_select_options_by_property_name(
+        self, property_name: str
+    ) -> list[str]:
         data_source = await self._get_parent_data_source_or_raise()
         return data_source.get_select_options_by_property_name(property_name)
 
-    async def get_multi_select_options_by_property_name(self, property_name: str) -> list[str]:
+    async def get_multi_select_options_by_property_name(
+        self, property_name: str
+    ) -> list[str]:
         data_source = await self._get_parent_data_source_or_raise()
         return data_source.get_multi_select_options_by_property_name(property_name)
 
-    async def get_status_options_by_property_name(self, property_name: str) -> list[str]:
+    async def get_status_options_by_property_name(
+        self, property_name: str
+    ) -> list[str]:
         data_source = await self._get_parent_data_source_or_raise()
         return data_source.get_status_options_by_property_name(property_name)
 
-    async def get_relation_options_by_property_name(self, property_name: str) -> list[str]:
+    async def get_relation_options_by_property_name(
+        self, property_name: str
+    ) -> list[str]:
         data_source = await self._get_parent_data_source_or_raise()
         return await data_source.get_relation_options_by_property_name(property_name)
 
@@ -151,7 +177,9 @@ class PagePropertyHandler:
         title_property_name = self._extract_title_property_name()
 
         self._get_typed_property_or_raise(title_property_name, PageTitleProperty)
-        updated_page = await self._property_http_client.patch_title(title_property_name, title)
+        updated_page = await self._property_http_client.patch_title(
+            title_property_name, title
+        )
         self._properties = updated_page.properties
 
     def _extract_title_property_name(self) -> str | None:
@@ -159,64 +187,104 @@ class PagePropertyHandler:
             return None
 
         return next(
-            (key for key, prop in self._properties.items() if isinstance(prop, PageTitleProperty)),
+            (
+                key
+                for key, prop in self._properties.items()
+                if isinstance(prop, PageTitleProperty)
+            ),
             None,
         )
 
     async def set_rich_text_property(self, property_name: str, text: str) -> None:
         self._get_typed_property_or_raise(property_name, PageRichTextProperty)
-        updated_page = await self._property_http_client.patch_rich_text_property(property_name, text)
+        updated_page = await self._property_http_client.patch_rich_text_property(
+            property_name, text
+        )
         self._properties = updated_page.properties
 
     async def set_url_property(self, property_name: str, url: str) -> None:
         self._get_typed_property_or_raise(property_name, PageURLProperty)
-        updated_page = await self._property_http_client.patch_url_property(property_name, url)
+        updated_page = await self._property_http_client.patch_url_property(
+            property_name, url
+        )
         self._properties = updated_page.properties
 
     async def set_email_property(self, property_name: str, email: str) -> None:
         self._get_typed_property_or_raise(property_name, PageEmailProperty)
-        updated_page = await self._property_http_client.patch_email_property(property_name, email)
+        updated_page = await self._property_http_client.patch_email_property(
+            property_name, email
+        )
         self._properties = updated_page.properties
 
-    async def set_phone_number_property(self, property_name: str, phone_number: str) -> None:
+    async def set_phone_number_property(
+        self, property_name: str, phone_number: str
+    ) -> None:
         self._get_typed_property_or_raise(property_name, PagePhoneNumberProperty)
-        updated_page = await self._property_http_client.patch_phone_property(property_name, phone_number)
+        updated_page = await self._property_http_client.patch_phone_property(
+            property_name, phone_number
+        )
         self._properties = updated_page.properties
 
-    async def set_number_property(self, property_name: str, number: int | float) -> None:
+    async def set_number_property(
+        self, property_name: str, number: int | float
+    ) -> None:
         self._get_typed_property_or_raise(property_name, PageNumberProperty)
-        updated_page = await self._property_http_client.patch_number_property(property_name, number)
+        updated_page = await self._property_http_client.patch_number_property(
+            property_name, number
+        )
         self._properties = updated_page.properties
 
     async def set_checkbox_property(self, property_name: str, checked: bool) -> None:
         self._get_typed_property_or_raise(property_name, PageCheckboxProperty)
-        updated_page = await self._property_http_client.patch_checkbox_property(property_name, checked)
+        updated_page = await self._property_http_client.patch_checkbox_property(
+            property_name, checked
+        )
         self._properties = updated_page.properties
 
-    async def set_date_property(self, property_name: str, date_value: str | dict) -> None:
+    async def set_date_property(
+        self, property_name: str, date_value: str | dict
+    ) -> None:
         self._get_typed_property_or_raise(property_name, PageDateProperty)
-        updated_page = await self._property_http_client.patch_date_property(property_name, date_value)
+        updated_page = await self._property_http_client.patch_date_property(
+            property_name, date_value
+        )
         self._properties = updated_page.properties
 
-    async def set_select_property_by_option_name(self, property_name: str, option_name: str) -> None:
+    async def set_select_property_by_option_name(
+        self, property_name: str, option_name: str
+    ) -> None:
         self._get_typed_property_or_raise(property_name, PageSelectProperty)
-        updated_page = await self._property_http_client.patch_select_property(property_name, option_name)
+        updated_page = await self._property_http_client.patch_select_property(
+            property_name, option_name
+        )
         self._properties = updated_page.properties
 
-    async def set_multi_select_property_by_option_names(self, property_name: str, option_names: list[str]) -> None:
+    async def set_multi_select_property_by_option_names(
+        self, property_name: str, option_names: list[str]
+    ) -> None:
         self._get_typed_property_or_raise(property_name, PageMultiSelectProperty)
-        updated_page = await self._property_http_client.patch_multi_select_property(property_name, option_names)
+        updated_page = await self._property_http_client.patch_multi_select_property(
+            property_name, option_names
+        )
         self._properties = updated_page.properties
 
-    async def set_status_property_by_option_name(self, property_name: str, status: str) -> None:
+    async def set_status_property_by_option_name(
+        self, property_name: str, status: str
+    ) -> None:
         self._get_typed_property_or_raise(property_name, PageStatusProperty)
-        updated_page = await self._property_http_client.patch_status_property(property_name, status)
+        updated_page = await self._property_http_client.patch_status_property(
+            property_name, status
+        )
         self._properties = updated_page.properties
 
-    async def set_relation_property_by_page_titles(self, property_name: str, page_titles: list[str]) -> None:
+    async def set_relation_property_by_page_titles(
+        self, property_name: str, page_titles: list[str]
+    ) -> None:
         self._get_typed_property_or_raise(property_name, PageRelationProperty)
         relation_ids = await self._convert_page_titles_to_ids(page_titles)
-        updated_page = await self._property_http_client.patch_relation_property(property_name, relation_ids)
+        updated_page = await self._property_http_client.patch_relation_property(
+            property_name, relation_ids
+        )
         self._properties = updated_page.properties
 
     async def _ensure_data_source_loaded(self) -> None:
@@ -226,7 +294,9 @@ class PagePropertyHandler:
             return
 
         self._parent_data_source = (
-            await NotionDataSource.from_id(self._parent_data_source_id) if self._parent_data_source_id else None
+            await NotionDataSource.from_id(self._parent_data_source_id)
+            if self._parent_data_source_id
+            else None
         )
         self._data_source_loaded = True
 
@@ -237,7 +307,9 @@ class PagePropertyHandler:
             raise AccessPagePropertyWithoutDataSourceError(self._parent_type)
         return self._parent_data_source
 
-    def _get_typed_property_or_raise(self, name: str, property_type: type[PagePropertyT]) -> PagePropertyT:
+    def _get_typed_property_or_raise(
+        self, name: str, property_type: type[PagePropertyT]
+    ) -> PagePropertyT:
         prop = self._properties.get(name)
 
         if prop is None:
@@ -267,6 +339,8 @@ class PagePropertyHandler:
         if not page_titles:
             return []
 
-        pages = await asyncio.gather(*[NotionPage.from_title(title=title) for title in page_titles])
+        pages = await asyncio.gather(
+            *[NotionPage.from_title(title=title) for title in page_titles]
+        )
 
         return [page.id for page in pages if page]

notionary/page/schemas.py

@@ -1,13 +1,13 @@
 from pydantic import BaseModel
 
-from notionary.page.properties.models import DiscriminatedPageProperty
+from notionary.page.properties.schemas import AnyPageProperty
 from notionary.shared.entity.schemas import EntityResponseDto
 
 
 class NotionPageDto(EntityResponseDto):
     archived: bool
-    properties: dict[str, DiscriminatedPageProperty]
+    properties: dict[str, AnyPageProperty]
 
 
 class PgePropertiesUpdateDto(BaseModel):
-    properties: dict[str, DiscriminatedPageProperty]
+    properties: dict[str, AnyPageProperty]

notionary/page/service.py

@@ -2,7 +2,9 @@ from collections.abc import Callable
 from typing import Self
 
 from notionary.blocks.client import NotionBlockHttpClient
-from notionary.blocks.rich_text.rich_text_markdown_converter import convert_rich_text_to_markdown
+from notionary.blocks.rich_text.rich_text_markdown_converter import (
+    convert_rich_text_to_markdown,
+)
 from notionary.comments.models import Comment
 from notionary.comments.service import CommentService
 from notionary.page.content.factory import PageContentServiceFactory
@@ -11,7 +13,7 @@ from notionary.page.content.service import PageContentService
 from notionary.page.page_http_client import NotionPageHttpClient
 from notionary.page.page_metadata_update_client import PageMetadataUpdateClient
 from notionary.page.properties.factory import PagePropertyHandlerFactory
-from notionary.page.properties.models import PageTitleProperty
+from notionary.page.properties.schemas import PageTitleProperty
 from notionary.page.properties.service import PagePropertyHandler
 from notionary.page.schemas import NotionPageDto
 from notionary.shared.entity.service import Entity
@@ -71,7 +73,9 @@ class NotionPage(Entity):
         page_property_handler_factory: PagePropertyHandlerFactory,
     ) -> Self:
         title_task = cls._extract_title_from_dto(dto)
-        page_property_handler = page_property_handler_factory.create_from_page_response(dto)
+        page_property_handler = page_property_handler_factory.create_from_page_response(
+            dto
+        )
 
         title = await title_task
 
@@ -92,7 +96,9 @@ class NotionPage(Entity):
         comment_service = CommentService()
 
         page_content_service_factory = PageContentServiceFactory()
-        page_content_service = page_content_service_factory.create(page_id=dto.id, block_client=block_client)
+        page_content_service = page_content_service_factory.create(
+            page_id=dto.id, block_client=block_client
+        )
 
         metadata_update_client = PageMetadataUpdateClient(page_id=dto.id)
 
@@ -109,7 +115,11 @@ class NotionPage(Entity):
     @staticmethod
     async def _extract_title_from_dto(response: NotionPageDto) -> str:
         title_property = next(
-            (prop for prop in response.properties.values() if isinstance(prop, PageTitleProperty)),
+            (
+                prop
+                for prop in response.properties.values()
+                if isinstance(prop, PageTitleProperty)
+            ),
             None,
         )
         rich_text_title = title_property.title if title_property else []
@@ -135,10 +145,14 @@ class NotionPage(Entity):
         return await self._comment_service.list_all_comments_for_page(page_id=self._id)
 
     async def post_top_level_comment(self, comment: str) -> None:
-        await self._comment_service.create_comment_on_page(page_id=self._id, text=comment)
+        await self._comment_service.create_comment_on_page(
+            page_id=self._id, text=comment
+        )
 
     async def post_reply_to_discussion(self, discussion_id: str, comment: str) -> None:
-        await self._comment_service.reply_to_discussion_by_id(discussion_id=discussion_id, text=comment)
+        await self._comment_service.reply_to_discussion_by_id(
+            discussion_id=discussion_id, text=comment
+        )
 
     async def set_title(self, title: str) -> None:
         await self.properties.set_title_property(title)

notionary/shared/entity/client.py

@@ -1,7 +1,9 @@
 from typing import TypeVar, override
 
 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 EntityResponseDto, NotionEntityUpdateDto
 
 ResponseType = TypeVar("ResponseType", bound=EntityResponseDto)
@@ -22,7 +24,9 @@ class GenericEntityMetadataUpdateClient(NotionHttpClient, EntityMetadataUpdateCl
 
     @override
     async def patch_metadata(self, updated_data: NotionEntityUpdateDto) -> ResponseType:
-        updated_data_dict = updated_data.model_dump(exclude_unset=True, exclude_none=True)
+        updated_data_dict = updated_data.model_dump(
+            exclude_unset=True, exclude_none=True
+        )
         url = f"{self._path_segment}/{self._entity_id}"
 
         response_dict = await self.patch(url, data=updated_data_dict)

notionary/shared/entity/dto_parsers.py

@@ -1,40 +1,7 @@
-from typing import cast
-
-from notionary.blocks.rich_text.rich_text_markdown_converter import RichTextToMarkdownConverter
-from notionary.shared.entity.schemas import Describable, EntityResponseDto, Titled
-from notionary.shared.models.cover import CoverType
-from notionary.shared.models.icon import IconType
-from notionary.shared.models.parent import DatabaseParent, DataSourceParent, ParentType
-
-
-def extract_emoji_icon_from_dto(entity_dto: EntityResponseDto) -> str | None:
-    if not entity_dto.icon or entity_dto.icon.type != IconType.EMOJI:
-        return None
-    return entity_dto.icon.emoji
-
-
-def extract_external_icon_url_from_dto(entity_dto: EntityResponseDto) -> str | None:
-    if not entity_dto.icon or entity_dto.icon.type != IconType.EXTERNAL:
-        return None
-    return entity_dto.icon.external.url if entity_dto.icon.external else None
-
-
-def extract_cover_image_url_from_dto(entity_dto: EntityResponseDto) -> str | None:
-    if not entity_dto.cover or entity_dto.cover.type != CoverType.EXTERNAL:
-        return None
-    return entity_dto.cover.external.url if entity_dto.cover.external else None
-
-
-def extract_database_id(entity_dto: EntityResponseDto) -> str | None:
-    if entity_dto.parent.type == ParentType.DATA_SOURCE_ID:
-        data_source_parent = cast(DataSourceParent, entity_dto.parent)
-        return data_source_parent.database_id if data_source_parent else None
-
-    if entity_dto.parent.type == ParentType.DATABASE_ID:
-        database_parent = cast(DatabaseParent, entity_dto.parent)
-        return database_parent.database_id if database_parent else None
-
-    return None
+from notionary.blocks.rich_text.rich_text_markdown_converter import (
+    RichTextToMarkdownConverter,
+)
+from notionary.shared.entity.schemas import Describable, Titled
 
 
 async def extract_title(

notionary/shared/entity/entity_metadata_update_client.py

@@ -1,13 +1,15 @@
 from abc import ABC, abstractmethod
 
 from notionary.shared.entity.schemas import EntityResponseDto, NotionEntityUpdateDto
-from notionary.shared.models.cover import NotionCover
-from notionary.shared.models.icon import EmojiIcon, ExternalIcon
+from notionary.shared.models.file import ExternalFile, FileUploadFile
+from notionary.shared.models.icon import EmojiIcon, Icon
 
 
 class EntityMetadataUpdateClient(ABC):
     @abstractmethod
-    async def patch_metadata(self, updated_data: NotionEntityUpdateDto) -> EntityResponseDto: ...
+    async def patch_metadata(
+        self, updated_data: NotionEntityUpdateDto
+    ) -> EntityResponseDto: ...
 
     async def patch_emoji_icon(self, emoji: str) -> EntityResponseDto:
         icon = EmojiIcon(emoji=emoji)
@@ -15,7 +17,16 @@ class EntityMetadataUpdateClient(ABC):
         return await self.patch_metadata(update_dto)
 
     async def patch_external_icon(self, icon_url: str) -> EntityResponseDto:
-        icon = ExternalIcon.from_url(icon_url)
+        icon = ExternalFile.from_url(icon_url)
+        return await self._patch_icon(icon)
+
+    async def patch_icon_from_file_upload(
+        self, file_upload_id: str
+    ) -> EntityResponseDto:
+        icon = FileUploadFile.from_id(id=file_upload_id)
+        return await self._patch_icon(icon)
+
+    async def _patch_icon(self, icon: Icon) -> EntityResponseDto:
         update_dto = NotionEntityUpdateDto(icon=icon)
         return await self.patch_metadata(update_dto)
 
@@ -24,7 +35,16 @@ class EntityMetadataUpdateClient(ABC):
         return await self.patch_metadata(update_dto)
 
     async def patch_external_cover(self, cover_url: str) -> EntityResponseDto:
-        cover = NotionCover.from_url(cover_url)
+        cover = ExternalFile.from_url(cover_url)
+        return await self._patch_cover(cover)
+
+    async def patch_cover_from_file_upload(
+        self, file_upload_id: str
+    ) -> EntityResponseDto:
+        cover = FileUploadFile.from_id(id=file_upload_id)
+        return await self._patch_cover(cover)
+
+    async def _patch_cover(self, cover: Icon) -> EntityResponseDto:
         update_dto = NotionEntityUpdateDto(cover=cover)
         return await self.patch_metadata(update_dto)
 

notionary/shared/entity/schemas.py

@@ -4,26 +4,26 @@ from typing import Protocol
 from pydantic import BaseModel
 
 from notionary.blocks.rich_text.models import RichText
-from notionary.shared.models.cover import NotionCover
+from notionary.shared.models.file import File
 from notionary.shared.models.icon import Icon
 from notionary.shared.models.parent import Parent
 from notionary.user.schemas import PartialUserDto
 
 
-class EntityWorkspaceQueryObjectType(StrEnum):
+class _EntityType(StrEnum):
     PAGE = "page"
     DATA_SOURCE = "data_source"
     DATABASE = "database"
 
 
 class EntityResponseDto(BaseModel):
-    object: EntityWorkspaceQueryObjectType
+    object: _EntityType
     id: str
     created_time: str
     created_by: PartialUserDto
     last_edited_time: str
     last_edited_by: PartialUserDto
-    cover: NotionCover | None = None
+    cover: File | None = None
     icon: Icon | None = None
     parent: Parent
     in_trash: bool
@@ -32,8 +32,8 @@ class EntityResponseDto(BaseModel):
 
 
 class NotionEntityUpdateDto(BaseModel):
-    icon: Icon | None = None
-    cover: NotionCover | None = None
+    icon: File | None = None
+    cover: File | None = None
     in_trash: bool | None = None