notionary 0.3.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

notionary/page/content/syntax/__init__.py

@@ -1,4 +1,5 @@
 from .grammar import MarkdownGrammar
+from .models import SyntaxDefinition
 from .registry import SyntaxRegistry
 
-__all__ = ["MarkdownGrammar", "SyntaxRegistry"]
+__all__ = ["MarkdownGrammar", "SyntaxDefinition", "SyntaxRegistry"]

notionary/page/content/syntax/registry.py

@@ -4,6 +4,8 @@ from notionary.page.content.syntax.grammar import MarkdownGrammar
 from notionary.page.content.syntax.models import SyntaxDefinition, SyntaxRegistryKey
 
 
+# TODO: Add support for file upload in blocks for file types (refactor file types aswell)
+# differentiate between external and uploaded files (file like blocks)
 class SyntaxRegistry:
     def __init__(self, markdown_markdown_grammar: MarkdownGrammar | None = None) -> None:
         self._markdown_grammar = markdown_markdown_grammar or MarkdownGrammar()
@@ -92,63 +94,79 @@ class SyntaxRegistry:
     def get_heading_syntax(self) -> SyntaxDefinition:
         return self._definitions[SyntaxRegistryKey.HEADING]
 
+    def _create_media_syntax(self, media_type: str, url_pattern: str | None = None) -> SyntaxDefinition:
+        url_pattern = url_pattern or "[^)]+"
+        return SyntaxDefinition(
+            start_delimiter=f"[{media_type}](",
+            end_delimiter=")",
+            regex_pattern=re.compile(rf"(?<!\!)\[{re.escape(media_type)}\]\(({url_pattern})\)"),
+        )
+
+    def _create_url_media_syntax(self, media_type: str) -> SyntaxDefinition:
+        return SyntaxDefinition(
+            start_delimiter=f"[{media_type}](",
+            end_delimiter=")",
+            regex_pattern=re.compile(rf"(?<!\!)\[{re.escape(media_type)}\]\((https?://[^\s)]+)\)"),
+        )
+
     def _register_defaults(self) -> None:
         self._register_audio_syntax()
-        self._register_bookmark_syntax()
-        self._register_image_syntax()
         self._register_video_syntax()
+        self._register_image_syntax()
         self._register_file_syntax()
         self._register_pdf_syntax()
+        self._register_bookmark_syntax()
+        self._register_embed_syntax()
 
-        # List blocks
         self._register_bulleted_list_syntax()
         self._register_numbered_list_syntax()
         self._register_todo_syntax()
         self._register_todo_done_syntax()
 
-        # Container blocks
         self._register_toggle_syntax()
         self._register_toggleable_heading_syntax()
         self._register_callout_syntax()
         self._register_quote_syntax()
         self._register_code_syntax()
 
-        # Column layout blocks
         self._register_column_list_syntax()
         self._register_column_syntax()
 
         self._register_heading_1_syntax()
         self._register_heading_2_syntax()
         self._register_heading_3_syntax()
-        self._register_heading_syntax()  # Shared pattern for regular headings
+        self._register_heading_syntax()
 
         self._register_divider_syntax()
         self._register_breadcrumb_syntax()
         self._register_table_of_contents_syntax()
         self._register_equation_syntax()
-        self._register_embed_syntax()
         self._register_table_syntax()
         self._register_table_row_syntax()
 
-        # Post-processing and utility blocks
         self._register_caption_syntax()
         self._register_space_syntax()
 
     def _register_audio_syntax(self) -> None:
-        definition = SyntaxDefinition(
-            start_delimiter="[audio](",
-            end_delimiter=")",
-            regex_pattern=re.compile(r"\[audio\]\(([^)]+)\)"),
-        )
-        self._definitions[SyntaxRegistryKey.AUDIO] = definition
+        self._definitions[SyntaxRegistryKey.AUDIO] = self._create_media_syntax("audio")
+
+    def _register_video_syntax(self) -> None:
+        self._definitions[SyntaxRegistryKey.VIDEO] = self._create_media_syntax("video")
+
+    def _register_image_syntax(self) -> None:
+        self._definitions[SyntaxRegistryKey.IMAGE] = self._create_media_syntax("image")
+
+    def _register_file_syntax(self) -> None:
+        self._definitions[SyntaxRegistryKey.FILE] = self._create_media_syntax("file")
+
+    def _register_pdf_syntax(self) -> None:
+        self._definitions[SyntaxRegistryKey.PDF] = self._create_media_syntax("pdf")
 
     def _register_bookmark_syntax(self) -> None:
-        definition = SyntaxDefinition(
-            start_delimiter="[bookmark](",
-            end_delimiter=")",
-            regex_pattern=re.compile(r"\[bookmark\]\((https?://[^\s\"]+)\)"),
-        )
-        self._definitions[SyntaxRegistryKey.BOOKMARK] = definition
+        self._definitions[SyntaxRegistryKey.BOOKMARK] = self._create_url_media_syntax("bookmark")
+
+    def _register_embed_syntax(self) -> None:
+        self._definitions[SyntaxRegistryKey.EMBED] = self._create_url_media_syntax("embed")
 
     def _register_breadcrumb_syntax(self) -> None:
         definition = SyntaxDefinition(
@@ -217,14 +235,6 @@ class SyntaxRegistry:
         )
         self._definitions[SyntaxRegistryKey.DIVIDER] = definition
 
-    def _register_embed_syntax(self) -> None:
-        definition = SyntaxDefinition(
-            start_delimiter="[embed](",
-            end_delimiter=")",
-            regex_pattern=re.compile(r"\[embed\]\((https?://[^\s)]+)\)"),
-        )
-        self._definitions[SyntaxRegistryKey.EMBED] = definition
-
     def _register_equation_syntax(self) -> None:
         definition = SyntaxDefinition(
             start_delimiter="$$",
@@ -233,14 +243,6 @@ class SyntaxRegistry:
         )
         self._definitions[SyntaxRegistryKey.EQUATION] = definition
 
-    def _register_file_syntax(self) -> None:
-        definition = SyntaxDefinition(
-            start_delimiter="[file](",
-            end_delimiter=")",
-            regex_pattern=re.compile(r"\[file\]\(([^)]+)\)"),
-        )
-        self._definitions[SyntaxRegistryKey.FILE] = definition
-
     def _register_heading_1_syntax(self) -> None:
         definition = SyntaxDefinition(
             start_delimiter="# ",
@@ -265,14 +267,6 @@ class SyntaxRegistry:
         )
         self._definitions[SyntaxRegistryKey.HEADING_3] = definition
 
-    def _register_image_syntax(self) -> None:
-        definition = SyntaxDefinition(
-            start_delimiter="[image](",
-            end_delimiter=")",
-            regex_pattern=re.compile(r"(?<!!)\[image\]\(([^)]+)\)"),
-        )
-        self._definitions[SyntaxRegistryKey.IMAGE] = definition
-
     def _register_numbered_list_syntax(self) -> None:
         definition = SyntaxDefinition(
             start_delimiter="1. ",
@@ -281,14 +275,6 @@ class SyntaxRegistry:
         )
         self._definitions[SyntaxRegistryKey.NUMBERED_LIST] = definition
 
-    def _register_pdf_syntax(self) -> None:
-        definition = SyntaxDefinition(
-            start_delimiter="[pdf](",
-            end_delimiter=")",
-            regex_pattern=re.compile(r"\[pdf\]\(([^)]+)\)"),
-        )
-        self._definitions[SyntaxRegistryKey.PDF] = definition
-
     def _register_quote_syntax(self) -> None:
         definition = SyntaxDefinition(
             start_delimiter="> ",
@@ -360,14 +346,6 @@ class SyntaxRegistry:
         )
         self._definitions[SyntaxRegistryKey.TOGGLEABLE_HEADING] = definition
 
-    def _register_video_syntax(self) -> None:
-        definition = SyntaxDefinition(
-            start_delimiter="[video](",
-            end_delimiter=")",
-            regex_pattern=re.compile(r"\[video\]\(([^)]+)\)"),
-        )
-        self._definitions[SyntaxRegistryKey.VIDEO] = definition
-
     def _register_caption_syntax(self) -> None:
         definition = SyntaxDefinition(
             start_delimiter="[caption]",

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,
@@ -51,8 +51,8 @@ class PagePropertyHttpClient(NotionHttpClient):
 
         return await self.patch_page(update_dto)
 
-    async def patch_title(self, title: str) -> NotionPageDto:
-        return await self._patch_property("title", title, PageTitleProperty)
+    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:
         return await self._patch_property(property_name, text, PageRichTextProperty)

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)

notionary/page/properties/service.py

@@ -10,7 +10,7 @@ from notionary.exceptions.properties import (
     PagePropertyTypeError,
 )
 from notionary.page.properties.client import PagePropertyHttpClient
-from notionary.page.properties.models import (
+from notionary.page.properties.schemas import (
     PageCheckboxProperty,
     PageCreatedTimeProperty,
     PageDateProperty,
@@ -147,11 +147,22 @@ class PagePropertyHandler:
     # Writer Methods
     # =========================================================================
 
-    async def set_title_property(self, property_name: str, title: str) -> None:
-        self._get_typed_property_or_raise(property_name, PageTitleProperty)
-        updated_page = await self._property_http_client.patch_title(property_name, title)
+    async def set_title_property(self, title: str) -> None:
+        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)
         self._properties = updated_page.properties
 
+    def _extract_title_property_name(self) -> str | None:
+        if not self._properties:
+            return None
+
+        return next(
+            (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)

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]