notionary 0.2.13__py3-none-any.whl → 0.2.15__py3-none-any.whl

notionary/database/notion_database.py

@@ -1,11 +1,19 @@
 from __future__ import annotations
+import random
 from typing import Any, AsyncGenerator, Dict, List, Optional
 
-from notionary.notion_client import NotionClient
+from notionary.database.client import NotionDatabaseClient
+from notionary.models.notion_database_response import (
+    NotionDatabaseResponse,
+    NotionPageResponse,
+    NotionQueryDatabaseResponse,
+)
 from notionary.page.notion_page import NotionPage
-from notionary.util.warn_direct_constructor_usage import warn_direct_constructor_usage
-from notionary.util import LoggingMixin
-from notionary.util.page_id_utils import format_uuid
+
+from notionary.database.notion_database_provider import NotionDatabaseProvider
+
+from notionary.database.filter_builder import FilterBuilder
+from notionary.util import factory_only, LoggingMixin
 
 
 class NotionDatabase(LoggingMixin):
@@ -15,137 +23,312 @@ class NotionDatabase(LoggingMixin):
     for further page operations.
     """
 
-    @warn_direct_constructor_usage
-    def __init__(self, database_id: str, token: Optional[str] = None):
+    @factory_only("from_database_id", "from_database_name")
+    def __init__(
+        self,
+        id: str,
+        title: str,
+        url: str,
+        emoji_icon: Optional[str] = None,
+        properties: Optional[Dict[str, Any]] = None,
+        token: Optional[str] = None,
+    ):
         """
         Initialize the minimal database manager.
-
-        Args:
-            database_id: ID of the Notion database
-            token: Optional Notion API token
         """
-        self.database_id = database_id
-        self._client = NotionClient(token=token)
+        self._id = id
+        self._title = title
+        self._url = url
+        self._emoji_icon = emoji_icon
+        self._properties = properties
+
+        self.client = NotionDatabaseClient(token=token)
 
     @classmethod
-    def from_database_id(
-        cls, database_id: str, token: Optional[str] = None
+    async def from_database_id(
+        cls, id: str, token: Optional[str] = None
     ) -> NotionDatabase:
         """
-        Create a NotionDatabase from a database ID.
-        Delegates to NotionDatabaseFactory.
+        Create a NotionDatabase from a database ID using NotionDatabaseProvider.
         """
-        from notionary.database.notion_database_factory import NotionDatabaseFactory
-
-        return NotionDatabaseFactory.from_database_id(database_id, token)
+        provider = cls.get_database_provider()
+        return await provider.get_database_by_id(id, token)
 
     @classmethod
     async def from_database_name(
-        cls, database_name: str, token: Optional[str] = None
+        cls,
+        database_name: str,
+        token: Optional[str] = None,
+        min_similarity: float = 0.6,
     ) -> NotionDatabase:
         """
-        Create a NotionDatabase by finding a database with a matching name.
-        Delegates to NotionDatabaseFactory.
+        Create a NotionDatabase by finding a database with fuzzy matching on the title using NotionDatabaseProvider.
         """
-        from notionary.database.notion_database_factory import NotionDatabaseFactory
+        provider = cls.get_database_provider()
+        return await provider.get_database_by_name(database_name, token, min_similarity)
+
+    @property
+    def id(self) -> str:
+        """Get the database ID (readonly)."""
+        return self._id
+
+    @property
+    def title(self) -> str:
+        """Get the database title (readonly)."""
+        return self._title
+
+    @property
+    def url(self) -> str:
+        """Get the database URL (readonly)."""
+        return self._url
+
+    @property
+    def emoji(self) -> Optional[str]:
+        """Get the database emoji (readonly)."""
+        return self._emoji_icon
+
+    @property
+    def properties(self) -> Optional[Dict[str, Any]]:
+        """Get the database properties (readonly)."""
+        return self._properties
+
+    # Database Provider is a singleton so we can instantiate it here with no worries
+    @property
+    def database_provider(self):
+        """Return a NotionDatabaseProvider instance for this database."""
+        return NotionDatabaseProvider.get_instance()
 
-        return await NotionDatabaseFactory.from_database_name(database_name, token)
+    @classmethod
+    def get_database_provider(cls):
+        """Return a NotionDatabaseProvider instance for class-level usage."""
+        return NotionDatabaseProvider.get_instance()
 
     async def create_blank_page(self) -> Optional[NotionPage]:
         """
         Create a new blank page in the database with minimal properties.
+        """
+        try:
+            create_page_response: NotionPageResponse = await self.client.create_page(
+                parent_database_id=self.id
+            )
 
-        Returns:
-            NotionPage for the created page, or None if creation failed
+            return await NotionPage.from_page_id(page_id=create_page_response.id)
+
+        except Exception as e:
+            self.logger.error("Error creating blank page: %s", str(e))
+            return None
+
+    async def set_title(self, new_title: str) -> bool:
+        """
+        Update the database title.
         """
         try:
-            response = await self._client.post(
-                "pages", {"parent": {"database_id": self.database_id}, "properties": {}}
+            result = await self.client.update_database_title(
+                database_id=self.id, title=new_title
             )
 
-            if response and "id" in response:
-                page_id = response["id"]
-                self.logger.info(
-                    "Created blank page %s in database %s", page_id, self.database_id
-                )
+            self._title = result.title[0].plain_text
+            self.logger.info(f"Successfully updated database title to: {new_title}")
+            self.database_provider.invalidate_database_cache(
+                database_id=self.id
+            )
+            return True
+
+        except Exception as e:
+            self.logger.error(f"Error updating database title: {str(e)}")
+            return False
+
+    async def set_emoji(self, new_emoji: str) -> bool:
+        """
+        Update the database emoji.
+        """
+        try:
+            result = await self.client.update_database_emoji(
+                database_id=self.id, emoji=new_emoji
+            )
+
+            self._emoji_icon = result.icon.emoji if result.icon else None
+            self.logger.info(f"Successfully updated database emoji to: {new_emoji}")
+            self.database_provider.invalidate_database_cache(
+                database_id=self.id
+            )
+            return True
+
+        except Exception as e:
+            self.logger.error(f"Error updating database emoji: {str(e)}")
+            return False
+
+    async def set_cover_image(self, image_url: str) -> Optional[str]:
+        """
+        Update the database cover image.
+        """
+        try:
+            result = await self.client.update_database_cover_image(
+                database_id=self.id, image_url=image_url
+            )
 
-                return NotionPage.from_page_id(
-                    page_id=page_id, token=self._client.token
+            if result.cover and result.cover.external:
+                self.database_provider.invalidate_database_cache(
+                    database_id=self.id
                 )
+                return result.cover.external.url
+            return None
+
+        except Exception as e:
+            self.logger.error(f"Error updating database cover image: {str(e)}")
+            return None
+
+    async def set_random_gradient_cover(self) -> Optional[str]:
+        """Sets a random gradient cover from Notion's default gradient covers (always jpg)."""
+        default_notion_covers = [
+            f"https://www.notion.so/images/page-cover/gradients_{i}.png"
+            for i in range(1, 10)
+        ]
+        random_cover_url = random.choice(default_notion_covers)
+        return await self.set_cover_image(random_cover_url)
 
-            self.logger.warning("Page creation failed: invalid response")
+    async def set_external_icon(self, external_icon_url: str) -> Optional[str]:
+        """
+        Update the database icon with an external image URL.
+        """
+        try:
+            result = await self.client.update_database_external_icon(
+                database_id=self.id, icon_url=external_icon_url
+            )
+
+            if result.icon and result.icon.external:
+                self.database_provider.invalidate_database_cache(
+                    database_id=self.id
+                )
+                return result.icon.external.url
             return None
 
         except Exception as e:
-            self.logger.error("Error creating blank page: %s", str(e))
+            self.logger.error(f"Error updating database external icon: {str(e)}")
             return None
 
-    async def get_pages(
-        self,
-        limit: int = 100,
-        filter_conditions: Optional[Dict[str, Any]] = None,
-        sorts: Optional[List[Dict[str, Any]]] = None,
-    ) -> List[NotionPage]:
+    async def get_options_by_property_name(self, property_name: str) -> List[str]:
         """
-        Get all pages from the database.
+        Retrieve all option names for a select, multi_select, status, or relation property.
 
         Args:
-            limit: Maximum number of pages to retrieve
-            filter_conditions: Optional filter to apply to the database query
-            sorts: Optional sort instructions for the database query
+            property_name: The name of the property in the database schema.
 
         Returns:
-            List of NotionPage instances for each page
+            A list of option names for the given property. For select, multi_select, or status,
+            returns the option names directly. For relation properties, returns the titles of related pages.
         """
-        self.logger.debug(
-            "Getting up to %d pages with filter: %s, sorts: %s",
-            limit,
-            filter_conditions,
-            sorts,
+        property_schema = 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":
+            return await self._get_relation_options(property_name)
+
+        return []
+
+    def get_property_type(self, property_name: str) -> Optional[str]:
+        """
+        Get the type of a property by its name.
+        """
+        property_schema = self.properties.get(property_name)
+        return property_schema.get("type") if property_schema else None
+
+    async def query_database_by_title(self, page_title: str) -> List[NotionPage]:
+        """
+        Query the database for pages with a specific title.
+        """
+        search_results: NotionQueryDatabaseResponse = (
+            await self.client.query_database_by_title(
+                database_id=self.id, page_title=page_title
+            )
         )
 
-        pages: List[NotionPage] = []
-        count = 0
+        page_results: List[NotionPage] = []
+
+        for page in search_results.results:
+            page = NotionPage.from_page_id(page_id=page.id, token=self.client.token)
+            page_results.append(page)
 
-        async for page in self.iter_pages(
-            page_size=min(limit, 100),
-            filter_conditions=filter_conditions,
-            sorts=sorts,
+        return page_results
+
+    async def iter_pages_updated_within(
+        self, hours: int = 24, page_size: int = 100
+    ) -> AsyncGenerator[NotionPage, None]:
+        """
+        Iterate through pages edited in the last N hours using FilterBuilder.
+        """
+
+        filter_builder = FilterBuilder()
+        filter_builder.with_updated_last_n_hours(hours).with_page_size(page_size)
+        filter_conditions = filter_builder.build()
+
+        async for page in self._iter_pages(
+            page_size=page_size, filter_conditions=filter_conditions
         ):
+            yield page
+
+    async def get_all_pages(self) -> List[NotionPage]:
+        """
+        Get all pages in the database (use with caution for large databases).
+        """
+        pages = []
+        async for page in self._iter_pages():
             pages.append(page)
-            count += 1
+        return pages
+
+    async def get_last_edited_time(self) -> Optional[str]:
+        """
+        Retrieve the last edited time of the database.
 
-            if count >= limit:
-                break
+        Returns:
+            ISO 8601 timestamp string of the last database edit, or None if request fails.
+        """
+        try:
+            db = await self.client.get_database(self.database_id)
 
-        self.logger.debug(
-            "Retrieved %d pages from database %s", len(pages), self.database_id
-        )
-        return pages
+            return db.last_edited_time
 
-    async def iter_pages(
+        except Exception as e:
+            self.logger.error(
+                "Error fetching last_edited_time for database %s: %s",
+                self.id,
+                str(e),
+            )
+            return None
+
+    def create_filter(self) -> FilterBuilder:
+        """Create a new filter builder for this database."""
+        return FilterBuilder()
+
+    async def iter_pages_with_filter(
+        self, filter_builder: FilterBuilder, page_size: int = 100
+    ):
+        """Iterate pages using a filter builder."""
+        filter_config = filter_builder.build()
+        self.logger.debug("Using filter: %s", filter_config)
+        async for page in self._iter_pages(
+            page_size=page_size, filter_conditions=filter_config
+        ):
+            yield page
+
+    async def _iter_pages(
         self,
         page_size: int = 100,
         filter_conditions: Optional[Dict[str, Any]] = None,
-        sorts: Optional[List[Dict[str, Any]]] = None,
     ) -> AsyncGenerator[NotionPage, None]:
         """
         Asynchronous generator that yields pages from the database.
         Directly queries the Notion API without using the schema.
-
-        Args:
-            page_size: Number of pages to fetch per request
-            filter_conditions: Optional filter to apply to the database query
-            sorts: Optional sort instructions for the database query
-
-        Yields:
-            NotionPage instances for each page
         """
         self.logger.debug(
-            "Iterating pages with page_size: %d, filter: %s, sorts: %s",
+            "Iterating pages with page_size: %d, filter: %s",
             page_size,
             filter_conditions,
-            sorts,
         )
 
         start_cursor: Optional[str] = None
@@ -156,79 +339,109 @@ class NotionDatabase(LoggingMixin):
         if filter_conditions:
             body["filter"] = filter_conditions
 
-        if sorts:
-            body["sorts"] = sorts
-
         while has_more:
             current_body = body.copy()
             if start_cursor:
                 current_body["start_cursor"] = start_cursor
 
-            result = await self._client.post(
-                f"databases/{self.database_id}/query", data=current_body
+            result = await self.client.query_database(
+                database_id=self.id, query_data=current_body
             )
 
-            if not result or "results" not in result:
+            if not result or not result.results:
                 return
 
-            for page in result["results"]:
-                page_id: str = page.get("id", "")
-
-                yield NotionPage.from_page_id(page_id=page_id, token=self._client.token)
+            for page in result.results:
+                yield await NotionPage.from_page_id(page_id=page.id, token=self.client.token)
 
-            has_more = result.get("has_more", False)
-            start_cursor = result.get("next_cursor") if has_more else None
+            has_more = result.has_more
+            start_cursor = result.next_cursor if has_more else None
 
-    async def archive_page(self, page_id: str) -> bool:
+    @classmethod
+    def _create_from_response(
+        cls, db_response: NotionDatabaseResponse, token: Optional[str]
+    ) -> NotionDatabase:
         """
-        Delete (archive) a page.
+        Create NotionDatabase instance from API response.
+        """
+        title = cls._extract_title(db_response)
+        emoji_icon = cls._extract_emoji_icon(db_response)
+
+        instance = cls(
+            id=db_response.id,
+            title=title,
+            url=db_response.url,
+            emoji_icon=emoji_icon,
+            properties=db_response.properties,
+            token=token,
+        )
 
-        Args:
-            page_id: The ID of the page to delete
+        cls.logger.info(
+            "Created database manager: '%s' (ID: %s)", title, db_response.id
+        )
 
-        Returns:
-            bool: True if successful, False otherwise
-        """
-        try:
-            formatted_page_id = format_uuid(page_id)
+        return instance
 
-            data = {"archived": True}
+    @staticmethod
+    def _extract_title(db_response: NotionDatabaseResponse) -> str:
+        """Extract title from database response."""
+        if db_response.title and len(db_response.title) > 0:
+            return db_response.title[0].plain_text
+        return "Untitled Database"
 
-            result = await self._client.patch_page(formatted_page_id, data)
+    @staticmethod
+    def _extract_emoji_icon(db_response: NotionDatabaseResponse) -> Optional[str]:
+        """Extract emoji from database response."""
+        if not db_response.icon:
+            return None
 
-            if not result:
-                self.logger.error("Error deleting page %s", formatted_page_id)
-                return False
+        if db_response.icon.type == "emoji":
+            return db_response.icon.emoji
 
-            self.logger.info(
-                "Page %s successfully deleted (archived)", formatted_page_id
-            )
-            return True
+        return None
 
-        except Exception as e:
-            self.logger.error("Error in archive_page: %s", str(e))
-            return False
+    def _extract_title_from_page(self, page: NotionPageResponse) -> Optional[str]:
+        """
+        Extracts the title from a NotionPageResponse object.
+        """
+        if not page.properties:
+            return None
 
-    async def get_last_edited_time(self) -> Optional[str]:
+        title_property = next(
+            (
+                prop
+                for prop in page.properties.values()
+                if isinstance(prop, dict) and prop.get("type") == "title"
+            ),
+            None,
+        )
+
+        if not title_property or "title" not in title_property:
+            return None
+
+        try:
+            title_parts = title_property["title"]
+            return "".join(part.get("plain_text", "") for part in title_parts)
+
+        except (KeyError, TypeError, AttributeError):
+            return None
+
+    async def _get_relation_options(self, property_name: str) -> List[Dict[str, Any]]:
         """
-        Retrieve the last edited time of the database.
+        Retrieve the titles of all pages related to a relation property.
+
+        Args:
+            property_name: The name of the relation property in the database schema.
 
         Returns:
-            ISO 8601 timestamp string of the last database edit, or None if request fails.
+            A list of titles for all related pages. Returns an empty list if no related pages are found.
         """
-        try:
-            db = await self._client.get_database(self.database_id)
+        property_schema = self.properties.get(property_name)
 
-            return db.last_edited_time
+        relation_database_id = property_schema.get("relation", {}).get("database_id")
 
-        except Exception as e:
-            self.logger.error(
-                "Error fetching last_edited_time for database %s: %s",
-                self.database_id,
-                str(e),
-            )
-            return None
+        search_results = await self.client.query_database(
+            database_id=relation_database_id
+        )
 
-    async def close(self) -> None:
-        """Close the client connection."""
-        await self._client.close()
+        return [self._extract_title_from_page(page) for page in search_results.results]