Revert "Progress towards getting all children"

This reverts commit f814093.

Author: adamtheturtle

src/_notion_scripts/upload.py

@@ -17,7 +17,6 @@
 from ultimate_notion.blocks import Image as UnoImage
 from ultimate_notion.blocks import Video as UnoVideo
 from ultimate_notion.obj_api.blocks import Block as UnoObjAPIBlock
-from ultimate_notion.obj_api.core import Unset, UnsetType
 
 
 class _SerializedBlockTreeNode(TypedDict):
@@ -121,75 +120,6 @@ def _upload_blocks_recursively(
             )
 
 
-@beartype
-def _reconstruct_nested_structure(
-    *,
-    items: list[dict[str, Any]],
-) -> list[dict[str, Any]]:
-    """
-    Reconstruct nested structure from flattened block items.
-    """
-    result: list[dict[str, Any]] = []
-    for item in items:
-        block = item["block"]
-        block_type = block["type"]
-
-        # Handle blocks that can have children
-        if block_type in {
-            "paragraph",
-            "callout",
-            "bulleted_list_item",
-            "numbered_list_item",
-            "toggle",
-        }:
-            pass
-            # children = item.get("children", [])
-            # nested_blocks = _reconstruct_nested_structure(
-            #     items=children,
-            # )
-            # block[block_type]["children"] = nested_blocks
-
-        result.append(block)
-    return result
-
-
-@beartype
-def _sanitize_serialized_block(
-    *,
-    serialized_block: dict[str, Any],
-) -> dict[str, Any]:
-    """
-    Sanitize a serialized block.
-    """
-    return serialized_block
-    if isinstance(serialized_block, dict):
-        return {
-            key: _sanitize_serialized_block(serialized_block=value)
-            for key, value in serialized_block.items()
-        }
-    return serialized_block
-
-
-@beartype
-def _sanitize_block(
-    *,
-    block: Block,
-    session: Session,
-) -> Any:
-    """
-    Sanitize a block.
-    """
-    if block.obj_ref.id and not isinstance(block.obj_ref.id, UnsetType):
-        block = session.get_block(block_ref=block.obj_ref.id)
-    block.obj_ref.created_by = Unset
-    block.obj_ref.last_edited_by = Unset
-    block.obj_ref.created_time = Unset
-    block.obj_ref.last_edited_time = Unset
-    block.obj_ref.id = Unset
-    block.obj_ref.parent = Unset
-    return block
-
-
 @click.command()
 @click.option(
     "--file",
@@ -255,53 +185,6 @@ def main(
 
     for child in page.children:
         child.delete()
-    block_list = _reconstruct_nested_structure(items=blocks)
-    block_obj_list = [
-        Block.wrap_obj_ref(UnoObjAPIBlock.model_validate(obj=block))
-        for block in block_list
-    ]
-    sanitized_block_list = [
-        _sanitize_block(block=block, session=session)
-        for block in block_obj_list
-    ]
-    children_list = list(page.children)
-    sanitized_children_list = [
-        _sanitize_block(block=child, session=session)
-        for child in children_list
-    ]
-
-    import difflib
-    import pprint
-
-    for index, page_child in enumerate(sanitized_children_list):
-        block_child = sanitized_block_list[index]
-        if page_child != block_child:
-            s1 = pprint.pformat(
-                page_child.__dict__, sort_dicts=True
-            ).splitlines()
-            s2 = pprint.pformat(
-                block_child.__dict__, sort_dicts=True
-            ).splitlines()
-
-            diff = difflib.unified_diff(s1, s2)
-
-            diff_list = list(diff)
-            nice_diff = "\n".join(diff)
-            breakpoint()
-    # children_obj_list = [
-    #     Block.wrap_obj_ref(UnoObjAPIBlock.model_validate(obj=child))
-    #     for child in children_list
-    # ]
-    # serialized_children_list = [
-    #     child.obj_ref.serialize_for_api() for child in children_list
-    # ]
-    # sanitized_serialized_children_list = [
-    #     _sanitize_serialized_block(serialized_block=serialized_block)
-    #     for serialized_block in serialized_children_list
-    # ]
-    breakpoint()
-    # for child in page.children:
-    #     child.delete()
 
     # See https://developers.notion.com/reference/request-limits#limits-for-property-values
     # which shows that the max number of blocks per request is 100.

src/sphinx_notion/__init__.py

@@ -92,17 +92,14 @@ def _create_rich_text_from_children(*, node: nodes.Element) -> Text:
     for child in node.children:
         if isinstance(child, nodes.reference):
             link_url = child.attributes["refuri"]
-            assert isinstance(link_url, str)
-            link_url_with_slash = link_url.rstrip("/") + "/"
             link_text = child.attributes.get("name", link_url)
 
             new_text = text(
                 text=link_text,
-                href=link_url_with_slash,
+                href=link_url,
                 bold=False,
                 italic=False,
                 code=False,
-                color=default_color,
             )
         elif isinstance(child, nodes.target):
             continue