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

notionary/workspace/query/service.py

@@ -0,0 +1,93 @@
+from __future__ import annotations
+
+import asyncio
+from collections.abc import AsyncIterator
+from typing import TYPE_CHECKING, Protocol
+
+from notionary.exceptions.search import DatabaseNotFound, DataSourceNotFound, PageNotFound
+from notionary.utils.fuzzy import find_best_match
+from notionary.workspace.client import WorkspaceClient
+from notionary.workspace.query.builder import WorkspaceQueryConfigBuilder
+from notionary.workspace.query.models import WorkspaceQueryConfig
+
+if TYPE_CHECKING:
+    from notionary import NotionDatabase, NotionDataSource, NotionPage
+
+
+class SearchableEntity(Protocol):
+    title: str
+
+
+class WorkspaceQueryService:
+    def __init__(self, client: WorkspaceClient | None = None) -> None:
+        self._client = client or WorkspaceClient()
+
+    async def get_pages_stream(self, search_config: WorkspaceQueryConfig) -> AsyncIterator[NotionPage]:
+        from notionary import NotionPage
+
+        async for page_dto in self._client.query_pages_stream(search_config):
+            yield await NotionPage.from_id(page_dto.id)
+
+    async def get_pages(self, search_config: WorkspaceQueryConfig) -> list[NotionPage]:
+        from notionary import NotionPage
+
+        page_dtos = [dto async for dto in self._client.query_pages_stream(search_config)]
+        page_tasks = [NotionPage.from_id(dto.id) for dto in page_dtos]
+        return await asyncio.gather(*page_tasks)
+
+    async def get_data_sources_stream(self, search_config: WorkspaceQueryConfig) -> AsyncIterator[NotionDataSource]:
+        from notionary import NotionDataSource
+
+        async for data_source_dto in self._client.query_data_sources_stream(search_config):
+            yield await NotionDataSource.from_id(data_source_dto.id)
+
+    async def get_data_sources(self, search_config: WorkspaceQueryConfig) -> list[NotionDataSource]:
+        from notionary import NotionDataSource
+
+        data_source_dtos = [dto async for dto in self._client.query_data_sources_stream(search_config)]
+        data_source_tasks = [NotionDataSource.from_id(dto.id) for dto in data_source_dtos]
+        return await asyncio.gather(*data_source_tasks)
+
+    async def find_data_source(self, query: str, min_similarity: float = 0.6) -> NotionDataSource:
+        config = WorkspaceQueryConfigBuilder().with_query(query).with_data_sources_only().with_page_size(5).build()
+        data_sources = await self.get_data_sources(config)
+
+        return self._get_best_match(
+            data_sources, query, exception_class=DataSourceNotFound, min_similarity=min_similarity
+        )
+
+    async def find_page(self, query: str, min_similarity: float = 0.6) -> NotionPage:
+        config = WorkspaceQueryConfigBuilder().with_query(query).with_pages_only().with_page_size(5).build()
+        pages = await self.get_pages(config)
+
+        return self._get_best_match(pages, query, exception_class=PageNotFound, min_similarity=min_similarity)
+
+    async def find_database(self, query: str = "") -> NotionDatabase:
+        config = WorkspaceQueryConfigBuilder().with_query(query).with_data_sources_only().with_page_size(100).build()
+        data_sources = await self.get_data_sources(config)
+
+        parent_database_tasks = [data_source.get_parent_database() for data_source in data_sources]
+        parent_databases = await asyncio.gather(*parent_database_tasks)
+        potential_databases = [database for database in parent_databases if database is not None]
+
+        return self._get_best_match(potential_databases, query, exception_class=DatabaseNotFound)
+
+    def _get_best_match(
+        self,
+        search_results: list[SearchableEntity],
+        query: str,
+        exception_class: type[Exception],
+        min_similarity: float | None = None,
+    ) -> SearchableEntity:
+        best_match = find_best_match(
+            query=query,
+            items=search_results,
+            text_extractor=lambda searchable_entity: searchable_entity.title,
+            min_similarity=min_similarity,
+        )
+
+        if not best_match:
+            available_titles = [result.title for result in search_results[:5]]
+            raise exception_class(query, available_titles)
+
+        return best_match

notionary/workspace/schemas.py

@@ -0,0 +1,21 @@
+from typing import Generic, Literal, TypeVar
+
+from pydantic import BaseModel
+
+from notionary.data_source.schemas import DataSourceDto
+from notionary.page.schemas import NotionPageDto
+
+T = TypeVar("T", bound=BaseModel)
+
+PageOrDataSource = DataSourceDto | NotionPageDto
+
+
+class SearchResponse(BaseModel, Generic[T]):
+    results: list[T]
+    next_cursor: str | None = None
+    has_more: bool
+    type: Literal["page_or_data_source"]
+
+
+PageSearchResponse = SearchResponse[NotionPageDto]
+DataSourceSearchResponse = SearchResponse[DataSourceDto]

notionary/workspace/service.py

@@ -0,0 +1,116 @@
+from __future__ import annotations
+
+from collections.abc import AsyncIterator, Callable
+from typing import TYPE_CHECKING, Self
+
+from notionary.user.service import UserService
+from notionary.workspace.query.builder import WorkspaceQueryConfigBuilder
+from notionary.workspace.query.models import WorkspaceQueryConfig, WorkspaceQueryObjectType
+from notionary.workspace.query.service import WorkspaceQueryService
+
+if TYPE_CHECKING:
+    from notionary.data_source.service import NotionDataSource
+    from notionary.page.service import NotionPage
+    from notionary.user import BotUser, PersonUser
+
+type _QueryConfigInput = WorkspaceQueryConfig | Callable[[WorkspaceQueryConfigBuilder], WorkspaceQueryConfigBuilder]
+
+
+class NotionWorkspace:
+    def __init__(
+        self,
+        name: str | None = None,
+        query_service: WorkspaceQueryService | None = None,
+        user_service: UserService | None = None,
+    ) -> None:
+        self._name = name
+        self._query_service = query_service or WorkspaceQueryService()
+        self._user_service = user_service or UserService()
+
+    @classmethod
+    async def from_current_integration(cls) -> Self:
+        from notionary.user import BotUser
+
+        bot_user = await BotUser.from_current_integration()
+
+        return cls(name=bot_user.workspace_name)
+
+    @property
+    def name(self) -> str:
+        return self._name
+
+    async def get_pages(
+        self,
+        config: _QueryConfigInput | None = None,
+    ) -> list[NotionPage]:
+        query_config = self._resolve_config(config, default_object_type_to_query=WorkspaceQueryObjectType.PAGE)
+        return await self._query_service.get_pages(query_config)
+
+    async def get_pages_stream(
+        self,
+        config: _QueryConfigInput | None = None,
+    ) -> AsyncIterator[NotionPage]:
+        query_config = self._resolve_config(config, default_object_type_to_query=WorkspaceQueryObjectType.PAGE)
+        async for page in self._query_service.get_pages_stream(query_config):
+            yield page
+
+    async def get_data_sources(
+        self,
+        config: _QueryConfigInput | None = None,
+    ) -> list[NotionDataSource]:
+        query_config = self._resolve_config(config, default_object_type_to_query=WorkspaceQueryObjectType.DATA_SOURCE)
+        return await self._query_service.get_data_sources(query_config)
+
+    async def get_data_sources_stream(
+        self,
+        config: _QueryConfigInput | None = None,
+    ) -> AsyncIterator[NotionDataSource]:
+        query_config = self._resolve_config(config, default_object_type_to_query=WorkspaceQueryObjectType.DATA_SOURCE)
+        async for data_source in self._query_service.get_data_sources_stream(query_config):
+            yield data_source
+
+    def _resolve_config(
+        self,
+        config: _QueryConfigInput | None,
+        default_object_type_to_query: WorkspaceQueryObjectType,
+    ) -> WorkspaceQueryConfig:
+        if isinstance(config, WorkspaceQueryConfig):
+            return config
+
+        builder = self._create_builder_with_defaults(default_object_type_to_query)
+
+        if callable(config):
+            config(builder)
+
+        return builder.build()
+
+    def _create_builder_with_defaults(self, object_type: WorkspaceQueryObjectType) -> WorkspaceQueryConfigBuilder:
+        builder = WorkspaceQueryConfigBuilder()
+
+        if object_type == WorkspaceQueryObjectType.PAGE:
+            builder.with_pages_only()
+        else:
+            builder.with_data_sources_only()
+
+        return builder
+
+    async def get_users(self) -> list[PersonUser]:
+        return [user async for user in self._user_service.list_users_stream()]
+
+    async def get_users_stream(self) -> AsyncIterator[PersonUser]:
+        async for user in self._user_service.list_users_stream():
+            yield user
+
+    async def get_bot_users(self) -> list[BotUser]:
+        return [user async for user in self._user_service.list_bot_users_stream()]
+
+    async def get_bot_users_stream(self) -> AsyncIterator[BotUser]:
+        async for user in self._user_service.list_bot_users_stream():
+            yield user
+
+    async def search_users(self, query: str) -> list[PersonUser]:
+        return [user async for user in self._user_service.search_users_stream(query)]
+
+    async def search_users_stream(self, query: str) -> AsyncIterator[PersonUser]:
+        async for user in self._user_service.search_users_stream(query):
+            yield user

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

@@ -1,24 +1,16 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: notionary
-Version: 0.2.27
+Version: 0.2.28
 Summary: Python library for programmatic Notion workspace management - databases, pages, and content with advanced Markdown support
-License: MIT
-Author: Mathis Arends
-Author-email: mathisarends27@gmail.com
-Requires-Python: >=3.9
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: aiofiles (>=24.1.0,<25.0.0)
-Requires-Dist: httpx (>=0.28.0)
-Requires-Dist: posthog (>=6.3.1,<7.0.0)
-Requires-Dist: pydantic (>=2.11.4)
-Requires-Dist: python-dotenv (>=1.1.0)
 Project-URL: Homepage, https://github.com/mathisarends/notionary
+Author-email: Mathis Arends <mathisarends27@gmail.com>
+License: MIT
+License-File: LICENSE
+Requires-Python: >=3.11
+Requires-Dist: aiofiles<25.0.0,>=24.1.0
+Requires-Dist: httpx>=0.28.0
+Requires-Dist: pydantic>=2.11.4
+Requires-Dist: python-dotenv<2.0.0,>=1.0.1
 Description-Content-Type: text/markdown
 
 <picture>
@@ -35,7 +27,7 @@ Description-Content-Type: text/markdown
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](LICENSE)
 [![Documentation](https://img.shields.io/badge/docs-mathisarends.github.io-blue.svg)](https://mathisarends.github.io/notionary/)
 
-**Transform complex Notion API interactions into simple, Pythonic code.**  
+**Transform complex Notion API interactions into simple, Pythonic code.**
 Perfect for developers building AI agents, automation workflows, and dynamic content systems.
 
 </div>
@@ -73,13 +65,13 @@ export NOTION_SECRET=your_integration_key
 
 https://github.com/user-attachments/assets/da8b4691-bee4-4b0f-801e-dccacb630398
 
-*Create styled project pages with properties, content, and rich formatting*
+_Create styled project pages with properties, content, and rich formatting_
 
 ### Local File Uploads (Videos & Images)
 
 https://github.com/user-attachments/assets/a079ec01-bb56-4c65-8260-7b1fca42ac68
 
-*Upload videos and images using simple markdown syntax - files are automatically uploaded to Notion*
+_Upload videos and images using simple markdown syntax - files are automatically uploaded to Notion_
 
 ---
 
@@ -93,33 +85,33 @@ from notionary import NotionPage, NotionDatabase
 
 async def main():
     # Find pages by name - fuzzy matching included!
-    page = await NotionPage.from_page_name("Meeting Notes")
-    
+    page = await NotionPage.from_title("Meeting Notes")
+
     # Option 1: Direct Extended Markdown
     await page.append_markdown("""
     ## Action Items
     - [x] Review project proposal
-    - [ ] Schedule team meeting  
+    - [ ] Schedule team meeting
     - [ ] Update documentation
 
     [callout](Meeting decisions require follow-up "💡")
-    
+
     +++ Details
     Additional context and next steps...
     +++
     """)
-    
+
     # Option 2: Type-Safe Builder (maps to same markdown internally)
     await page.append_markdown(lambda builder: (
         builder
-        .h2("Project Status") 
+        .h2("Project Status")
         .callout("Milestone reached!", "🎉")
         .columns(
             lambda col: col.h3("Completed").bulleted_list([
                 "API design", "Database setup", "Authentication"
             ]),
             lambda col: col.h3("In Progress").bulleted_list([
-                "Frontend UI", "Testing", "Documentation"  
+                "Frontend UI", "Testing", "Documentation"
             ]),
             width_ratios=[0.6, 0.4]
         )
@@ -138,33 +130,36 @@ asyncio.run(main())
 
 Every Notion block type with extended syntax:
 
-| Block Type | Markdown Syntax | Use Case |
-|------------|-----------------|----------|
-| **Callouts** | `[callout](Text "🔥")` | Highlighting key information |
-| **Toggles** | `+++ Title\nContent\n+++` | Collapsible sections |
-| **Columns** | `::: columns\n::: column\nContent\n:::\n:::` | Side-by-side layouts |
-| **Tables** | Standard markdown tables | Structured data |
-| **Media** | `[video](./file.mp4)(caption:Description)` | Auto-uploading files |
-| **Code** | Standard code fences with captions | Code snippets |
-| **Equations** | `$LaTeX$` | Mathematical expressions |
-| **TOC** | `[toc](blue_background)` | Auto-generated navigation |
+| Block Type    | Markdown Syntax                              | Use Case                     |
+| ------------- | -------------------------------------------- | ---------------------------- |
+| **Callouts**  | `[callout](Text "🔥")`                       | Highlighting key information |
+| **Toggles**   | `+++ Title\nContent\n+++`                    | Collapsible sections         |
+| **Columns**   | `::: columns\n::: column\nContent\n:::\n:::` | Side-by-side layouts         |
+| **Tables**    | Standard markdown tables                     | Structured data              |
+| **Media**     | `[video](./file.mp4)(caption:Description)`   | Auto-uploading files         |
+| **Code**      | Standard code fences with captions           | Code snippets                |
+| **Equations** | `$LaTeX$`                                    | Mathematical expressions     |
+| **TOC**       | `[toc](blue_background)`                     | Auto-generated navigation    |
 
 ---
 
 ## What You Can Build 💡
 
 ### **AI Content Systems**
+
 - **Report Generation**: AI agents that create structured reports, documentation, and analysis
 - **Content Pipelines**: Automated workflows that process data and generate Notion pages
 - **Knowledge Management**: AI-powered documentation systems with smart categorization
 
-### **Workflow Automation**  
+### **Workflow Automation**
+
 - **Project Management**: Sync project status, update timelines, generate progress reports
 - **Data Integration**: Connect external APIs and databases to Notion workspaces
 - **Template Systems**: Dynamic page generation from templates and data sources
 
 ### **Content Management**
-- **Bulk Operations**: Mass page updates, content migration, and database management  
+
+- **Bulk Operations**: Mass page updates, content migration, and database management
 - **Media Handling**: Automated image/video uploads with proper organization
 - **Cross-Platform**: Sync content between Notion and other platforms
 
@@ -177,34 +172,40 @@ Every Notion block type with extended syntax:
 <td width="50%">
 
 ### Smart Discovery
+
 - Find pages/databases by name
-- Fuzzy matching for approximate searches  
+- Fuzzy matching for approximate searches
 - No more hunting for IDs or URLs
 
 ### Extended Markdown
+
 - Rich syntax beyond standard markdown
 - Callouts, toggles, columns, media uploads
 - Schema provided for AI agent integration
 
-### Modern Python 
+### Modern Python
+
 - Full async/await support
-- Type hints throughout  
+- Type hints throughout
 - High-performance batch operations
 
 </td>
 <td width="50%">
 
 ### Round-Trip Editing
+
 - Read existing content as markdown
 - Edit and modify preserving formatting
 - Write back to Notion seamlessly
 
 ### AI-Ready Architecture
+
 - Schema-driven syntax for LLM prompts
 - Perfect for AI content generation
 - Handles complex nested structures
 
 ### Complete Coverage
+
 - Every Notion block type supported
 - File uploads with automatic handling
 - Database operations and properties
@@ -218,24 +219,28 @@ Every Notion block type with extended syntax:
 ## Examples & Documentation
 
 ### Full Documentation
+
 [**mathisarends.github.io/notionary**](https://mathisarends.github.io/notionary/) - Complete API reference, guides, and tutorials
 
 ### Quick Links
+
 - [**Getting Started**](https://mathisarends.github.io/notionary/get-started/) - Setup and first steps
-- [**Page Management**](https://mathisarends.github.io/notionary/page/) - Content and properties  
+- [**Page Management**](https://mathisarends.github.io/notionary/page/) - Content and properties
 - [**Database Operations**](https://mathisarends.github.io/notionary/database/) - Queries and management
 - [**Block Types Reference**](https://mathisarends.github.io/notionary/blocks/) - Complete syntax guide
 
 ### Hands-On Examples
 
 **Core Functionality:**
+
 - [Page Management](examples/page_example.py) - Create, update, and manage pages
-- [Database Operations](examples/database.py) - Connect and query databases  
+- [Database Operations](examples/database.py) - Connect and query databases
 - [Workspace Discovery](examples/workspace_discovery.py) - Explore your workspace
 
 **Extended Markdown:**
+
 - [Basic Formatting](examples/markdown/basic.py) - Text, lists, and links
-- [Callouts & Highlights](examples/markdown/callout.py) - Information boxes  
+- [Callouts & Highlights](examples/markdown/callout.py) - Information boxes
 - [Toggle Sections](examples/markdown/toggle.py) - Collapsible content
 - [Multi-Column Layouts](examples/markdown/columns.py) - Side-by-side design
 - [Tables & Data](examples/markdown/table.py) - Structured presentations
@@ -245,8 +250,9 @@ Every Notion block type with extended syntax:
 ## Contributing
 
 We welcome contributions from the community! Whether you're:
+
 - **Fixing bugs** - Help improve stability and reliability
-- **Adding features** - Extend functionality for new use cases  
+- **Adding features** - Extend functionality for new use cases
 - **Improving docs** - Make the library more accessible
 - **Sharing examples** - Show creative applications and patterns
 
@@ -260,11 +266,10 @@ Check our [**Contributing Guide**](https://mathisarends.github.io/notionary/cont
 
 [📖 **Read the Docs**](https://mathisarends.github.io/notionary/) • [🚀 **Getting Started**](https://mathisarends.github.io/notionary/get-started/) • [💻 **Browse Examples**](examples/)
 
-*Built with ❤️ for Python developers and AI agents*
+_Built with ❤️ for Python developers and AI agents_
 
 ---
 
 **Transform complex Notion API interactions into simple, powerful code.**
 
 </div>
-