notionary 0.2.10__py3-none-any.whl → 0.2.11__py3-none-any.whl

notionary/__init__.py

@@ -1,3 +1,5 @@
+__version__ = "0.2.10"
+
 from .notion_client import NotionClient
 
 from .database.notion_database import NotionDatabase
@@ -12,6 +14,10 @@ from .elements.registry.block_registry_builder import (
     BlockRegistryBuilder,
 )
 
+from .telemetry.telemetry import NotionaryTelemetry
+
+_telemetry = NotionaryTelemetry()
+
 __all__ = [
     "NotionClient",
     "NotionDatabase",

notionary/database/database_discovery.py

@@ -7,7 +7,7 @@ from typing import (
     Tuple,
 )
 from notionary.notion_client import NotionClient
-from notionary.util.logging_mixin import LoggingMixin
+from notionary.util import LoggingMixin
 
 
 class DatabaseDiscovery(LoggingMixin):

notionary/database/notion_database.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
-import json
 from typing import Any, AsyncGenerator, Dict, List, Optional
 
 from notionary.notion_client import NotionClient
 from notionary.page.notion_page import NotionPage
+from notionary.telemetry import NotionaryTelemetry
 from notionary.util.warn_direct_constructor_usage import warn_direct_constructor_usage
-from notionary.util.logging_mixin import LoggingMixin
+from notionary.util import LoggingMixin
 from notionary.util.page_id_utils import format_uuid
 
 
@@ -26,10 +26,11 @@ class NotionDatabase(LoggingMixin):
             token: Optional Notion API token
         """
         self.database_id = database_id
+        self._telemetry = NotionaryTelemetry.get_instance()
         self._client = NotionClient(token=token)
 
     @classmethod
-    async def from_database_id(
+    def from_database_id(
         cls, database_id: str, token: Optional[str] = None
     ) -> NotionDatabase:
         """
@@ -38,7 +39,7 @@ class NotionDatabase(LoggingMixin):
         """
         from notionary.database.notion_database_factory import NotionDatabaseFactory
 
-        return await NotionDatabaseFactory.from_database_id(database_id, token)
+        return NotionDatabaseFactory.from_database_id(database_id, token)
 
     @classmethod
     async def from_database_name(

notionary/database/notion_database_factory.py

@@ -1,4 +1,3 @@
-import logging
 from typing import List, Optional, Dict, Any
 from difflib import SequenceMatcher
 
@@ -11,10 +10,13 @@ from notionary.exceptions.database_exceptions import (
     DatabaseParsingError,
     NotionDatabaseException,
 )
-from notionary.util.logging_mixin import LoggingMixin
-from notionary.util.page_id_utils import format_uuid
+from notionary.telemetry import track_usage
+from notionary.util import LoggingMixin
+from notionary.util import format_uuid
+from notionary.util import singleton
 
 
+@singleton
 class NotionDatabaseFactory(LoggingMixin):
     """
     Factory class for creating NotionDatabaseManager instances.
@@ -22,7 +24,8 @@ class NotionDatabaseFactory(LoggingMixin):
     """
 
     @classmethod
-    async def from_database_id(
+    @track_usage('page_factory_method_used', {'method': 'from_page_id'})
+    def from_database_id(
         cls, database_id: str, token: Optional[str] = None
     ) -> NotionDatabase:
         """
@@ -35,6 +38,7 @@ class NotionDatabaseFactory(LoggingMixin):
         Returns:
             An initialized NotionDatabaseManager instance
         """
+
         try:
             formatted_id = format_uuid(database_id) or database_id
 
@@ -55,6 +59,7 @@ class NotionDatabaseFactory(LoggingMixin):
             raise DatabaseConnectionError(error_msg) from e
 
     @classmethod
+    @track_usage('page_factory_method_used', {'method': 'from_url'})
     async def from_database_name(
         cls, database_name: str, token: Optional[str] = None
     ) -> NotionDatabase:
@@ -72,7 +77,7 @@ class NotionDatabaseFactory(LoggingMixin):
         cls.logger.debug("Searching for database with name: %s", database_name)
 
         client = NotionClient(token=token)
-
+        
         try:
             cls.logger.debug("Using search endpoint to find databases")
 

notionary/elements/audio_element.py

@@ -1,12 +1,12 @@
 import re
 from typing import Dict, Any, Optional, List
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 
-
+@auto_track_conversions
 class AudioElement(NotionBlockElement):
     """
     Handles conversion between Markdown audio embeds and Notion audio blocks.

notionary/elements/bookmark_element.py

@@ -1,13 +1,13 @@
 import re
 from typing import Dict, Any, Optional, List, Tuple
 
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 
-
+@auto_track_conversions
 class BookmarkElement(NotionBlockElement):
     """
     Handles conversion between Markdown bookmarks and Notion bookmark blocks.

notionary/elements/bulleted_list_element.py

@@ -1,13 +1,13 @@
 import re
 from typing import Dict, Any, Optional
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 from notionary.elements.text_inline_formatter import TextInlineFormatter
 
-
+@auto_track_conversions
 class BulletedListElement(NotionBlockElement):
     """Class for converting between Markdown bullet lists and Notion bulleted list items."""
 

notionary/elements/callout_element.py

@@ -6,9 +6,9 @@ from notionary.prompting.element_prompt_content import (
     ElementPromptContent,
 )
 from notionary.elements.text_inline_formatter import TextInlineFormatter
-from notionary.elements.notion_block_element import NotionBlockElement
-
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 
+@auto_track_conversions
 class CalloutElement(NotionBlockElement):
     """
     Handles conversion between Markdown callouts and Notion callout blocks.

notionary/elements/code_block_element.py

@@ -1,12 +1,12 @@
 import re
 from typing import Dict, Any, Optional, List, Tuple
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 
-
+@auto_track_conversions
 class CodeBlockElement(NotionBlockElement):
     """
     Handles conversion between Markdown code blocks and Notion code blocks.

notionary/elements/column_element.py

@@ -1,10 +1,14 @@
 import re
 from typing import Dict, Any, Optional, List, Tuple, Callable
 
-from notionary.elements.notion_block_element import NotionBlockElement
-from notionary.prompting.element_prompt_content import ElementPromptBuilder, ElementPromptContent
-
-
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
+from notionary.page.formatting.spacer_rules import SPACER_MARKER
+from notionary.prompting.element_prompt_content import (
+    ElementPromptBuilder,
+    ElementPromptContent,
+)
+
+@auto_track_conversions
 class ColumnElement(NotionBlockElement):
     """
     Handles conversion between custom Markdown column syntax and Notion column blocks.
@@ -252,7 +256,7 @@ class ColumnElement(NotionBlockElement):
         """
         if not (in_column and column_content):
             return
-        
+
         processed_content = ColumnElement._preprocess_column_content(column_content)
 
         column_blocks = converter_callback("\n".join(processed_content))
@@ -265,43 +269,45 @@ class ColumnElement(NotionBlockElement):
     def is_multiline(cls) -> bool:
         """Column blocks span multiple lines."""
         return True
-    
+
     @staticmethod
     def _preprocess_column_content(lines: List[str]) -> List[str]:
         """
         Preprocess column content to handle special cases like first headings.
-        
+
         This removes any spacer markers that might have been added before the first
         heading in a column, as each column should have its own heading context.
-        
+
         Args:
             lines: The lines of content for the column
-            
+
         Returns:
             Processed lines ready for conversion
         """
-        from notionary.page.markdown_to_notion_converter import MarkdownToNotionConverter
-
         processed_lines = []
         found_first_heading = False
-        spacer_marker = MarkdownToNotionConverter.SPACER_MARKER
-        
+
         i = 0
         while i < len(lines):
             line = lines[i]
-            
+
             # Check if this is a heading line
             if re.match(r"^(#{1,6})\s+(.+)$", line.strip()):
                 # If it's the first heading, look ahead to check for spacer
-                if not found_first_heading and i > 0 and processed_lines and processed_lines[-1] == spacer_marker:
+                if (
+                    not found_first_heading
+                    and i > 0
+                    and processed_lines
+                    and processed_lines[-1] == SPACER_MARKER
+                ):
                     # Remove spacer before first heading in column
                     processed_lines.pop()
-                
+
                 found_first_heading = True
-            
+
             processed_lines.append(line)
             i += 1
-        
+
         return processed_lines
 
     @classmethod
@@ -331,30 +337,31 @@ class ColumnElement(NotionBlockElement):
                 ":::\n"
                 ":::"
             )
-            .with_examples([
-                "::: columns\n"
-                "::: column\n"
-                "## Features\n"
-                "- Fast response time\n"
-                "- Intuitive interface\n"
-                "- Regular updates\n"
-                ":::\n"
-                "::: column\n"
-                "## Benefits\n"
-                "- Increased productivity\n"
-                "- Better collaboration\n"
-                "- Simplified workflows\n"
-                ":::\n"
-                ":::",
-                
-                "::: columns\n"
-                "::: column\n"
-                "![Image placeholder](/api/placeholder/400/320)\n"
-                ":::\n"
-                "::: column\n"
-                "This text appears next to the image, creating a media-with-caption style layout.\n"
-                ":::\n"
-                ":::"
-            ])
+            .with_examples(
+                [
+                    "::: columns\n"
+                    "::: column\n"
+                    "## Features\n"
+                    "- Fast response time\n"
+                    "- Intuitive interface\n"
+                    "- Regular updates\n"
+                    ":::\n"
+                    "::: column\n"
+                    "## Benefits\n"
+                    "- Increased productivity\n"
+                    "- Better collaboration\n"
+                    "- Simplified workflows\n"
+                    ":::\n"
+                    ":::",
+                    "::: columns\n"
+                    "::: column\n"
+                    "![Image placeholder](/api/placeholder/400/320)\n"
+                    ":::\n"
+                    "::: column\n"
+                    "This text appears next to the image, creating a media-with-caption style layout.\n"
+                    ":::\n"
+                    ":::",
+                ]
+            )
             .build()
-        )
+        )

notionary/elements/divider_element.py

@@ -1,13 +1,13 @@
 import re
 from typing import Dict, Any, Optional
 
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 
-
+@auto_track_conversions
 class DividerElement(NotionBlockElement):
     """
     Handles conversion between Markdown horizontal dividers and Notion divider blocks.

notionary/elements/embed_element.py

@@ -1,12 +1,12 @@
 import re
 from typing import Dict, Any, Optional, List
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 
-
+@auto_track_conversions
 class EmbedElement(NotionBlockElement):
     """
     Handles conversion between Markdown embeds and Notion embed blocks.

notionary/elements/heading_element.py

@@ -1,14 +1,14 @@
 import re
 from typing import Dict, Any, Optional
 
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 from notionary.elements.text_inline_formatter import TextInlineFormatter
 
-
+@auto_track_conversions
 class HeadingElement(NotionBlockElement):
     """Handles conversion between Markdown headings and Notion heading blocks."""
 
@@ -91,4 +91,4 @@ class HeadingElement(NotionBlockElement):
             .with_syntax("## Your Heading Text")
             .with_standard_markdown()
             .build()
-        )
+        )

notionary/elements/image_element.py

@@ -1,12 +1,12 @@
 import re
 from typing import Dict, Any, Optional, List
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 
-
+@auto_track_conversions
 class ImageElement(NotionBlockElement):
     """
     Handles conversion between Markdown images and Notion image blocks.

notionary/elements/mention_element.py

@@ -2,13 +2,13 @@ import re
 from typing import Dict, Any, Optional, List
 from typing_extensions import override
 
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 
-
+@auto_track_conversions
 class MentionElement(NotionBlockElement):
     """
     Handles conversion between Markdown mentions and Notion mention elements.

notionary/elements/notion_block_element.py

@@ -1,7 +1,9 @@
+from functools import wraps
 from typing import Dict, Any, Optional
 from abc import ABC
 
 from notionary.prompting.element_prompt_content import ElementPromptContent
+from notionary.telemetry import track_usage
 
 
 class NotionBlockElement(ABC):
@@ -32,3 +34,37 @@ class NotionBlockElement(ABC):
     @classmethod
     def get_llm_prompt_content(cls) -> ElementPromptContent:
         """Returns a dictionary with information for LLM prompts about this element."""
+
+
+def auto_track_conversions(cls):
+    """
+    Decorator der sich auch auf Subklassen vererbt.
+    """
+    conversion_methods = ['markdown_to_notion', 'notion_to_markdown']
+    
+    original_init_subclass = getattr(cls, '__init_subclass__', None)
+    
+    @classmethod
+    def __init_subclass__(cls_inner, **kwargs):
+        # Original __init_subclass__ aufrufen
+        if original_init_subclass:
+            original_init_subclass(**kwargs)
+        
+        # Tracking für Subklasse hinzufügen
+        for method_name in conversion_methods:
+            if hasattr(cls_inner, method_name):
+                original_method = getattr(cls_inner, method_name)
+                
+                if isinstance(original_method, classmethod):
+                    func = original_method.__func__
+                    
+                    @track_usage(f"{cls_inner.__name__.lower()}_{method_name}")
+                    @classmethod
+                    @wraps(func)
+                    def tracked_method(cls_ref, *args, **kwargs):
+                        return func(cls_ref, *args, **kwargs)
+                    
+                    setattr(cls_inner, method_name, tracked_method)
+    
+    cls.__init_subclass__ = __init_subclass__
+    return cls

notionary/elements/numbered_list_element.py

@@ -1,13 +1,13 @@
 import re
 from typing import Dict, Any, Optional
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 from notionary.elements.text_inline_formatter import TextInlineFormatter
 
-
+@auto_track_conversions
 class NumberedListElement(NotionBlockElement):
     """Class for converting between Markdown numbered lists and Notion numbered list items."""
 

notionary/elements/paragraph_element.py

@@ -1,13 +1,13 @@
 from typing import Dict, Any, Optional
 
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 from notionary.elements.text_inline_formatter import TextInlineFormatter
 
-
+@auto_track_conversions
 class ParagraphElement(NotionBlockElement):
     """Handles conversion between Markdown paragraphs and Notion paragraph blocks."""
 

notionary/elements/qoute_element.py

@@ -1,12 +1,12 @@
 import re
 from typing import Dict, Any, Optional, List, Tuple
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 
-
+@auto_track_conversions
 class QuoteElement(NotionBlockElement):
     """Class for converting between Markdown blockquotes and Notion quote blocks."""
 

notionary/elements/table_element.py

@@ -1,13 +1,13 @@
 import re
 from typing import Dict, Any, Optional, List, Tuple
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.elements.text_inline_formatter import TextInlineFormatter
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 
-
+@auto_track_conversions
 class TableElement(NotionBlockElement):
     """
     Handles conversion between Markdown tables and Notion table blocks.

notionary/elements/text_inline_formatter.py

@@ -29,6 +29,7 @@ class TextInlineFormatter:
         (r"~~(.+?)~~", {"strikethrough": True}),
         (r"`(.+?)`", {"code": True}),
         (r"\[(.+?)\]\((.+?)\)", {"link": True}),
+        (r"@\[([0-9a-f-]+)\]", {"mention": True}),
     ]
 
     @classmethod
@@ -87,11 +88,15 @@ class TextInlineFormatter:
                     cls._create_text_element(remaining_text[:earliest_pos], {})
                 )
 
-            elif "link" in earliest_format:
+            if "link" in earliest_format:
                 content = earliest_match.group(1)
                 url = earliest_match.group(2)
                 segments.append(cls._create_link_element(content, url))
 
+            elif "mention" in earliest_format:
+                id = earliest_match.group(1)
+                segments.append(cls._create_mention_element(id))
+
             else:
                 content = earliest_match.group(1)
                 segments.append(cls._create_text_element(content, earliest_format))
@@ -152,6 +157,23 @@ class TextInlineFormatter:
             "plain_text": text,
         }
 
+    @classmethod
+    def _create_mention_element(cls, id: str) -> Dict[str, Any]:
+        """
+        Create a Notion mention element.
+
+        Args:
+            id: The page ID
+
+        Returns:
+            Notion rich_text element with mention
+        """
+        return {
+            "type": "mention",
+            "mention": {"type": "page", "page": {"id": id}},
+            "annotations": cls._default_annotations(),
+        }
+
     @classmethod
     def extract_text_with_formatting(cls, rich_text: List[Dict[str, Any]]) -> str:
         """

notionary/elements/todo_element.py

@@ -1,13 +1,13 @@
 import re
 from typing import Dict, Any, Optional
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 from notionary.elements.text_inline_formatter import TextInlineFormatter
 
-
+@auto_track_conversions
 class TodoElement(NotionBlockElement):
     """
     Handles conversion between Markdown todo items and Notion to_do blocks.

notionary/elements/toggle_element.py

@@ -1,13 +1,13 @@
 import re
 from typing import Dict, Any, Optional, List, Tuple, Callable
 
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 
-
+@auto_track_conversions
 class ToggleElement(NotionBlockElement):
     """
     Improved ToggleElement class using pipe syntax instead of indentation.

notionary/elements/toggleable_heading_element.py

@@ -1,14 +1,14 @@
 import re
 from typing import Dict, Any, Optional, List, Tuple, Callable
 
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 from notionary.elements.text_inline_formatter import TextInlineFormatter
 
-
+@auto_track_conversions
 class ToggleableHeadingElement(NotionBlockElement):
     """Handles conversion between Markdown collapsible headings and Notion toggleable heading blocks with pipe syntax."""
 

notionary/elements/video_element.py

@@ -1,12 +1,12 @@
 import re
 from typing import Dict, Any, Optional, List
-from notionary.elements.notion_block_element import NotionBlockElement
+from notionary.elements.notion_block_element import NotionBlockElement, auto_track_conversions
 from notionary.prompting.element_prompt_content import (
     ElementPromptBuilder,
     ElementPromptContent,
 )
 
-
+@auto_track_conversions
 class VideoElement(NotionBlockElement):
     """
     Handles conversion between Markdown video embeds and Notion video blocks.