notionary 0.2.18__py3-none-any.whl → 0.2.19__py3-none-any.whl

notionary/blocks/shared/models.py

@@ -29,6 +29,7 @@ BlockColor = Literal[
     "purple_background",
     "red",
     "red_background",
+    "default_background"
 ]
 
 BlockType = Literal[
@@ -577,6 +578,8 @@ class Block(BaseModel):
     archived: bool = False
     in_trash: bool = False
     has_children: bool = False
+    
+    children: Optional[list[Block]] = None # for recursive structure
 
     # Block type-specific content (only one will be populated based on type)
     audio: Optional[AudioBlock] = None

notionary/page/content/page_content_retriever.py

@@ -1,8 +1,10 @@
+import json
 from typing import Any, Dict, Optional
 
 from notionary.blocks.registry.block_registry import BlockRegistry
 
 from notionary.blocks import NotionBlockClient
+from notionary.blocks.shared.models import Block
 from notionary.page.notion_to_markdown_converter import (
     NotionToMarkdownConverter,
 )
@@ -23,30 +25,36 @@ class PageContentRetriever(LoggingMixin):
 
     async def get_page_content(self) -> str:
         blocks = await self._get_page_blocks_with_children()
-        return self._notion_to_markdown_converter.convert(blocks)
+
+        # TODO: Fix this quick fix🧯 Quick-Fix: Konvertiere rekursive Block-Objekte in plain dicts
+        blocks_as_dicts = [block.model_dump(mode="python", exclude_unset=True) for block in blocks]
+
+        return self._notion_to_markdown_converter.convert(blocks_as_dicts)
 
     async def _get_page_blocks_with_children(
         self, parent_id: Optional[str] = None
-    ) -> list[Dict[str, Any]]:
-        blocks = (
-            await self.client.get_page_blocks(page_id=self.page_id)
+    ) -> list[Block]:
+        response = (
+            await self.client.get_block_children(block_id=self.page_id)
             if parent_id is None
             else await self.client.get_block_children(parent_id)
         )
 
-        if not blocks:
+        if not response or not response.results:
             return []
 
+        blocks = response.results
+
         for block in blocks:
-            if not block.get("has_children"):
+            if not block.has_children:
                 continue
 
-            block_id = block.get("id")
+            block_id = block.id
             if not block_id:
                 continue
 
             children = await self._get_page_blocks_with_children(block_id)
             if children:
-                block["children"] = children
+                block.children = children
 
-        return blocks
+        return blocks

notionary/page/formatting/markdown_to_notion_converter.py

@@ -1,7 +1,7 @@
 from notionary.blocks import ColumnElement, BlockRegistry
 from notionary.page.formatting.line_processor import LineProcessor
 
-
+# TODO: Hier rekursiven Baum Parser verwenden!
 class MarkdownToNotionConverter:
     """Clean converter focused on block identification and conversion"""
 

{notionary-0.2.18.dist-info → notionary-0.2.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: notionary
-Version: 0.2.18
+Version: 0.2.19
 Summary: Python library for programmatic Notion workspace management - databases, pages, and content with advanced Markdown support
 License: MIT
 Author: Mathis Arends

{notionary-0.2.18.dist-info → notionary-0.2.19.dist-info}/RECORD

@@ -68,7 +68,7 @@ notionary/blocks/registry/block_registry.py,sha256=O0yo3B6QIZa-a6gClt_rzaxO_ijws
 notionary/blocks/registry/block_registry_builder.py,sha256=r7wVIjvfCRZWby9RabX9zBSeH_BuoqrRNCl-8yHwt5I,6551
 notionary/blocks/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 notionary/blocks/shared/block_client.py,sha256=EF2xYcrpJ2pF5LYSc9UNDw74Izf25gw5a05-P4CRmZE,8997
-notionary/blocks/shared/models.py,sha256=UfKWmFo3e_GoDU27rrDqyi1DHVnCm-dsFayH7TWx0_I,17905
+notionary/blocks/shared/models.py,sha256=lpLtDOLxpiEQzEYAroaLpCgjCn4XoInsVyJHK-bBcDE,18007
 notionary/blocks/shared/notion_block_element.py,sha256=pKsGRPrSa_IqZHmer4HL5DCzFuhqo34vYXptXoXToX0,1443
 notionary/blocks/shared/text_inline_formatter.py,sha256=mCqFS05oJwSU5fPoUUHVeud_hU8G4Z5mYFx7KeMY-s8,8564
 notionary/blocks/shared/text_inline_formatter_new.py,sha256=nYmoFQVuAkfouCpGYULxFr4hHVCnRgvf3zxoiHBxIKg,4665
@@ -100,6 +100,7 @@ notionary/database/exceptions.py,sha256=jwFdxoIQHLO3mO3p5t890--1FjbTX60fNyqBAe-s
 notionary/database/factory.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 notionary/database/models/page_result.py,sha256=Vmm5_oYpYAkIIJVoTd1ZZGloeC3cmFLMYP255mAmtaw,233
 notionary/database/notion_database.py,sha256=wSqPfVtOnDL-aKRrE9BSMP1cpHe0_8RYyfCMxrlJSNo,16746
+notionary/elements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 notionary/file_upload/__init__.py,sha256=7TNyiIgLMD_IGRXTwRiAmStokF3rLoG4zXPwNb9KQqk,168
 notionary/file_upload/client.py,sha256=qlxgu7_Ia0wbBflInoGki4mR8Po_RZgfLjO2wa279jY,8581
 notionary/file_upload/models.py,sha256=0mYtuGkZ_eh_YmX0uxqye5vg3wWgqWuwOupAmLJXMUY,1625
@@ -112,10 +113,10 @@ notionary/page/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 notionary/page/client.py,sha256=XQ72lOEwn-gO8fmhKSKHqSHs3hRmoKH0TkJ3TtblcAg,4030
 notionary/page/content/markdown_whitespace_processor.py,sha256=azsYau4eDrFN9CY7kzlG-ketoVKSkqSTc1bFq_i7ggQ,2942
 notionary/page/content/notion_text_length_utils.py,sha256=RZqlcolvBBR1krlTMGS8q9xiZYYDGTyxZAjKhhONQyk,2757
-notionary/page/content/page_content_retriever.py,sha256=9LP7DNQLcNdGCMj-18r0VPLXqlJvRB5iwDGsAbp6bYo,1581
+notionary/page/content/page_content_retriever.py,sha256=NOJ4ubLgZJECtQYcactVkeB6eiIYRBTM1llk5fh_6uc,1901
 notionary/page/content/page_content_writer.py,sha256=0evYwdR7dSWECer_nHGAQsXbbkcbpnGQuacNXp14nG8,5656
 notionary/page/formatting/line_processor.py,sha256=zr1P2zG0lSGgBlP1KbFvcnazOUTHGnF_uQeFUtLakfw,5404
-notionary/page/formatting/markdown_to_notion_converter.py,sha256=8UyAkkCbubkasBfV9lat1l-2Wkn6S8DwiSPJaDewslI,6027
+notionary/page/formatting/markdown_to_notion_converter.py,sha256=tbgaoEPJ96-JfCsyEsEK5-abdfmXapm9F2CAEX2rpig,6073
 notionary/page/markdown_syntax_prompt_generator.py,sha256=uHCPNV9aQi3GzLVimyUKwza29hfxu6DTMVIa_QevJbk,4987
 notionary/page/notion_page.py,sha256=5RbKxlA2RBoGiNXjO4bvgV9OMIIKwsTPbM3XolDOU2w,19026
 notionary/page/notion_to_markdown_converter.py,sha256=3zvP1HSnUp3YlvK3PfIqh8GUi7xAuVWGQB0c38uK5VU,6117
@@ -143,7 +144,7 @@ notionary/util/page_id_utils.py,sha256=AA00kRO-g3Cc50tf_XW_tb5RBuPKLuBxRa0D8LYhL
 notionary/util/singleton.py,sha256=CKAvykndwPRZsA3n3MAY_XdCR59MBjjKP0vtm2BcvF0,428
 notionary/util/singleton_metaclass.py,sha256=uNeHiqS6TwhljvG1RE4NflIp2HyMuMmrCg2xI-vxmHE,809
 notionary/workspace.py,sha256=hp5JPVT_aQsZNuxg2R-DiODobcGlVP4CusxNhzpnxKw,3813
-notionary-0.2.18.dist-info/LICENSE,sha256=zOm3cRT1qD49eg7vgw95MI79rpUAZa1kRBFwL2FkAr8,1120
-notionary-0.2.18.dist-info/METADATA,sha256=AmwT7ZFt4QDIojNXfiD-DNAT6byaofyDMd8IrXmZ0Hw,6867
-notionary-0.2.18.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-notionary-0.2.18.dist-info/RECORD,,
+notionary-0.2.19.dist-info/LICENSE,sha256=zOm3cRT1qD49eg7vgw95MI79rpUAZa1kRBFwL2FkAr8,1120
+notionary-0.2.19.dist-info/METADATA,sha256=iKAerIgfYBeA0i8JunODWf3Wr54rsL9ZDmmJLLWy6Ms,6867
+notionary-0.2.19.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+notionary-0.2.19.dist-info/RECORD,,