Calcium-Ion
86ac0f7745
* test(relayconvert): add golden snapshot matrix and relaykit boundary guard Phase 0 of the relaykit extraction plan: pin byte-level output of every registered (from,to) request/response/stream conversion route, and forbid kit-bound packages from growing host-only imports. * wip(relayconvert): drop gin.Context from converter signatures; add convmeta draft Phase 1 in progress: relayconvert now takes context.Context; host media resolver adapts gin.Context back at the service boundary. * refactor(relayconvert): decouple converters from RelayInfo, gin, and settings Phase 1 of the relaykit extraction plan: - converters now depend on convmeta.Meta (implemented by RelayInfo) instead of *relaycommon.RelayInfo; ClaudeConvertInfo and the format guesser move to convmeta with aliases left behind - host settings reach converters via a convmeta.Options snapshot built in RelayInfo.ConvOptions; no more model_setting/reasoning global reads inside the conversion layer - effort-suffix helpers move to service/relayconvert/reasoning (old package forwards); chat-to-responses upgrade policy moves to service (host routing logic, not conversion) - golden conversion matrix unchanged * test(relayconvert): tighten boundary — kit packages now free of gin/setting imports * refactor(dto): drop gin and logger dependencies Phase 2 (part 1): dto.Request.IsStream now takes *http.Request instead of *gin.Context (Gemini's impl reads query/path off the std request); dto's three logger calls become common.SysError. Boundary test allowlist is now empty — kit-bound packages import no gin/setting/logger/model. * refactor(kit): extract dependency-free kitutil; dto/types/relayconvert stop importing common Phase 2 of the relaykit extraction plan: - new service/relayconvert/kitutil holds the pure helpers the kit needs (JSON wrappers, pointer/string/uuid/timestamp utils, MaskSensitiveInfo, pluggable LogInfo/LogError hooks, Debug flag) - dto, types, and all relayconvert packages now use kitutil; their only remaining internal deps are dto/types/constant - common keeps every original symbol (MaskSensitiveInfo delegates to kitutil) so host code is untouched; main.go routes kit logging into common.SysLog/SysError and mirrors DebugEnabled - golden conversion matrix unchanged * refactor(kit): move EndpointType/FinishReason to types; OpenRouter dialect via Options Kit packages (dto/types/relayconvert/reasonmap) no longer import constant: - EndpointType and finish-reason values live in types; constant re-exports - the OpenRouter special-case in claude->openai request conversion reads Options.OpenRouterDialect, set by the host from the channel type; InitChannelMeta invalidates the cached snapshot on channel switch * refactor: extract relaykit submodule (dto/types/relayconvert/reasonmap) Phase 3 of the relaykit extraction plan: - new go module github.com/QuantumNous/new-api/relaykit containing dto (minus task family), types, relayconvert (with convmeta/kitutil/reasoning), and reasonmap; host consumes it via require + replace, go.work for dev - task-family dto (task/suno/midjourney/video) stays in the host dto package; dual-consumer host files alias it as taskdto - relaykit builds and tests standalone (GOWORK=off): no host imports, no gin, no DB, no settings - golden conversion matrix unchanged * build(docker): copy relaykit/go.mod before go mod download The local-replace submodule's go.mod must exist inside the build context for the main module graph to resolve. * fix: address relaykit extraction regressions * fix: address relaykit review regressions * docs: document Meta nil receiver contract * fix(relaykit): fail OpenAI→Claude conversion without max_tokens; reject negative default_max_tokens The Claude Messages API requires max_tokens (omitting it is a 400 "Field required"), but with a nil Options.Claude.DefaultMaxTokens hook the converters silently emitted a request the upstream is guaranteed to reject. Both OpenAI Chat and Responses → Claude conversions now return sharedclaude.ErrMissingMaxTokens when no path (client value, default hook, thinking-adapter floor) supplied one. Unreachable in the host, which always configures the hook. Host side, claude.default_max_tokens now rejects negative values at the option API before persisting — they would wrap into huge unsigned values during conversion. Zero stays allowed: the current API treats max_tokens: 0 as cache pre-warming. * fix: make Gemini safety settings read path race-free
74 lines
2.9 KiB
Makefile
74 lines
2.9 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 ./...
|
|
|
|
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
|