notionary 0.2.21__py3-none-any.whl → 0.2.22__py3-none-any.whl

notionary/blocks/video/video_element.py

@@ -5,34 +5,27 @@ from typing import Optional
 
 from notionary.blocks.base_block_element import BaseBlockElement
 from notionary.blocks.file.file_element_models import ExternalFile, FileBlock, FileType
+from notionary.blocks.mixins.captions import CaptionMixin
+from notionary.blocks.syntax_prompt_builder import BlockElementMarkdownInformation
 from notionary.blocks.models import Block, BlockCreateResult
-from notionary.blocks.paragraph.paragraph_models import (
-    CreateParagraphBlock,
-    ParagraphBlock,
-)
-from notionary.blocks.rich_text.rich_text_models import RichTextObject
-from notionary.blocks.rich_text.text_inline_formatter import TextInlineFormatter
 from notionary.blocks.types import BlockType
 from notionary.blocks.video.video_element_models import CreateVideoBlock
 
 
-class VideoElement(BaseBlockElement):
+class VideoElement(BaseBlockElement, CaptionMixin):
     """
     Handles conversion between Markdown video embeds and Notion video blocks.
 
     Markdown video syntax:
     - [video](https://example.com/video.mp4) - URL only
-    - [video](https://example.com/video.mp4 "Caption") - URL + caption
+    - [video](https://example.com/video.mp4)(caption:Demo Video) - URL with caption
+    - (caption:Tutorial video)[video](https://youtube.com/watch?v=abc123) - caption before URL
 
     Supports YouTube, Vimeo, and direct file URLs.
     """
 
-    PATTERN = re.compile(
-        r"^\[video\]\("  # prefix
-        r"(https?://[^\s\"]+)"  # URL
-        r"(?:\s+\"([^\"]+)\")?"  # optional caption
-        r"\)$"
-    )
+    # Flexible pattern that can handle caption in any position
+    VIDEO_PATTERN = re.compile(r"\[video\]\((https?://[^\s\"]+)\)")
 
     YOUTUBE_PATTERNS = [
         re.compile(r"(?:https?://)?(?:www\.)?youtube\.com/watch\?v=([\w-]{11})"),
@@ -44,34 +37,33 @@ class VideoElement(BaseBlockElement):
         return block.type == BlockType.VIDEO and block.video
 
     @classmethod
-    def markdown_to_notion(cls, text: str) -> BlockCreateResult:
-        """Convert markdown video syntax to a Notion VideoBlock plus an empty paragraph."""
-        match = cls.PATTERN.match(text.strip())
-        if not match:
+    async def markdown_to_notion(cls, text: str) -> BlockCreateResult:
+        """Convert markdown video syntax to a Notion VideoBlock."""
+        # Use our own regex to find the video URL
+        video_match = cls.VIDEO_PATTERN.search(text.strip())
+        if not video_match:
             return None
 
-        url, caption_text = match.group(1), match.group(2) or ""
+        url = video_match.group(1)
 
         vid_id = cls._get_youtube_id(url)
         if vid_id:
             url = f"https://www.youtube.com/watch?v={vid_id}"
 
+        # Use mixin to extract caption (if present anywhere in text)
+        caption_text = cls.extract_caption(text.strip())
+        caption_rich_text = cls.build_caption_rich_text(caption_text or "")
+
         video_block = FileBlock(
-            type=FileType.EXTERNAL, external=ExternalFile(url=url), caption=[]
+            type=FileType.EXTERNAL,
+            external=ExternalFile(url=url),
+            caption=caption_rich_text,
         )
-        if caption_text.strip():
-            rt = RichTextObject.from_plain_text(caption_text.strip())
-            video_block.caption = [rt]
-
-        empty_para = ParagraphBlock(rich_text=[])
 
-        return [
-            CreateVideoBlock(video=video_block),
-            CreateParagraphBlock(paragraph=empty_para),
-        ]
+        return CreateVideoBlock(video=video_block)
 
     @classmethod
-    def notion_to_markdown(cls, block: Block) -> Optional[str]:
+    async def notion_to_markdown(cls, block: Block) -> Optional[str]:
         if block.type != BlockType.VIDEO or not block.video:
             return None
 
@@ -85,17 +77,14 @@ class VideoElement(BaseBlockElement):
         else:
             return None  # (file_upload o.ä. hier nicht supported)
 
-        # Captions
-        captions = fo.caption or []
-        if not captions:
-            return f"[video]({url})"
+        result = f"[video]({url})"
 
-        caption_text = "".join(
-            (rt.plain_text or TextInlineFormatter.extract_text_with_formatting([rt]))
-            for rt in captions
-        )
+        # Add caption if present
+        caption_markdown = await cls.format_caption_for_markdown(fo.caption or [])
+        if caption_markdown:
+            result += caption_markdown
 
-        return f'[video]({url} "{caption_text}")'
+        return result
 
     @classmethod
     def _get_youtube_id(cls, url: str) -> Optional[str]:
@@ -104,3 +93,19 @@ class VideoElement(BaseBlockElement):
             if m:
                 return m.group(1)
         return None
+
+    @classmethod
+    def get_system_prompt_information(cls) -> Optional[BlockElementMarkdownInformation]:
+        """Get system prompt information for video blocks."""
+        return BlockElementMarkdownInformation(
+            block_type=cls.__name__,
+            description="Video blocks embed videos from external URLs like YouTube, Vimeo, or direct video files",
+            syntax_examples=[
+                "[video](https://youtube.com/watch?v=abc123)",
+                "[video](https://vimeo.com/123456789)",
+                "[video](https://example.com/video.mp4)(caption:Demo Video)",
+                "(caption:Tutorial)[video](https://youtu.be/abc123)",
+                "[video](https://youtube.com/watch?v=xyz)(caption:**Important** tutorial)",
+            ],
+            usage_guidelines="Use for embedding videos from supported platforms or direct video file URLs. Supports YouTube, Vimeo, and direct video files. Caption supports rich text formatting and describes the video content.",
+        )

notionary/blocks/video/video_markdown_node.py

@@ -5,6 +5,7 @@ from typing import Optional
 from pydantic import BaseModel
 
 from notionary.markdown.markdown_node import MarkdownNode
+from notionary.blocks.mixins.captions import CaptionMarkdownNodeMixin
 
 
 class VideoMarkdownBlockParams(BaseModel):
@@ -12,10 +13,9 @@ class VideoMarkdownBlockParams(BaseModel):
     caption: Optional[str] = None
 
 
-class VideoMarkdownNode(MarkdownNode):
+class VideoMarkdownNode(MarkdownNode, CaptionMarkdownNodeMixin):
     """
     Programmatic interface for creating Notion-style video blocks.
-    Example: [video](https://example.com/video.mp4 "Optional caption")
     """
 
     def __init__(self, url: str, caption: Optional[str] = None):
@@ -27,6 +27,11 @@ class VideoMarkdownNode(MarkdownNode):
         return cls(url=params.url, caption=params.caption)
 
     def to_markdown(self) -> str:
-        if self.caption:
-            return f'[video]({self.url} "{self.caption}")'
-        return f"[video]({self.url})"
+        """Return the Markdown representation.
+
+        Examples:
+        - [video](https://example.com/movie.mp4)
+        - [video](https://www.youtube.com/watch?v=dQw4w9WgXcQ)(caption:Music Video)
+        """
+        base_markdown = f"[video]({self.url})"
+        return self.append_caption_to_markdown(base_markdown, self.caption)

notionary/database/client.py

@@ -1,5 +1,7 @@
 from typing import Any, Dict, Optional
 
+from urllib3.util import response
+
 from notionary.base_notion_client import BaseNotionClient
 from notionary.database.models import (
     NotionDatabaseResponse,
@@ -18,6 +20,27 @@ class NotionDatabaseClient(BaseNotionClient):
     def __init__(self, token: Optional[str] = None, timeout: int = 30):
         super().__init__(token, timeout)
 
+    async def create_database(
+        self,
+        title: str,
+        parent_page_id: Optional[str],
+        properties: Optional[Dict[str, Any]] = None,
+    ) -> NotionDatabaseResponse:
+        """
+        Creates a new database as child of the specified page.
+        """
+        if properties is None:
+            properties = {"Name": {"title": {}}}
+
+        database_data = {
+            "parent": {"page_id": parent_page_id},
+            "title": [{"type": "text", "text": {"content": title}}],
+            "properties": properties,
+        }
+
+        response = await self.post("databases", database_data)
+        return NotionDatabaseResponse.model_validate(response)
+
     async def get_database(self, database_id: str) -> NotionDatabaseResponse:
         """
         Gets metadata for a Notion database by its ID.

notionary/file_upload/models.py

@@ -1,4 +1,4 @@
-from typing import List, Literal, Optional
+from typing import Literal, Optional
 
 from pydantic import BaseModel
 
@@ -28,7 +28,7 @@ class FileUploadListResponse(BaseModel):
     """
 
     object: Literal["list"]
-    results: List[FileUploadResponse]
+    results: list[FileUploadResponse]
     next_cursor: Optional[str] = None
     has_more: bool
     type: Literal["file_upload"]

notionary/markdown/markdown_builder.py

@@ -51,6 +51,7 @@ from notionary.blocks.toggleable_heading import (
     ToggleableHeadingMarkdownBlockParams,
     ToggleableHeadingMarkdownNode,
 )
+from notionary.blocks.types import BlockType, MarkdownBlockType
 from notionary.blocks.video import VideoMarkdownBlockParams, VideoMarkdownNode
 from notionary.markdown.markdown_document_model import (
     MarkdownBlock,
@@ -67,32 +68,38 @@ class MarkdownBuilder:
     def __init__(self) -> None:
         self.children: list[MarkdownNode] = []
 
-        # Explicit mapping instead of dynamic getattr - type-safe and clear
         self._block_processors: dict[str, Callable[[Any], None]] = {
-            "heading": self._add_heading,
-            "paragraph": self._add_paragraph,
-            "quote": self._add_quote,
-            "bulleted_list": self._add_bulleted_list,
-            "numbered_list": self._add_numbered_list,
-            "todo": self._add_todo,
-            "callout": self._add_callout,
-            "code": self._add_code,
-            "image": self._add_image,
-            "video": self._add_video,
-            "audio": self._add_audio,
-            "file": self._add_file,
-            "pdf": self._add_pdf,
-            "bookmark": self._add_bookmark,
-            "embed": self._add_embed,
-            "table": self._add_table,
-            "divider": self._add_divider,
-            "equation": self._add_equation,
-            "table_of_contents": self._add_table_of_contents,
-            "toggle": self._add_toggle,
-            "toggleable_heading": self._add_toggleable_heading,
-            "columns": self._add_columns,
-            "breadcrumb": self._add_breadcrumb,
-            "space": self._add_space,
+            MarkdownBlockType.HEADING_1: self._add_heading,
+            MarkdownBlockType.HEADING_2: self._add_heading,
+            MarkdownBlockType.HEADING_3: self._add_heading,
+            MarkdownBlockType.PARAGRAPH: self._add_paragraph,
+            MarkdownBlockType.QUOTE: self._add_quote,
+            MarkdownBlockType.BULLETED_LIST_ITEM: self._add_bulleted_list,
+            MarkdownBlockType.NUMBERED_LIST_ITEM: self._add_numbered_list,
+            MarkdownBlockType.TO_DO: self._add_todo,
+            MarkdownBlockType.CALLOUT: self._add_callout,
+            MarkdownBlockType.CODE: self._add_code,
+            MarkdownBlockType.IMAGE: self._add_image,
+            MarkdownBlockType.VIDEO: self._add_video,
+            MarkdownBlockType.AUDIO: self._add_audio,
+            MarkdownBlockType.FILE: self._add_file,
+            MarkdownBlockType.PDF: self._add_pdf,
+            MarkdownBlockType.BOOKMARK: self._add_bookmark,
+            MarkdownBlockType.EMBED: self._add_embed,
+            MarkdownBlockType.TABLE: self._add_table,
+            MarkdownBlockType.DIVIDER: self._add_divider,
+            MarkdownBlockType.EQUATION: self._add_equation,
+            MarkdownBlockType.TABLE_OF_CONTENTS: self._add_table_of_contents,
+            MarkdownBlockType.TOGGLE: self._add_toggle,
+            MarkdownBlockType.COLUMN_LIST: self._add_columns,
+            MarkdownBlockType.BREADCRUMB: self._add_breadcrumb,
+            MarkdownBlockType.HEADING: self._add_heading,
+            MarkdownBlockType.BULLETED_LIST: self._add_bulleted_list,
+            MarkdownBlockType.NUMBERED_LIST: self._add_numbered_list,
+            MarkdownBlockType.TODO: self._add_todo,
+            MarkdownBlockType.TOGGLEABLE_HEADING: self._add_toggleable_heading,
+            MarkdownBlockType.COLUMNS: self._add_columns,
+            MarkdownBlockType.SPACE: self._add_space,
         }
 
     @classmethod
@@ -353,7 +360,7 @@ class MarkdownBuilder:
         return self
 
     def bookmark(
-        self, url: str, title: Optional[str] = None, description: Optional[str] = None
+        self, url: str, title: Optional[str] = None, caption: Optional[str] = None
     ) -> Self:
         """
         Add a bookmark.
@@ -364,7 +371,7 @@ class MarkdownBuilder:
             description: Optional bookmark description text
         """
         self.children.append(
-            BookmarkMarkdownNode(url=url, title=title, description=description)
+            BookmarkMarkdownNode(url=url, title=title, caption=caption)
         )
         return self
 

notionary/page/client.py

@@ -20,20 +20,40 @@ class NotionPageClient(BaseNotionClient):
 
     async def create_page(
         self,
+        *,
         parent_database_id: Optional[str] = None,
-        properties: Optional[dict[str, Any]] = None,
+        parent_page_id: Optional[str] = None,
+        title: str,
     ) -> NotionPageResponse:
         """
-        Creates a new page in a Notion database or as a child page.
+        Creates a new page either in a database or as a child of another page.
+        Exactly one of parent_database_id or parent_page_id must be provided.
+        Only 'title' is supported here (no icon/cover/children).
         """
-        page_data = {
-            "parent": {"database_id": parent_database_id} if parent_database_id else {},
-            "properties": properties or {},
+        # Exakt einen Parent zulassen
+        if (parent_database_id is None) == (parent_page_id is None):
+            raise ValueError("Specify exactly one parent: database OR page")
+
+        # Parent bauen
+        parent = (
+            {"database_id": parent_database_id}
+            if parent_database_id
+            else {"page_id": parent_page_id}
+        )
+
+        properties: dict[str, Any] = {
+            "title": {
+                "title": [
+                    {"type": "text", "text": {"content": title}}
+                ]
+            }
         }
 
-        response = await self.post("pages", page_data)
+        payload = {"parent": parent, "properties": properties}
+        response = await self.post("pages", payload)
         return NotionPageResponse.model_validate(response)
 
+
     async def patch_page(
         self, page_id: str, data: Optional[dict[str, Any]] = None
     ) -> NotionPageResponse:

notionary/page/notion_page.py

@@ -5,12 +5,15 @@ import random
 from typing import TYPE_CHECKING, Any, Callable, Optional, Union
 
 from notionary.blocks.client import NotionBlockClient
+from notionary.blocks.syntax_prompt_builder import SyntaxPromptBuilder
 from notionary.blocks.models import DatabaseParent
 from notionary.blocks.registry.block_registry import BlockRegistry
 from notionary.blocks.registry.block_registry_builder import BlockRegistryBuilder
+from notionary.database.client import NotionDatabaseClient
 from notionary.markdown.markdown_builder import MarkdownBuilder
 from notionary.page.client import NotionPageClient
 from notionary.page.models import NotionPageResponse
+from notionary.page.page_content_deleting_service import PageContentDeletingService
 from notionary.page.page_content_writer import PageContentWriter
 from notionary.page.property_formatter import NotionPropertyFormatter
 from notionary.page.reader.page_content_retriever import PageContentRetriever
@@ -21,7 +24,6 @@ from notionary.util.fuzzy import find_best_match
 if TYPE_CHECKING:
     from notionary import NotionDatabase
 
-
 class NotionPage(LoggingMixin):
     """
     Managing content and metadata of a Notion page.
@@ -55,7 +57,7 @@ class NotionPage(LoggingMixin):
         self._client = NotionPageClient(token=token)
         self._block_client = NotionBlockClient(token=token)
         self._page_data = None
-
+        
         self.block_element_registry = BlockRegistry.create_registry()
 
         self._page_content_writer = PageContentWriter(
@@ -63,6 +65,11 @@ class NotionPage(LoggingMixin):
             block_registry=self.block_element_registry,
         )
 
+        self._page_content_deleting_service = PageContentDeletingService(
+            page_id=self._page_id,
+            block_registry=self.block_element_registry,
+        )
+
         self._page_content_retriever = PageContentRetriever(
             block_registry=self.block_element_registry,
         )
@@ -202,6 +209,10 @@ class NotionPage(LoggingMixin):
         """
         return self.block_element_registry.builder
 
+    def get_prompt_information(self) -> str:
+        markdown_syntax_builder = SyntaxPromptBuilder()
+        return markdown_syntax_builder.build_concise_reference()
+
     async def set_title(self, title: str) -> str:
         """
         Set the title of the page.
@@ -264,7 +275,7 @@ class NotionPage(LoggingMixin):
         Returns:
             bool: True if successful, False otherwise
         """
-        clear_result = await self._page_content_writer.clear_page_content()
+        clear_result = await self._page_content_deleting_service.clear_page_content()
         if not clear_result:
             self.logger.error("Failed to clear page content before replacement")
 
@@ -279,7 +290,7 @@ class NotionPage(LoggingMixin):
         """
         Clear all content from the page.
         """
-        return await self._page_content_writer.clear_page_content()
+        return await self._page_content_deleting_service.clear_page_content()
 
     async def get_text_content(self) -> str:
         """
@@ -309,7 +320,27 @@ class NotionPage(LoggingMixin):
 
             self.logger.error(f"Error updating page emoji: {str(e)}")
             return None
-
+        
+    async def create_child_database(self, title: str) -> NotionDatabase:
+        from notionary import NotionDatabase
+        database_client = NotionDatabaseClient(token=self._client.token)
+        
+        create_database_response =  await database_client.create_database(
+            title=title,
+            parent_page_id=self._page_id,
+        )
+        
+        return await NotionDatabase.from_database_id(id=create_database_response.id, token=self._client.token)
+    
+    async def create_child_page(self, title: str) -> NotionPage:
+        from notionary import NotionPage
+        child_page_response = await self._client.create_page(
+            parent_page_id=self._page_id,
+            title=title,
+        )
+        
+        return await NotionPage.from_page_id(page_id=child_page_response.id, token=self._client.token)
+    
     async def set_external_icon(self, url: str) -> Optional[str]:
         """
         Sets the page icon to an external image.
@@ -605,4 +636,4 @@ class NotionPage(LoggingMixin):
         """Extract parent database ID from page response."""
         parent = page_response.parent
         if isinstance(parent, DatabaseParent):
-            return parent.database_id
+            return parent.database_id

notionary/page/page_content_deleting_service.py

@@ -0,0 +1,117 @@
+from typing import Optional
+
+from notionary.blocks.client import NotionBlockClient
+from notionary.blocks.models import Block
+from notionary.blocks.registry.block_registry import BlockRegistry
+from notionary.page.reader.page_content_retriever import PageContentRetriever
+from notionary.util import LoggingMixin
+
+
+class PageContentDeletingService(LoggingMixin):
+    """Service responsible for deleting page content and blocks."""
+
+    def __init__(self, page_id: str, block_registry: BlockRegistry):
+        self.page_id = page_id
+        self.block_registry = block_registry
+        self._block_client = NotionBlockClient()
+        self._content_retriever = PageContentRetriever(block_registry=block_registry)
+
+    async def clear_page_content(self) -> Optional[str]:
+        """Clear all content of the page and return deleted content as markdown."""
+        try:
+            children_response = await self._block_client.get_block_children(
+                block_id=self.page_id
+            )
+
+            if not children_response or not children_response.results:
+                return None
+
+            # Use PageContentRetriever for sophisticated markdown conversion
+            deleted_content = self._content_retriever._convert_blocks_to_markdown(
+                children_response.results, indent_level=0
+            )
+
+            # Delete blocks
+            success = True
+            for block in children_response.results:
+                block_success = await self._delete_block_with_children(block)
+                if not block_success:
+                    success = False
+
+            if not success:
+                self.logger.warning("Some blocks could not be deleted")
+
+            return deleted_content if deleted_content else None
+
+        except Exception:
+            self.logger.error("Error clearing page content", exc_info=True)
+            return None
+
+    async def _delete_block_with_children(self, block: Block) -> bool:
+        """Delete a block and all its children recursively."""
+        if not block.id:
+            self.logger.error("Block has no valid ID")
+            return False
+
+        self.logger.debug("Deleting block: %s (type: %s)", block.id, block.type)
+
+        try:
+            if block.has_children and not await self._delete_block_children(block):
+                return False
+
+            return await self._delete_single_block(block)
+
+        except Exception as e:
+            self.logger.error("Failed to delete block %s: %s", block.id, str(e))
+            return False
+
+    async def _delete_block_children(self, block: Block) -> bool:
+        """Delete all children of a block."""
+        self.logger.debug("Block %s has children, deleting children first", block.id)
+
+        try:
+            children_blocks = await self._block_client.get_all_block_children(block.id)
+
+            if not children_blocks:
+                self.logger.debug("No children found for block: %s", block.id)
+                return True
+
+            self.logger.debug(
+                "Found %d children to delete for block: %s",
+                len(children_blocks),
+                block.id,
+            )
+
+            # Delete all children recursively
+            for child_block in children_blocks:
+                if not await self._delete_block_with_children(child_block):
+                    self.logger.error(
+                        "Failed to delete child block: %s", child_block.id
+                    )
+                    return False
+
+            self.logger.debug(
+                "Successfully deleted all children of block: %s", block.id
+            )
+            return True
+
+        except Exception as e:
+            self.logger.error(
+                "Failed to delete children of block %s: %s", block.id, str(e)
+            )
+            return False
+
+    async def _delete_single_block(self, block: Block) -> bool:
+        """Delete a single block."""
+        deleted_block: Optional[Block] = await self._block_client.delete_block(block.id)
+
+        if deleted_block is None:
+            self.logger.error("Failed to delete block: %s", block.id)
+            return False
+
+        if deleted_block.archived or deleted_block.in_trash:
+            self.logger.debug("Successfully deleted/archived block: %s", block.id)
+            return True
+        else:
+            self.logger.warning("Block %s was not properly archived/deleted", block.id)
+            return False