notionary 0.2.10__tar.gz → 0.2.12__tar.gz

{notionary-0.2.10 → notionary-0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: notionary
-Version: 0.2.10
+Version: 0.2.12
 Summary: A toolkit to convert between Markdown and Notion blocks
 Home-page: https://github.com/mathisarends/notionary
 Author: Mathis Arends
@@ -13,6 +13,8 @@ License-File: LICENSE
 Requires-Dist: httpx>=0.28.0
 Requires-Dist: python-dotenv>=1.1.0
 Requires-Dist: pydantic>=2.11.4
+Requires-Dist: posthog>=3.0.0
+Requires-Dist: click>=8.0.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{notionary-0.2.10 → notionary-0.2.12}/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-0.2.12/notionary/cli/main.py

@@ -0,0 +1,184 @@
+#!/usr/bin/env python3
+"""
+Notionary CLI - Integration Key Setup
+"""
+
+import click
+import os
+import platform
+from pathlib import Path
+from dotenv import load_dotenv
+from rich.console import Console
+from rich.panel import Panel
+from rich.prompt import Prompt, Confirm
+
+console = Console()
+
+def get_paste_tips():
+    """Get platform-specific paste tips"""
+    system = platform.system().lower()
+    
+    if system == "darwin":  # macOS
+        return [
+            "• Terminal: [cyan]Cmd+V[/cyan]",
+            "• iTerm2: [cyan]Cmd+V[/cyan]",
+        ]
+    elif system == "windows":
+        return [
+            "• PowerShell: [cyan]Right-click[/cyan] or [cyan]Shift+Insert[/cyan]",
+            "• cmd: [cyan]Right-click[/cyan]",
+        ]
+    else:  # Linux and others
+        return [
+            "• Terminal: [cyan]Ctrl+Shift+V[/cyan] or [cyan]Right-click[/cyan]",
+            "• Some terminals: [cyan]Shift+Insert[/cyan]",
+        ]
+
+def show_paste_tips():
+    """Show platform-specific paste tips"""
+    console.print("\n[bold yellow]💡 Paste Tips:[/bold yellow]")
+    for tip in get_paste_tips():
+        console.print(tip)
+    console.print()
+
+def get_notion_secret() -> str:
+    """Get NOTION_SECRET using the same logic as NotionClient"""
+    load_dotenv()
+    return os.getenv("NOTION_SECRET", "")
+
+@click.group()
+@click.version_option()  # Automatische Version aus setup.py
+def main():
+    """
+    Notionary CLI - Notion API Integration
+    """
+    pass
+
+@main.command()
+def init():
+    """
+    Setup your Notion Integration Key
+    """
+    # Check if key already exists
+    existing_key = get_notion_secret()
+    
+    if existing_key:
+        console.print(Panel.fit(
+            "[bold green]✅ You're all set![/bold green]\n"
+            f"Your Notion Integration Key is already configured.\n"
+            f"Key: [dim]{existing_key[:8]}...[/dim]",
+            title="Already Configured"
+        ))
+        
+        # Option to reconfigure
+        if Confirm.ask("\n[yellow]Would you like to update your key?[/yellow]"):
+            setup_new_key()
+        else:
+            console.print("\n[blue]No changes made. Happy coding! 🚀[/blue]")
+    else:
+        # No key found, start setup
+        console.print(Panel.fit(
+            "[bold green]🚀 Notionary Setup[/bold green]\n"
+            "Enter your Notion Integration Key to get started...\n\n"
+            "[bold blue]🔗 Create an Integration Key or get an existing one:[/bold blue]\n"
+            "[cyan]https://www.notion.so/profile/integrations[/cyan]",
+            title="Initialization"
+        ))
+        setup_new_key()
+
+def setup_new_key():
+    """Handle the key setup process"""
+    try:
+        # Show Integration Key creation link
+        console.print("\n[bold blue]🔗 Create an Integration Key:[/bold blue]")
+        console.print("[cyan]https://www.notion.so/profile/integrations[/cyan]")
+        console.print()
+        
+        # Get integration key
+        integration_key = Prompt.ask(
+            "[bold cyan]Notion Integration Key[/bold cyan]"
+        )
+        
+        # Input validation
+        if not integration_key or not integration_key.strip():
+            console.print("[bold red]❌ Integration Key cannot be empty![/bold red]")
+            return
+            
+        # Trim whitespace
+        integration_key = integration_key.strip()
+        
+        # Check for common paste issues
+        if integration_key in ["^V", "^v", "^C", "^c"]:
+            console.print("[bold red]❌ Paste didn't work! Try:[/bold red]")
+            show_paste_tips()
+            return
+        
+        # Show masked feedback that paste worked
+        masked_key = "•" * len(integration_key)
+        console.print(f"[dim]Received: {masked_key} ({len(integration_key)} characters)[/dim]")
+        
+        # Basic validation for Notion keys
+        if not integration_key.startswith('ntn_') or len(integration_key) < 30:
+            console.print("[bold yellow]⚠️  Warning: This doesn't look like a valid Notion Integration Key[/bold yellow]")
+            console.print("[dim]Notion keys usually start with 'ntn_' and are about 50+ characters long[/dim]")
+            if not Confirm.ask("Continue anyway?"):
+                return
+        
+        # Save the key
+        if save_integration_key(integration_key):
+            return  # Success!
+        
+    except KeyboardInterrupt:
+        console.print("\n[yellow]Setup cancelled.[/yellow]")
+    except Exception as e:
+        console.print(f"\n[bold red]❌ Error during setup: {e}[/bold red]")
+        raise click.Abort()
+
+def save_integration_key(integration_key: str) -> bool:
+    """Save the integration key to .env file"""
+    try:
+        # .env Datei im aktuellen Verzeichnis erstellen/aktualisieren
+        env_file = Path.cwd() / ".env"
+        
+        # Bestehende .env lesen falls vorhanden
+        existing_lines = []
+        if env_file.exists():
+            with open(env_file, 'r', encoding='utf-8') as f:
+                existing_lines = [line.rstrip() for line in f.readlines()]
+        
+        # NOTION_SECRET Zeile hinzufügen/ersetzen
+        updated_lines = []
+        notion_secret_found = False
+        
+        for line in existing_lines:
+            if line.startswith('NOTION_SECRET='):
+                updated_lines.append(f'NOTION_SECRET={integration_key}')
+                notion_secret_found = True
+            else:
+                updated_lines.append(line)
+        
+        # Falls NOTION_SECRET noch nicht existiert, hinzufügen
+        if not notion_secret_found:
+            updated_lines.append(f'NOTION_SECRET={integration_key}')
+        
+        # .env Datei schreiben
+        with open(env_file, 'w', encoding='utf-8') as f:
+            f.write('\n'.join(updated_lines) + '\n')
+        
+        # Verification
+        written_key = get_notion_secret()
+        if written_key == integration_key:
+            console.print("\n[bold green]✅ Integration Key saved and verified![/bold green]")
+            console.print(f"[dim]Configuration: {env_file}[/dim]")
+            console.print("\n[blue]Ready to use notionary in your Python code! 🚀[/blue]")
+            return True
+        else:
+            console.print("\n[bold red]❌ Error: Key verification failed![/bold red]")
+            return False
+            
+    except Exception as e:
+        console.print(f"\n[bold red]❌ Error saving key: {e}[/bold red]")
+        return False
+
+if __name__ == '__main__':
+    main()

{notionary-0.2.10 → notionary-0.2.12}/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-0.2.10 → notionary-0.2.12}/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()
         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-0.2.10 → notionary-0.2.12}/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-0.2.10 → notionary-0.2.12}/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-0.2.10 → notionary-0.2.12}/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-0.2.10 → notionary-0.2.12}/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-0.2.10 → notionary-0.2.12}/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-0.2.10 → notionary-0.2.12}/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-0.2.10 → notionary-0.2.12}/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-0.2.10 → notionary-0.2.12}/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-0.2.10 → notionary-0.2.12}/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-0.2.10 → notionary-0.2.12}/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-0.2.10 → notionary-0.2.12}/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-0.2.10 → notionary-0.2.12}/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.