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

notionary/page/page_metadata_update_client.py

@@ -2,7 +2,9 @@ from typing import override
 
 from notionary.http.client import NotionHttpClient
 from notionary.page.schemas import NotionPageDto
-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 PageMetadataUpdateClient(NotionHttpClient, EntityMetadataUpdateClient):
         self._page_id = page_id
 
     @override
-    async def patch_metadata(self, updated_data: NotionEntityUpdateDto) -> NotionPageDto:
-        updated_data_dict = updated_data.model_dump(exclude_unset=True, exclude_none=True)
+    async def patch_metadata(
+        self, updated_data: NotionEntityUpdateDto
+    ) -> NotionPageDto:
+        updated_data_dict = updated_data.model_dump(
+            exclude_unset=True, exclude_none=True
+        )
 
-        response_dict = await self.patch(f"pages/{self._page_id}", data=updated_data_dict)
+        response_dict = await self.patch(
+            f"pages/{self._page_id}", data=updated_data_dict
+        )
         return NotionPageDto.model_validate(response_dict)

notionary/page/properties/client.py

@@ -4,7 +4,7 @@ from pydantic import BaseModel
 
 from notionary.blocks.rich_text.models import RichText
 from notionary.http.client import NotionHttpClient
-from notionary.page.properties.models import (
+from notionary.page.properties.schemas import (
     DateValue,
     PageCheckboxProperty,
     PageDateProperty,
@@ -44,7 +44,9 @@ class PagePropertyHttpClient(NotionHttpClient):
         property_type: type[PagePropertyT],
         current_property: PagePropertyT | None = None,
     ) -> NotionPageDto:
-        updated_property = self._create_updated_property(property_type, current_property, value)
+        updated_property = self._create_updated_property(
+            property_type, current_property, value
+        )
 
         properties = {property_name: updated_property}
         update_dto = PgePropertiesUpdateDto(properties=properties)
@@ -54,40 +56,64 @@ class PagePropertyHttpClient(NotionHttpClient):
     async def patch_title(self, property_name: str, title: str) -> NotionPageDto:
         return await self._patch_property(property_name, title, PageTitleProperty)
 
-    async def patch_rich_text_property(self, property_name: str, text: str) -> NotionPageDto:
+    async def patch_rich_text_property(
+        self, property_name: str, text: str
+    ) -> NotionPageDto:
         return await self._patch_property(property_name, text, PageRichTextProperty)
 
     async def patch_url_property(self, property_name: str, url: str) -> NotionPageDto:
         return await self._patch_property(property_name, url, PageURLProperty)
 
-    async def patch_email_property(self, property_name: str, email: str) -> NotionPageDto:
+    async def patch_email_property(
+        self, property_name: str, email: str
+    ) -> NotionPageDto:
         return await self._patch_property(property_name, email, PageEmailProperty)
 
-    async def patch_phone_property(self, property_name: str, phone: str) -> NotionPageDto:
+    async def patch_phone_property(
+        self, property_name: str, phone: str
+    ) -> NotionPageDto:
         return await self._patch_property(property_name, phone, PagePhoneNumberProperty)
 
-    async def patch_number_property(self, property_name: str, number: int | float) -> NotionPageDto:
+    async def patch_number_property(
+        self, property_name: str, number: int | float
+    ) -> NotionPageDto:
         return await self._patch_property(property_name, number, PageNumberProperty)
 
-    async def patch_checkbox_property(self, property_name: str, checked: bool) -> NotionPageDto:
+    async def patch_checkbox_property(
+        self, property_name: str, checked: bool
+    ) -> NotionPageDto:
         return await self._patch_property(property_name, checked, PageCheckboxProperty)
 
-    async def patch_select_property(self, property_name: str, value: str) -> NotionPageDto:
+    async def patch_select_property(
+        self, property_name: str, value: str
+    ) -> NotionPageDto:
         return await self._patch_property(property_name, value, PageSelectProperty)
 
-    async def patch_multi_select_property(self, property_name: str, values: list[str]) -> NotionPageDto:
-        return await self._patch_property(property_name, values, PageMultiSelectProperty)
+    async def patch_multi_select_property(
+        self, property_name: str, values: list[str]
+    ) -> NotionPageDto:
+        return await self._patch_property(
+            property_name, values, PageMultiSelectProperty
+        )
 
-    async def patch_date_property(self, property_name: str, date_value: str | dict) -> NotionPageDto:
+    async def patch_date_property(
+        self, property_name: str, date_value: str | dict
+    ) -> NotionPageDto:
         return await self._patch_property(property_name, date_value, PageDateProperty)
 
-    async def patch_status_property(self, property_name: str, status: str) -> NotionPageDto:
+    async def patch_status_property(
+        self, property_name: str, status: str
+    ) -> NotionPageDto:
         return await self._patch_property(property_name, status, PageStatusProperty)
 
-    async def patch_relation_property(self, property_name: str, relation_ids: str | list[str]) -> NotionPageDto:
+    async def patch_relation_property(
+        self, property_name: str, relation_ids: str | list[str]
+    ) -> NotionPageDto:
         if isinstance(relation_ids, str):
             relation_ids = [relation_ids]
-        return await self._patch_property(property_name, relation_ids, PageRelationProperty)
+        return await self._patch_property(
+            property_name, relation_ids, PageRelationProperty
+        )
 
     # TODO: Fix this shit here
     def _create_updated_property(
@@ -126,8 +152,12 @@ class PagePropertyHttpClient(NotionHttpClient):
             select_option = SelectOption(name=str(value))
             return PageSelectProperty(id=property_id, select=select_option)
         elif property_type == PageMultiSelectProperty:
-            multi_select_options = [SelectOption(id="", name=str(item)) for item in value]
-            return PageMultiSelectProperty(id=property_id, multi_select=multi_select_options)
+            multi_select_options = [
+                SelectOption(id="", name=str(item)) for item in value
+            ]
+            return PageMultiSelectProperty(
+                id=property_id, multi_select=multi_select_options
+            )
         elif property_type == PageDateProperty:
             if isinstance(value, dict) and "start" in value:
                 date_value = DateValue(**value)

notionary/page/properties/factory.py

@@ -7,12 +7,16 @@ from notionary.shared.models.parent import DataSourceParent, ParentType
 
 
 class PagePropertyHandlerFactory:
-    def create_from_page_response(self, page_response: NotionPageDto) -> PagePropertyHandler:
+    def create_from_page_response(
+        self, page_response: NotionPageDto
+    ) -> PagePropertyHandler:
         return PagePropertyHandler(
             properties=page_response.properties,
             parent_type=page_response.parent.type,
             page_url=page_response.url,
-            page_property_http_client=self._create_http_client(page_id=page_response.id),
+            page_property_http_client=self._create_http_client(
+                page_id=page_response.id
+            ),
             parent_data_source=self._extract_parent_data_source_id(page_response),
         )
 

notionary/page/properties/{models.py → schemas.py}

@@ -1,9 +1,10 @@
 from enum import StrEnum
-from typing import Annotated, Any, Literal, TypeVar
+from typing import Any, Literal, TypeVar
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 from notionary.blocks.rich_text.models import RichText
+from notionary.shared.models.file import File
 from notionary.shared.properties.type import PropertyType
 from notionary.shared.typings import JsonDict
 from notionary.user.schemas import PersonUserResponseDto, UserResponseDto
@@ -38,38 +39,6 @@ class DateValue(BaseModel):
     time_zone: str | None = None
 
 
-# ============================================================================
-# File Models
-# ============================================================================
-
-
-class FileType(StrEnum):
-    EXTERNAL = "external"
-    FILE = "file"
-
-
-class ExternalFile(BaseModel):
-    """External file hosted outside of Notion."""
-
-    url: str
-
-
-class NotionFile(BaseModel):
-    """File uploaded to Notion with expiration."""
-
-    url: str
-    expiry_time: str
-
-
-class FileObject(BaseModel):
-    """File object can be external or uploaded to Notion."""
-
-    name: str
-    type: FileType
-    external: ExternalFile | None = None
-    file: NotionFile | None = None
-
-
 # ============================================================================
 # Formula Models
 # ============================================================================
@@ -142,25 +111,9 @@ class VerificationValue(BaseModel):
 # ============================================================================
 
 
-class PageStatusProperty(PageProperty):
-    type: Literal[PropertyType.STATUS] = PropertyType.STATUS
-    status: StatusOption | None = None
-    options: list[StatusOption] = Field(default_factory=list)
-
-    @property
-    def option_names(self) -> list[str]:
-        return [option.name for option in self.options]
-
-
-class PageRelationProperty(PageProperty):
-    type: Literal[PropertyType.RELATION] = PropertyType.RELATION
-    relation: list[RelationItem] = Field(default_factory=list)
-    has_more: bool = False
-
-
-class PageURLProperty(PageProperty):
-    type: Literal[PropertyType.URL] = PropertyType.URL
-    url: str | None = None
+class PageTitleProperty(PageProperty):
+    type: Literal[PropertyType.TITLE] = PropertyType.TITLE
+    title: list[RichText] = Field(default_factory=list)
 
 
 class PageRichTextProperty(PageProperty):
@@ -168,6 +121,16 @@ class PageRichTextProperty(PageProperty):
     rich_text: list[RichText] = Field(default_factory=list)
 
 
+class PageSelectProperty(PageProperty):
+    type: Literal[PropertyType.SELECT] = PropertyType.SELECT
+    select: SelectOption | None = None
+    options: list[SelectOption] = Field(default_factory=list)
+
+    @property
+    def option_names(self) -> list[str]:
+        return [option.name for option in self.options]
+
+
 class PageMultiSelectProperty(PageProperty):
     type: Literal[PropertyType.MULTI_SELECT] = PropertyType.MULTI_SELECT
     multi_select: list[SelectOption] = Field(default_factory=list)
@@ -178,19 +141,19 @@ class PageMultiSelectProperty(PageProperty):
         return [option.name for option in self.options]
 
 
-class PageSelectProperty(PageProperty):
-    type: Literal[PropertyType.SELECT] = PropertyType.SELECT
-    select: SelectOption | None = None
-    options: list[SelectOption] = Field(default_factory=list)
+class PageStatusProperty(PageProperty):
+    type: Literal[PropertyType.STATUS] = PropertyType.STATUS
+    status: StatusOption | None = None
+    options: list[StatusOption] = Field(default_factory=list)
 
     @property
     def option_names(self) -> list[str]:
         return [option.name for option in self.options]
 
 
-class PagePeopleProperty(PageProperty):
-    type: Literal[PropertyType.PEOPLE] = PropertyType.PEOPLE
-    people: list[PersonUserResponseDto] = Field(default_factory=list)
+class PageNumberProperty(PageProperty):
+    type: Literal[PropertyType.NUMBER] = PropertyType.NUMBER
+    number: float | None = None
 
 
 class PageDateProperty(PageProperty):
@@ -198,21 +161,16 @@ class PageDateProperty(PageProperty):
     date: DateValue | None = None
 
 
-class PageTitleProperty(PageProperty):
-    type: Literal[PropertyType.TITLE] = PropertyType.TITLE
-    title: list[RichText] = Field(default_factory=list)
-
-
-class PageNumberProperty(PageProperty):
-    type: Literal[PropertyType.NUMBER] = PropertyType.NUMBER
-    number: float | None = None
-
-
 class PageCheckboxProperty(PageProperty):
     type: Literal[PropertyType.CHECKBOX] = PropertyType.CHECKBOX
     checkbox: bool = False
 
 
+class PageURLProperty(PageProperty):
+    type: Literal[PropertyType.URL] = PropertyType.URL
+    url: str | None = None
+
+
 class PageEmailProperty(PageProperty):
     type: Literal[PropertyType.EMAIL] = PropertyType.EMAIL
     email: str | None = None
@@ -223,29 +181,34 @@ class PagePhoneNumberProperty(PageProperty):
     phone_number: str | None = None
 
 
-class PageCreatedTimeProperty(PageProperty):
-    type: Literal[PropertyType.CREATED_TIME] = PropertyType.CREATED_TIME
-    created_time: str  # ISO 8601 datetime - read-only
-
-
-class PageLastEditedTimeProperty(PageProperty):
-    type: Literal[PropertyType.LAST_EDITED_TIME] = PropertyType.LAST_EDITED_TIME
-    last_edited_time: str  # ISO 8601 datetime - read-only
+class PagePeopleProperty(PageProperty):
+    type: Literal[PropertyType.PEOPLE] = PropertyType.PEOPLE
+    people: list[PersonUserResponseDto] = Field(default_factory=list)
 
 
 class PageCreatedByProperty(PageProperty):
     type: Literal[PropertyType.CREATED_BY] = PropertyType.CREATED_BY
-    created_by: UserResponseDto  # User object - read-only
+    created_by: UserResponseDto
 
 
 class PageLastEditedByProperty(PageProperty):
     type: Literal[PropertyType.LAST_EDITED_BY] = PropertyType.LAST_EDITED_BY
-    last_edited_by: UserResponseDto  # User object - read-only
+    last_edited_by: UserResponseDto
 
 
-class PageFilesProperty(PageProperty):
-    type: Literal[PropertyType.FILES] = PropertyType.FILES
-    files: list[FileObject] = Field(default_factory=list)
+class PageCreatedTimeProperty(PageProperty):
+    type: Literal[PropertyType.CREATED_TIME] = PropertyType.CREATED_TIME
+    created_time: str
+
+
+class PageLastEditedTimeProperty(PageProperty):
+    type: Literal[PropertyType.LAST_EDITED_TIME] = PropertyType.LAST_EDITED_TIME
+    last_edited_time: str
+
+
+class PageLastVisitedTimeProperty(PageProperty):
+    type: Literal[PropertyType.LAST_VISITED_TIME] = PropertyType.LAST_VISITED_TIME
+    last_visited_time: str | None = None
 
 
 class PageFormulaProperty(PageProperty):
@@ -258,14 +221,15 @@ class PageRollupProperty(PageProperty):
     rollup: RollupValue
 
 
-class PageUniqueIdProperty(PageProperty):
-    type: Literal[PropertyType.UNIQUE_ID] = PropertyType.UNIQUE_ID
-    unique_id: UniqueIdValue
+class PageFilesProperty(PageProperty):
+    type: Literal[PropertyType.FILES] = PropertyType.FILES
+    files: list[File] = Field(default_factory=list)
 
 
-class PageVerificationProperty(PageProperty):
-    type: Literal[PropertyType.VERIFICATION] = PropertyType.VERIFICATION
-    verification: VerificationValue
+class PageRelationProperty(PageProperty):
+    type: Literal[PropertyType.RELATION] = PropertyType.RELATION
+    relation: list[RelationItem] = Field(default_factory=list)
+    has_more: bool = False
 
 
 class PageButtonProperty(PageProperty):
@@ -273,36 +237,58 @@ class PageButtonProperty(PageProperty):
     button: JsonDict = Field(default_factory=dict)
 
 
-# ============================================================================
-# Discriminated Union
-# ============================================================================
+class PageLocationProperty(PageProperty):
+    type: Literal[PropertyType.LOCATION] = PropertyType.LOCATION
+    location: JsonDict | None = None
 
 
-DiscriminatedPageProperty = Annotated[
-    PageStatusProperty
-    | PageRelationProperty
-    | PageURLProperty
+class PagePlaceProperty(PageProperty):
+    type: Literal[PropertyType.PLACE] = PropertyType.PLACE
+    place: JsonDict | None = None
+
+
+class PageVerificationProperty(PageProperty):
+    type: Literal[PropertyType.VERIFICATION] = PropertyType.VERIFICATION
+    verification: VerificationValue
+
+
+class PageUniqueIdProperty(PageProperty):
+    type: Literal[PropertyType.UNIQUE_ID] = PropertyType.UNIQUE_ID
+    unique_id: UniqueIdValue
+
+
+class PageUnknownProperty(PageProperty):
+    model_config = ConfigDict(extra="allow")
+
+
+type AnyPageProperty = (
+    PageTitleProperty
     | PageRichTextProperty
-    | PageMultiSelectProperty
     | PageSelectProperty
-    | PagePeopleProperty
-    | PageDateProperty
-    | PageTitleProperty
+    | PageMultiSelectProperty
+    | PageStatusProperty
     | PageNumberProperty
+    | PageDateProperty
     | PageCheckboxProperty
+    | PageURLProperty
     | PageEmailProperty
     | PagePhoneNumberProperty
-    | PageCreatedTimeProperty
-    | PageLastEditedTimeProperty
+    | PagePeopleProperty
     | PageCreatedByProperty
     | PageLastEditedByProperty
-    | PageFilesProperty
+    | PageCreatedTimeProperty
+    | PageLastEditedTimeProperty
+    | PageLastVisitedTimeProperty
     | PageFormulaProperty
     | PageRollupProperty
-    | PageUniqueIdProperty
+    | PageFilesProperty
+    | PageRelationProperty
+    | PageButtonProperty
+    | PageLocationProperty
+    | PagePlaceProperty
     | PageVerificationProperty
-    | PageButtonProperty,
-    Field(discriminator="type"),
-]
+    | PageUniqueIdProperty
+    | PageUnknownProperty
+)
 
 PagePropertyT = TypeVar("PagePropertyT", bound=PageProperty)