notionary 0.2.25__py3-none-any.whl → 0.2.27__py3-none-any.whl

notionary/blocks/callout/callout_models.py

@@ -27,6 +27,7 @@ class CalloutBlock(BaseModel):
     icon: Optional[IconObject] = None
     children: Optional[list[Block]] = None
 
+
 class CreateCalloutBlock(BaseModel):
     type: Literal["callout"] = "callout"
     callout: CalloutBlock

notionary/database/client.py

@@ -1,7 +1,5 @@
 from typing import Any, Dict, Optional
 
-from urllib3.util import response
-
 from notionary.base_notion_client import BaseNotionClient
 from notionary.database.models import (
     NotionDatabaseResponse,

notionary/page/models.py

@@ -2,6 +2,8 @@ from typing import Any, Literal, Optional, Union
 
 from pydantic import BaseModel, ConfigDict
 
+from notionary.blocks.models import ParentObject
+
 
 class TextContent(BaseModel):
     content: str
@@ -241,13 +243,6 @@ class NotionCover(BaseModel):
     external: Optional[ExternalCover] = None
 
 
-# Parent types for Pydantic
-class NotionParent(BaseModel):
-    type: str  # 'database_id', 'page_id', 'workspace'
-    database_id: Optional[str] = None
-    page_id: Optional[str] = None
-
-
 # User type for Pydantic
 class NotionUser(BaseModel):
     object: str  # 'user'
@@ -274,7 +269,7 @@ class NotionDatabaseResponse(BaseModel):
     properties: dict[
         str, Any
     ]  # Using Any for flexibility with different property schemas
-    parent: NotionParent
+    parent: ParentObject
     url: str
     public_url: Optional[str] = None
     archived: bool
@@ -290,7 +285,7 @@ class NotionPageResponse(BaseModel):
     last_edited_by: NotionUser
     cover: Optional[NotionCover] = None
     icon: Optional[Icon] = None
-    parent: NotionParent
+    parent: ParentObject
     archived: bool
     in_trash: bool
     properties: dict[str, Any]

notionary/page/notion_page.py

@@ -1,13 +1,16 @@
 from __future__ import annotations
 
+from ast import Dict
 import asyncio
 import random
 from typing import TYPE_CHECKING, Any, Callable, Optional, Union
 
+from yaml import Token
+
 from notionary.blocks.client import NotionBlockClient
 from notionary.comments import CommentClient, Comment
 from notionary.blocks.syntax_prompt_builder import SyntaxPromptBuilder
-from notionary.blocks.models import DatabaseParent
+from notionary.blocks.models import DatabaseParent, ParentObject
 from notionary.blocks.registry.block_registry import BlockRegistry
 from notionary.database.client import NotionDatabaseClient
 from notionary.file_upload.client import NotionFileUploadClient
@@ -43,6 +46,7 @@ class NotionPage(LoggingMixin):
         archived: bool,
         in_trash: bool,
         emoji_icon: Optional[str] = None,
+        external_icon_url: Optional[str] = None,
         properties: Optional[dict[str, Any]] = None,
         parent_database: Optional[NotionDatabase] = None,
         token: Optional[str] = None,
@@ -56,11 +60,13 @@ class NotionPage(LoggingMixin):
         self._is_archived = archived
         self._is_in_trash = in_trash
         self._emoji_icon = emoji_icon
+        self._external_icon_url = external_icon_url
         self._properties = properties
         self._parent_database = parent_database
 
         self._client = NotionPageClient(token=token)
         self._block_client = NotionBlockClient(token=token)
+        self._database_client = NotionDatabaseClient(token=token)
         self._comment_client = CommentClient(token=token)
         self._page_data = None
 
@@ -188,6 +194,13 @@ class NotionPage(LoggingMixin):
         """
         return self._url
 
+    @property
+    def external_icon_url(self) -> Optional[str]:
+        """
+        Get the icon of the page.
+        """
+        return self._external_icon_url
+
     @property
     def emoji_icon(self) -> Optional[str]:
         """
@@ -341,12 +354,32 @@ class NotionPage(LoggingMixin):
             )
 
             self._emoji = page_response.icon.emoji
+            self._external_icon_url = None
             return page_response.icon.emoji
         except Exception as e:
 
             self.logger.error(f"Error updating page emoji: {str(e)}")
             return None
 
+    async def set_external_icon(self, url: str) -> Optional[str]:
+        """
+        Sets the page icon to an external image.
+        """
+        try:
+            icon = {"type": "external", "external": {"url": url}}
+            page_response = await self._client.patch_page(
+                page_id=self._page_id, data={"icon": icon}
+            )
+
+            self._icon = url
+            self._emoji = None
+            self.logger.info(f"Successfully updated page external icon to: {url}")
+            return page_response.icon.external.url
+
+        except Exception as e:
+            self.logger.error(f"Error updating page external icon: {str(e)}")
+            return None
+
     async def create_child_database(self, title: str) -> NotionDatabase:
         from notionary import NotionDatabase
 
@@ -433,30 +466,20 @@ class NotionPage(LoggingMixin):
         """
         Get the value of a specific property.
         """
-        if not self._parent_database:
-            return None
-
-        database_property_schema = self._parent_database.properties.get(property_name)
-
-        if not database_property_schema:
+        if property_name not in self._properties:
             self.logger.warning(
-                "Property '%s' not found in database schema", property_name
+                "Property '%s' not found in page properties", property_name
             )
             return None
 
-        property_type = database_property_schema.get("type")
+        property_schema: dict = self._properties.get(property_name)
+
+        property_type = property_schema.get("type")
 
         if property_type == "relation":
             return await self._get_relation_property_values_by_name(property_name)
 
-        if property_name not in self._properties:
-            self.logger.warning(
-                "Property '%s' not found in page properties", property_name
-            )
-            return None
-
-        property_data = self._properties.get(property_name)
-        return extract_property_value(property_data)
+        return extract_property_value(property_schema)
 
     async def _get_relation_property_values_by_name(
         self, property_name: str
@@ -464,7 +487,7 @@ class NotionPage(LoggingMixin):
         """
         Retrieve the titles of all related pages for a relation property.
         """
-        page_property_schema = self.properties.get(property_name)
+        page_property_schema = self._properties.get(property_name)
         relation_page_ids = [
             rel.get("id") for rel in page_property_schema.get("relation", [])
         ]
@@ -477,23 +500,25 @@ class NotionPage(LoggingMixin):
         """
         Get the available options for a property (select, multi_select, status, relation).
         """
-        if not self._parent_database:
-            self.logger.error(
-                "Parent database not set. Cannot get options for property: %s",
-                property_name,
+        if property_name not in self.properties:
+            self.logger.warning(
+                "Property '%s' not found in page properties", property_name
             )
             return []
 
-        try:
-            return await self._parent_database.get_options_by_property_name(
-                property_name=property_name
-            )
-        except Exception as e:
-            self.logger.error(
-                "Error getting options for property '%s': %s", property_name, str(e)
-            )
-            return []
+        property_schema: dict = self.properties.get(property_name)
+        property_type = property_schema.get("type")
+
+        if property_type in ["select", "multi_select", "status"]:
+            options = property_schema.get(property_type, {}).get("options", [])
+            return [option.get("name", "") for option in options]
+
+        if property_type == "relation" and self._parent_database:
+            return await self._parent_database._get_relation_options(property_name)
+
+        return []
 
+    # Fix this for pages that do not ah
     async def set_property_value_by_name(self, property_name: str, value: Any) -> Any:
         """
         Set the value of a specific property by its name.
@@ -603,7 +628,8 @@ class NotionPage(LoggingMixin):
         from notionary.database.database import NotionDatabase
 
         title = cls._extract_title(page_response)
-        emoji = cls._extract_emoji(page_response)
+        emoji_icon = cls._extract_page_emoji_icon(page_response)
+        external_icon_url = cls._extract_external_icon_url(page_response)
         parent_database_id = cls._extract_parent_database_id(page_response)
 
         parent_database = (
@@ -616,7 +642,8 @@ class NotionPage(LoggingMixin):
             page_id=page_response.id,
             title=title,
             url=page_response.url,
-            emoji_icon=emoji,
+            emoji_icon=emoji_icon,
+            external_icon_url=external_icon_url,
             archived=page_response.archived,
             in_trash=page_response.in_trash,
             properties=page_response.properties,
@@ -653,15 +680,22 @@ class NotionPage(LoggingMixin):
             return ""
 
     @staticmethod
-    def _extract_emoji(page_response: NotionPageResponse) -> Optional[str]:
-        """Extract emoji from database response."""
+    def _extract_page_emoji_icon(page_response: NotionPageResponse) -> Optional[str]:
+        """Extract external icon URL from page response."""
         if not page_response.icon:
             return None
 
         if page_response.icon.type == "emoji":
             return page_response.icon.emoji
 
-        return None
+    @staticmethod
+    def _extract_external_icon_url(page_response: NotionPageResponse) -> Optional[str]:
+        """Extract emoji from database response."""
+        if not page_response.icon:
+            return None
+
+        if page_response.icon.type == "external":
+            return page_response.icon.external.url
 
     @staticmethod
     def _extract_parent_database_id(page_response: NotionPageResponse) -> Optional[str]:

{notionary-0.2.25.dist-info → notionary-0.2.27.dist-info}/METADATA

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

{notionary-0.2.25.dist-info → notionary-0.2.27.dist-info}/RECORD

@@ -22,7 +22,7 @@ notionary/blocks/bulleted_list/bulleted_list_models.py,sha256=QN21PIwAP7MQoIjZeU
 notionary/blocks/callout/__init__.py,sha256=17rdvOF5W1aPxkp-pk13rLgkx6pIciCsub3ncAv_zXk,363
 notionary/blocks/callout/callout_element.py,sha256=6Ss1jv1cqAM4GuNGvuy7dCFjpp-dLavf-wXevn3IEmw,3575
 notionary/blocks/callout/callout_markdown_node.py,sha256=2zZNMwg8uiGBqaMOUVOTlIK8kiq20IQ0Ylv7ZFUm-bc,602
-notionary/blocks/callout/callout_models.py,sha256=E58ko2ujDV80HlI20S9etbCMTm6a_IaSp9waUozWTa8,863
+notionary/blocks/callout/callout_models.py,sha256=g_xU7oiRRseoSO86dqHPIiwoseGvvnl3jsPZbBMT-mE,865
 notionary/blocks/child_database/__init__.py,sha256=FzjjHOS9Je2oXuxLK9S9Oq56-EDEZRTJBfDzkacFpY0,368
 notionary/blocks/child_database/child_database_element.py,sha256=1pxtoB_XTIWorYp984TpsPMZy8A5IdQ15nJALyzme-c,2279
 notionary/blocks/child_database/child_database_models.py,sha256=SP6S9tKTetKNdCkYY3QCxeXd2lq1DyfdNvDhKlhD22Q,264
@@ -123,7 +123,7 @@ notionary/comments/__init__.py,sha256=G0OWsaN2VgbykvhLlNSweL_f0bl16j9NpidH2UNbFc
 notionary/comments/client.py,sha256=vWjgPFk_TPY7peq10aJc7WTG-b0q6Fn8qirAlzlqLls,7311
 notionary/comments/models.py,sha256=O2-yg-0Xrs8xrzLUa4793FlyNn3HbTRsv4dqaskI6ps,3409
 notionary/database/__init__.py,sha256=4tdML0fBzkOCpiWT6q-L--5NELFLbTPD0IUA_E8yZno,155
-notionary/database/client.py,sha256=mN_8XHvIQkRxiWbgBfvncgw4IRiCFX3bVLMLBvtk1Ig,5398
+notionary/database/client.py,sha256=NQWUcfMLAYsnTefFgOjgOHMYN7rn_IRBrsKPUlUY0c8,5361
 notionary/database/database.py,sha256=sdo830KVInR4enaEaeMHaPadNfYnPLy5R3OW2f74w28,16558
 notionary/database/database_filter_builder.py,sha256=YIkdghD5VbdwLJISMRiJ0WIJTm8jcDIL22yrvZau4sA,5950
 notionary/database/database_provider.py,sha256=HB-hZ9pMjronLJS8w_b1GiQ-Ecz1uJbrWpnePL67BCA,8956
@@ -137,8 +137,8 @@ notionary/file_upload/models.py,sha256=bSNgw5WzkOuotyalqkkcVC_Ue6YRHR-CSJV7nZRV_
 notionary/file_upload/notion_file_upload.py,sha256=vOEEh8g8Sj4JedrK9e-NYjJ0HXH3iGdM5N74kkVXVZQ,13221
 notionary/page/client.py,sha256=IOsjWOsmODxOq-7OF0y-gcuC2HUbMIT0SvJZHrH9weQ,4520
 notionary/page/markdown_whitespace_processor.py,sha256=SbWLL6bdeTGds_khDNX2mQe00lGYUFvH6PX8_xpNvBA,4634
-notionary/page/models.py,sha256=pD8FlK8KtnUrIITTd2jg_yJICakgPE4ysZiS9KiMpr0,7088
-notionary/page/notion_page.py,sha256=6aQqAqiEg6gb5lISKkV6a2UzIixgOZ-7eivlvXpyHvc,23689
+notionary/page/models.py,sha256=zk9QOgCDzVfYfT1Gp2bL1_Bw-QUyfWxwTTIPzIayQ7g,6945
+notionary/page/notion_page.py,sha256=_Hj0U9gl3laRKs3l1Cd8tBODXZrHYxrK2Z5gw0O0Fvo,25146
 notionary/page/page_content_deleting_service.py,sha256=G3im6VotG1tgI-SaqoQR-gSnOloF6CEnft1qxLps4as,4546
 notionary/page/page_content_writer.py,sha256=t8N7yfW--ac7szvDmTdecFEfcF5Nz95vyCQ-lpYcOUw,3046
 notionary/page/page_context.py,sha256=27vrTRZP7NsaS4dEp4pBNR30Re2hh00qKlL3xt4YtpI,1773
@@ -196,7 +196,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=DMvrh0IbAV8nIG1oX-2Yz57Uk1YHB647DNxoI3pAT3s,809
 notionary/workspace.py,sha256=QP4WcOIdQnlVr4M7hpGaFT-Fori_QRhsV-SBC2lnwTU,3809
-notionary-0.2.25.dist-info/LICENSE,sha256=zOm3cRT1qD49eg7vgw95MI79rpUAZa1kRBFwL2FkAr8,1120
-notionary-0.2.25.dist-info/METADATA,sha256=Bzep6uh4Odk8Hx_SyIYfoyR0tzAchXL1Un7LillnwQQ,9143
-notionary-0.2.25.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-notionary-0.2.25.dist-info/RECORD,,
+notionary-0.2.27.dist-info/LICENSE,sha256=zOm3cRT1qD49eg7vgw95MI79rpUAZa1kRBFwL2FkAr8,1120
+notionary-0.2.27.dist-info/METADATA,sha256=NabOWlvkZwSL3tGqEiC1DGDd-cWAUNPJaT6hdFH3KAo,9143
+notionary-0.2.27.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+notionary-0.2.27.dist-info/RECORD,,