better-notion 2.1.1__tar.gz → 2.1.5__tar.gz

{better_notion-2.1.1 → better_notion-2.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: better-notion
-Version: 2.1.1
+Version: 2.1.5
 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 → better_notion-2.1.5}/better_notion/utils/agents/schemas.py

@@ -421,7 +421,13 @@ class TaskSchema:
 
     @staticmethod
     def get_schema() -> Dict[str, Dict[str, Any]]:
-        """Return Notion database schema for Tasks."""
+        """Return Notion database schema for Tasks.
+
+        Note: The following properties are NOT included here and will be added
+        after database creation via database.update():
+        - "Dependencies": Self-referential relation (requires database's own ID)
+        - "Related Work Issue": Relation to Work Issues (Work Issues created after Tasks)
+        """
         return {
             "Title": PropertyBuilder.title("Title"),
             "Version": PropertyBuilder.relation("Version"),
@@ -458,10 +464,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"),
             "Actual Hours": PropertyBuilder.number("Actual Hours"),
             "Assignee": PropertyBuilder.people("Assignee"),
@@ -520,7 +522,13 @@ class WorkIssueSchema:
 
     @staticmethod
     def get_schema() -> Dict[str, Dict[str, Any]]:
-        """Return Notion database schema for Work Issues."""
+        """Return Notion database schema for Work Issues.
+
+        Note: The following properties are NOT included here and will be added
+        after database creation via database.update():
+        - "Blocking Tasks": Relation to Tasks (added in post-processing)
+        - "Caused Incidents": Relation to Incidents (Incidents created after Work Issues)
+        """
         return {
             "Title": PropertyBuilder.title("Title"),
             "Project": PropertyBuilder.relation("Project"),
@@ -559,10 +567,6 @@ class WorkIssueSchema:
             "Proposed Solution": PropertyBuilder.text("Proposed Solution"),
             "Related Idea": PropertyBuilder.relation("Related Idea", dual_property=False),
             "Fix Tasks": PropertyBuilder.relation("Fix Tasks", dual_property=False),
-            # Blocking Tasks: Tasks blocked by this work issue (will be updated after database creation)
-            "Blocking Tasks": PropertyBuilder.relation("Blocking Tasks", dual_property=False),
-            # Caused Incidents: Incidents caused by this work issue (will be updated after database creation)
-            "Caused Incidents": PropertyBuilder.relation("Caused Incidents", dual_property=False),
         }
 
 
@@ -571,7 +575,11 @@ class IncidentSchema:
 
     @staticmethod
     def get_schema() -> Dict[str, Dict[str, Any]]:
-        """Return Notion database schema for Incidents."""
+        """Return Notion database schema for Incidents.
+
+        Note: "Root Cause Work Issue" is NOT included here and will be added
+        after database creation via database.update() for consistency.
+        """
         return {
             "Title": PropertyBuilder.title("Title"),
             "Project": PropertyBuilder.relation("Project"),
@@ -605,8 +613,6 @@ class IncidentSchema:
                 ],
             ),
             "Fix Task": PropertyBuilder.relation("Fix Task", dual_property=False),
-            # Root Cause Work Issue: Relation to Work Issues (will be updated after database creation)
-            "Root Cause Work Issue": PropertyBuilder.relation("Root Cause Work Issue", dual_property=False),
             "Root Cause": PropertyBuilder.text("Root Cause"),
             "Detected Date": PropertyBuilder.date("Detected Date"),
             "Resolved Date": PropertyBuilder.date("Resolved Date"),

{better_notion-2.1.1 → better_notion-2.1.5}/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,24 +133,50 @@ 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()
 
+        # Add self-referential Dependencies relation to Tasks database
+        if "tasks" in self._database_ids:
+            await self._update_relation(
+                self._database_ids["tasks"],
+                "Dependencies",
+                self._database_ids["tasks"]  # Self-reference
+            )
+
         # Save workspace metadata
         self.save_database_ids()
 
@@ -224,7 +257,7 @@ class WorkspaceInitializer:
         )
 
     async def _create_tasks_db(self, parent: Page) -> None:
-        """Create Tasks database with relations to Versions (self-referencing for dependencies)."""
+        """Create Tasks database with relations to Versions."""
         schema = TaskSchema.get_schema()
 
         # Update relations with Versions database ID
@@ -234,8 +267,6 @@ class WorkspaceInitializer:
                 "versions"
             ]
 
-        # Tasks reference themselves for dependencies
-        # Will be updated after database creation
         db = await self._client.databases.create(
             parent=parent,
             title="Tasks",
@@ -244,9 +275,6 @@ class WorkspaceInitializer:
 
         self._database_ids["tasks"] = db.id
 
-        # Update self-referential relations
-        await self._update_self_relations(db.id)
-
         # Update Versions database with reverse relation
         await self._add_reverse_relation(
             self._database_ids["versions"],
@@ -337,37 +365,51 @@ class WorkspaceInitializer:
         # This is a no-op but documents the intent
         pass
 
-    async def _update_self_relations(self, database_id: str) -> None:
-        """Update self-referential relations in Tasks database.
+    async def _delete_existing_databases(self, parent: Page, database_ids: dict) -> None:
+        """Delete all existing databases in the parent page.
 
-        Note: The database was created with placeholder relations.
-        This method updates them to point to themselves.
+        Args:
+            parent: Parent page
+            database_ids: Dict of database IDs to delete
         """
-        # Get the current database schema
-        db = await self._client.databases.get(database_id)
+        import asyncio
 
-        # Update the Dependencies relation to point to itself
-        schema = db.schema
-        if "Dependencies" in schema:
-            schema["Dependencies"]["relation"]["database_id"] = database_id
+        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))
 
-        # Update the database schema via API
-        await self._client._api._request(
-            "PATCH",
-            f"/databases/{database_id}",
-            json={"properties": schema}
-        )
+        # Delete all databases concurrently
+        if deletion_tasks:
+            await asyncio.gather(*deletion_tasks, return_exceptions=True)
 
-        logger.info(f"Updated self-referential relations for Tasks database {database_id}")
+    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_cross_database_relations(self) -> None:
         """Update cross-database relations after all databases are created.
 
-        This updates:
-        - Tasks: Related Work Issue -> Work Issues
-        - Work Issues: Blocking Tasks -> Tasks
-        - Work Issues: Caused Incidents -> Incidents
+        This adds:
+        - Tasks: Dependencies (self-referential), Related Work Issue -> Work Issues
+        - Work Issues: Blocking Tasks -> Tasks, Caused Incidents -> Incidents
         - Incidents: Root Cause Work Issue -> Work Issues
+
+        All these properties are added AFTER database creation because they
+        reference databases that may not exist yet during initial creation.
         """
         if "tasks" in self._database_ids:
             await self._update_relation(
@@ -403,7 +445,7 @@ class WorkspaceInitializer:
         property_name: str,
         target_database_id: Optional[str],
     ) -> None:
-        """Update a relation property to point to the target database.
+        """Add or update a relation property to point to the target database.
 
         Args:
             database_id: Database to update
@@ -418,20 +460,92 @@ class WorkspaceInitializer:
         db = await self._client.databases.get(database_id)
         schema = db.schema
 
-        # Update the relation property
+        # Add or update the relation property
+        # Some properties (like Dependencies, Related Work Issue) are added AFTER
+        # database creation, so they may not exist in the initial schema
         if property_name in schema:
+            # Property exists, just update the database_id
             schema[property_name]["relation"]["database_id"] = target_database_id
+        else:
+            # Property doesn't exist, ADD it
+            # This handles cases where the property couldn't be in the initial schema
+            if property_name == "Dependencies":
+                # Self-referential relation
+                schema[property_name] = {
+                    "relation": {
+                        "database_id": database_id,  # Self-reference
+                        "type": "dual_property",
+                        "dual_property": {
+                            "synced_property_name": "Dependent Tasks",
+                            "synced_property_type": "relation"
+                        }
+                    }
+                }
+            elif property_name == "Related Work Issue":
+                # Relation to Work Issues database
+                schema[property_name] = {
+                    "relation": {
+                        "database_id": target_database_id,
+                        "type": "dual_property",
+                        "dual_property": {
+                            "synced_property_name": "Related Tasks",
+                            "synced_property_type": "relation"
+                        }
+                    }
+                }
+            elif property_name == "Blocking Tasks":
+                # Relation from Work Issues to Tasks
+                schema[property_name] = {
+                    "relation": {
+                        "database_id": target_database_id,
+                        "type": "dual_property",
+                        "dual_property": {
+                            "synced_property_name": "Blocked By Work Issue",
+                            "synced_property_type": "relation"
+                        }
+                    }
+                }
+            elif property_name == "Caused Incidents":
+                # Relation from Work Issues to Incidents
+                schema[property_name] = {
+                    "relation": {
+                        "database_id": target_database_id,
+                        "type": "dual_property",
+                        "dual_property": {
+                            "synced_property_name": "Root Cause Work Issue",
+                            "synced_property_type": "relation"
+                        }
+                    }
+                }
+            elif property_name == "Root Cause Work Issue":
+                # Relation from Incidents to Work Issues
+                schema[property_name] = {
+                    "relation": {
+                        "database_id": target_database_id,
+                        "type": "dual_property",
+                        "dual_property": {
+                            "synced_property_name": "Caused Incidents",
+                            "synced_property_type": "relation"
+                        }
+                    }
+                }
+            else:
+                # Generic relation
+                schema[property_name] = {
+                    "relation": {
+                        "database_id": target_database_id,
+                        "dual_property": {}
+                    }
+                }
 
-            # Update the database schema via API
-            await self._client._api._request(
-                "PATCH",
-                f"/databases/{database_id}",
-                json={"properties": schema}
-            )
+        # Update the database schema via API
+        await self._client._api._request(
+            "PATCH",
+            f"/databases/{database_id}",
+            json={"properties": schema}
+        )
 
-            logger.info(f"Updated {property_name} relation to {target_database_id}")
-        else:
-            logger.warning(f"Property {property_name} not found in database {database_id}")
+        logger.info(f"Added/Updated {property_name} relation to {target_database_id}")
 
     def save_database_ids(self, path: Optional[Path] = None) -> None:
         """Save workspace metadata (database IDs and workspace info) to config file.

{better_notion-2.1.1 → better_notion-2.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "better-notion"
-version = "2.1.1"
+version = "2.1.5"
 description = "A high-level Python SDK for the Notion API with developer experience in mind."
 readme = "README.md"
 requires-python = ">=3.10"