impl tags api

.env

@@ -0,0 +1,3 @@
+HOST=127.0.0.1
+PORT=8000
+DATABASE_URL="postgresql://infiniflow:infiniflow@localhost/docgpt"

.env.template

@@ -0,0 +1,3 @@
+HOST=127.0.0.1
+PORT=8000
+DATABASE_URL="postgresql://infiniflow:infiniflow@localhost/docgpt"

.gitignore

@@ -14,3 +14,4 @@ Cargo.lock
 *.pdb
 
 .idea/
+.env

Cargo.toml

@@ -8,9 +8,15 @@ edition = "2021"
 [dependencies]
 actix-web = "4.3.1"
 actix-rt = "2.8.0"
+actix-files = "0.6.2"
 postgres = "0.19.7"
 sea-orm = {version = "0.12.9", features = ["sqlx-postgres", "runtime-tokio-native-tls", "macros"]}
 serde = { version = "1", features = ["derive"] }
+serde_json = "1.0"
+tracing-subscriber = "0.3.18"
+dotenvy = "0.15.7"
+listenfd = "1.0.1"
+migration = { path = "./migration" }
 
 [[bin]]
 name = "doc_gpt"

migration/README.md

@@ -1,4 +1,4 @@
-# Running Migrator CLI
+          # Running Migrator CLI
 
 - Generate a new migration file
     ```sh

migration/src/m20220101_000001_create_table.rs

@@ -37,12 +37,13 @@ impl MigrationTrait for Migration {
                     .table(TagInfo::Table)
                     .if_not_exists()
                     .col(
-                        ColumnDef::new(TagInfo::Uid)
+                        ColumnDef::new(TagInfo::Tid)
                             .big_integer()
                             .not_null()
                             .auto_increment()
                             .primary_key(),
                     )
+                    .col(ColumnDef::new(TagInfo::Uid).big_integer().not_null())
                     .col(ColumnDef::new(TagInfo::TagName).string().not_null())
                     .col(ColumnDef::new(TagInfo::Regx).string())
                     .col(ColumnDef::new(TagInfo::Color).big_integer().default(1))
@@ -61,8 +62,7 @@ impl MigrationTrait for Migration {
                     .table(Tag2Doc::Table)
                     .if_not_exists()
                     .col(ColumnDef::new(Tag2Doc::TagId).big_integer())
-                    .col(ColumnDef::new(Tag2Doc::Did).big_integer().comment("doc id, did in docinfo"))
-                    .index(Index::create().col(Tag2Doc::TagId))
+                    .col(ColumnDef::new(Tag2Doc::Did).big_integer())
                     .to_owned(),
             )
             .await?;
@@ -73,8 +73,7 @@ impl MigrationTrait for Migration {
                     .table(Kb2Doc::Table)
                     .if_not_exists()
                     .col(ColumnDef::new(Kb2Doc::KbId).big_integer())
-                    .col(ColumnDef::new(Kb2Doc::Did).big_integer().comment("doc id, did in docinfo"))
-                    .index(Index::create().col(Kb2Doc::KbId))
+                    .col(ColumnDef::new(Kb2Doc::Did).big_integer())
                     .to_owned(),
             )
             .await?;
@@ -86,7 +85,6 @@ impl MigrationTrait for Migration {
                     .if_not_exists()
                     .col(ColumnDef::new(Dialog2Kb::DialogId).big_integer())
                     .col(ColumnDef::new(Dialog2Kb::KbId).big_integer())
-                    .index(Index::create().col(Dialog2Kb::DialogId))
                     .to_owned(),
             )
             .await?;
@@ -96,9 +94,8 @@ impl MigrationTrait for Migration {
                 Table::create()
                     .table(Doc2Doc::Table)
                     .if_not_exists()
-                    .col(ColumnDef::new(Doc2Doc::ParentId).big_integer().comment("doc id, did in docinfo"))
-                    .col(ColumnDef::new(Doc2Doc::Did).big_integer().comment("doc id, did in docinfo"))
-                    .index(Index::create().col(Doc2Doc::ParentId))
+                    .col(ColumnDef::new(Doc2Doc::ParentId).big_integer())
+                    .col(ColumnDef::new(Doc2Doc::Did).big_integer())
                     .to_owned(),
             )
             .await?;
@@ -108,15 +105,16 @@ impl MigrationTrait for Migration {
                 Table::create()
                     .table(KbInfo::Table)
                     .if_not_exists()
-                    .col(ColumnDef::new(KbInfo::KbId).big_integer().auto_increment().not_null())
+                    .col(ColumnDef::new(KbInfo::KbId).big_integer()
+                        .auto_increment()
+                        .not_null()
+                        .primary_key())
                     .col(ColumnDef::new(KbInfo::Uid).big_integer().not_null())
                     .col(ColumnDef::new(KbInfo::KbName).string().not_null())
                     .col(ColumnDef::new(KbInfo::Icon).big_integer().default(1))
                     .col(ColumnDef::new(KbInfo::CreatedAt).date().not_null())
                     .col(ColumnDef::new(KbInfo::UpdatedAt).date().not_null())
                     .col(ColumnDef::new(KbInfo::IsDeleted).boolean().default(false))
-                    .index(Index::create().col(KbInfo::KbId))
-                    .index(Index::create().col(KbInfo::Uid))
                     .to_owned(),
             )
             .await?;
@@ -126,7 +124,10 @@ impl MigrationTrait for Migration {
                 Table::create()
                     .table(DocInfo::Table)
                     .if_not_exists()
-                    .col(ColumnDef::new(DocInfo::Did).big_integer().auto_increment().not_null())
+                    .col(ColumnDef::new(DocInfo::Did).big_integer()
+                        .not_null()
+                        .auto_increment()
+                        .primary_key())
                     .col(ColumnDef::new(DocInfo::Uid).big_integer().not_null())
                     .col(ColumnDef::new(DocInfo::DocName).string().not_null())
                     .col(ColumnDef::new(DocInfo::Size).big_integer().not_null())
@@ -135,8 +136,6 @@ impl MigrationTrait for Migration {
                     .col(ColumnDef::new(DocInfo::CreatedAt).date().not_null())
                     .col(ColumnDef::new(DocInfo::UpdatedAt).date().not_null())
                     .col(ColumnDef::new(DocInfo::IsDeleted).boolean().default(false))
-                    .index(Index::create().col(DocInfo::Did))
-                    .index(Index::create().col(DocInfo::Uid))
                     .to_owned(),
             )
             .await?;
@@ -146,15 +145,17 @@ impl MigrationTrait for Migration {
                 Table::create()
                     .table(DialogInfo::Table)
                     .if_not_exists()
-                    .col(ColumnDef::new(DialogInfo::DialogId).big_integer().auto_increment().not_null())
+                    .col(ColumnDef::new(DialogInfo::DialogId)
+                        .big_integer()
+                        .not_null()
+                        .auto_increment()
+                        .primary_key())
                     .col(ColumnDef::new(DialogInfo::Uid).big_integer().not_null())
                     .col(ColumnDef::new(DialogInfo::DialogName).string().not_null())
                     .col(ColumnDef::new(DialogInfo::History).string().comment("json"))
                     .col(ColumnDef::new(DialogInfo::CreatedAt).date().not_null())
                     .col(ColumnDef::new(DialogInfo::UpdatedAt).date().not_null())
                     .col(ColumnDef::new(DialogInfo::IsDeleted).boolean().default(false))
-                    .index(Index::create().col(DialogInfo::DialogId))
-                    .index(Index::create().col(DialogInfo::Uid))
                     .to_owned(),
             )
             .await?;
@@ -221,6 +222,7 @@ enum UserInfo {
 #[derive(DeriveIden)]
 enum TagInfo {
     Table,
+    Tid,
     Uid,
     TagName,
     Regx,

src/api/mod.rs

@@ -0,0 +1,10 @@
+use serde::{Deserialize, Serialize};
+
+pub(crate) mod tag;
+
+#[derive(Debug, Deserialize, Serialize)]
+struct JsonResponse<T> {
+    code: u32,
+    err: String,
+    data: T,
+}

src/api/tag.rs

@@ -0,0 +1,58 @@
+use std::collections::HashMap;
+use actix_web::{get, HttpResponse, post, web};
+use actix_web::http::Error;
+use crate::api::JsonResponse;
+use crate::AppState;
+use crate::entity::tag_info;
+use crate::service::tag_info::{Mutation, Query};
+
+#[post("/v1.0/create_tag")]
+async fn create(model: web::Json<tag_info::Model>, data: web::Data<AppState>) -> Result<HttpResponse, Error> {
+    let model = Mutation::create_tag(&data.conn, model.into_inner()).await.unwrap();
+
+    let mut result = HashMap::new();
+    result.insert("tid", model.uid.unwrap());
+
+    let json_response = JsonResponse {
+        code: 200,
+        err: "".to_owned(),
+        data: result,
+    };
+
+    Ok(HttpResponse::Ok()
+        .content_type("application/json")
+        .body(serde_json::to_string(&json_response).unwrap()))
+}
+
+#[post("/v1.0/delete_tag")]
+async fn delete(model: web::Json<tag_info::Model>, data: web::Data<AppState>) -> Result<HttpResponse, Error> {
+    let _ = Mutation::delete_tag(&data.conn, model.tid).await.unwrap();
+
+    let json_response = JsonResponse {
+        code: 200,
+        err: "".to_owned(),
+        data: (),
+    };
+
+    Ok(HttpResponse::Ok()
+        .content_type("application/json")
+        .body(serde_json::to_string(&json_response).unwrap()))
+}
+
+#[get("/v1.0/tags")]
+async fn list(data: web::Data<AppState>) -> Result<HttpResponse, Error> {
+    let tags = Query::find_tag_infos(&data.conn).await.unwrap();
+
+    let mut result = HashMap::new();
+    result.insert("tags", tags);
+
+    let json_response = JsonResponse {
+        code: 200,
+        err: "".to_owned(),
+        data: result,
+    };
+
+    Ok(HttpResponse::Ok()
+        .content_type("application/json")
+        .body(serde_json::to_string(&json_response).unwrap()))
+}

src/entity/dialog_2_kb.rs → src/entity/dialog2_kb.rs

@@ -2,9 +2,10 @@ use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Deserialize, Serialize)]
-#[sea_orm(table_name = "dialog_2_kb")]
+#[sea_orm(table_name = "dialog2_kb")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
+    #[sea_orm(index)]
     pub dialog_id: i64,
     #[sea_orm(primary_key, auto_increment = false)]
     pub kb_id: i64,

src/entity/dialog_info.rs

@@ -6,27 +6,25 @@ use serde::{Deserialize, Serialize};
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub dialog_id: i64,
-    #[sea_orm(primary_key, auto_increment = false)]
+    #[sea_orm(index)]
     pub uid: i64,
     pub dialog_name: String,
     pub history: String,
 
-    pub created_at: DateTimeWithTimeZone,
-    pub updated_at: DateTimeWithTimeZone,
-    #[sea_orm(soft_delete_column)]
-    pub is_deleted: bool,
+    pub created_at: Date,
+    pub updated_at: Date,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {}
 
 impl Related<super::kb_info::Entity> for Entity {
     fn to() -> RelationDef {
-        super::dialog_2_kb::Relation::KbInfo.def()
+        super::dialog2_kb::Relation::KbInfo.def()
     }
 
     fn via() -> Option<RelationDef> {
-        Some(super::dialog_2_kb::Relation::DialogInfo.def().rev())
+        Some(super::dialog2_kb::Relation::DialogInfo.def().rev())
     }
 }
 

src/entity/doc_2_doc.rs → src/entity/doc2_doc.rs

@@ -2,9 +2,10 @@ use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Deserialize, Serialize)]
-#[sea_orm(table_name = "doc_2_doc")]
+#[sea_orm(table_name = "doc2_doc")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
+    #[sea_orm(index)]
     pub parent_id: i64,
     #[sea_orm(primary_key, auto_increment = false)]
     pub did: i64,

src/entity/doc_info.rs

@@ -6,16 +6,16 @@ use serde::{Deserialize, Serialize};
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub did: i64,
-    #[sea_orm(primary_key, auto_increment = false)]
+    #[sea_orm(index)]
     pub uid: i64,
     pub doc_name: String,
     pub size: i64,
     #[sea_orm(column_name = "type")]
     pub r#type: String,
     pub kb_progress: f64,
 
-    pub created_at: DateTimeWithTimeZone,
-    pub updated_at: DateTimeWithTimeZone,
+    pub created_at: Date,
+    pub updated_at: Date,
     #[sea_orm(soft_delete_column)]
     pub is_deleted: bool,
 }
@@ -25,31 +25,31 @@ pub enum Relation {}
 
 impl Related<super::tag_info::Entity> for Entity {
     fn to() -> RelationDef {
-        super::tag_2_doc::Relation::Tag.def()
+        super::tag2_doc::Relation::Tag.def()
     }
 
     fn via() -> Option<RelationDef> {
-        Some(super::tag_2_doc::Relation::DocInfo.def().rev())
+        Some(super::tag2_doc::Relation::DocInfo.def().rev())
     }
 }
 
 impl Related<super::kb_info::Entity> for Entity {
     fn to() -> RelationDef {
-        super::kb_2_doc::Relation::KbInfo.def()
+        super::kb2_doc::Relation::KbInfo.def()
     }
 
     fn via() -> Option<RelationDef> {
-        Some(super::kb_2_doc::Relation::DocInfo.def().rev())
+        Some(super::kb2_doc::Relation::DocInfo.def().rev())
     }
 }
 
 impl Related<Entity> for Entity {
     fn to() -> RelationDef {
-        super::doc_2_doc::Relation::Parent.def()
+        super::doc2_doc::Relation::Parent.def()
     }
 
     fn via() -> Option<RelationDef> {
-        Some(super::doc_2_doc::Relation::Child.def().rev())
+        Some(super::doc2_doc::Relation::Child.def().rev())
     }
 }
 

src/entity/kb_2_doc.rs → src/entity/kb2_doc.rs

@@ -2,9 +2,10 @@ use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Deserialize, Serialize)]
-#[sea_orm(table_name = "kb_2_doc")]
+#[sea_orm(table_name = "kb2_doc")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
+    #[sea_orm(index)]
     pub kb_id: i64,
     #[sea_orm(primary_key, auto_increment = false)]
     pub uid: i64,