chore: reduce unnecessary page apis

Signed-off-by: Wei Zhang <[email protected]>

ee/tabby-db/migrations/0042_page-section.up.sql

@@ -5,7 +5,7 @@ CREATE TABLE pages(
     author_id INTEGER NOT NULL,
 
     title TEXT,
-    summary TEXT,
+    content TEXT,
 
     created_at TIMESTAMP NOT NULL DEFAULT (DATETIME('now')),
     updated_at TIMESTAMP NOT NULL DEFAULT (DATETIME('now')),
@@ -17,14 +17,11 @@ CREATE TABLE page_sections(
     id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     page_id INTEGER NOT NULL,
 
-    position INTEGER NOT NULL,
-
     title TEXT NOT NULL,
     content TEXT NOT NULL,
 
     created_at TIMESTAMP NOT NULL DEFAULT (DATETIME('now')),
     updated_at TIMESTAMP NOT NULL DEFAULT (DATETIME('now')),
 
-    FOREIGN KEY(page_id) REFERENCES pages(id) ON DELETE CASCADE,
-    CONSTRAINT `page_id_position` UNIQUE(page_id, position)
+    FOREIGN KEY(page_id) REFERENCES pages(id) ON DELETE CASCADE
 );

ee/tabby-db/schema/schema.sql

@@ -266,19 +266,17 @@ CREATE TABLE pages(
   -- The user who created the page
   author_id INTEGER NOT NULL,
   title TEXT,
-  summary TEXT,
+  content TEXT,
   created_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now')),
   updated_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now')),
   FOREIGN KEY(author_id) REFERENCES users(id) ON DELETE CASCADE
 );
 CREATE TABLE page_sections(
   id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
   page_id INTEGER NOT NULL,
-  position INTEGER NOT NULL,
   title TEXT NOT NULL,
   content TEXT NOT NULL,
   created_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now')),
   updated_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now')),
-  FOREIGN KEY(page_id) REFERENCES pages(id) ON DELETE CASCADE,
-  CONSTRAINT `page_id_position` UNIQUE(page_id, position)
+  FOREIGN KEY(page_id) REFERENCES pages(id) ON DELETE CASCADE
 );

ee/tabby-db/src/lib.rs

@@ -11,7 +11,7 @@ pub use job_runs::JobRunDAO;
 pub use ldap_credential::LdapCredentialDAO;
 pub use notifications::NotificationDAO;
 pub use oauth_credential::OAuthCredentialDAO;
-pub use pages::PageDAO;
+pub use pages::{PageDAO, PageSectionDAO};
 pub use provided_repositories::ProvidedRepositoryDAO;
 pub use repositories::RepositoryDAO;
 pub use server_setting::ServerSettingDAO;

ee/tabby-db/src/pages.rs

@@ -10,7 +10,7 @@ pub struct PageDAO {
     pub id: i64,
     pub author_id: i64,
     pub title: Option<String>,
-    pub summary: Option<String>,
+    pub content: Option<String>,
     pub created_at: DateTime<Utc>,
     pub updated_at: DateTime<Utc>,
 }
@@ -20,7 +20,6 @@ pub struct PageSectionDAO {
     pub id: i64,
     pub page_id: i64,
 
-    pub position: i64,
     pub title: String,
     pub content: String,
 
@@ -37,26 +36,6 @@ impl DbConn {
         Ok(res.last_insert_rowid())
     }
 
-    pub async fn create_page_section(
-        &self,
-        page_id: i64,
-        position: i64,
-        title: &str,
-        content: &str,
-    ) -> Result<i64> {
-        let res = query!(
-            "INSERT INTO page_sections(page_id, position, title, content) VALUES (?, ?, ?, ?)",
-            page_id,
-            position,
-            title,
-            content
-        )
-        .execute(&self.pool)
-        .await?;
-
-        Ok(res.last_insert_rowid())
-    }
-
     pub async fn update_page_title(&self, page_id: i64, title: &str) -> Result<()> {
         query!(
             "UPDATE pages SET title = ?, updated_at = DATETIME('now') WHERE id = ?",
@@ -69,10 +48,10 @@ impl DbConn {
         Ok(())
     }
 
-    pub async fn update_page_summary(&self, page_id: i64, summary: &str) -> Result<()> {
+    pub async fn update_page_content(&self, page_id: i64, content: &str) -> Result<()> {
         query!(
-            "UPDATE pages SET summary = ?, updated_at = DATETIME('now') WHERE id = ?",
-            summary,
+            "UPDATE pages SET content = ?, updated_at = DATETIME('now') WHERE id = ?",
+            content,
             page_id
         )
         .execute(&self.pool)
@@ -106,7 +85,7 @@ impl DbConn {
                 "id",
                 "author_id",
                 "title",
-                "summary",
+                "content",
                 "created_at" as "created_at: DateTime<Utc>",
                 "updated_at" as "updated_at: DateTime<Utc>"
             ],
@@ -136,7 +115,7 @@ impl DbConn {
                 id,
                 author_id,
                 title,
-                summary,
+                content,
                 created_at as "created_at: DateTime<Utc>",
                 updated_at  as "updated_at: DateTime<Utc>"
             FROM pages
@@ -163,7 +142,6 @@ impl DbConn {
             [
                 "id",
                 "page_id",
-                "position",
                 "title",
                 "content",
                 "created_at" as "created_at: DateTime<Utc>",
@@ -179,4 +157,50 @@ impl DbConn {
 
         Ok(sections)
     }
+
+    pub async fn get_page_section(&self, id: i64) -> Result<Option<PageSectionDAO>> {
+        let section = query_as!(
+            PageSectionDAO,
+            r#"SELECT
+                id,
+                page_id,
+                title,
+                content,
+                created_at as "created_at: DateTime<Utc>",
+                updated_at  as "updated_at: DateTime<Utc>"
+            FROM page_sections
+            WHERE id = ?"#,
+            id
+        )
+        .fetch_optional(&self.pool)
+        .await?;
+
+        Ok(section)
+    }
+
+    pub async fn create_page_section(
+        &self,
+        page_id: i64,
+        title: &str,
+        content: &str,
+    ) -> Result<i64> {
+        let res = query!(
+            "INSERT INTO page_sections(page_id, title, content) VALUES (?, ?, ?)",
+            page_id,
+            title,
+            content
+        )
+        .execute(&self.pool)
+        .await?;
+
+        Ok(res.last_insert_rowid())
+    }
+
+    pub async fn delete_page_section(&self, id: i64) -> Result<()> {
+        query!("DELETE FROM page_sections WHERE id = ?", id,)
+            .execute(&self.pool)
+            .await?;
+
+        Ok(())
+    }
 }

ee/tabby-schema/graphql/schema.graphql

@@ -112,6 +112,11 @@ enum Role {
   ASSISTANT
 }
 
+input AddPageSectionInput {
+  pageId: ID!
+  title: String!
+}
+
 input CodeQueryInput {
   filepath: String
   language: String
@@ -206,12 +211,6 @@ input PasswordResetInput {
   password2: String!
 }
 
-input ReorderSectionInput {
-  pageId: ID!
-  id: ID!
-  position: Int!
-}
-
 input RequestInvitationInput {
   email: String!
 }
@@ -275,13 +274,6 @@ input UpdateOAuthCredentialInput {
   clientSecret: String
 }
 
-input UpdateSectionInput {
-  pageId: ID!
-  id: ID!
-  title: String!
-  regenerate: Boolean!
-}
-
 input UpsertUserGroupMembershipInput {
   userGroupId: ID!
   userId: ID!
@@ -665,13 +657,24 @@ type Mutation {
   "Turn on persisted status for a thread."
   setThreadPersisted(threadId: ID!): Boolean!
   updateThreadMessage(input: UpdateMessageInput!): Boolean!
+  """
+    Utilize an existing thread and its messages to create a page.
+    This will automatically generate the page title and a summary of the content.
+
+    Every two messages will be converted into a page section.
+    The user's message will serve as the title of the section.
+    The assistant's message will become the content of the section.
+  """
   convertThreadToPage(threadId: ID!): ID!
-  generatePageTitle(id: ID!): String!
-  generatePageSummary(id: ID!): String!
+  "delete a page and all its sections."
   deletePage(id: ID!): Boolean!
-  updatePageSection(input: UpdateSectionInput!): Section!
-  reorderPageSections(input: ReorderSectionInput!): Boolean!
-  deletePageSection(pageId: ID!, sectionId: ID!): Boolean!
+  """
+    Creates a new page section.
+    Only the title is required; the answer will be generated as the content.
+  """
+  addPageSection(input: AddPageSectionInput!): ID!
+  "delete a single page section."
+  deletePageSection(sectionId: ID!): Boolean!
   createCustomDocument(input: CreateCustomDocumentInput!): ID!
   deleteCustomDocument(id: ID!): Boolean!
   setPresetDocumentActive(input: SetPresetDocumentActiveInput!): Boolean!
@@ -706,7 +709,7 @@ type Page {
   id: ID!
   authorId: ID!
   title: String
-  summary: String
+  content: String
   createdAt: DateTime!
   updatedAt: DateTime!
 }
@@ -827,6 +830,7 @@ type Query {
     Thread is public within an instance, so no need to check for ownership.
   """
   threadMessages(threadId: ID!, after: String, before: String, first: Int, last: Int): MessageConnection!
+  "Read pages by page IDs."
   pages(ids: [ID!], after: String, before: String, first: Int, last: Int): PageConnection!
   pageSections(pageId: ID!, after: String, before: String, first: Int, last: Int): SectionConnection!
   customWebDocuments(ids: [ID!], after: String, before: String, first: Int, last: Int): CustomDocumentConnection!
@@ -878,7 +882,6 @@ type RepositoryGrepOutput {
 type Section {
   id: ID!
   pageId: ID!
-  position: Int!
   title: String!
   content: String!
   createdAt: DateTime!

ee/tabby-schema/src/dao.rs

@@ -3,9 +3,10 @@ use hash_ids::HashIds;
 use lazy_static::lazy_static;
 use tabby_db::{
     EmailSettingDAO, IntegrationDAO, InvitationDAO, JobRunDAO, LdapCredentialDAO, NotificationDAO,
-    OAuthCredentialDAO, PageDAO, ServerSettingDAO, ThreadDAO, ThreadMessageAttachmentClientCode,
-    ThreadMessageAttachmentCode, ThreadMessageAttachmentDoc, ThreadMessageAttachmentIssueDoc,
-    ThreadMessageAttachmentPullDoc, ThreadMessageAttachmentWebDoc, UserEventDAO,
+    OAuthCredentialDAO, PageDAO, PageSectionDAO, ServerSettingDAO, ThreadDAO,
+    ThreadMessageAttachmentClientCode, ThreadMessageAttachmentCode, ThreadMessageAttachmentDoc,
+    ThreadMessageAttachmentIssueDoc, ThreadMessageAttachmentPullDoc, ThreadMessageAttachmentWebDoc,
+    UserEventDAO,
 };
 
 use crate::{
@@ -354,7 +355,20 @@ impl From<PageDAO> for page::Page {
             id: value.id.as_id(),
             author_id: value.author_id.as_id(),
             title: value.title,
-            summary: value.summary,
+            content: value.content,
+            created_at: value.created_at,
+            updated_at: value.updated_at,
+        }
+    }
+}
+
+impl From<PageSectionDAO> for page::Section {
+    fn from(value: PageSectionDAO) -> Self {
+        Self {
+            id: value.id.as_id(),
+            page_id: value.page_id.as_id(),
+            title: value.title,
+            content: value.content,
             created_at: value.created_at,
             updated_at: value.updated_at,
         }