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

notionary/page/client.py

@@ -20,18 +20,33 @@ 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(

notionary/page/notion_page.py

@@ -5,12 +5,16 @@ import random
 from typing import TYPE_CHECKING, Any, Callable, Optional, Union
 
 from notionary.blocks.client import NotionBlockClient
+from notionary.comments import CommentClient, Comment
+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
@@ -54,6 +58,7 @@ class NotionPage(LoggingMixin):
 
         self._client = NotionPageClient(token=token)
         self._block_client = NotionBlockClient(token=token)
+        self._comment_client = CommentClient(token=token)
         self._page_data = None
 
         self.block_element_registry = BlockRegistry.create_registry()
@@ -63,6 +68,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 +212,45 @@ 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 get_comments(self) -> list[Comment]:
+        return await self._comment_client.list_all_comments_for_page(page_id=self._page_id)
+    
+    async def post_comment(
+        self,
+        content: str,
+        *,
+        discussion_id: Optional[str] = None,
+        rich_text: Optional[list[dict[str, Any]]] = None,
+    ) -> Optional[Comment]:
+        """
+        Post a comment on this page.
+
+        Args:
+            content: The plain text content of the comment
+            discussion_id: Optional discussion ID to reply to an existing discussion
+            rich_text: Optional rich text formatting for the comment content
+
+        Returns:
+            Comment: The created comment object, or None if creation failed
+        """
+        try:
+            # Use the comment client to create the comment
+            comment = await self._comment_client.create_comment(
+                page_id=self._page_id,
+                content=content,
+                discussion_id=discussion_id,
+                rich_text=rich_text,
+            )
+            self.logger.info(f"Successfully posted comment on page '{self._title}'")
+            return comment
+        except Exception as e:
+            self.logger.error(f"Failed to post comment on page '{self._title}': {str(e)}")
+            return None
+
     async def set_title(self, title: str) -> str:
         """
         Set the title of the page.
@@ -264,7 +313,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 +328,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:
         """
@@ -310,6 +359,32 @@ 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.

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

notionary/page/page_content_writer.py

@@ -2,12 +2,9 @@ from typing import Callable, Optional, Union
 
 from notionary.blocks.client import NotionBlockClient
 from notionary.blocks.divider import DividerElement
-from notionary.blocks.models import Block
 from notionary.blocks.registry.block_registry import BlockRegistry
 from notionary.blocks.table_of_contents import TableOfContentsElement
 from notionary.markdown.markdown_builder import MarkdownBuilder
-from notionary.page.markdown_whitespace_processor import MarkdownWhitespaceProcessor
-from notionary.page.reader.page_content_retriever import PageContentRetriever
 from notionary.page.writer.markdown_to_notion_converter import MarkdownToNotionConverter
 from notionary.util import LoggingMixin
 
@@ -22,8 +19,6 @@ class PageContentWriter(LoggingMixin):
             block_registry=block_registry
         )
 
-        self._content_retriever = PageContentRetriever(block_registry=block_registry)
-
     async def append_markdown(
         self,
         content: Union[str, Callable[[MarkdownBuilder], MarkdownBuilder]],
@@ -33,14 +28,6 @@ class PageContentWriter(LoggingMixin):
     ) -> Optional[str]:
         """
         Append markdown content to a Notion page using either text or builder callback.
-
-        Args:
-            content: Either raw markdown text OR a callback function that receives a MarkdownBuilder
-            append_divider: Whether to append a divider
-            prepend_table_of_contents: Whether to prepend table of contents
-
-        Returns:
-            str: The processed markdown content that was appended (None if failed)
         """
 
         if isinstance(content, str):
@@ -66,7 +53,9 @@ class PageContentWriter(LoggingMixin):
         processed_markdown = self._process_markdown_whitespace(final_markdown)
 
         try:
-            blocks = self._markdown_to_notion_converter.convert(processed_markdown)
+            blocks = await self._markdown_to_notion_converter.convert(
+                processed_markdown
+            )
 
             result = await self._block_client.append_block_children(
                 block_id=self.page_id, children=blocks
@@ -83,114 +72,101 @@ class PageContentWriter(LoggingMixin):
             self.logger.error("Error appending markdown: %s", str(e), exc_info=True)
             return None
 
-    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)
+    def _process_markdown_whitespace(self, markdown_text: str) -> str:
+        """Process markdown text to normalize whitespace while preserving code blocks."""
+        lines = markdown_text.split("\n")
+        if not lines:
+            return ""
 
-        try:
-            children_blocks = await self._block_client.get_all_block_children(block.id)
+        return self._process_whitespace_lines(lines)
 
-            if not children_blocks:
-                self.logger.debug("No children found for block: %s", block.id)
-                return True
+    def _process_whitespace_lines(self, lines: list[str]) -> str:
+        """Process all lines and return the processed markdown."""
+        processed_lines = []
+        in_code_block = False
+        current_code_block = []
 
-            self.logger.debug(
-                "Found %d children to delete for block: %s",
-                len(children_blocks),
-                block.id,
+        for line in lines:
+            processed_lines, in_code_block, current_code_block = (
+                self._process_single_line(
+                    line, processed_lines, in_code_block, current_code_block
+                )
             )
 
-            # 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
+        return "\n".join(processed_lines)
 
-        except Exception as e:
-            self.logger.error(
-                "Failed to delete children of block %s: %s", block.id, str(e)
+    def _process_single_line(
+        self,
+        line: str,
+        processed_lines: list[str],
+        in_code_block: bool,
+        current_code_block: list[str],
+    ) -> tuple[list[str], bool, list[str]]:
+        """Process a single line and return updated state."""
+        if self._is_code_block_marker(line):
+            return self._handle_code_block_marker(
+                line, processed_lines, in_code_block, current_code_block
             )
-            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
+        if in_code_block:
+            current_code_block.append(line)
+            return processed_lines, in_code_block, current_code_block
         else:
-            self.logger.warning("Block %s was not properly archived/deleted", block.id)
-            return False
+            processed_lines.append(line.lstrip())
+            return processed_lines, in_code_block, current_code_block
 
-    def _process_markdown_whitespace(self, markdown_text: str) -> str:
-        """Process markdown text to normalize whitespace while preserving code blocks."""
-        lines = markdown_text.split("\n")
-        if not lines:
-            return ""
-
-        processor = MarkdownWhitespaceProcessor()
-        return processor.process_lines(lines)
+    def _handle_code_block_marker(
+        self,
+        line: str,
+        processed_lines: list[str],
+        in_code_block: bool,
+        current_code_block: list[str],
+    ) -> tuple[list[str], bool, list[str]]:
+        """Handle code block start/end markers."""
+        if not in_code_block:
+            return self._start_code_block(line, processed_lines)
+        else:
+            return self._end_code_block(processed_lines, current_code_block)
+
+    def _start_code_block(
+        self, line: str, processed_lines: list[str]
+    ) -> tuple[list[str], bool, list[str]]:
+        """Start a new code block."""
+        processed_lines.append(self._normalize_code_block_start(line))
+        return processed_lines, True, []
+
+    def _end_code_block(
+        self, processed_lines: list[str], current_code_block: list[str]
+    ) -> tuple[list[str], bool, list[str]]:
+        """End the current code block."""
+        processed_lines.extend(self._normalize_code_block_content(current_code_block))
+        processed_lines.append("```")
+        return processed_lines, False, []
+
+    def _is_code_block_marker(self, line: str) -> bool:
+        """Check if line is a code block marker."""
+        return line.lstrip().startswith("```")
+
+    def _normalize_code_block_start(self, line: str) -> str:
+        """Normalize code block opening marker."""
+        language = line.lstrip().replace("```", "", 1).strip()
+        return "```" + language
+
+    def _normalize_code_block_content(self, code_lines: list[str]) -> list[str]:
+        """Normalize code block indentation."""
+        if not code_lines:
+            return []
+
+        # Find minimum indentation from non-empty lines
+        non_empty_lines = [line for line in code_lines if line.strip()]
+        if not non_empty_lines:
+            return [""] * len(code_lines)
+
+        min_indent = min(len(line) - len(line.lstrip()) for line in non_empty_lines)
+        if min_indent == 0:
+            return code_lines
+
+        # Remove common indentation
+        return ["" if not line.strip() else line[min_indent:] for line in code_lines]
 
     def _ensure_table_of_contents_exists_in_registry(self) -> None:
         """Ensure TableOfContents is registered in the block registry."""

notionary/page/page_context.py

@@ -0,0 +1,64 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Optional
+from dataclasses import dataclass
+from contextvars import ContextVar
+
+if TYPE_CHECKING:
+    from notionary.database.client import NotionDatabaseClient
+    from notionary.file_upload import NotionFileUploadClient
+
+
+@dataclass(frozen=True)
+class PageContextProvider:
+    """Context object that provides dependencies for block conversion operations."""
+
+    page_id: str
+    database_client: NotionDatabaseClient
+    file_upload_client: NotionFileUploadClient
+
+
+# Context variable
+_page_context: ContextVar[Optional[PageContextProvider]] = ContextVar(
+    "page_context", default=None
+)
+
+
+def get_page_context() -> PageContextProvider:
+    """Get current page context or raise if not available."""
+    context = _page_context.get()
+    if context is None:
+        raise RuntimeError(
+            "No page context available. Use 'async with page_context(...)'"
+        )
+    return context
+
+
+def get_page_context_optional() -> Optional[PageContextProvider]:
+    """Get current page context or None if not available."""
+    return _page_context.get()
+
+
+class page_context:
+    """Async-only context manager for page operations."""
+
+    def __init__(self, provider: PageContextProvider):
+        self.provider = provider
+        self._token = None
+
+    def _set_context(self) -> PageContextProvider:
+        """Helper to set context and return provider."""
+        self._token = _page_context.set(self.provider)
+        return self.provider
+
+    def _reset_context(self) -> None:
+        """Helper to reset context."""
+        if self._token is not None:
+            _page_context.reset(self._token)
+
+    async def __aenter__(self) -> PageContextProvider:
+        return self._set_context()
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        self._reset_context()
+        return False

notionary/page/reader/handler/__init__.py

@@ -3,6 +3,7 @@ from .block_rendering_context import BlockRenderingContext
 from .column_list_renderer import ColumnListRenderer
 from .column_renderer import ColumnRenderer
 from .line_renderer import LineRenderer
+from .numbered_list_renderer import NumberedListRenderer
 from .toggle_renderer import ToggleRenderer
 from .toggleable_heading_renderer import ToggleableHeadingRenderer
 
@@ -12,6 +13,7 @@ __all__ = [
     "ColumnListRenderer",
     "ColumnRenderer",
     "LineRenderer",
+    "NumberedListRenderer",
     "ToggleRenderer",
     "ToggleableHeadingRenderer",
 ]

notionary/page/reader/handler/base_block_renderer.py

@@ -17,12 +17,12 @@ class BlockHandler(ABC):
         self._next_handler = handler
         return handler
 
-    def handle(self, context: BlockRenderingContext) -> None:
+    async def handle(self, context: BlockRenderingContext) -> None:
         """Handle the block or pass to next handler."""
         if self._can_handle(context):
-            self._process(context)
+            await self._process(context)
         elif self._next_handler:
-            self._next_handler.handle(context)
+            await self._next_handler.handle(context)
 
     @abstractmethod
     def _can_handle(self, context: BlockRenderingContext) -> bool:
@@ -30,7 +30,7 @@ class BlockHandler(ABC):
         pass
 
     @abstractmethod
-    def _process(self, context: BlockRenderingContext) -> None:
+    async def _process(self, context: BlockRenderingContext) -> None:
         """Process the block and update context."""
         pass
 

notionary/page/reader/handler/block_rendering_context.py

@@ -16,6 +16,11 @@ class BlockRenderingContext:
     block_registry: BlockRegistry
     convert_children_callback: Optional[Callable[[list[Block], int], str]] = None
 
+    # For batch processing
+    all_blocks: Optional[list[Block]] = None
+    current_block_index: Optional[int] = None
+    blocks_consumed: int = 0
+
     # Result
     markdown_result: Optional[str] = None
     children_result: Optional[str] = None