From 040e3a596e1e22d432ea5d911d5848a7dbca8a30 Mon Sep 17 00:00:00 2001 From: Meng Zhang Date: Wed, 21 Aug 2024 16:33:22 -0700 Subject: [PATCH] update --- Cargo.lock | 2 -- crates/tabby-common/Cargo.toml | 1 - ee/tabby-ui/lib/types/chat.ts | 4 +--- ee/tabby-webserver/Cargo.toml | 1 - ee/tabby-webserver/src/routes/mod.rs | 2 +- ee/tabby-webserver/src/service/answer.rs | 13 ++++++++----- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 83f7dd48085c..b62db063b239 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5037,7 +5037,6 @@ name = "tabby-common" version = "0.17.0-dev.0" dependencies = [ "anyhow", - "async-openai", "async-trait", "axum", "axum-extra", @@ -5272,7 +5271,6 @@ dependencies = [ "tracing", "url", "urlencoding", - "utoipa", "uuid", ] diff --git a/crates/tabby-common/Cargo.toml b/crates/tabby-common/Cargo.toml index fa01319e4127..15c32235b75d 100644 --- a/crates/tabby-common/Cargo.toml +++ b/crates/tabby-common/Cargo.toml @@ -25,7 +25,6 @@ tracing.workspace = true chrono.workspace = true axum.workspace = true axum-extra = { workspace = true, features = ["typed-header"] } -async-openai.workspace = true [dev-dependencies] temp_testdir = { workspace = true } diff --git a/ee/tabby-ui/lib/types/chat.ts b/ee/tabby-ui/lib/types/chat.ts index 3f710c25f04e..ffd542fa3688 100644 --- a/ee/tabby-ui/lib/types/chat.ts +++ b/ee/tabby-ui/lib/types/chat.ts @@ -1,7 +1,5 @@ import type { ChatMessage, Context } from 'tabby-chat-panel' -import type { - components, -} from 'tabby-openapi' +import type { components } from 'tabby-openapi' import { MessageAttachmentCode, diff --git a/ee/tabby-webserver/Cargo.toml b/ee/tabby-webserver/Cargo.toml index 3c1108be3d22..cde4f85797dd 100644 --- a/ee/tabby-webserver/Cargo.toml +++ b/ee/tabby-webserver/Cargo.toml @@ -54,7 +54,6 @@ cron = "0.12.1" async-stream.workspace = true logkit.workspace = true async-openai.workspace = true -utoipa.workspace = true [dev-dependencies] assert_matches.workspace = true diff --git a/ee/tabby-webserver/src/routes/mod.rs b/ee/tabby-webserver/src/routes/mod.rs index 39db9131d33f..aceb09af4fda 100644 --- a/ee/tabby-webserver/src/routes/mod.rs +++ b/ee/tabby-webserver/src/routes/mod.rs @@ -30,7 +30,7 @@ pub fn create( ctx: Arc, api: Router, ui: Router, - answer: Option>, + _answer: Option>, ) -> (Router, Router) { let schema = Arc::new(create_schema()); diff --git a/ee/tabby-webserver/src/service/answer.rs b/ee/tabby-webserver/src/service/answer.rs index 73809a12175e..b4b9b617fac6 100644 --- a/ee/tabby-webserver/src/service/answer.rs +++ b/ee/tabby-webserver/src/service/answer.rs @@ -10,16 +10,19 @@ use async_openai::{ }; use async_stream::stream; use futures::stream::BoxStream; -use tabby_common::{api::{ - code::{CodeSearch, CodeSearchError, CodeSearchHit, CodeSearchParams, CodeSearchQuery}, - doc::{DocSearch, DocSearchError, DocSearchHit}, -}, config::AnswerConfig}; +use tabby_common::{ + api::{ + code::{CodeSearch, CodeSearchError, CodeSearchHit, CodeSearchParams, CodeSearchQuery}, + doc::{DocSearch, DocSearchError, DocSearchHit}, + }, + config::AnswerConfig, +}; use tabby_inference::ChatCompletionStream; use tabby_schema::{ repository::RepositoryService, thread::{ self, CodeQueryInput, CodeSearchParamsOverrideInput, DocQueryInput, MessageAttachment, - MessageAttachmentCodeInput, ThreadRunItem, ThreadRunOptionsInput, + ThreadRunItem, ThreadRunOptionsInput, }, web_crawler::WebCrawlerService, };