move the review classifier, agent login and inference types into swarm-wire
This commit is contained in:
parent
bdeec3f744
commit
6ea13c02e3
4 changed files with 344 additions and 332 deletions
|
|
@ -26,7 +26,7 @@ use axum::http::{HeaderMap, StatusCode};
|
|||
use forgejo_api::{ApiErrorKind, ForgejoError};
|
||||
use problem_details::ProblemDetails;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use swarm_queue_client::review_classifier::{Classification, Polarity};
|
||||
use swarm_wire::review_classifier::{Classification, Polarity};
|
||||
use utoipa::ToSchema;
|
||||
|
||||
use super::{FileSource, RULES_PATHS, check_classifications, operator, parse_rules, split_repo};
|
||||
|
|
@ -509,7 +509,7 @@ mod tests {
|
|||
|
||||
use axum::body::Body;
|
||||
use axum::http::{Request, StatusCode};
|
||||
use swarm_queue_client::review_classifier::{Overall, Reply};
|
||||
use swarm_wire::review_classifier::{Overall, Reply};
|
||||
use tower::ServiceExt as _;
|
||||
|
||||
use super::super::tests::Fake;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ use std::time::Duration;
|
|||
|
||||
use forgejo_api::ForgejoError;
|
||||
use serde::Deserialize;
|
||||
use swarm_queue_client::review_classifier::{Overall, Reply, Row, TryOut, Verdict};
|
||||
use swarm_wire::review_classifier::{Overall, Reply, Row, TryOut, Verdict};
|
||||
use tokio::sync::Notify;
|
||||
use tokio::task::JoinHandle;
|
||||
|
||||
|
|
@ -983,7 +983,7 @@ mod tests {
|
|||
use std::time::Duration;
|
||||
|
||||
use axum::http::StatusCode;
|
||||
use swarm_queue_client::review_classifier::Polarity;
|
||||
use swarm_wire::review_classifier::Polarity;
|
||||
|
||||
use super::*;
|
||||
use crate::review_classifier::runs::tests::FakeDoc;
|
||||
|
|
@ -2113,7 +2113,7 @@ mod tests {
|
|||
|
||||
#[tokio::test]
|
||||
async fn a_review_runs_on_the_stored_runtime_model_and_effort() {
|
||||
use swarm_queue_client::agent_inference::Effort;
|
||||
use swarm_wire::agent_inference::Effort;
|
||||
|
||||
let mut fake = Fake::new(
|
||||
Reply::Done {
|
||||
|
|
@ -2122,10 +2122,10 @@ mod tests {
|
|||
},
|
||||
vec![rules_json()],
|
||||
);
|
||||
let acp = swarm_queue_client::review_classifier::Acp {
|
||||
let acp = swarm_wire::review_classifier::Acp {
|
||||
base_url: "https://llm.example/v1".to_owned(),
|
||||
model: "qwen".to_owned(),
|
||||
prices: swarm_queue_client::review_classifier::Prices {
|
||||
prices: swarm_wire::review_classifier::Prices {
|
||||
input: 1.0,
|
||||
output: 2.0,
|
||||
cache_read: None,
|
||||
|
|
@ -2149,7 +2149,7 @@ mod tests {
|
|||
);
|
||||
assert_eq!(
|
||||
sent[0].runtime,
|
||||
swarm_queue_client::review_classifier::Runtime::Acp(acp)
|
||||
swarm_wire::review_classifier::Runtime::Acp(acp)
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ use axum::extract::State;
|
|||
use axum::http::StatusCode;
|
||||
use problem_details::ProblemDetails;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use swarm_queue_client::review_classifier::{Overall, Reply, Row};
|
||||
use swarm_wire::review_classifier::{Overall, Reply, Row};
|
||||
use utoipa::ToSchema;
|
||||
|
||||
use crate::routes::{AppState, error_problem};
|
||||
|
|
@ -386,7 +386,7 @@ pub(crate) mod tests {
|
|||
|
||||
use axum::body::Body;
|
||||
use axum::http::Request;
|
||||
use swarm_queue_client::review_classifier::{Polarity, Verdict};
|
||||
use swarm_wire::review_classifier::{Polarity, Verdict};
|
||||
use tower::ServiceExt as _;
|
||||
use tracing_subscriber::layer::SubscriberExt as _;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ use axum::extract::rejection::JsonRejection;
|
|||
use axum::http::{HeaderMap, StatusCode};
|
||||
use problem_details::ProblemDetails;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use swarm_queue_client::agent_inference::Effort;
|
||||
use swarm_queue_client::review_classifier::{Acp, Runtime};
|
||||
use swarm_wire::agent_inference::Effort;
|
||||
use swarm_wire::review_classifier::{Acp, Runtime};
|
||||
use utoipa::ToSchema;
|
||||
|
||||
use crate::routes::{AppState, error_problem, wanted_error_status};
|
||||
|
|
@ -79,7 +79,7 @@ pub(crate) enum RuntimeKind {
|
|||
impl Default for Settings {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
model: swarm_queue_client::review_classifier::DEFAULT_MODEL.to_owned(),
|
||||
model: swarm_wire::review_classifier::DEFAULT_MODEL.to_owned(),
|
||||
effort: None,
|
||||
max_concurrent_reviews: 2,
|
||||
runtime: RuntimeKind::ApiKey,
|
||||
|
|
@ -404,7 +404,7 @@ mod tests {
|
|||
Acp {
|
||||
base_url: "https://llm.example/v1".to_owned(),
|
||||
model: "Qwen/Qwen3-35B".to_owned(),
|
||||
prices: swarm_queue_client::review_classifier::Prices {
|
||||
prices: swarm_wire::review_classifier::Prices {
|
||||
input: 0.5,
|
||||
output: 2.0,
|
||||
cache_read: Some(0.05),
|
||||
|
|
|
|||
Loading…
Reference in a new issue