notionary 0.1.12__py3-none-any.whl → 0.1.13__py3-none-any.whl

notionary/__init__.py

@@ -1,20 +1,24 @@
-from .core.notion_client import NotionClient
+from .notion_client import NotionClient
 
-from .core.database.notion_database_manager import NotionDatabaseManager
-from .core.database.notion_database_manager_factory import NotionDatabaseFactory
-from .core.database.database_discovery import DatabaseDiscovery
+from .database.notion_database import NotionDatabase
+from .database.notion_database_factory import NotionDatabaseFactory
+from .database.database_discovery import DatabaseDiscovery
 
-from .core.page.notion_page_manager import NotionPageManager
+from .page.notion_page import NotionPage
+from .page.notion_page_factory import NotionPageFactory
 
-from .core.converters.registry.block_element_registry import BlockElementRegistry
-from .core.converters.registry.block_element_registry_builder import BlockElementRegistryBuilder
+from .converters.registry.block_element_registry import BlockElementRegistry
+from .converters.registry.block_element_registry_builder import (
+    BlockElementRegistryBuilder,
+)
 
 __all__ = [
     "NotionClient",
-    "NotionDatabaseManager",
+    "NotionDatabase",
     "NotionDatabaseFactory",
     "DatabaseDiscovery",
-    "NotionPageManager",
+    "NotionPage",
+    "NotionPageFactory",
     "BlockElementRegistry",
     "BlockElementRegistryBuilder",
-]
+]

notionary/{core/converters → converters}/elements/audio_element.py

@@ -1,6 +1,6 @@
 import re
 from typing import Dict, Any, Optional, List
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.notion_block_element import NotionBlockElement
 
 
 class AudioElement(NotionBlockElement):

notionary/{core/converters → converters}/elements/bookmark_element.py

@@ -2,7 +2,7 @@ import re
 from typing import Dict, Any, Optional, List, Tuple
 from typing_extensions import override
 
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.notion_block_element import NotionBlockElement
 
 
 class BookmarkElement(NotionBlockElement):

notionary/{core/converters → converters}/elements/callout_element.py

@@ -2,8 +2,8 @@ from typing import Dict, Any, Optional
 from typing_extensions import override
 import re
 
-from notionary.core.converters.elements.text_inline_formatter import TextInlineFormatter
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.text_inline_formatter import TextInlineFormatter
+from notionary.converters.elements.notion_block_element import NotionBlockElement
 
 
 class CalloutElement(NotionBlockElement):

notionary/{core/converters → converters}/elements/code_block_element.py

@@ -1,7 +1,7 @@
 from typing import Dict, Any, Optional, List, Tuple
 from typing_extensions import override
 import re
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.notion_block_element import NotionBlockElement
 
 
 class CodeBlockElement(NotionBlockElement):

notionary/{core/converters → converters}/elements/column_element.py

@@ -2,7 +2,7 @@ import re
 from typing import Dict, Any, Optional, List, Tuple, Callable
 from typing_extensions import override
 
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.notion_block_element import NotionBlockElement
 
 
 class ColumnElement(NotionBlockElement):

notionary/{core/converters → converters}/elements/divider_element.py

@@ -4,7 +4,7 @@ from typing import Dict, Any, Optional
 from typing_extensions import override
 import re
 
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.notion_block_element import NotionBlockElement
 
 
 class DividerElement(NotionBlockElement):

notionary/{core/converters → converters}/elements/embed_element.py

@@ -1,6 +1,6 @@
 import re
 from typing import Dict, Any, Optional, List
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.notion_block_element import NotionBlockElement
 
 
 class EmbedElement(NotionBlockElement):

notionary/{core/converters → converters}/elements/heading_element.py

@@ -2,8 +2,8 @@ from typing import Dict, Any, Optional
 from typing_extensions import override
 import re
 
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
-from notionary.core.converters.elements.text_inline_formatter import TextInlineFormatter
+from notionary.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.text_inline_formatter import TextInlineFormatter
 
 
 class HeadingElement(NotionBlockElement):

notionary/{core/converters → converters}/elements/image_element.py

@@ -1,7 +1,7 @@
 import re
 from typing import Dict, Any, Optional, List
 from typing_extensions import override
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.notion_block_element import NotionBlockElement
 
 
 class ImageElement(NotionBlockElement):

notionary/{core/converters → converters}/elements/list_element.py

@@ -1,8 +1,8 @@
 import re
 from typing import Dict, Any, Optional
 from typing_extensions import override
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
-from notionary.core.converters.elements.text_inline_formatter import TextInlineFormatter
+from notionary.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.text_inline_formatter import TextInlineFormatter
 
 
 class BulletedListElement(NotionBlockElement):

notionary/{core/converters → converters}/elements/paragraph_element.py

@@ -1,8 +1,8 @@
 from typing import Dict, Any, Optional
 from typing_extensions import override
 
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
-from notionary.core.converters.elements.text_inline_formatter import TextInlineFormatter
+from notionary.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.text_inline_formatter import TextInlineFormatter
 
 
 class ParagraphElement(NotionBlockElement):

notionary/{core/converters → converters}/elements/qoute_element.py

@@ -2,7 +2,7 @@ import re
 from typing import Dict, Any, Optional, List, Tuple
 from typing_extensions import override
 
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.notion_block_element import NotionBlockElement
 
 
 class QuoteElement(NotionBlockElement):

notionary/{core/converters → converters}/elements/table_element.py

@@ -3,8 +3,8 @@
 from typing import Dict, Any, Optional, List, Tuple
 from typing_extensions import override
 import re
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
-from notionary.core.converters.elements.text_inline_formatter import TextInlineFormatter
+from notionary.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.text_inline_formatter import TextInlineFormatter
 
 
 class TableElement(NotionBlockElement):

notionary/{core/converters → converters}/elements/todo_lists.py

@@ -1,8 +1,8 @@
 import re
 from typing import Dict, Any, Optional
 from typing_extensions import override
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
-from notionary.core.converters.elements.text_inline_formatter import TextInlineFormatter
+from notionary.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.text_inline_formatter import TextInlineFormatter
 
 
 class TodoElement(NotionBlockElement):

notionary/{core/converters → converters}/elements/toggle_element.py

@@ -1,7 +1,7 @@
 import re
 from typing import Dict, Any, Optional, List, Tuple, Callable
 
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.notion_block_element import NotionBlockElement
 
 
 class ToggleElement(NotionBlockElement):
@@ -171,17 +171,12 @@ class ToggleElement(NotionBlockElement):
                 i += 1
                 continue
 
-            # Wenn context_aware aktiviert ist, prüfen wir für "Transcript"-Toggles
-            # ob sie direkt nach einem Bullet Point kommen
             is_transcript_toggle = cls.TRANSCRIPT_TOGGLE_PATTERN.match(line.strip())
 
             if context_aware and is_transcript_toggle:
-                # Prüfen, ob der Toggle in einem gültigen Kontext ist (nach Bullet Point)
                 if i > 0 and lines[i - 1].strip().startswith("- "):
-                    # Gültiger Kontext, fahre fort
                     pass
                 else:
-                    # Ungültiger Kontext für Transcript-Toggle, überspringe ihn
                     i += 1
                     continue
 

notionary/{core/converters → converters}/elements/video_element.py

@@ -1,6 +1,6 @@
 import re
 from typing import Dict, Any, Optional, List
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.notion_block_element import NotionBlockElement
 
 
 class VideoElement(NotionBlockElement):

notionary/{core/converters → converters}/markdown_to_notion_converter.py

@@ -1,9 +1,9 @@
 from typing import Dict, Any, List, Optional, Tuple
 
-from notionary.core.converters.registry.block_element_registry import (
+from notionary.converters.registry.block_element_registry import (
     BlockElementRegistry,
 )
-from notionary.core.converters.registry.block_element_registry_builder import (
+from notionary.converters.registry.block_element_registry_builder import (
     BlockElementRegistryBuilder,
 )
 

notionary/{core/converters → converters}/notion_to_markdown_converter.py

@@ -1,9 +1,9 @@
 from typing import Dict, Any, List, Optional
 
-from notionary.core.converters.registry.block_element_registry import (
+from notionary.converters.registry.block_element_registry import (
     BlockElementRegistry,
 )
-from notionary.core.converters.registry.block_element_registry_builder import (
+from notionary.converters.registry.block_element_registry_builder import (
     BlockElementRegistryBuilder,
 )
 

notionary/{core/converters → converters}/registry/block_element_registry.py

@@ -1,7 +1,7 @@
 from typing import Dict, Any, Optional, List, Type
 
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
-from notionary.core.converters.elements.text_inline_formatter import TextInlineFormatter
+from notionary.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.elements.text_inline_formatter import TextInlineFormatter
 
 
 class BlockElementRegistry:

notionary/{core/converters → converters}/registry/block_element_registry_builder.py

@@ -1,30 +1,30 @@
 from typing import List, Type
 from collections import OrderedDict
 
-from notionary.core.converters.elements.audio_element import AudioElement
-from notionary.core.converters.elements.embed_element import EmbedElement
-from notionary.core.converters.elements.notion_block_element import NotionBlockElement
-from notionary.core.converters.registry.block_element_registry import (
+from notionary.converters.elements.audio_element import AudioElement
+from notionary.converters.elements.embed_element import EmbedElement
+from notionary.converters.elements.notion_block_element import NotionBlockElement
+from notionary.converters.registry.block_element_registry import (
     BlockElementRegistry,
 )
 
-from notionary.core.converters.elements.paragraph_element import ParagraphElement
-from notionary.core.converters.elements.heading_element import HeadingElement
-from notionary.core.converters.elements.callout_element import CalloutElement
-from notionary.core.converters.elements.code_block_element import CodeBlockElement
-from notionary.core.converters.elements.divider_element import DividerElement
-from notionary.core.converters.elements.table_element import TableElement
-from notionary.core.converters.elements.todo_lists import TodoElement
-from notionary.core.converters.elements.list_element import (
+from notionary.converters.elements.paragraph_element import ParagraphElement
+from notionary.converters.elements.heading_element import HeadingElement
+from notionary.converters.elements.callout_element import CalloutElement
+from notionary.converters.elements.code_block_element import CodeBlockElement
+from notionary.converters.elements.divider_element import DividerElement
+from notionary.converters.elements.table_element import TableElement
+from notionary.converters.elements.todo_lists import TodoElement
+from notionary.converters.elements.list_element import (
     BulletedListElement,
     NumberedListElement,
 )
-from notionary.core.converters.elements.qoute_element import QuoteElement
-from notionary.core.converters.elements.image_element import ImageElement
-from notionary.core.converters.elements.video_element import VideoElement
-from notionary.core.converters.elements.toggle_element import ToggleElement
-from notionary.core.converters.elements.bookmark_element import BookmarkElement
-from notionary.core.converters.elements.column_element import ColumnElement
+from notionary.converters.elements.qoute_element import QuoteElement
+from notionary.converters.elements.image_element import ImageElement
+from notionary.converters.elements.video_element import VideoElement
+from notionary.converters.elements.toggle_element import ToggleElement
+from notionary.converters.elements.bookmark_element import BookmarkElement
+from notionary.converters.elements.column_element import ColumnElement
 
 
 class BlockElementRegistryBuilder:

notionary/{core/database → database}/database_discovery.py

@@ -6,7 +6,7 @@ from typing import (
     Any,
     Tuple,
 )
-from notionary.core.notion_client import NotionClient
+from notionary.notion_client import NotionClient
 from notionary.util.logging_mixin import LoggingMixin
 
 
@@ -37,43 +37,45 @@ class DatabaseDiscovery(LoggingMixin):
             List of tuples containing (database_title, database_id)
         """
         databases = []
-        
+
         async for database in self._iter_databases(page_size):
             db_id = database.get("id")
             if not db_id:
                 continue
-                
+
             title = self._extract_database_title(database)
             databases.append((title, db_id))
-            
+
         return databases
-        
+
     async def discover_and_print(self, page_size: int = 100) -> List[Tuple[str, str]]:
         """
         Discover databases and print the results in a nicely formatted way.
-        
+
         This is a convenience method that discovers databases and handles
         the formatting and printing of results.
-        
+
         Args:
             page_size: The number of databases to fetch per request
-            
+
         Returns:
             The same list of databases as discover() for further processing
         """
         databases = await self.discover(page_size)
-        
+
         if not databases:
             print("\n⚠️ No databases found!")
             print("Please ensure your Notion integration has access to databases.")
-            print("You need to share the databases with your integration in Notion settings.")
+            print(
+                "You need to share the databases with your integration in Notion settings."
+            )
             return databases
-            
+
         print(f"✅ Found {len(databases)} databases:")
-        
+
         for i, (title, db_id) in enumerate(databases, 1):
             print(f"{i}. {title} (ID: {db_id})")
-        
+
         return databases
 
     async def _iter_databases(
@@ -113,7 +115,7 @@ class DatabaseDiscovery(LoggingMixin):
 
             if not result.get("has_more") or not result.get("next_cursor"):
                 return
-                
+
             start_cursor = result["next_cursor"]
 
     def _extract_database_title(self, database: Dict[str, Any]) -> str:
@@ -128,7 +130,7 @@ class DatabaseDiscovery(LoggingMixin):
         """
         if "title" not in database:
             return "Untitled"
-            
+
         title_parts = []
         for text_obj in database["title"]:
             if "plain_text" in text_obj:
@@ -136,5 +138,5 @@ class DatabaseDiscovery(LoggingMixin):
 
         if not title_parts:
             return "Untitled"
-            
-        return "".join(title_parts)
+
+        return "".join(title_parts)

notionary/{core/database → database}/database_info_service.py

@@ -1,5 +1,5 @@
 from typing import Optional
-from notionary.core.notion_client import NotionClient
+from notionary.notion_client import NotionClient
 
 
 class DatabaseInfoService:

notionary/{core/database/notion_database_manager.py → database/notion_database.py}

@@ -1,12 +1,12 @@
 from typing import Any, AsyncGenerator, Dict, List, Optional
 
-from notionary.core.notion_client import NotionClient
-from notionary.core.page.notion_page_manager import NotionPageManager
+from notionary.notion_client import NotionClient
+from notionary.page.notion_page import NotionPage
 from notionary.util.logging_mixin import LoggingMixin
 from notionary.util.page_id_utils import format_uuid
 
 
-class NotionDatabaseManager(LoggingMixin):
+class NotionDatabase(LoggingMixin):
     """
     Minimal manager for Notion databases.
     Focused exclusively on creating basic pages and retrieving page managers
@@ -24,12 +24,12 @@ class NotionDatabaseManager(LoggingMixin):
         self.database_id = format_uuid(database_id) or database_id
         self._client = NotionClient(token=token)
 
-    async def create_blank_page(self) -> Optional[NotionPageManager]:
+    async def create_blank_page(self) -> Optional[NotionPage]:
         """
         Create a new blank page in the database with minimal properties.
 
         Returns:
-            NotionPageManager for the created page, or None if creation failed
+            NotionPage for the created page, or None if creation failed
         """
         try:
             response = await self._client.post(
@@ -42,7 +42,7 @@ class NotionDatabaseManager(LoggingMixin):
                     "Created blank page %s in database %s", page_id, self.database_id
                 )
 
-                return NotionPageManager(page_id=page_id)
+                return NotionPage(page_id=page_id)
 
             self.logger.warning("Page creation failed: invalid response")
             return None
@@ -50,13 +50,13 @@ class NotionDatabaseManager(LoggingMixin):
         except Exception as e:
             self.logger.error("Error creating blank page: %s", str(e))
             return None
-        
+
     async def get_pages(
         self,
         limit: int = 100,
         filter_conditions: Optional[Dict[str, Any]] = None,
         sorts: Optional[List[Dict[str, Any]]] = None,
-    ) -> List[NotionPageManager]:
+    ) -> List[NotionPage]:
         """
         Get all pages from the database.
 
@@ -66,7 +66,7 @@ class NotionDatabaseManager(LoggingMixin):
             sorts: Optional sort instructions for the database query
 
         Returns:
-            List of NotionPageManager instances for each page
+            List of NotionPage instances for each page
         """
         self.logger.debug(
             "Getting up to %d pages with filter: %s, sorts: %s",
@@ -75,7 +75,7 @@ class NotionDatabaseManager(LoggingMixin):
             sorts,
         )
 
-        pages: List[NotionPageManager] = []
+        pages: List[NotionPage] = []
         count = 0
 
         async for page in self.iter_pages(
@@ -99,7 +99,7 @@ class NotionDatabaseManager(LoggingMixin):
         page_size: int = 100,
         filter_conditions: Optional[Dict[str, Any]] = None,
         sorts: Optional[List[Dict[str, Any]]] = None,
-    ) -> AsyncGenerator[NotionPageManager, None]:
+    ) -> AsyncGenerator[NotionPage, None]:
         """
         Asynchronous generator that yields pages from the database.
         Directly queries the Notion API without using the schema.
@@ -110,7 +110,7 @@ class NotionDatabaseManager(LoggingMixin):
             sorts: Optional sort instructions for the database query
 
         Yields:
-            NotionPageManager instances for each page
+            NotionPage instances for each page
         """
         self.logger.debug(
             "Iterating pages with page_size: %d, filter: %s, sorts: %s",
@@ -149,7 +149,7 @@ class NotionDatabaseManager(LoggingMixin):
 
                 page_url = f"https://notion.so/{page_id.replace('-', '')}"
 
-                notion_page_manager = NotionPageManager(
+                notion_page_manager = NotionPage(
                     page_id=page_id, title=title, url=page_url
                 )
                 yield notion_page_manager
@@ -220,4 +220,3 @@ class NotionDatabaseManager(LoggingMixin):
     async def close(self) -> None:
         """Close the client connection."""
         await self._client.close()
-

notionary/{core/database/notion_database_manager_factory.py → database/notion_database_factory.py}

@@ -2,8 +2,8 @@ import logging
 from typing import List, Optional, Dict, Any
 from difflib import SequenceMatcher
 
-from notionary.core.notion_client import NotionClient
-from notionary.core.database.notion_database_manager import NotionDatabaseManager
+from notionary.database.notion_database import NotionDatabase
+from notionary.notion_client import NotionClient
 from notionary.exceptions.database_exceptions import (
     DatabaseConnectionError,
     DatabaseInitializationError,
@@ -29,7 +29,7 @@ class NotionDatabaseFactory(LoggingMixin):
     @classmethod
     async def from_database_id(
         cls, database_id: str, token: Optional[str] = None
-    ) -> NotionDatabaseManager:
+    ) -> NotionDatabase:
         """
         Create a NotionDatabaseManager from a database ID.
 
@@ -45,7 +45,7 @@ class NotionDatabaseFactory(LoggingMixin):
         try:
             formatted_id = format_uuid(database_id) or database_id
 
-            manager = NotionDatabaseManager(formatted_id, token)
+            manager = NotionDatabase(formatted_id, token)
 
             logger.info(
                 "Successfully created database manager for ID: %s", formatted_id
@@ -53,10 +53,8 @@ class NotionDatabaseFactory(LoggingMixin):
             return manager
 
         except DatabaseInitializationError:
-            # Re-raise the already typed exception
             raise
         except NotionDatabaseException:
-            # Re-raise other custom exceptions
             raise
         except Exception as e:
             error_msg = f"Error connecting to database {database_id}: {str(e)}"
@@ -66,7 +64,7 @@ class NotionDatabaseFactory(LoggingMixin):
     @classmethod
     async def from_database_name(
         cls, database_name: str, token: Optional[str] = None
-    ) -> NotionDatabaseManager:
+    ) -> NotionDatabase:
         """
         Create a NotionDatabaseManager by finding a database with a matching name.
         Uses fuzzy matching to find the closest match to the given name.
@@ -86,13 +84,11 @@ class NotionDatabaseFactory(LoggingMixin):
         try:
             logger.debug("Using search endpoint to find databases")
 
-            # Create search query for databases
             search_payload = {
                 "filter": {"property": "object", "value": "database"},
                 "page_size": 100,
             }
 
-            # Perform search
             response = await client.post("search", search_payload)
 
             if not response or "results" not in response:
@@ -144,9 +140,9 @@ class NotionDatabaseFactory(LoggingMixin):
                 best_score,
             )
 
-            manager = NotionDatabaseManager(database_id, token)
+            manager = NotionDatabase(database_id, token)
 
-            logger.info(f"Successfully created database manager for '{matched_name}'")
+            logger.info("Successfully created database manager for '%s'", matched_name)
             await client.close()
             return manager
 
@@ -193,4 +189,4 @@ class NotionDatabaseFactory(LoggingMixin):
             if "plain_text" in text_obj:
                 text_parts.append(text_obj["plain_text"])
 
-        return "".join(text_parts)
+        return "".join(text_parts)

notionary/{core/page → page}/content/page_content_manager.py

@@ -1,17 +1,15 @@
-import re
 from typing import Any, Dict, List, Optional
 
-from notionary.core.converters.markdown_to_notion_converter import (
+from notionary.notion_client import NotionClient
+from notionary.converters.registry.block_element_registry import BlockElementRegistry
+
+from notionary.converters.markdown_to_notion_converter import (
     MarkdownToNotionConverter,
 )
-from notionary.core.converters.notion_to_markdown_converter import (
+from notionary.converters.notion_to_markdown_converter import (
     NotionToMarkdownConverter,
 )
-from notionary.core.converters.registry.block_element_registry import (
-    BlockElementRegistry,
-)
-from notionary.core.notion_client import NotionClient
-from notionary.core.page.content.notion_page_content_chunker import (
+from notionary.page.content.notion_page_content_chunker import (
     NotionPageContentChunker,
 )
 from notionary.util.logging_mixin import LoggingMixin

notionary/{core/page → page}/metadata/metadata_editor.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict, Optional
-from notionary.core.notion_client import NotionClient
-from notionary.core.page.properites.property_formatter import NotionPropertyFormatter
+from notionary.notion_client import NotionClient
+from notionary.page.properites.property_formatter import NotionPropertyFormatter
 from notionary.util.logging_mixin import LoggingMixin
 
 

notionary/{core/page → page}/metadata/notion_icon_manager.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict, Optional
 
-from notionary.core.notion_client import NotionClient
+from notionary.notion_client import NotionClient
 from notionary.util.logging_mixin import LoggingMixin
 
 

notionary/{core/page → page}/metadata/notion_page_cover_manager.py

@@ -1,6 +1,6 @@
 import random
 from typing import Any, Dict, Optional
-from notionary.core.notion_client import NotionClient
+from notionary.notion_client import NotionClient
 from notionary.util.logging_mixin import LoggingMixin