better-notion 2.1.1__py3-none-any.whl → 2.1.3__py3-none-any.whl

better_notion/utils/agents/schemas.py

@@ -421,7 +421,11 @@ class TaskSchema:
 
     @staticmethod
     def get_schema() -> Dict[str, Dict[str, Any]]:
-        """Return Notion database schema for Tasks."""
+        """Return Notion database schema for Tasks.
+
+        Note: "Dependencies" self-referential relation is NOT included here.
+        It will be added after the database is created via database.update().
+        """
         return {
             "Title": PropertyBuilder.title("Title"),
             "Version": PropertyBuilder.relation("Version"),
@@ -458,8 +462,6 @@ class TaskSchema:
                     SelectOption.option("Low", "blue"),
                 ],
             ),
-            # Dependencies: Self-referential relation (will be updated after database creation)
-            "Dependencies": PropertyBuilder.relation("Dependencies", dual_property=False),
             # Related Work Issue: Relation to Work Issues (will be updated after database creation)
             "Related Work Issue": PropertyBuilder.relation("Related Work Issue", dual_property=False),
             "Estimated Hours": PropertyBuilder.number("Estimated Hours"),

better_notion/utils/agents/workspace.py

@@ -93,10 +93,17 @@ class WorkspaceInitializer:
             logger.error(error_msg)
             raise Exception(error_msg) from e
 
-        # Check for existing workspace unless skipped
-        if not skip_detection:
-            existing = await WorkspaceMetadata.detect_workspace(parent, self._client)
-            if existing:
+        # Check for existing workspace
+        existing = await WorkspaceMetadata.detect_workspace(parent, self._client)
+
+        if existing:
+            if skip_detection:
+                # --reset flag: Delete all existing databases first
+                logger.warning(f"Reset mode: Deleting {len(existing.get('database_ids', {}))} existing databases...")
+                await self._delete_existing_databases(parent, existing.get("database_ids", {}))
+                logger.info("All existing databases deleted")
+            else:
+                # Normal mode: Raise error if workspace exists
                 workspace_info = {
                     "workspace_id": existing.get("workspace_id", "unknown"),
                     "workspace_name": existing.get("workspace_name", workspace_name),
@@ -126,20 +133,38 @@ class WorkspaceInitializer:
             ("Incidents", "incidents", self._create_incidents_db),
         ]
 
-        for display_name, key, create_func in databases_order:
-            try:
-                logger.info(f"Creating {display_name} database...")
-                await create_func(parent)
-                logger.info(f"✓ {display_name} database created: {self._database_ids[key]}")
-            except Exception as e:
-                error_msg = (
-                    f"Failed to create {display_name} database: {str(e)}\n"
-                    f"Databases created so far: {list(self._database_ids.keys())}\n"
-                    f"Parent page: {parent_page_id}\n"
-                    f"Workspace name: {workspace_name}"
-                )
-                logger.error(error_msg)
-                raise Exception(error_msg) from e
+        try:
+            for display_name, key, create_func in databases_order:
+                try:
+                    logger.info(f"Creating {display_name} database...")
+                    await create_func(parent)
+                    logger.info(f"✓ {display_name} database created: {self._database_ids[key]}")
+                except Exception as e:
+                    # Clean up databases created so far
+                    import traceback
+                    logger.error(f"Failed to create {display_name} database: {str(e)}")
+                    logger.error(f"Full traceback:\n{traceback.format_exc()}")
+
+                    # Try to get more error details if available
+                    error_details = str(e)
+                    if hasattr(e, 'response') and hasattr(e.response, 'text'):
+                        logger.error(f"Notion API response: {e.response.text}")
+                        error_details += f"\nNotion API response: {e.response.text}"
+
+                    logger.warning(f"Cleaning up {len(self._database_ids)} databases that were created...")
+                    await self._delete_existing_databases(parent, self._database_ids)
+
+                    error_msg = (
+                        f"Failed to create {display_name} database: {error_details}\n"
+                        f"All partially created databases have been deleted.\n"
+                        f"Parent page: {parent_page_id}\n"
+                        f"Workspace name: {workspace_name}"
+                    )
+                    logger.error(error_msg)
+                    raise Exception(error_msg) from e
+        except Exception as e:
+            # Re-raise the exception
+            raise e
 
         # Update cross-database relations that require both databases to exist
         await self._update_cross_database_relations()
@@ -337,19 +362,67 @@ class WorkspaceInitializer:
         # This is a no-op but documents the intent
         pass
 
+    async def _delete_existing_databases(self, parent: Page, database_ids: dict) -> None:
+        """Delete all existing databases in the parent page.
+
+        Args:
+            parent: Parent page
+            database_ids: Dict of database IDs to delete
+        """
+        import asyncio
+
+        deletion_tasks = []
+        for db_name, db_id in database_ids.items():
+            if db_id:
+                logger.info(f"Deleting {db_name} database ({db_id})...")
+                deletion_tasks.append(self._delete_database(db_id))
+
+        # Delete all databases concurrently
+        if deletion_tasks:
+            await asyncio.gather(*deletion_tasks, return_exceptions=True)
+
+    async def _delete_database(self, database_id: str) -> None:
+        """Delete a single database.
+
+        Args:
+            database_id: ID of the database to delete
+        """
+        try:
+            await self._client._api._request(
+                "DELETE",
+                f"/blocks/{database_id}"
+            )
+            logger.info(f"Deleted database {database_id}")
+        except Exception as e:
+            logger.warning(f"Failed to delete database {database_id}: {str(e)}")
+            # Continue with other deletions even if this one fails
+
     async def _update_self_relations(self, database_id: str) -> None:
-        """Update self-referential relations in Tasks database.
+        """Add self-referential Dependencies relation to Tasks database.
 
-        Note: The database was created with placeholder relations.
-        This method updates them to point to themselves.
+        The Dependencies property cannot be included in the initial schema
+        because it requires the database's own ID. This method adds it
+        after the database is created.
+
+        Args:
+            database_id: ID of the Tasks database
         """
         # Get the current database schema
         db = await self._client.databases.get(database_id)
-
-        # Update the Dependencies relation to point to itself
         schema = db.schema
-        if "Dependencies" in schema:
-            schema["Dependencies"]["relation"]["database_id"] = database_id
+
+        # Add the Dependencies self-referential relation
+        # This creates a relation from Tasks to Tasks itself
+        schema["Dependencies"] = {
+            "relation": {
+                "database_id": database_id,  # Self-reference
+                "type": "dual_property",
+                "dual_property": {
+                    "synced_property_name": "Dependent Tasks",
+                    "synced_property_type": "relation"
+                }
+            }
+        }
 
         # Update the database schema via API
         await self._client._api._request(
@@ -358,7 +431,7 @@ class WorkspaceInitializer:
             json={"properties": schema}
         )
 
-        logger.info(f"Updated self-referential relations for Tasks database {database_id}")
+        logger.info(f"Added Dependencies self-referential relation to Tasks database {database_id}")
 
     async def _update_cross_database_relations(self) -> None:
         """Update cross-database relations after all databases are created.

{better_notion-2.1.1.dist-info → better_notion-2.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: better-notion
-Version: 2.1.1
+Version: 2.1.3
 Summary: A high-level Python SDK for the Notion API with developer experience in mind.
 Project-URL: Homepage, https://github.com/nesalia-inc/better-notion
 Project-URL: Documentation, https://github.com/nesalia-inc/better-notion#readme

{better_notion-2.1.1.dist-info → better_notion-2.1.3.dist-info}/RECORD

@@ -130,11 +130,11 @@ better_notion/utils/agents/dependency_resolver.py,sha256=PfHHDIQztGih4LwylMb0_My
 better_notion/utils/agents/metadata.py,sha256=thQSXfYx9mWgmBud8HtlNTLr5SwH6E_O1AjSNSnMFoo,6614
 better_notion/utils/agents/project_context.py,sha256=aJlzy5H2rL4sAfW2jHL_3K2VkBJ4ihUhCRVolkpuO78,7477
 better_notion/utils/agents/rbac.py,sha256=8ZA8Y7wbOiVZDbpjpH7iC35SZrZ0jl4fcJ3xWCm3SsE,11820
-better_notion/utils/agents/schemas.py,sha256=EpAEevoth-DGWepGMubRFjdvHfe7zrQxi9i4CHDvem8,22946
+better_notion/utils/agents/schemas.py,sha256=pO4MiSaWzSOCZu6J3uZPH7mtMVpE2H3iDHzd6WH0wXc,22926
 better_notion/utils/agents/state_machine.py,sha256=xUBEeDTbU1Xq-rsRo2sbr6AUYpYrV9DTHOtZT2cWES8,6699
-better_notion/utils/agents/workspace.py,sha256=-EzPLFPjaD9PCeLkSdu1ddRa9-RlHgFvLJ2qxFou7X8,19713
-better_notion-2.1.1.dist-info/METADATA,sha256=5hImQwg_VfumZ1dMkCtz1QEWUtcYr8ywTvlPlREvnKE,11096
-better_notion-2.1.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-better_notion-2.1.1.dist-info/entry_points.txt,sha256=D0bUcP7Z00Zyjxw7r2p29T95UrwioDO0aGDoHe9I6fo,55
-better_notion-2.1.1.dist-info/licenses/LICENSE,sha256=BAdN3JpgMY_y_fWqZSCFSvSbC2mTHP-BKDAzF5FXQAI,1069
-better_notion-2.1.1.dist-info/RECORD,,
+better_notion/utils/agents/workspace.py,sha256=W9MKf4b2fvoGCKHp8EuZROnr1tfmR3lS5GrmCuKrZQQ,22841
+better_notion-2.1.3.dist-info/METADATA,sha256=jQ5fHLFQ9DN3gfYKaiJuUMPIWjDhrC8VeIAQl_KxDMQ,11096
+better_notion-2.1.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+better_notion-2.1.3.dist-info/entry_points.txt,sha256=D0bUcP7Z00Zyjxw7r2p29T95UrwioDO0aGDoHe9I6fo,55
+better_notion-2.1.3.dist-info/licenses/LICENSE,sha256=BAdN3JpgMY_y_fWqZSCFSvSbC2mTHP-BKDAzF5FXQAI,1069
+better_notion-2.1.3.dist-info/RECORD,,