From efe964d59c99060ed012f4e6ef5b8399bd05cf8d Mon Sep 17 00:00:00 2001 From: Gabriel Gordon-Hall Date: Thu, 28 Mar 2024 11:44:37 +0000 Subject: [PATCH] remove unused config vars --- server/bleep/src/config.rs | 22 ------------ server/bleep/src/ee/webserver.rs | 8 +---- server/bleep/src/webserver/config.rs | 2 -- server/bleep/src/webserver/middleware.rs | 44 ------------------------ 4 files changed, 1 insertion(+), 75 deletions(-) diff --git a/server/bleep/src/config.rs b/server/bleep/src/config.rs index 2e5d2d075d..7671a33407 100644 --- a/server/bleep/src/config.rs +++ b/server/bleep/src/config.rs @@ -85,11 +85,6 @@ pub struct Configuration { // // External dependencies // - #[clap(long, default_value_t = default_answer_api_url())] - #[serde(default = "default_answer_api_url")] - /// URL for the answer-api - pub answer_api_url: String, - #[clap(long)] /// Path to dynamic libraries used in the app. pub dylib_dir: Option, @@ -156,11 +151,6 @@ pub struct Configuration { #[clap(long)] pub bloop_instance_org: Option, - #[clap(long)] - #[serde(serialize_with = "serialize_secret_opt_str", default)] - /// Bot secret token - pub bot_secret: Option, - // // Cloud deployment values // @@ -304,12 +294,6 @@ impl Configuration { qdrant_url: right_if_default!(b.qdrant_url, a.qdrant_url, String::new()), - answer_api_url: right_if_default!( - b.answer_api_url, - a.answer_api_url, - default_answer_api_url() - ), - cognito_userpool_id: b.cognito_userpool_id.or(a.cognito_userpool_id), cognito_client_id: b.cognito_client_id.or(a.cognito_client_id), @@ -326,8 +310,6 @@ impl Configuration { instance_domain: b.instance_domain.or(a.instance_domain), - bot_secret: b.bot_secret.or(a.bot_secret), - dylib_dir: b.dylib_dir.or(a.dylib_dir), } } @@ -404,10 +386,6 @@ fn default_qdrant_url() -> String { String::from("http://127.0.0.1:6334") } -fn default_answer_api_url() -> String { - String::from("http://127.0.0.1:7879") -} - fn default_max_chunk_tokens() -> usize { 256 } diff --git a/server/bleep/src/ee/webserver.rs b/server/bleep/src/ee/webserver.rs index 6e50990ea7..139b031108 100644 --- a/server/bleep/src/ee/webserver.rs +++ b/server/bleep/src/ee/webserver.rs @@ -7,7 +7,6 @@ use crate::{ background::SyncConfig, repo::FilterUpdate, webserver::{ - middleware::User, prelude::*, repos::{RepoParams, ReposResponse}, }, @@ -19,9 +18,8 @@ use crate::{ // pub(crate) async fn patch_repository( Query(RepoParams { repo, .. }): Query, - user: Extension, State(app): State, - Json(mut patch): Json, + Json(patch): Json, ) -> impl IntoResponse { if let Some(ref file_filter) = patch.file_filter { _ = crate::repo::iterator::FileFilter::from(file_filter); @@ -31,10 +29,6 @@ pub(crate) async fn patch_repository( _ = crate::repo::iterator::BranchFilter::from(branch_filter); } - if !user.paid_features(&app).await { - patch.branch_filter = None; - } - if patch.file_filter.is_some() || patch.branch_filter.is_some() { app.write_index() .enqueue(SyncConfig::new(app, repo).filter_updates(patch.into())) diff --git a/server/bleep/src/webserver/config.rs b/server/bleep/src/webserver/config.rs index a39344a37c..34bb3d4ff6 100644 --- a/server/bleep/src/webserver/config.rs +++ b/server/bleep/src/webserver/config.rs @@ -13,7 +13,6 @@ pub(super) struct ConfigResponse { bloop_version: String, bloop_commit: String, credentials_upgrade: bool, - paid: bool, } impl super::ApiResponse for ConfigResponse {} @@ -48,7 +47,6 @@ pub(super) async fn get( bloop_commit: git_version::git_version!(fallback = "unknown").into(), bloop_user_profile: user_profile, credentials_upgrade: app.config.source.exists("credentials.json"), - paid: user.paid_features(&app).await, user_login, github_user, org_name, diff --git a/server/bleep/src/webserver/middleware.rs b/server/bleep/src/webserver/middleware.rs index 0039166822..349dc2ee38 100644 --- a/server/bleep/src/webserver/middleware.rs +++ b/server/bleep/src/webserver/middleware.rs @@ -10,7 +10,6 @@ use axum::{ }; use axum_extra::extract::CookieJar; use jwt_authorizer::JwtClaims; -use tracing::error; #[derive(Serialize, Clone)] pub enum User { @@ -59,49 +58,6 @@ impl User { Ok(llm::client::Client::new(app.clone())) } - - pub(crate) async fn paid_features(&self, app: &Application) -> bool { - let access_token = match self { - User::Desktop { access_token, .. } => access_token, - User::Cloud { .. } => return true, - _ => return false, - }; - - let Ok(response) = reqwest::Client::new() - .get(format!("{}/v2/get-usage-quota", app.config.answer_api_url)) - .bearer_auth(access_token) - .send() - .await - else { - error!("failed to get quota for user"); - return false; - }; - - if response.status().is_success() { - let response: serde_json::Value = - response.json().await.expect("answer_api proto bad or down"); - - response - .get("upgraded") - .and_then(serde_json::Value::as_bool) - .unwrap_or_default() - } else { - let status = response.status(); - match response.text().await { - Ok(body) if !body.is_empty() => { - error!(?status, ?body, "request failed with status code") - } - Ok(_) => error!(?status, "request failed; response had no body"), - Err(err) => error!( - ?status, - ?err, - "request failed; failed to retrieve response body", - ), - } - - false - } - } } pub fn local_user(router: Router, app: Application) -> Router {