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

notionary/page/writer/handler/column_handler.py

@@ -26,14 +26,14 @@ class ColumnHandler(LineHandler):
     def _can_handle(self, context: LineProcessingContext) -> bool:
         return self._is_column_start(context) or self._is_column_end(context)
 
-    def _process(self, context: LineProcessingContext) -> None:
+    async def _process(self, context: LineProcessingContext) -> None:
         if self._is_column_start(context):
-            self._start_column(context)
+            await self._start_column(context)
             self._mark_processed(context)
             return
 
         if self._is_column_end(context):
-            self._finalize_column(context)
+            await self._finalize_column(context)
             self._mark_processed(context)
 
     def _is_column_start(self, context: LineProcessingContext) -> bool:
@@ -52,15 +52,15 @@ class ColumnHandler(LineHandler):
         current_parent = context.parent_stack[-1]
         return issubclass(current_parent.element_type, ColumnElement)
 
-    def _start_column(self, context: LineProcessingContext) -> None:
+    async def _start_column(self, context: LineProcessingContext) -> None:
         """Start a new column."""
         # Create Column block directly - much more efficient!
         column_element = ColumnElement()
-        result = column_element.markdown_to_notion(context.line)
+        result = await column_element.markdown_to_notion(context.line)
         if not result:
             return
 
-        block = result if not isinstance(result, list) else result[0]
+        block = result
 
         # Push to parent stack
         parent_context = ParentBlockContext(
@@ -70,10 +70,10 @@ class ColumnHandler(LineHandler):
         )
         context.parent_stack.append(parent_context)
 
-    def _finalize_column(self, context: LineProcessingContext) -> None:
+    async def _finalize_column(self, context: LineProcessingContext) -> None:
         """Finalize a single column and add it to the column list or result."""
         column_context = context.parent_stack.pop()
-        self._assign_column_children_if_any(column_context, context)
+        await self._assign_column_children_if_any(column_context, context)
 
         if context.parent_stack:
             parent = context.parent_stack[-1]
@@ -87,7 +87,7 @@ class ColumnHandler(LineHandler):
         # Fallback: no parent or parent is not ColumnList
         context.result_blocks.append(column_context.block)
 
-    def _assign_column_children_if_any(
+    async def _assign_column_children_if_any(
         self, column_context: ParentBlockContext, context: LineProcessingContext
     ) -> None:
         """Collect and assign any children blocks inside this column."""
@@ -96,7 +96,7 @@ class ColumnHandler(LineHandler):
         # Process text lines
         if column_context.child_lines:
             children_text = "\n".join(column_context.child_lines)
-            text_blocks = self._convert_children_text(
+            text_blocks = await self._convert_children_text(
                 children_text, context.block_registry
             )
             all_children.extend(text_blocks)
@@ -123,7 +123,7 @@ class ColumnHandler(LineHandler):
         parent.block.column_list.children.append(column_context.block)
         return True
 
-    def _convert_children_text(self, text: str, block_registry) -> list:
+    async def _convert_children_text(self, text: str, block_registry) -> list:
         """Convert children text to blocks."""
         from notionary.page.writer.markdown_to_notion_converter import (
             MarkdownToNotionConverter,
@@ -133,7 +133,7 @@ class ColumnHandler(LineHandler):
             return []
 
         child_converter = MarkdownToNotionConverter(block_registry)
-        return child_converter._process_lines(text)
+        return await child_converter.process_lines(text)
 
     def _mark_processed(self, context: LineProcessingContext) -> None:
         """Mark context as processed and signal to continue."""

notionary/page/writer/handler/column_list_handler.py

@@ -7,9 +7,9 @@ from notionary.page.writer.handler.line_handler import (
     LineHandler,
     LineProcessingContext,
 )
-
 from notionary.page.writer.handler.line_processing_context import ParentBlockContext
 
+
 class ColumnListHandler(LineHandler):
     """Handles column list elements - both start and end.
     Syntax:
@@ -31,15 +31,15 @@ class ColumnListHandler(LineHandler):
     def _can_handle(self, context: LineProcessingContext) -> bool:
         return self._is_column_list_start(context) or self._is_column_list_end(context)
 
-    def _process(self, context: LineProcessingContext) -> None:
+    async def _process(self, context: LineProcessingContext) -> None:
         if self._is_column_list_start(context):
-            self._start_column_list(context)
+            await self._start_column_list(context)
             context.was_processed = True
             context.should_continue = True
             return
 
         if self._is_column_list_end(context):
-            self._finalize_column_list(context)
+            await self._finalize_column_list(context)
             context.was_processed = True
             context.should_continue = True
 
@@ -59,7 +59,7 @@ class ColumnListHandler(LineHandler):
         current_parent = context.parent_stack[-1]
         return issubclass(current_parent.element_type, ColumnListElement)
 
-    def _start_column_list(self, context: LineProcessingContext) -> None:
+    async def _start_column_list(self, context: LineProcessingContext) -> None:
         """Start a new column list."""
         # Create ColumnList block using the element from registry
         column_list_element = None
@@ -72,11 +72,11 @@ class ColumnListHandler(LineHandler):
             return
 
         # Create the block
-        result = column_list_element.markdown_to_notion(context.line)
+        result = await column_list_element.markdown_to_notion(context.line)
         if not result:
             return
 
-        block = result if not isinstance(result, list) else result[0]
+        block = result
 
         # Push to parent stack
         parent_context = ParentBlockContext(
@@ -86,10 +86,10 @@ class ColumnListHandler(LineHandler):
         )
         context.parent_stack.append(parent_context)
 
-    def _finalize_column_list(self, context: LineProcessingContext) -> None:
+    async def _finalize_column_list(self, context: LineProcessingContext) -> None:
         """Finalize a column list and add it to result_blocks."""
         column_list_context = context.parent_stack.pop()
-        self._assign_column_list_children_if_any(column_list_context, context)
+        await self._assign_column_list_children_if_any(column_list_context, context)
 
         # Check if we have a parent context to add this column_list to
         if context.parent_stack:
@@ -101,7 +101,7 @@ class ColumnListHandler(LineHandler):
             # No parent, add to top level
             context.result_blocks.append(column_list_context.block)
 
-    def _assign_column_list_children_if_any(
+    async def _assign_column_list_children_if_any(
         self, column_list_context: ParentBlockContext, context: LineProcessingContext
     ) -> None:
         """Collect and assign any column children blocks inside this column list."""
@@ -110,7 +110,7 @@ class ColumnListHandler(LineHandler):
         # Process text lines
         if column_list_context.child_lines:
             children_text = "\n".join(column_list_context.child_lines)
-            children_blocks = self._convert_children_text(
+            children_blocks = await self._convert_children_text(
                 children_text, context.block_registry
             )
             all_children.extend(children_blocks)
@@ -126,7 +126,7 @@ class ColumnListHandler(LineHandler):
         ]
         column_list_context.block.column_list.children = column_children
 
-    def _convert_children_text(self, text: str, block_registry) -> list:
+    async def _convert_children_text(self, text: str, block_registry) -> list:
         """Convert children text to blocks."""
         from notionary.page.writer.markdown_to_notion_converter import (
             MarkdownToNotionConverter,
@@ -136,4 +136,4 @@ class ColumnListHandler(LineHandler):
             return []
 
         child_converter = MarkdownToNotionConverter(block_registry)
-        return child_converter._process_lines(text)
+        return await child_converter.process_lines(text)

notionary/page/writer/handler/equation_handler.py

@@ -0,0 +1,74 @@
+import re
+
+from notionary.blocks.equation.equation_element import EquationElement
+from notionary.page.writer.handler.line_handler import (
+    LineHandler,
+    LineProcessingContext,
+)
+
+
+class EquationHandler(LineHandler):
+    """Handles equation block specific logic with batching.
+
+    Markdown syntax:
+    $$
+    \sum_{i=1}^n i = \frac{n(n+1)}{2} \\
+    \sum_{i=1}^n i^2 = \frac{n(n+1)(2n+1)}{6} \\
+    \sum_{i=1}^n i^3 = \left(\frac{n(n+1)}{2}\right)^2
+    $$
+    """
+
+    def __init__(self):
+        super().__init__()
+        self._equation_start_pattern = re.compile(r"^\$\$\s*$")
+        self._equation_end_pattern = re.compile(r"^\$\$\s*$")
+
+    def _can_handle(self, context: LineProcessingContext) -> bool:
+        if self._is_inside_parent_context(context):
+            return False
+        return self._is_equation_start(context)
+
+    async def _process(self, context: LineProcessingContext) -> None:
+        if self._is_equation_start(context):
+            await self._process_complete_equation_block(context)
+            self._mark_processed(context)
+
+    def _is_equation_start(self, context: LineProcessingContext) -> bool:
+        """Check if this line starts an equation block."""
+        return self._equation_start_pattern.match(context.line.strip()) is not None
+
+    def _is_inside_parent_context(self, context: LineProcessingContext) -> bool:
+        """Check if we're currently inside any parent context (toggle, heading, etc.)."""
+        return len(context.parent_stack) > 0
+
+    async def _process_complete_equation_block(
+        self, context: LineProcessingContext
+    ) -> None:
+        """Process the entire equation block in one go using EquationElement."""
+        equation_lines, lines_to_consume = self._collect_equation_lines(context)
+
+        block = EquationElement.create_from_markdown_block(
+            opening_line=context.line, equation_lines=equation_lines
+        )
+
+        if block:
+            context.lines_consumed = lines_to_consume
+            context.result_blocks.append(block)
+
+    def _collect_equation_lines(
+        self, context: LineProcessingContext
+    ) -> tuple[list[str], int]:
+        """Collect lines until closing $$ fence and return (lines, count_to_consume)."""
+        lines = []
+        for idx, ln in enumerate(context.get_remaining_lines()):
+            if self._equation_end_pattern.match(ln.strip()):
+                return lines, idx + 1
+            lines.append(ln)
+        # No closing fence: consume all remaining
+        rem = context.get_remaining_lines()
+        return rem, len(rem)
+
+    def _mark_processed(self, context: LineProcessingContext) -> None:
+        """Mark context as processed and continue."""
+        context.was_processed = True
+        context.should_continue = True

notionary/page/writer/handler/line_handler.py

@@ -17,12 +17,12 @@ class LineHandler(ABC):
         self._next_handler = handler
         return handler
 
-    def handle(self, context: LineProcessingContext) -> None:
+    async def handle(self, context: LineProcessingContext) -> None:
         """Handle the line 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: LineProcessingContext) -> bool:
@@ -30,6 +30,6 @@ class LineHandler(ABC):
         pass
 
     @abstractmethod
-    def _process(self, context: LineProcessingContext) -> None:
+    async def _process(self, context: LineProcessingContext) -> None:
         """Process the line and update context."""
         pass

notionary/page/writer/handler/regular_line_handler.py

@@ -1,6 +1,5 @@
 from notionary.blocks.column.column_element import ColumnElement
 from notionary.blocks.column.column_list_element import ColumnListElement
-from notionary.blocks.models import BlockCreateRequest, BlockCreateResult
 from notionary.page.writer.handler import LineHandler, LineProcessingContext
 
 
@@ -10,16 +9,16 @@ class RegularLineHandler(LineHandler):
     def _can_handle(self, context: LineProcessingContext) -> bool:
         return context.line.strip()
 
-    def _process(self, context: LineProcessingContext) -> None:
+    async def _process(self, context: LineProcessingContext) -> None:
         if self._is_in_column_context(context):
             self._add_to_column_context(context)
             context.was_processed = True
             context.should_continue = True
             return
 
-        block_created = self._process_single_line_content(context)
+        block_created = await self._process_single_line_content(context)
         if not block_created:
-            self._process_as_paragraph(context)
+            await self._process_as_paragraph(context)
 
         context.was_processed = True
 
@@ -37,56 +36,51 @@ class RegularLineHandler(LineHandler):
         """Add line as child to the current Column context."""
         context.parent_stack[-1].add_child_line(context.line)
 
-    def _process_single_line_content(self, context: LineProcessingContext) -> bool:
+    async def _process_single_line_content(
+        self, context: LineProcessingContext
+    ) -> bool:
         """Process a regular line for simple elements (lists, etc.)."""
+        specialized_elements = self._get_specialized_elements()
+
         for element in context.block_registry.get_elements():
-            # Skip all elements that have specialized handlers
-            from notionary.blocks.code import CodeElement
-            from notionary.blocks.paragraph import ParagraphElement
-            from notionary.blocks.table import TableElement
-            from notionary.blocks.toggle import ToggleElement
-            from notionary.blocks.toggleable_heading import ToggleableHeadingElement
-
-            specialized_elements = (
-                ColumnListElement,
-                ColumnElement,
-                ToggleElement,
-                ToggleableHeadingElement,
-                TableElement,
-                CodeElement,
-                ParagraphElement,  # Skip paragraph to ensure equations are processed first
-            )
 
             if issubclass(element, specialized_elements):
                 continue
 
-            result = element.markdown_to_notion(context.line)
+            result = await element.markdown_to_notion(context.line)
             if not result:
                 continue
 
-            blocks = self._normalize_to_list(result)
-            for block in blocks:
-                context.result_blocks.append(block)
+            context.result_blocks.append(result)
 
             return True
 
         return False
 
-    def _process_as_paragraph(self, context: LineProcessingContext) -> None:
+    async def _process_as_paragraph(self, context: LineProcessingContext) -> None:
         """Process a line as a paragraph."""
         from notionary.blocks.paragraph.paragraph_element import ParagraphElement
 
         paragraph_element = ParagraphElement()
-        result = paragraph_element.markdown_to_notion(context.line)
+        result = await paragraph_element.markdown_to_notion(context.line)
 
         if result:
-            blocks = self._normalize_to_list(result)
-            for block in blocks:
-                context.result_blocks.append(block)
-
-    @staticmethod
-    def _normalize_to_list(result: BlockCreateResult) -> list[BlockCreateRequest]:
-        """Normalize the result to a list."""
-        if result is None:
-            return []
-        return result if isinstance(result, list) else [result]
+            context.result_blocks.append(result)
+
+    def _get_specialized_elements(self):
+        """Get tuple of elements that have specialized handlers."""
+        from notionary.blocks.code import CodeElement
+        from notionary.blocks.paragraph import ParagraphElement
+        from notionary.blocks.table import TableElement
+        from notionary.blocks.toggle import ToggleElement
+        from notionary.blocks.toggleable_heading import ToggleableHeadingElement
+
+        return (
+            ColumnListElement,
+            ColumnElement,
+            ToggleElement,
+            ToggleableHeadingElement,
+            TableElement,
+            CodeElement,
+            ParagraphElement,
+        )

notionary/page/writer/handler/table_handler.py

@@ -1,9 +1,6 @@
 import re
 
-from notionary.blocks.rich_text.rich_text_models import RichTextObject
-from notionary.blocks.rich_text.text_inline_formatter import TextInlineFormatter
 from notionary.blocks.table.table_element import TableElement
-from notionary.blocks.table.table_models import CreateTableRowBlock, TableRowBlock
 from notionary.page.writer.handler import LineHandler, LineProcessingContext
 
 
@@ -20,11 +17,11 @@ class TableHandler(LineHandler):
             return False
         return self._is_table_start(context)
 
-    def _process(self, context: LineProcessingContext) -> None:
+    async def _process(self, context: LineProcessingContext) -> None:
         if not self._is_table_start(context):
             return
 
-        self._process_complete_table(context)
+        await self._process_complete_table(context)
         context.was_processed = True
         context.should_continue = True
 
@@ -36,16 +33,8 @@ class TableHandler(LineHandler):
         """Check if this line starts a table."""
         return self._table_row_pattern.match(context.line.strip()) is not None
 
-    def _process_complete_table(self, context: LineProcessingContext) -> None:
-        """Process the entire table in one go."""
-        # Create table element
-        table_element = TableElement()
-        result = table_element.markdown_to_notion(context.line)
-        if not result:
-            return
-
-        block = result if not isinstance(result, list) else result[0]
-
+    async def _process_complete_table(self, context: LineProcessingContext) -> None:
+        """Process the entire table in one go using TableElement."""
         # Collect all table lines (including the current one)
         table_lines = [context.line]
         remaining_lines = context.get_remaining_lines()
@@ -68,63 +57,10 @@ class TableHandler(LineHandler):
                 lines_to_consume = i
                 break
         else:
-            # Consumed all remaining lines
             lines_to_consume = len(remaining_lines)
 
-        # Process the table content
-        table_rows, separator_found = self._process_table_lines(table_lines)
-
-        table = block.table
-        table.children = table_rows
-        table.has_column_header = bool(separator_found)
-
-        # Tell the main loop to skip the consumed lines
-        context.lines_consumed = lines_to_consume
-        context.result_blocks.append(block)
-
-    def _process_table_lines(
-        self, table_lines: list[str]
-    ) -> tuple[list[CreateTableRowBlock], bool]:
-        """Process all table lines and return rows and separator status."""
-        table_rows = []
-        separator_found = False
-
-        for line in table_lines:
-            line = line.strip()
-            if not line:
-                continue
-
-            if self._is_separator_line(line):
-                separator_found = True
-                continue
-
-            if self._table_row_pattern.match(line):
-                table_row = self._create_table_row_from_line(line)
-                table_rows.append(table_row)
-
-        return table_rows, separator_found
-
-    def _is_separator_line(self, line: str) -> bool:
-        return self._separator_pattern.match(line) is not None
-
-    def _create_table_row_from_line(self, line: str) -> CreateTableRowBlock:
-        cells = self._parse_table_row(line)
-        rich_text_cells = [self._convert_cell_to_rich_text(cell) for cell in cells]
-        table_row = TableRowBlock(cells=rich_text_cells)
-        return CreateTableRowBlock(table_row=table_row)
-
-    def _convert_cell_to_rich_text(self, cell: str) -> list[RichTextObject]:
-        rich_text = TextInlineFormatter.parse_inline_formatting(cell)
-        if not rich_text:
-            rich_text = [RichTextObject.from_plain_text(cell)]
-        return rich_text
-
-    def _parse_table_row(self, row_text: str) -> list[str]:
-        row_content = row_text.strip()
-
-        if row_content.startswith("|"):
-            row_content = row_content[1:]
-        if row_content.endswith("|"):
-            row_content = row_content[:-1]
+        block = await TableElement.create_from_markdown_table(table_lines)
 
-        return [cell.strip() for cell in row_content.split("|")]
+        if block:
+            context.lines_consumed = lines_to_consume
+            context.result_blocks.append(block)

notionary/page/writer/handler/toggle_handler.py

@@ -25,15 +25,15 @@ class ToggleHandler(LineHandler):
             or self._is_toggle_content(context)
         )
 
-    def _process(self, context: LineProcessingContext) -> None:
+    async def _process(self, context: LineProcessingContext) -> None:
         # Explicit, readable branches (small duplication is acceptable)
         if self._is_toggle_start(context):
-            self._start_toggle(context)
+            await self._start_toggle(context)
             context.was_processed = True
             context.should_continue = True
 
         if self._is_toggle_end(context):
-            self._finalize_toggle(context)
+            await self._finalize_toggle(context)
             context.was_processed = True
             context.should_continue = True
 
@@ -69,16 +69,16 @@ class ToggleHandler(LineHandler):
         current_parent = context.parent_stack[-1]
         return issubclass(current_parent.element_type, ToggleElement)
 
-    def _start_toggle(self, context: LineProcessingContext) -> None:
+    async def _start_toggle(self, context: LineProcessingContext) -> None:
         """Start a new toggle block."""
         toggle_element = ToggleElement()
 
         # Create the block
-        result = toggle_element.markdown_to_notion(context.line)
+        result = await toggle_element.markdown_to_notion(context.line)
         if not result:
             return
 
-        block = result if not isinstance(result, list) else result[0]
+        block = result
 
         # Push to parent stack
         parent_context = ParentBlockContext(
@@ -88,12 +88,12 @@ class ToggleHandler(LineHandler):
         )
         context.parent_stack.append(parent_context)
 
-    def _finalize_toggle(self, context: LineProcessingContext) -> None:
+    async def _finalize_toggle(self, context: LineProcessingContext) -> None:
         """Finalize a toggle block and add it to result_blocks."""
         toggle_context = context.parent_stack.pop()
 
         if toggle_context.has_children():
-            all_children = self._get_all_children(
+            all_children = await self._get_all_children(
                 toggle_context, context.block_registry
             )
             toggle_context.block.toggle.children = all_children
@@ -124,7 +124,7 @@ class ToggleHandler(LineHandler):
         """Add content to the current toggle context."""
         context.parent_stack[-1].add_child_line(context.line)
 
-    def _convert_children_text(self, text: str, block_registry) -> list:
+    async def _convert_children_text(self, text: str, block_registry) -> list:
         """Convert children text to blocks."""
         from notionary.page.writer.markdown_to_notion_converter import (
             MarkdownToNotionConverter,
@@ -134,16 +134,18 @@ class ToggleHandler(LineHandler):
             return []
 
         child_converter = MarkdownToNotionConverter(block_registry)
-        return child_converter._process_lines(text)
+        return await child_converter.process_lines(text)
 
-    def _get_all_children(self, parent_context, block_registry) -> list:
+    async def _get_all_children(self, parent_context, block_registry) -> list:
         """Helper method to combine text-based and direct block children."""
         children_blocks = []
 
         # Process text lines
         if parent_context.child_lines:
             children_text = "\n".join(parent_context.child_lines)
-            text_blocks = self._convert_children_text(children_text, block_registry)
+            text_blocks = await self._convert_children_text(
+                children_text, block_registry
+            )
             children_blocks.extend(text_blocks)
 
         # Add direct blocks (like processed columns)