better-notion 2.1.0__py3-none-any.whl → 2.1.2__py3-none-any.whl

better_notion/utils/agents/schemas.py

@@ -458,8 +458,10 @@ class TaskSchema:
                     SelectOption.option("Low", "blue"),
                 ],
             ),
-            # Note: Self-referential relations (Dependencies, Dependent Tasks) removed because
-            # they can't be created during initial database creation (need the database's own ID)
+            # 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"),
@@ -557,6 +559,10 @@ 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),
         }
 
 
@@ -599,6 +605,8 @@ 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/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,31 @@ 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
+                    logger.error(f"Failed to create {display_name} database: {str(e)}")
+                    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: {str(e)}\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()
 
         # Save workspace metadata
         self.save_database_ids()
@@ -334,19 +352,136 @@ 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.
 
         Note: The database was created with placeholder relations.
         This method updates them to point to themselves.
         """
-        # Get the database
+        # Get the current database schema
         db = await self._client.databases.get(database_id)
 
-        # Update Dependencies and Dependent Tasks to point to self
-        # Note: This would require updating the database schema
-        # via the Notion API, which may not support all updates
-        pass
+        # Update the Dependencies relation to point to itself
+        schema = db.schema
+        if "Dependencies" in schema:
+            schema["Dependencies"]["relation"]["database_id"] = database_id
+
+        # Update the database schema via API
+        await self._client._api._request(
+            "PATCH",
+            f"/databases/{database_id}",
+            json={"properties": schema}
+        )
+
+        logger.info(f"Updated self-referential relations for Tasks database {database_id}")
+
+    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
+        - Incidents: Root Cause Work Issue -> Work Issues
+        """
+        if "tasks" in self._database_ids:
+            await self._update_relation(
+                self._database_ids["tasks"],
+                "Related Work Issue",
+                self._database_ids.get("work_issues")
+            )
+
+        if "work_issues" in self._database_ids:
+            await self._update_relation(
+                self._database_ids["work_issues"],
+                "Blocking Tasks",
+                self._database_ids.get("tasks")
+            )
+            await self._update_relation(
+                self._database_ids["work_issues"],
+                "Caused Incidents",
+                self._database_ids.get("incidents")
+            )
+
+        if "incidents" in self._database_ids:
+            await self._update_relation(
+                self._database_ids["incidents"],
+                "Root Cause Work Issue",
+                self._database_ids.get("work_issues")
+            )
+
+        logger.info("Updated all cross-database relations")
+
+    async def _update_relation(
+        self,
+        database_id: str,
+        property_name: str,
+        target_database_id: Optional[str],
+    ) -> None:
+        """Update a relation property to point to the target database.
+
+        Args:
+            database_id: Database to update
+            property_name: Name of the relation property
+            target_database_id: Target database ID (if None, skip update)
+        """
+        if not target_database_id:
+            logger.warning(f"Skipping {property_name} update: target database not found")
+            return
+
+        # Get the current database schema
+        db = await self._client.databases.get(database_id)
+        schema = db.schema
+
+        # Update the relation property
+        if property_name in schema:
+            schema[property_name]["relation"]["database_id"] = target_database_id
+
+            # 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}")
 
     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.0.dist-info → better_notion-2.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: better-notion
-Version: 2.1.0
+Version: 2.1.2
 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.0.dist-info → better_notion-2.1.2.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=eHfGhY90FAPXA3E8qE6gP75dgNzn-9z5Ju1FMwBKnQQ,22120
+better_notion/utils/agents/schemas.py,sha256=EpAEevoth-DGWepGMubRFjdvHfe7zrQxi9i4CHDvem8,22946
 better_notion/utils/agents/state_machine.py,sha256=xUBEeDTbU1Xq-rsRo2sbr6AUYpYrV9DTHOtZT2cWES8,6699
-better_notion/utils/agents/workspace.py,sha256=Uy8bqLsT_VFGYAPoiQJNuCvGdjMceaSiVGbR9saMpoU,16558
-better_notion-2.1.0.dist-info/METADATA,sha256=CGwOskvV6KSl4YON4CUNgzo3W0TWLWfJ83Vd3aRa0Wk,11096
-better_notion-2.1.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-better_notion-2.1.0.dist-info/entry_points.txt,sha256=D0bUcP7Z00Zyjxw7r2p29T95UrwioDO0aGDoHe9I6fo,55
-better_notion-2.1.0.dist-info/licenses/LICENSE,sha256=BAdN3JpgMY_y_fWqZSCFSvSbC2mTHP-BKDAzF5FXQAI,1069
-better_notion-2.1.0.dist-info/RECORD,,
+better_notion/utils/agents/workspace.py,sha256=9BRe_qGMjdyR9jaAkm9NCCovqWjeY429LE7mP1fyumo,21894
+better_notion-2.1.2.dist-info/METADATA,sha256=TxRPM7kRzFEcT7oiAZDSmSmtQ0nOOd7Xi5xY4i1Z6sY,11096
+better_notion-2.1.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+better_notion-2.1.2.dist-info/entry_points.txt,sha256=D0bUcP7Z00Zyjxw7r2p29T95UrwioDO0aGDoHe9I6fo,55
+better_notion-2.1.2.dist-info/licenses/LICENSE,sha256=BAdN3JpgMY_y_fWqZSCFSvSbC2mTHP-BKDAzF5FXQAI,1069
+better_notion-2.1.2.dist-info/RECORD,,