mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-10-28 16:46:57 +08:00
CaIon
bb28f2ccad
Token estimates badly undercounted agent requests. Claude tool definitions, Responses function calls and their outputs, Chat assistant tool calls, and Gemini system instructions, function calls, function responses, and tools never reached the counter; Chat tool schemas were counted as Go map syntax and Claude tool results as escaped JSON. Measured against upstream usage on 54 real Claude Code and Codex conversation windows, native prompt estimates were 31-93% low, and the Claude and Gemini completion fallbacks about 90% low because streamed tool calls were not counted. All of these now reach the counter. The completion fallbacks count tool names and arguments, plus 40 tokens per Claude tool_use block. The estimator weights are refitted per tokenizer: Claude before Opus 4.7, Claude 4.7 and later (about 30% more tokens for the same text), GPT, and Gemini. Prompt estimates now land within 1% bias and 3-4% mean error for each family. Token counting moves into tokenkit, an independent module like relaykit, so other gateways can use it. It also replaces the flat 520-token image estimate with each provider's sizing rules, checked against upstream usage on sizes outside the test table: OpenAI patch and tile rules per model and detail level (gpt-5.5 and later default to original detail, and their high detail is billed as measured, not as documented), Claude's two resolution tiers, and Gemini 3 media resolution and Gemini 2.x tiles. Chat image_url parts without detail no longer default to high in ParseContent, so they estimate as the upstream default auto; no converter sent that value upstream. tiktoken-go moves to v0.8.1, about twice as fast on ordinary text. It requires Go 1.26, so the root module and tokenkit move to Go 1.26; relaykit stays on 1.25.1. In every version BPE cost grows with the square of a pre-tokenized piece, so 100,000 Chinese characters without punctuation took 21.6 s to count during pre-consume. Count now cuts single-class runs longer than 1024 bytes, which leaves ordinary text unchanged and brings that input down to 106 ms. The encoder cache no longer grows with client-supplied model names.
76 lines
3.0 KiB
Makefile
76 lines
3.0 KiB
Makefile
WEB_DIR = ./web
|
|
API_DIR = .
|
|
DEV_WEB_PORT ?= 5173
|
|
DEV_COMPOSE_FILE = docker-compose.dev.yml
|
|
DEV_POSTGRES_SERVICE = postgres
|
|
DEV_API_SERVICE = new-api
|
|
DEV_POSTGRES_DB = new-api
|
|
DEV_POSTGRES_USER = root
|
|
DEV_SQLITE_PATH ?= one-api.db
|
|
|
|
.PHONY: all build-web build-all-web start-api dev dev-api dev-api-rebuild dev-web reset-setup test
|
|
|
|
all: build-all-web start-api
|
|
|
|
build-web:
|
|
@echo "Building web frontend..."
|
|
@cd $(WEB_DIR) && bun install --frozen-lockfile
|
|
@cd $(WEB_DIR) && DISABLE_ESLINT_PLUGIN='true' VITE_REACT_APP_VERSION=$$(cat ../VERSION) bun run build
|
|
|
|
build-all-web: build-web
|
|
|
|
start-api:
|
|
@echo "Starting api dev server..."
|
|
@cd $(API_DIR) && go run main.go &
|
|
|
|
dev-api:
|
|
@echo "Starting api services (docker)..."
|
|
@docker compose -f $(DEV_COMPOSE_FILE) up -d
|
|
|
|
dev-api-rebuild:
|
|
@echo "Rebuilding and starting api service (docker)..."
|
|
@docker compose -f $(DEV_COMPOSE_FILE) up -d --build $(DEV_API_SERVICE)
|
|
|
|
dev-web:
|
|
@echo "Starting web frontend dev server..."
|
|
@echo "Web frontend: http://localhost:$(DEV_WEB_PORT)"
|
|
@cd $(WEB_DIR) && bun install
|
|
@cd $(WEB_DIR) && bun run dev -- --host 0.0.0.0 --port $(DEV_WEB_PORT)
|
|
|
|
dev: dev-api dev-web
|
|
|
|
# The main package embeds the ignored web/dist output and is covered after build-web.
|
|
test:
|
|
@echo "Testing root Go module..."
|
|
@root_module=$$(GOWORK=off go list -m); \
|
|
root_packages=$$(GOWORK=off go list -e ./... | grep -vxF "$$root_module"); \
|
|
GOWORK=off go test $$root_packages
|
|
@echo "Testing relaykit Go module..."
|
|
@cd relaykit && GOWORK=off go test ./...
|
|
@echo "Testing tokenkit Go module..."
|
|
@cd tokenkit && GOWORK=off go test ./...
|
|
|
|
reset-setup:
|
|
@echo "Resetting local setup wizard state..."
|
|
@if docker compose -f $(DEV_COMPOSE_FILE) ps --services --status running | grep -qx "$(DEV_POSTGRES_SERVICE)"; then \
|
|
echo "Detected running docker dev PostgreSQL. Removing setup record and root users..."; \
|
|
docker compose -f $(DEV_COMPOSE_FILE) exec -T $(DEV_POSTGRES_SERVICE) \
|
|
psql -U $(DEV_POSTGRES_USER) -d $(DEV_POSTGRES_DB) \
|
|
-c 'DELETE FROM setups;' \
|
|
-c 'DELETE FROM users WHERE role = 100;' \
|
|
-c "DELETE FROM options WHERE key IN ('SelfUseModeEnabled', 'DemoSiteEnabled');"; \
|
|
echo "Restarting docker dev api so setup status is recalculated..."; \
|
|
docker compose -f $(DEV_COMPOSE_FILE) restart $(DEV_API_SERVICE); \
|
|
elif db_path="$${SQLITE_PATH:-$(DEV_SQLITE_PATH)}"; db_path="$${db_path%%\?*}"; [ -f "$$db_path" ]; then \
|
|
db_path="$${SQLITE_PATH:-$(DEV_SQLITE_PATH)}"; \
|
|
db_path="$${db_path%%\?*}"; \
|
|
echo "Detected local SQLite database: $$db_path"; \
|
|
sqlite3 "$$db_path" \
|
|
"DELETE FROM setups; DELETE FROM users WHERE role = 100; DELETE FROM options WHERE key IN ('SelfUseModeEnabled', 'DemoSiteEnabled');"; \
|
|
echo "SQLite setup state reset. Restart the local api process before testing the setup wizard."; \
|
|
else \
|
|
echo "No running docker dev PostgreSQL or local SQLite database found."; \
|
|
echo "Start the dev stack with 'make dev-api', or set SQLITE_PATH/DEV_SQLITE_PATH to your local SQLite database."; \
|
|
exit 1; \
|
|
fi
|