Merge pull request #129 from brainless/feature/integrate_olla_anthrop…

…ic_send_chat_ai_request Integrate Ollama, Anthropic
brainless · Jun 10, 2024 · 568ea51 · 568ea51
2 parents 12c86f1 + 8e0880a
commit 568ea51
Show file tree

Hide file tree

Showing 63 changed files with 2,726 additions and 2,103 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -26,7 +26,7 @@ ts-rs = { version = "7.1.1", features = ["chrono", "chrono-impl", "url", "url-im
 sqlx-postgres = "0.7.3"
 chrono = { version = "0.4.34", features = ["serde"] }
 sqlparser = "0.43.1"
-reqwest = { version = "0.11.24", features = ["json"] }
+reqwest = { version = "0.11.24", features = ["blocking", "json"] }
 serde_json = "1.0.114"
 tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread"] }
 log = "0.4.21"

diff --git a/src-tauri/migrations/20240601025237_chat.sql b/src-tauri/migrations/20240601025237_chat.sql
@@ -3,17 +3,18 @@ CREATE TABLE chat
 (
     id                          INTEGER PRIMARY KEY,
 
-    previous_chat_id            INTEGER,
+    root_chat_id                INTEGER,
+    role                        VARCHAR(60),
     message                     TEXT,
     requested_content_format    JSONB,
     tool_response               JSONB,
     is_system_chat              BOOL NOT NULL,
-    requested_ai_model_api_name VARCHAR(60),
+    requested_ai_model          VARCHAR(60),
     is_processed_by_ai          BOOL,
     api_error_response          TEXT,
 
     created_by_id               INTEGER,
     created_at                  DATETIME NOT NULL,
-    FOREIGN KEY (previous_chat_id) REFERENCES chat (id) ON DELETE CASCADE,
+    FOREIGN KEY (root_chat_id) REFERENCES chat (id) ON DELETE CASCADE,
     FOREIGN KEY (created_by_id) REFERENCES user_account (id)
 );
diff --git a/src-tauri/migrations/20240603032137_workflow.sql b/src-tauri/migrations/20240603032137_workflow.sql
@@ -1,5 +1,4 @@
 -- Workflow table to store repeatable tasks
-
 CREATE TABLE workflow
 (
     id                      INTEGER PRIMARY KEY,
@@ -14,6 +13,7 @@ CREATE TABLE workflow
     FOREIGN KEY (created_by_id) REFERENCES user_account (id)
 );
 
+
 CREATE TABLE step_template
 (
     id                              INTEGER PRIMARY KEY,

diff --git a/src-tauri/src/ai/commands.rs b/src-tauri/src/ai/commands.rs