notionary 0.1.7__py3-none-any.whl → 0.1.8__py3-none-any.whl

notionary/core/page/content/page_content_manager.py

@@ -48,25 +48,30 @@ class PageContentManager(LoggingMixin):
             return "No content to delete."
 
         deleted = 0
-        for b in results:
-            if await self._client.delete(f"blocks/{b['id']}"):
+        skipped = 0
+        for block in results:
+            if block.get("type") in ["child_database", "database", "linked_database"]:
+                skipped += 1
+                continue
+                
+            if await self._client.delete(f"blocks/{block['id']}"):
                 deleted += 1
 
-        return f"Deleted {deleted}/{len(results)} blocks."
+        return f"Deleted {deleted}/{len(results)} blocks. Skipped {skipped} database blocks."
 
     async def get_blocks(self) -> List[Dict[str, Any]]:
         result = await self._client.get(f"blocks/{self.page_id}/children")
         if not result:
             self.logger.error("Error retrieving page content: %s", result.error)
             return []
-        return result.data.get("results", [])
+        return result.get("results", [])
 
     async def get_block_children(self, block_id: str) -> List[Dict[str, Any]]:
         result = await self._client.get(f"blocks/{block_id}/children")
         if not result:
             self.logger.error("Error retrieving block children: %s", result.error)
             return []
-        return result.data.get("results", [])
+        return result.get("results", [])
 
     async def get_page_blocks_with_children(self) -> List[Dict[str, Any]]:
         blocks = await self.get_blocks()

notionary/util/page_id_utils.py

@@ -4,36 +4,41 @@ from typing import Optional
 UUID_PATTERN = r"^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
 UUID_RAW_PATTERN = r"([a-f0-9]{32})"
 
-
 def extract_uuid(source: str) -> Optional[str]:
+    if is_valid_uuid(source):
+        return source
+        
     match = re.search(UUID_RAW_PATTERN, source.lower())
     if not match:
         return None
-
+    
     uuid_raw = match.group(1)
     return f"{uuid_raw[0:8]}-{uuid_raw[8:12]}-{uuid_raw[12:16]}-{uuid_raw[16:20]}-{uuid_raw[20:32]}"
 
-
 def is_valid_uuid(uuid: str) -> bool:
     return bool(re.match(UUID_PATTERN, uuid.lower()))
 
-
 def format_uuid(value: str) -> Optional[str]:
     if is_valid_uuid(value):
         return value
     return extract_uuid(value)
 
-
 def extract_and_validate_page_id(page_id: Optional[str], url: Optional[str]) -> str:
+    print("page_id", page_id)
+    print("=====")
     if not page_id and not url:
         raise ValueError("Either page_id or url must be provided")
-
+    
     candidate = page_id or url
+    
+    if is_valid_uuid(candidate):
+        return candidate
+        
     extracted_id = extract_uuid(candidate)
     if not extracted_id:
         raise ValueError(f"Could not extract a valid UUID from: {candidate}")
-
+    
     formatted = format_uuid(extracted_id)
-    if not is_valid_uuid(formatted):
+    if not formatted or not is_valid_uuid(formatted):
         raise ValueError(f"Invalid UUID format: {formatted}")
     return formatted

{notionary-0.1.7.dist-info → notionary-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: notionary
-Version: 0.1.7
+Version: 0.1.8
 Summary: A toolkit to convert between Markdown and Notion blocks
 Home-page: https://github.com/mathisarends/notionary
 Author: Mathis Arends

{notionary-0.1.7.dist-info → notionary-0.1.8.dist-info}/RECORD

@@ -27,7 +27,7 @@ notionary/core/database/notion_database_manager_factory.py,sha256=SoWUiM5zdajmR1
 notionary/core/database/notion_database_schema.py,sha256=WUIjG7I5kusk4GOOdmVSHIKc2Z8SeOgJ1FuGpTn4avQ,3304
 notionary/core/database/models/page_result.py,sha256=Vmm5_oYpYAkIIJVoTd1ZZGloeC3cmFLMYP255mAmtaw,233
 notionary/core/page/notion_page_manager.py,sha256=NH4mNZ9jgRxmc3gay1ymG0Qcc5k_YX9eSkCMUnB9ghw,13247
-notionary/core/page/content/page_content_manager.py,sha256=CZGb8vXWADxwo_xBrZ7mmKEW_HSFhlVNjOgWMfYgGJc,3142
+notionary/core/page/content/page_content_manager.py,sha256=GjgxVwi5NOMsvGwBNj-woq940ZupzALCQegDyIcsgMg,3358
 notionary/core/page/metadata/metadata_editor.py,sha256=U3Ff9GRk28dqT9M1xsl6Q3Cj47-hB1n2pNJzeDXy4ks,4938
 notionary/core/page/metadata/notion_icon_manager.py,sha256=v9pUG61TOT8x9UzDqBtQW6S5XQzWostq7IwrURnWvF4,1499
 notionary/core/page/metadata/notion_page_cover_manager.py,sha256=nDWXeEztKyPscq5dRxIZ6d6IqV7E3vR-Qg1N8KzP_fo,1831
@@ -43,10 +43,10 @@ notionary/core/page/relations/relation_operation_result.py,sha256=XkO4rK0ha_FRsf
 notionary/exceptions/database_exceptions.py,sha256=I-Tx6bYRLpi5pjGPtbT-Mqxvz3BFgYTiuZxknJeLxtI,2638
 notionary/exceptions/page_creation_exception.py,sha256=4v7IuZD6GsQLrqhDLriGjuG3ML638gAO53zDCrLePuU,281
 notionary/util/logging_mixin.py,sha256=fKsx9t90bwvL74ZX3dU-sXdC4TZCQyO6qU9I8txkw_U,1369
-notionary/util/page_id_utils.py,sha256=vgCEp6BdsSJuEtLZVjrRAU9p6moLW-vymM7va8fhErI,1220
+notionary/util/page_id_utils.py,sha256=27mnrPGLJgBCZWcVFnPjKubRdcEZXsgFM0Iaz4SG-jQ,1432
 notionary/util/singleton_decorator.py,sha256=GTNMfIlVNRUVMw_c88xqd12-DcqZJjmyidN54yqiNVw,472
-notionary-0.1.7.dist-info/licenses/LICENSE,sha256=zOm3cRT1qD49eg7vgw95MI79rpUAZa1kRBFwL2FkAr8,1120
-notionary-0.1.7.dist-info/METADATA,sha256=l0WogkR1uSHB6R6ZMCQPIlE4ajYyQ9HfnUDbccNYYfg,6153
-notionary-0.1.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-notionary-0.1.7.dist-info/top_level.txt,sha256=fhONa6BMHQXqthx5PanWGbPL0b8rdFqhrJKVLf_adSs,10
-notionary-0.1.7.dist-info/RECORD,,
+notionary-0.1.8.dist-info/licenses/LICENSE,sha256=zOm3cRT1qD49eg7vgw95MI79rpUAZa1kRBFwL2FkAr8,1120
+notionary-0.1.8.dist-info/METADATA,sha256=AwOUIr9n5QV0UX-ukrYRdbjy5KD9Gqk5jChg0l0S2j8,6153
+notionary-0.1.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+notionary-0.1.8.dist-info/top_level.txt,sha256=fhONa6BMHQXqthx5PanWGbPL0b8rdFqhrJKVLf_adSs,10
+notionary-0.1.8.dist-info/RECORD,,