mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 01:10:23 +08:00
- 新增 cache_creation_ephemeral_5m/1h_input_tokens 字段,区分不同 TTL 的缓存写入 token - 引入 effective_input_tokens(扣除 cache read 后的有效输入 token),暴露给 usage 接口 - billing 规则生成器支持 5m/1h ephemeral cache 独立定价与分级计费 - usage_mapper 增加 Claude/Anthropic 格式映射,修复 OpenAI responses 格式字段兼容性 - 迁移逻辑增强:支持 checksum 容错、applied/pending 数量日志、逐步执行信息输出 - executor 抽离 LocalExecutionRequestOutcome 类型,统一 sync/stream 路径返回语义 - provider-transport auth 层新增 complete passthrough headers 构建逻辑 - 前端 usage 类型全面补充 effective_input_tokens、cache_creation_tokens、total_input_context 字段
125 lines
5.1 KiB
SQL
125 lines
5.1 KiB
SQL
-- Align Rust-managed migrations with legacy Alembic revision
|
|
-- c3d4e5f6a7b8 (usage_token_semantics_v2).
|
|
|
|
DO $$
|
|
BEGIN
|
|
IF EXISTS (
|
|
SELECT 1
|
|
FROM information_schema.columns
|
|
WHERE table_schema = 'public'
|
|
AND table_name = 'usage'
|
|
AND column_name = 'total_tokens'
|
|
) AND NOT EXISTS (
|
|
SELECT 1
|
|
FROM information_schema.columns
|
|
WHERE table_schema = 'public'
|
|
AND table_name = 'usage'
|
|
AND column_name = 'input_output_total_tokens'
|
|
) THEN
|
|
ALTER TABLE "usage" RENAME COLUMN total_tokens TO input_output_total_tokens;
|
|
END IF;
|
|
END $$;
|
|
|
|
ALTER TABLE "usage"
|
|
ADD COLUMN IF NOT EXISTS input_output_total_tokens INTEGER DEFAULT 0,
|
|
ADD COLUMN IF NOT EXISTS cache_creation_input_tokens_5m INTEGER NOT NULL DEFAULT 0,
|
|
ADD COLUMN IF NOT EXISTS cache_creation_input_tokens_1h INTEGER NOT NULL DEFAULT 0,
|
|
ADD COLUMN IF NOT EXISTS input_context_tokens INTEGER NOT NULL DEFAULT 0,
|
|
ADD COLUMN IF NOT EXISTS total_tokens INTEGER NOT NULL DEFAULT 0,
|
|
ADD COLUMN IF NOT EXISTS cache_creation_cost_usd_5m NUMERIC(20, 8) NOT NULL DEFAULT 0,
|
|
ADD COLUMN IF NOT EXISTS cache_creation_cost_usd_1h NUMERIC(20, 8) NOT NULL DEFAULT 0,
|
|
ADD COLUMN IF NOT EXISTS actual_cache_creation_cost_usd_5m NUMERIC(20, 8) NOT NULL DEFAULT 0,
|
|
ADD COLUMN IF NOT EXISTS actual_cache_creation_cost_usd_1h NUMERIC(20, 8) NOT NULL DEFAULT 0,
|
|
ADD COLUMN IF NOT EXISTS actual_cache_cost_usd NUMERIC(20, 8) NOT NULL DEFAULT 0,
|
|
ADD COLUMN IF NOT EXISTS cache_creation_price_per_1m_5m NUMERIC(20, 8),
|
|
ADD COLUMN IF NOT EXISTS cache_creation_price_per_1m_1h NUMERIC(20, 8);
|
|
|
|
UPDATE "usage"
|
|
SET
|
|
input_output_total_tokens = src.new_iot,
|
|
input_context_tokens = src.new_ict,
|
|
total_tokens = src.new_total,
|
|
cache_creation_cost_usd_5m = src.new_cc5m,
|
|
cache_creation_cost_usd_1h = src.new_cc1h,
|
|
actual_cache_creation_cost_usd_5m = src.new_acc5m,
|
|
actual_cache_creation_cost_usd_1h = src.new_acc1h,
|
|
actual_cache_cost_usd = src.new_accu,
|
|
cache_creation_price_per_1m_5m = src.new_cp5m,
|
|
cache_creation_price_per_1m_1h = src.new_cp1h,
|
|
cache_cost_usd = src.new_ccu
|
|
FROM (
|
|
SELECT
|
|
id,
|
|
COALESCE(
|
|
input_output_total_tokens,
|
|
COALESCE(input_tokens, 0) + COALESCE(output_tokens, 0)
|
|
) AS new_iot,
|
|
COALESCE(input_tokens, 0) + COALESCE(cache_read_input_tokens, 0) AS new_ict,
|
|
COALESCE(
|
|
input_output_total_tokens,
|
|
COALESCE(input_tokens, 0) + COALESCE(output_tokens, 0)
|
|
) + COALESCE(cache_creation_input_tokens, 0) + COALESCE(cache_read_input_tokens, 0) AS new_total,
|
|
CASE
|
|
WHEN COALESCE(cache_creation_input_tokens_5m, 0) > 0
|
|
AND COALESCE(cache_creation_input_tokens_1h, 0) = 0
|
|
THEN COALESCE(cache_creation_cost_usd, 0)
|
|
WHEN COALESCE(cache_creation_input_tokens_5m, 0) > 0
|
|
AND COALESCE(cache_creation_input_tokens, 0) > 0
|
|
THEN COALESCE(cache_creation_cost_usd, 0)
|
|
* (COALESCE(cache_creation_input_tokens_5m, 0) * 1.0
|
|
/ GREATEST(COALESCE(cache_creation_input_tokens, 0), 1))
|
|
ELSE 0
|
|
END AS new_cc5m,
|
|
CASE
|
|
WHEN COALESCE(cache_creation_input_tokens_1h, 0) > 0
|
|
AND COALESCE(cache_creation_input_tokens_5m, 0) = 0
|
|
THEN COALESCE(cache_creation_cost_usd, 0)
|
|
WHEN COALESCE(cache_creation_input_tokens_1h, 0) > 0
|
|
AND COALESCE(cache_creation_input_tokens, 0) > 0
|
|
THEN COALESCE(cache_creation_cost_usd, 0)
|
|
* (COALESCE(cache_creation_input_tokens_1h, 0) * 1.0
|
|
/ GREATEST(COALESCE(cache_creation_input_tokens, 0), 1))
|
|
ELSE 0
|
|
END AS new_cc1h,
|
|
CASE
|
|
WHEN COALESCE(cache_creation_input_tokens_5m, 0) > 0
|
|
AND COALESCE(cache_creation_input_tokens_1h, 0) = 0
|
|
THEN COALESCE(actual_cache_creation_cost_usd, 0)
|
|
WHEN COALESCE(cache_creation_input_tokens_5m, 0) > 0
|
|
AND COALESCE(cache_creation_input_tokens, 0) > 0
|
|
THEN COALESCE(actual_cache_creation_cost_usd, 0)
|
|
* (COALESCE(cache_creation_input_tokens_5m, 0) * 1.0
|
|
/ GREATEST(COALESCE(cache_creation_input_tokens, 0), 1))
|
|
ELSE 0
|
|
END AS new_acc5m,
|
|
CASE
|
|
WHEN COALESCE(cache_creation_input_tokens_1h, 0) > 0
|
|
AND COALESCE(cache_creation_input_tokens_5m, 0) = 0
|
|
THEN COALESCE(actual_cache_creation_cost_usd, 0)
|
|
WHEN COALESCE(cache_creation_input_tokens_1h, 0) > 0
|
|
AND COALESCE(cache_creation_input_tokens, 0) > 0
|
|
THEN COALESCE(actual_cache_creation_cost_usd, 0)
|
|
* (COALESCE(cache_creation_input_tokens_1h, 0) * 1.0
|
|
/ GREATEST(COALESCE(cache_creation_input_tokens, 0), 1))
|
|
ELSE 0
|
|
END AS new_acc1h,
|
|
COALESCE(actual_cache_creation_cost_usd, 0)
|
|
+ COALESCE(actual_cache_read_cost_usd, 0) AS new_accu,
|
|
CASE
|
|
WHEN COALESCE(cache_creation_input_tokens_5m, 0) > 0
|
|
AND COALESCE(cache_creation_input_tokens_1h, 0) = 0
|
|
THEN cache_creation_price_per_1m
|
|
ELSE NULL
|
|
END AS new_cp5m,
|
|
CASE
|
|
WHEN COALESCE(cache_creation_input_tokens_1h, 0) > 0
|
|
AND COALESCE(cache_creation_input_tokens_5m, 0) = 0
|
|
THEN cache_creation_price_per_1m
|
|
ELSE NULL
|
|
END AS new_cp1h,
|
|
COALESCE(cache_creation_cost_usd, 0)
|
|
+ COALESCE(cache_read_cost_usd, 0) AS new_ccu
|
|
FROM "usage"
|
|
) AS src
|
|
WHERE "usage".id = src.id;
|