mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-03 09:50: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:
@@ -7,7 +7,7 @@ use super::types::{
|
||||
StoredManagementTokenListPage, StoredManagementTokenUserSummary, StoredManagementTokenWithUser,
|
||||
UpdateManagementTokenRecord,
|
||||
};
|
||||
use crate::DataLayerError;
|
||||
use crate::{error::SqlxResultExt, DataLayerError};
|
||||
|
||||
const LIST_MANAGEMENT_TOKENS_SQL: &str = r#"
|
||||
SELECT
|
||||
@@ -217,8 +217,9 @@ impl ManagementTokenReadRepository for SqlxManagementTokenRepository {
|
||||
.bind(query.user_id.as_deref())
|
||||
.bind(query.is_active)
|
||||
.fetch_one(&self.pool)
|
||||
.await?;
|
||||
let total = count_row.try_get::<i64, _>("total")?;
|
||||
.await
|
||||
.map_postgres_err()?;
|
||||
let total = count_row.try_get::<i64, _>("total").map_postgres_err()?;
|
||||
|
||||
let rows = sqlx::query(LIST_MANAGEMENT_TOKENS_SQL)
|
||||
.bind(query.user_id.as_deref())
|
||||
@@ -226,7 +227,8 @@ impl ManagementTokenReadRepository for SqlxManagementTokenRepository {
|
||||
.bind(i64::try_from(query.offset).unwrap_or(i64::MAX))
|
||||
.bind(i64::try_from(query.limit).unwrap_or(i64::MAX))
|
||||
.fetch_all(&self.pool)
|
||||
.await?;
|
||||
.await
|
||||
.map_postgres_err()?;
|
||||
|
||||
Ok(StoredManagementTokenListPage {
|
||||
items: rows
|
||||
@@ -244,7 +246,8 @@ impl ManagementTokenReadRepository for SqlxManagementTokenRepository {
|
||||
let row = sqlx::query(GET_MANAGEMENT_TOKEN_WITH_USER_SQL)
|
||||
.bind(token_id)
|
||||
.fetch_optional(&self.pool)
|
||||
.await?;
|
||||
.await
|
||||
.map_postgres_err()?;
|
||||
row.as_ref().map(map_token_with_user_row).transpose()
|
||||
}
|
||||
}
|
||||
@@ -305,7 +308,8 @@ impl ManagementTokenWriteRepository for SqlxManagementTokenRepository {
|
||||
let result = sqlx::query(DELETE_MANAGEMENT_TOKEN_SQL)
|
||||
.bind(token_id)
|
||||
.execute(&self.pool)
|
||||
.await?;
|
||||
.await
|
||||
.map_postgres_err()?;
|
||||
Ok(result.rows_affected() > 0)
|
||||
}
|
||||
|
||||
@@ -318,7 +322,8 @@ impl ManagementTokenWriteRepository for SqlxManagementTokenRepository {
|
||||
.bind(token_id)
|
||||
.bind(is_active)
|
||||
.fetch_optional(&self.pool)
|
||||
.await?;
|
||||
.await
|
||||
.map_postgres_err()?;
|
||||
row.as_ref().map(map_token_row).transpose()
|
||||
}
|
||||
|
||||
@@ -332,7 +337,8 @@ impl ManagementTokenWriteRepository for SqlxManagementTokenRepository {
|
||||
.bind(&mutation.token_hash)
|
||||
.bind(mutation.token_prefix.as_deref())
|
||||
.fetch_optional(&self.pool)
|
||||
.await?;
|
||||
.await
|
||||
.map_postgres_err()?;
|
||||
row.as_ref().map(map_token_row).transpose()
|
||||
}
|
||||
}
|
||||
@@ -363,40 +369,40 @@ fn map_management_token_write_error(
|
||||
|
||||
match conflict {
|
||||
Some(detail) => DataLayerError::InvalidInput(detail),
|
||||
None => DataLayerError::Postgres(err),
|
||||
None => DataLayerError::Postgres(err.to_string()),
|
||||
}
|
||||
}
|
||||
|
||||
fn map_token_row(row: &PgRow) -> Result<StoredManagementToken, DataLayerError> {
|
||||
Ok(StoredManagementToken::new(
|
||||
row.try_get("id")?,
|
||||
row.try_get("user_id")?,
|
||||
row.try_get("name")?,
|
||||
row.try_get("id").map_postgres_err()?,
|
||||
row.try_get("user_id").map_postgres_err()?,
|
||||
row.try_get("name").map_postgres_err()?,
|
||||
)?
|
||||
.with_display_fields(
|
||||
row.try_get("description")?,
|
||||
row.try_get("token_prefix")?,
|
||||
row.try_get("allowed_ips")?,
|
||||
row.try_get("description").map_postgres_err()?,
|
||||
row.try_get("token_prefix").map_postgres_err()?,
|
||||
row.try_get("allowed_ips").map_postgres_err()?,
|
||||
)
|
||||
.with_runtime_fields(
|
||||
optional_unix_secs(row.try_get("expires_at_unix_secs")?),
|
||||
optional_unix_secs(row.try_get("last_used_at_unix_secs")?),
|
||||
row.try_get("last_used_ip")?,
|
||||
u64::try_from(row.try_get::<i32, _>("usage_count")?).unwrap_or(0),
|
||||
row.try_get("is_active")?,
|
||||
optional_unix_secs(row.try_get("expires_at_unix_secs").map_postgres_err()?),
|
||||
optional_unix_secs(row.try_get("last_used_at_unix_secs").map_postgres_err()?),
|
||||
row.try_get("last_used_ip").map_postgres_err()?,
|
||||
u64::try_from(row.try_get::<i32, _>("usage_count").map_postgres_err()?).unwrap_or(0),
|
||||
row.try_get("is_active").map_postgres_err()?,
|
||||
)
|
||||
.with_timestamps(
|
||||
optional_unix_secs(row.try_get("created_at_unix_secs")?),
|
||||
optional_unix_secs(row.try_get("updated_at_unix_secs")?),
|
||||
optional_unix_secs(row.try_get("created_at_unix_secs").map_postgres_err()?),
|
||||
optional_unix_secs(row.try_get("updated_at_unix_secs").map_postgres_err()?),
|
||||
))
|
||||
}
|
||||
|
||||
fn map_user_summary_row(row: &PgRow) -> Result<StoredManagementTokenUserSummary, DataLayerError> {
|
||||
StoredManagementTokenUserSummary::new(
|
||||
row.try_get("user_row_id")?,
|
||||
row.try_get("user_email")?,
|
||||
row.try_get("user_username")?,
|
||||
row.try_get("user_role")?,
|
||||
row.try_get("user_row_id").map_postgres_err()?,
|
||||
row.try_get("user_email").map_postgres_err()?,
|
||||
row.try_get("user_username").map_postgres_err()?,
|
||||
row.try_get("user_role").map_postgres_err()?,
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user