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

notionary/blocks/divider/divider_markdown_node.py

@@ -1,25 +1,11 @@
-from __future__ import annotations
-
-from pydantic import BaseModel
-
-from notionary.markdown.markdown_node import MarkdownNode
-
-
-class DividerMarkdownBlockParams(BaseModel):
-    pass
+from notionary.blocks.markdown.markdown_node import MarkdownNode
 
 
 class DividerMarkdownNode(MarkdownNode):
     """
+    Enhanced Divider node with Pydantic integration.
     Programmatic interface for creating Markdown divider lines (---).
     """
 
-    def __init__(self):
-        pass  # Keine Attribute notwendig
-
-    @classmethod
-    def from_params(cls, params: DividerMarkdownBlockParams) -> DividerMarkdownNode:
-        return cls()
-
     def to_markdown(self) -> str:
         return "---"

notionary/blocks/embed/__init__.py

@@ -1,6 +1,5 @@
 from notionary.blocks.embed.embed_element import EmbedElement
 from notionary.blocks.embed.embed_markdown_node import (
-    EmbedMarkdownBlockParams,
     EmbedMarkdownNode,
 )
 from notionary.blocks.embed.embed_models import CreateEmbedBlock, EmbedBlock
@@ -10,5 +9,4 @@ __all__ = [
     "EmbedBlock",
     "CreateEmbedBlock",
     "EmbedMarkdownNode",
-    "EmbedMarkdownBlockParams",
 ]

notionary/blocks/embed/embed_markdown_node.py

@@ -1,30 +1,17 @@
-from __future__ import annotations
-
 from typing import Optional
 
-from pydantic import BaseModel
-
-from notionary.markdown.markdown_node import MarkdownNode
-
-
-class EmbedMarkdownBlockParams(BaseModel):
-    url: str
-    caption: Optional[str] = None
+from notionary.blocks.markdown.markdown_node import MarkdownNode
 
 
 class EmbedMarkdownNode(MarkdownNode):
     """
+    Enhanced Embed node with Pydantic integration.
     Programmatic interface for creating Notion-style Markdown embed blocks.
     Example: [embed](https://example.com "Optional caption")
     """
 
-    def __init__(self, url: str, caption: Optional[str] = None):
-        self.url = url
-        self.caption = caption
-
-    @classmethod
-    def from_params(cls, params: EmbedMarkdownBlockParams) -> EmbedMarkdownNode:
-        return cls(url=params.url, caption=params.caption)
+    url: str
+    caption: Optional[str] = None
 
     def to_markdown(self) -> str:
         if self.caption:

notionary/blocks/equation/__init__.py

@@ -1,6 +1,5 @@
 from notionary.blocks.equation.equation_element import EquationElement
 from notionary.blocks.equation.equation_element_markdown_node import (
-    EquationMarkdownBlockParams,
     EquationMarkdownNode,
 )
 from notionary.blocks.equation.equation_models import CreateEquationBlock, EquationBlock

notionary/blocks/equation/equation_element_markdown_node.py

@@ -1,16 +1,9 @@
-from __future__ import annotations
-
-from pydantic import BaseModel
-
-from notionary.markdown.markdown_node import MarkdownNode
-
-
-class EquationMarkdownBlockParams(BaseModel):
-    expression: str
+from notionary.blocks.markdown.markdown_node import MarkdownNode
 
 
 class EquationMarkdownNode(MarkdownNode):
     """
+    Enhanced Equation node with Pydantic integration.
     Programmatic interface for creating Markdown equation blocks.
     Uses standard Markdown equation syntax with double dollar signs.
 
@@ -20,12 +13,7 @@ class EquationMarkdownNode(MarkdownNode):
     $$\\int_0^\\infty e^{-x} dx = 1$$
     """
 
-    def __init__(self, expression: str):
-        self.expression = expression
-
-    @classmethod
-    def from_params(cls, params: EquationMarkdownBlockParams) -> EquationMarkdownNode:
-        return cls(expression=params.expression)
+    expression: str
 
     def to_markdown(self) -> str:
         expr = self.expression.strip()

notionary/blocks/file/__init__.py

@@ -1,7 +1,6 @@
 from notionary.blocks.file.file_element import FileElement
 from notionary.blocks.file.file_element_markdown_node import (
     FileMarkdownNode,
-    FileMarkdownNodeParams,
 )
 from notionary.blocks.file.file_element_models import (
     CreateFileBlock,
@@ -21,5 +20,4 @@ __all__ = [
     "FileBlock",
     "CreateFileBlock",
     "FileMarkdownNode",
-    "FileMarkdownNodeParams",
 ]

notionary/blocks/file/file_element.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import re
+from pathlib import Path
 from typing import Optional
 
 from notionary.blocks.base_block_element import BaseBlockElement
@@ -9,63 +10,73 @@ from notionary.blocks.file.file_element_models import (
     ExternalFile,
     FileBlock,
     FileType,
+    FileUploadFile,
 )
 from notionary.blocks.mixins.captions import CaptionMixin
+from notionary.blocks.mixins.file_upload.file_upload_mixin import FileUploadMixin
 from notionary.blocks.syntax_prompt_builder import BlockElementMarkdownInformation
 from notionary.blocks.models import Block, BlockCreateResult, BlockType
 
 
-class FileElement(BaseBlockElement, CaptionMixin):
-    """
+class FileElement(BaseBlockElement, CaptionMixin, FileUploadMixin):
+    r"""
     Handles conversion between Markdown file embeds and Notion file blocks.
 
-    Markdown file syntax:
-    - [file](https://example.com/document.pdf) - URL only
-    - [file](https://example.com/document.pdf)(caption:Annual Report) - URL with caption
-    - (caption:Important document)[file](https://example.com/doc.pdf) - caption before URL
+    Supports both external URLs and local file uploads.
 
-    Supports external file URLs with optional captions.
+    Markdown file syntax:
+    - [file](https://example.com/document.pdf) - External URL
+    - [file](./local/document.pdf) - Local file (will be uploaded)
+    - [file](C:\Documents\report.pdf) - Absolute local path (will be uploaded)
+    - [file](https://example.com/document.pdf)(caption:Annual Report) - With caption
+    - (caption:Important document)[file](./doc.pdf) - Caption before URL
     """
 
-    # Simple pattern that matches just the file link, CaptionMixin handles caption separately
-    FILE_PATTERN = re.compile(r"\[file\]\((https?://[^\s\"]+)\)")
-
-    @classmethod
-    def _extract_file_url(cls, text: str) -> Optional[str]:
-        """Extract file URL from text, handling caption patterns."""
-        # First remove any captions to get clean text for URL extraction
-        clean_text = cls.remove_caption(text)
-
-        # Now extract the URL from clean text
-        match = cls.FILE_PATTERN.search(clean_text)
-        if match:
-            return match.group(1)
-
-        return None
+    FILE_PATTERN = re.compile(r"\[file\]\(([^)]+)\)")
 
     @classmethod
     def match_notion(cls, block: Block) -> bool:
-        # Notion file block covers files
-        return block.type == BlockType.FILE and block.file
+        return bool(block.type == BlockType.FILE and block.file)
 
     @classmethod
-    async def markdown_to_notion(cls, text: str) -> BlockCreateResult:
+    async def markdown_to_notion(cls, text: str) -> Optional[BlockCreateResult]:
         """Convert markdown file link to Notion FileBlock."""
-        # Use our helper method to extract the URL
-        url = cls._extract_file_url(text.strip())
-        if not url:
+        file_path = cls._extract_file_path(text.strip())
+        if not file_path:
             return None
 
-        # Use mixin to extract caption (if present anywhere in text)
+        cls.logger.info(f"Processing file: {file_path}")
+
+        # Extract caption
         caption_text = cls.extract_caption(text.strip())
         caption_rich_text = cls.build_caption_rich_text(caption_text or "")
 
-        # Build FileBlock using FileType enum
-        file_block = FileBlock(
-            type=FileType.EXTERNAL,
-            external=ExternalFile(url=url),
-            caption=caption_rich_text,
-        )
+        # Determine if it's a local file or external URL
+        if cls._is_local_file_path(file_path):
+            cls.logger.debug(f"Detected local file: {file_path}")
+
+            # Upload the local file using mixin method
+            file_upload_id = await cls._upload_local_file(file_path, "file")
+            if not file_upload_id:
+                cls.logger.error(f"Failed to upload file: {file_path}")
+                return None
+
+            # Create FILE_UPLOAD block
+            file_block = FileBlock(
+                type=FileType.FILE_UPLOAD,
+                file_upload=FileUploadFile(id=file_upload_id),
+                caption=caption_rich_text,
+                name=Path(file_path).name,
+            )
+
+        else:
+            cls.logger.debug(f"Using external URL: {file_path}")
+
+            file_block = FileBlock(
+                type=FileType.EXTERNAL,
+                external=ExternalFile(url=file_path),
+                caption=caption_rich_text,
+            )
 
         return CreateFileBlock(file=file_block)
 
@@ -76,18 +87,15 @@ class FileElement(BaseBlockElement, CaptionMixin):
 
         fb: FileBlock = block.file
 
-        # Determine URL (only external and file types are valid for Markdown)
+        # Determine the source for markdown
         if fb.type == FileType.EXTERNAL and fb.external:
-            url = fb.external.url
+            source = fb.external.url
         elif fb.type == FileType.FILE and fb.file:
-            url = fb.file.url
-        elif fb.type == FileType.FILE_UPLOAD:
-            # Uploaded file has no stable URL for Markdown
-            return None
+            source = fb.file.url
         else:
             return None
 
-        result = f"[file]({url})"
+        result = f"[file]({source})"
 
         # Add caption if present
         caption_markdown = await cls.format_caption_for_markdown(fb.caption or [])
@@ -101,12 +109,25 @@ class FileElement(BaseBlockElement, CaptionMixin):
         """Get system prompt information for file blocks."""
         return BlockElementMarkdownInformation(
             block_type=cls.__name__,
-            description="File blocks embed downloadable files from external URLs with optional captions",
+            description="File blocks embed files from external URLs or upload local files with optional captions",
             syntax_examples=[
                 "[file](https://example.com/document.pdf)",
+                "[file](./local/document.pdf)",
+                "[file](C:\\Documents\\report.xlsx)",
                 "[file](https://example.com/document.pdf)(caption:Annual Report)",
-                "(caption:Q1 Data)[file](https://example.com/spreadsheet.xlsx)",
-                "[file](https://example.com/manual.docx)(caption:**User** manual)",
+                "(caption:Q1 Data)[file](./spreadsheet.xlsx)",
+                "[file](./manual.docx)(caption:**User** manual)",
             ],
-            usage_guidelines="Use for linking to downloadable files like PDFs, documents, spreadsheets. Supports various file formats. Caption supports rich text formatting and should describe the file content or purpose.",
+            usage_guidelines="Use for both external URLs and local files. Local files will be automatically uploaded to Notion. Supports various file formats including PDFs, documents, spreadsheets, images. Caption supports rich text formatting and should describe the file content or purpose.",
         )
+
+    @classmethod
+    def _extract_file_path(cls, text: str) -> Optional[str]:
+        """Extract file path/URL from text, handling caption patterns."""
+        clean_text = cls.remove_caption(text)
+
+        match = cls.FILE_PATTERN.search(clean_text)
+        if match:
+            return match.group(1).strip()
+
+        return None

notionary/blocks/file/file_element_markdown_node.py

@@ -1,30 +1,17 @@
-from __future__ import annotations
-
 from typing import Optional
 
-from pydantic import BaseModel
-
-from notionary.markdown.markdown_node import MarkdownNode
+from notionary.blocks.markdown.markdown_node import MarkdownNode
 from notionary.blocks.mixins.captions import CaptionMarkdownNodeMixin
 
 
-class FileMarkdownNodeParams(BaseModel):
-    url: str
-    caption: Optional[str] = None
-
-
 class FileMarkdownNode(MarkdownNode, CaptionMarkdownNodeMixin):
     """
+    Enhanced File node with Pydantic integration.
     Programmatic interface for creating Notion-style Markdown file embeds.
     """
 
-    def __init__(self, url: str, caption: Optional[str] = None):
-        self.url = url
-        self.caption = caption or ""
-
-    @classmethod
-    def from_params(cls, params: FileMarkdownNodeParams) -> FileMarkdownNode:
-        return cls(url=params.url, caption=params.caption)
+    url: str
+    caption: Optional[str] = None
 
     def to_markdown(self) -> str:
         """Return the Markdown representation.

notionary/blocks/heading/__init__.py

@@ -1,6 +1,5 @@
 from notionary.blocks.heading.heading_element import HeadingElement
 from notionary.blocks.heading.heading_markdown_node import (
-    HeadingMarkdownBlockParams,
     HeadingMarkdownNode,
 )
 from notionary.blocks.heading.heading_models import (
@@ -17,5 +16,4 @@ __all__ = [
     "CreateHeading2Block",
     "CreateHeading3Block",
     "HeadingMarkdownNode",
-    "HeadingMarkdownBlockParams",
 ]

notionary/blocks/heading/heading_markdown_node.py

@@ -1,30 +1,16 @@
-from __future__ import annotations
-
-from pydantic import BaseModel
-
-from notionary.markdown.markdown_node import MarkdownNode
-
-
-class HeadingMarkdownBlockParams(BaseModel):
-    text: str
-    level: int = 1
+from pydantic import Field
+from notionary.blocks.markdown.markdown_node import MarkdownNode
 
 
 class HeadingMarkdownNode(MarkdownNode):
     """
+    Enhanced Heading node with Pydantic integration.
     Programmatic interface for creating Markdown headings (H1-H3).
     Example: # Heading 1, ## Heading 2, ### Heading 3
     """
 
-    def __init__(self, text: str, level: int = 1):
-        if not (1 <= level <= 3):
-            raise ValueError("Only heading levels 1-3 are supported (H1, H2, H3)")
-        self.text = text
-        self.level = level
-
-    @classmethod
-    def from_params(cls, params: HeadingMarkdownBlockParams) -> HeadingMarkdownNode:
-        return cls(text=params.text, level=params.level)
+    text: str
+    level: int = Field(default=1, ge=1, le=3)
 
     def to_markdown(self) -> str:
         return f"{'#' * self.level} {self.text}"

notionary/blocks/heading/heading_models.py

@@ -1,6 +1,6 @@
-from typing import Literal
+from typing import Literal, Optional
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
 
 from notionary.blocks.models import Block
 from notionary.blocks.rich_text.rich_text_models import RichTextObject
@@ -11,7 +11,7 @@ class HeadingBlock(BaseModel):
     rich_text: list[RichTextObject]
     color: BlockColor = BlockColor.DEFAULT
     is_toggleable: bool = False
-    children: list[Block] = Field(default_factory=list)
+    children: Optional[list[Block]] = None
 
 
 class CreateHeading1Block(BaseModel):

notionary/blocks/image_block/__init__.py

@@ -1,6 +1,5 @@
 from notionary.blocks.image_block.image_element import ImageElement
 from notionary.blocks.image_block.image_markdown_node import (
-    ImageMarkdownBlockParams,
     ImageMarkdownNode,
 )
 from notionary.blocks.image_block.image_models import CreateImageBlock
@@ -9,5 +8,4 @@ __all__ = [
     "ImageElement",
     "CreateImageBlock",
     "ImageMarkdownNode",
-    "ImageMarkdownBlockParams",
 ]

notionary/blocks/image_block/image_element.py

@@ -4,49 +4,76 @@ import re
 from typing import Optional
 
 from notionary.blocks.base_block_element import BaseBlockElement
-from notionary.blocks.file.file_element_models import ExternalFile, FileType
+from notionary.blocks.file.file_element_models import (
+    ExternalFile,
+    FileType,
+    FileUploadFile,
+)
 from notionary.blocks.image_block.image_models import CreateImageBlock, FileBlock
 from notionary.blocks.mixins.captions import CaptionMixin
+from notionary.blocks.mixins.file_upload.file_upload_mixin import FileUploadMixin
 from notionary.blocks.syntax_prompt_builder import BlockElementMarkdownInformation
 from notionary.blocks.models import Block, BlockCreateResult, BlockType
 
 
-class ImageElement(BaseBlockElement, CaptionMixin):
-    """
+class ImageElement(BaseBlockElement, CaptionMixin, FileUploadMixin):
+    r"""
     Handles conversion between Markdown images and Notion image blocks.
 
+    Supports both external URLs and local image file uploads.
+
     Markdown image syntax:
-    - [image](https://example.com/image.jpg) - URL only
+    - [image](https://example.com/image.jpg) - External URL
+    - [image](./local/photo.png) - Local image file (will be uploaded)
+    - [image](C:\Pictures\avatar.jpg) - Absolute local path (will be uploaded)
     - [image](https://example.com/image.jpg)(caption:This is a caption) - URL with caption
-    - (caption:Profile picture)[image](https://example.com/avatar.jpg) - caption before URL
+    - (caption:Profile picture)[image](./avatar.jpg) - Caption before URL
     """
 
-    # Flexible pattern that can handle caption in any position
-    IMAGE_PATTERN = re.compile(r"\[image\]\((https?://[^\s\"]+)\)")
+    # Pattern matches both URLs and file paths
+    IMAGE_PATTERN = re.compile(r"\[image\]\(([^)]+)\)")
 
     @classmethod
     def match_notion(cls, block: Block) -> bool:
         return block.type == BlockType.IMAGE and block.image
 
     @classmethod
-    async def markdown_to_notion(cls, text: str) -> BlockCreateResult:
+    async def markdown_to_notion(cls, text: str) -> Optional[BlockCreateResult]:
         """Convert markdown image syntax to Notion ImageBlock."""
-        clean_text = cls.remove_caption(text.strip())
-
-        # Use our own regex to find the image URL
-        image_match = cls.IMAGE_PATTERN.search(clean_text)
-        if not image_match:
+        image_path = cls._extract_image_path(text.strip())
+        if not image_path:
             return None
 
-        url = image_match.group(1)
+        cls.logger.info(f"Processing image: {image_path}")
 
+        # Extract caption
         caption_text = cls.extract_caption(text.strip())
         caption_rich_text = cls.build_caption_rich_text(caption_text or "")
 
-        # Build ImageBlock
-        image_block = FileBlock(
-            type="external", external=ExternalFile(url=url), caption=caption_rich_text
-        )
+        # Determine if it's a local file or external URL
+        if cls._is_local_file_path(image_path):
+            cls.logger.debug(f"Detected local image file: {image_path}")
+
+            # Upload the local image file using mixin method
+            file_upload_id = await cls._upload_local_file(image_path, "image")
+            if not file_upload_id:
+                cls.logger.error(f"Failed to upload image: {image_path}")
+                return None
+
+            image_block = FileBlock(
+                type=FileType.FILE_UPLOAD,
+                file_upload=FileUploadFile(id=file_upload_id),
+                caption=caption_rich_text,
+            )
+
+        else:
+            cls.logger.debug(f"Using external image URL: {image_path}")
+
+            image_block = FileBlock(
+                type=FileType.EXTERNAL,
+                external=ExternalFile(url=image_path),
+                caption=caption_rich_text,
+            )
 
         return CreateImageBlock(image=image_block)
 
@@ -57,14 +84,15 @@ class ImageElement(BaseBlockElement, CaptionMixin):
 
         fo = block.image
 
+        # Determine the source for markdown
         if fo.type == FileType.EXTERNAL and fo.external:
-            url = fo.external.url
+            source = fo.external.url
         elif fo.type == FileType.FILE and fo.file:
-            url = fo.file.url
+            source = fo.file.url
         else:
             return None
 
-        result = f"[image]({url})"
+        result = f"[image]({source})"
 
         # Add caption if present
         caption_markdown = await cls.format_caption_for_markdown(fo.caption or [])
@@ -78,12 +106,25 @@ class ImageElement(BaseBlockElement, CaptionMixin):
         """Get system prompt information for image blocks."""
         return BlockElementMarkdownInformation(
             block_type=cls.__name__,
-            description="Image blocks display images from external URLs with optional captions",
+            description="Image blocks display images from external URLs or upload local image files with optional captions",
             syntax_examples=[
                 "[image](https://example.com/photo.jpg)",
+                "[image](./local/screenshot.png)",
+                "[image](C:\\Pictures\\avatar.jpg)",
                 "[image](https://example.com/diagram.png)(caption:Architecture Diagram)",
-                "(caption:Sales Chart)[image](https://example.com/chart.svg)",
-                "[image](https://example.com/screenshot.png)(caption:Dashboard **overview**)",
+                "(caption:Sales Chart)[image](./chart.svg)",
+                "[image](./screenshot.png)(caption:Dashboard **overview**)",
             ],
-            usage_guidelines="Use for displaying images from external URLs. Supports common image formats (jpg, png, gif, svg, webp). Caption supports rich text formatting and describes the image content.",
+            usage_guidelines="Use for displaying images from external URLs or local files. Local image files will be automatically uploaded to Notion. Supports common image formats (jpg, png, gif, svg, webp, bmp, tiff, heic). Caption supports rich text formatting and describes the image content.",
         )
+
+    @classmethod
+    def _extract_image_path(cls, text: str) -> Optional[str]:
+        """Extract image path/URL from text, handling caption patterns."""
+        clean_text = cls.remove_caption(text)
+
+        match = cls.IMAGE_PATTERN.search(clean_text)
+        if match:
+            return match.group(1).strip()
+
+        return None

notionary/blocks/image_block/image_markdown_node.py

@@ -1,33 +1,18 @@
-from __future__ import annotations
-
 from typing import Optional
 
-from pydantic import BaseModel
-
-from notionary.markdown.markdown_node import MarkdownNode
+from notionary.blocks.markdown.markdown_node import MarkdownNode
 from notionary.blocks.mixins.captions import CaptionMarkdownNodeMixin
 
 
-class ImageMarkdownBlockParams(BaseModel):
-    url: str
-    caption: Optional[str] = None
-
-
 class ImageMarkdownNode(MarkdownNode, CaptionMarkdownNodeMixin):
     """
+    Enhanced Image node with Pydantic integration.
     Programmatic interface for creating Notion-style image blocks.
     """
 
-    def __init__(
-        self, url: str, caption: Optional[str] = None, alt: Optional[str] = None
-    ):
-        self.url = url
-        self.caption = caption
-        # Note: 'alt' is kept for API compatibility but not used in Notion syntax
-
-    @classmethod
-    def from_params(cls, params: ImageMarkdownBlockParams) -> ImageMarkdownNode:
-        return cls(url=params.url, caption=params.caption)
+    url: str
+    caption: Optional[str] = None
+    alt: Optional[str] = None
 
     def to_markdown(self) -> str:
         """Return the Markdown representation.