mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-01 17:00:21 +08:00
refactor: 大规模模块拆分与代码精简,新增 ai-pipeline/data-contracts 独立 crate
- 新增 aether-ai-pipeline 和 aether-data-contracts crate,将 pipeline 逻辑与数据契约从 gateway 中解耦 - 重构 admin handlers:拆分单体模块为 auth/billing/endpoint/features/model/observability/provider/system 等独立子模块 - 合并 chat/cli 重复代码路径:精简 conversion、finalize、planner 中的 sync/chat/cli 分支 - 重构 scheduler/executor/data 层,引入 facade 模式降低模块间耦合 - 移除冗余的 intent 模块,将 plan_fallback/policy/stream_path/sync_path 迁移至 executor - 前端适配:调整 admin API 调用和 provider 模型测试对话框
This commit is contained in:
@@ -9,6 +9,7 @@ description = "Usage runtime shared types and queue primitives extracted from ae
|
||||
[dependencies]
|
||||
aether-contracts.workspace = true
|
||||
aether-data.workspace = true
|
||||
aether-data-contracts.workspace = true
|
||||
async-trait.workspace = true
|
||||
base64.workspace = true
|
||||
serde.workspace = true
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use aether_data::DataLayerError;
|
||||
use aether_data_contracts::DataLayerError;
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct UsageRuntimeConfig {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use std::collections::BTreeMap;
|
||||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
|
||||
use aether_data::DataLayerError;
|
||||
use aether_data_contracts::DataLayerError;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::Value;
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ use aether_data::redis::{
|
||||
RedisConsumerGroup, RedisConsumerName, RedisStreamEntry, RedisStreamName,
|
||||
RedisStreamReclaimConfig, RedisStreamRunner, RedisStreamRunnerConfig,
|
||||
};
|
||||
use aether_data::DataLayerError;
|
||||
use aether_data_contracts::DataLayerError;
|
||||
|
||||
use super::config::UsageRuntimeConfig;
|
||||
use super::event::UsageEvent;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use aether_data::repository::usage::UpsertUsageRecord;
|
||||
use aether_data::DataLayerError;
|
||||
use aether_data_contracts::repository::usage::UpsertUsageRecord;
|
||||
use aether_data_contracts::DataLayerError;
|
||||
|
||||
use crate::{UsageEvent, UsageEventType};
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use aether_data::repository::candidates::StoredRequestCandidate;
|
||||
use aether_data::repository::video_tasks::StoredVideoTask;
|
||||
use aether_data_contracts::repository::candidates::StoredRequestCandidate;
|
||||
use aether_data_contracts::repository::video_tasks::StoredVideoTask;
|
||||
use serde_json::{Map, Value};
|
||||
|
||||
pub fn report_context_is_locally_actionable(report_context: Option<&Value>) -> bool {
|
||||
@@ -105,8 +105,10 @@ fn has_u64(value: &Value, key: &str) -> bool {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use aether_data::repository::candidates::{RequestCandidateStatus, StoredRequestCandidate};
|
||||
use aether_data::repository::video_tasks::{StoredVideoTask, VideoTaskStatus};
|
||||
use aether_data_contracts::repository::candidates::{
|
||||
RequestCandidateStatus, StoredRequestCandidate,
|
||||
};
|
||||
use aether_data_contracts::repository::video_tasks::{StoredVideoTask, VideoTaskStatus};
|
||||
use serde_json::{json, Value};
|
||||
|
||||
use super::{
|
||||
|
||||
@@ -2,7 +2,7 @@ use std::sync::Arc;
|
||||
|
||||
use aether_contracts::{ExecutionPlan, ExecutionTelemetry};
|
||||
use aether_data::redis::RedisStreamRunner;
|
||||
use aether_data::DataLayerError;
|
||||
use aether_data_contracts::DataLayerError;
|
||||
use async_trait::async_trait;
|
||||
use tracing::warn;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use aether_data::repository::settlement::{StoredUsageSettlement, UsageSettlementInput};
|
||||
use aether_data::repository::usage::StoredRequestUsageAudit;
|
||||
use aether_data::{DataLayerError, DataLayerError::InvalidInput};
|
||||
use aether_data_contracts::repository::settlement::{StoredUsageSettlement, UsageSettlementInput};
|
||||
use aether_data_contracts::repository::usage::StoredRequestUsageAudit;
|
||||
use aether_data_contracts::{DataLayerError, DataLayerError::InvalidInput};
|
||||
use async_trait::async_trait;
|
||||
|
||||
#[async_trait]
|
||||
@@ -57,8 +57,8 @@ mod tests {
|
||||
use std::sync::Mutex;
|
||||
|
||||
use super::{settle_usage_if_needed, UsageSettlementWriter};
|
||||
use aether_data::repository::settlement::UsageSettlementInput;
|
||||
use aether_data::repository::usage::StoredRequestUsageAudit;
|
||||
use aether_data_contracts::repository::settlement::UsageSettlementInput;
|
||||
use aether_data_contracts::repository::usage::StoredRequestUsageAudit;
|
||||
use async_trait::async_trait;
|
||||
|
||||
#[derive(Default)]
|
||||
@@ -77,8 +77,8 @@ mod tests {
|
||||
&self,
|
||||
input: UsageSettlementInput,
|
||||
) -> Result<
|
||||
Option<aether_data::repository::settlement::StoredUsageSettlement>,
|
||||
aether_data::DataLayerError,
|
||||
Option<aether_data_contracts::repository::settlement::StoredUsageSettlement>,
|
||||
aether_data_contracts::DataLayerError,
|
||||
> {
|
||||
self.inputs
|
||||
.lock()
|
||||
@@ -183,7 +183,10 @@ mod tests {
|
||||
.await
|
||||
.expect_err("non-finite costs should be rejected");
|
||||
|
||||
assert!(matches!(err, aether_data::DataLayerError::InvalidInput(_)));
|
||||
assert!(matches!(
|
||||
err,
|
||||
aether_data_contracts::DataLayerError::InvalidInput(_)
|
||||
));
|
||||
let inputs = writer.inputs.lock().expect("settlement inputs lock");
|
||||
assert!(inputs.is_empty());
|
||||
}
|
||||
|
||||
@@ -2,8 +2,8 @@ use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
|
||||
use aether_data::redis::{RedisConsumerName, RedisStreamEntry, RedisStreamRunner};
|
||||
use aether_data::repository::usage::{StoredRequestUsageAudit, UpsertUsageRecord};
|
||||
use aether_data::DataLayerError;
|
||||
use aether_data_contracts::repository::usage::{StoredRequestUsageAudit, UpsertUsageRecord};
|
||||
use aether_data_contracts::DataLayerError;
|
||||
use async_trait::async_trait;
|
||||
use tracing::warn;
|
||||
|
||||
@@ -226,8 +226,10 @@ fn consumer_name() -> String {
|
||||
mod tests {
|
||||
use std::sync::Mutex;
|
||||
|
||||
use aether_data::repository::settlement::{StoredUsageSettlement, UsageSettlementInput};
|
||||
use aether_data::repository::usage::{StoredRequestUsageAudit, UpsertUsageRecord};
|
||||
use aether_data_contracts::repository::settlement::{
|
||||
StoredUsageSettlement, UsageSettlementInput,
|
||||
};
|
||||
use aether_data_contracts::repository::usage::{StoredRequestUsageAudit, UpsertUsageRecord};
|
||||
use async_trait::async_trait;
|
||||
|
||||
use super::{write_event_record, UsageRecordWriter};
|
||||
@@ -244,7 +246,8 @@ mod tests {
|
||||
async fn upsert_usage_record(
|
||||
&self,
|
||||
record: UpsertUsageRecord,
|
||||
) -> Result<Option<StoredRequestUsageAudit>, aether_data::DataLayerError> {
|
||||
) -> Result<Option<StoredRequestUsageAudit>, aether_data_contracts::DataLayerError>
|
||||
{
|
||||
self.records
|
||||
.lock()
|
||||
.expect("records lock")
|
||||
@@ -304,7 +307,7 @@ mod tests {
|
||||
async fn settle_usage(
|
||||
&self,
|
||||
input: UsageSettlementInput,
|
||||
) -> Result<Option<StoredUsageSettlement>, aether_data::DataLayerError> {
|
||||
) -> Result<Option<StoredUsageSettlement>, aether_data_contracts::DataLayerError> {
|
||||
self.settlements
|
||||
.lock()
|
||||
.expect("settlements lock")
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use aether_contracts::{ExecutionPlan, ExecutionTelemetry};
|
||||
use aether_data::repository::usage::UpsertUsageRecord;
|
||||
use aether_data::DataLayerError;
|
||||
use aether_data_contracts::repository::usage::UpsertUsageRecord;
|
||||
use aether_data_contracts::DataLayerError;
|
||||
use base64::Engine as _;
|
||||
use serde_json::{Map, Value};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user