notionary 0.2.25__tar.gz → 0.2.26__tar.gz

{notionary-0.2.25 → notionary-0.2.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: notionary
-Version: 0.2.25
+Version: 0.2.26
 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 → notionary-0.2.26}/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-0.2.25 → notionary-0.2.26}/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-0.2.25 → notionary-0.2.26}/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-0.2.25 → notionary-0.2.26}/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
@@ -61,6 +64,7 @@ class NotionPage(LoggingMixin):
 
         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
 
@@ -433,30 +437,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 +458,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 +471,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.

{notionary-0.2.25 → notionary-0.2.26}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "notionary"
-version = "0.2.25"
+version = "0.2.26"
 description = "Python library for programmatic Notion workspace management - databases, pages, and content with advanced Markdown support"
 readme = "README.md"
 requires-python = ">=3.9"