Commit graph

16 commits

Author SHA1 Message Date
jedarden
293463aaac test(bf-4gif): add comprehensive MockUpstream test suite
Add complete test coverage for MockUpstream server scenarios and methods:

- Verify all 11 documented scenarios (429, empty body, errors, etc.)
- Test all 6 MockUpstream methods (GetRequestCount, SetFailUntilCount, etc.)
- Add 8 proxy integration tests verifying end-to-end behavior

All tests pass, confirming MockUpstream correctly simulates:
* Rate limiting with Retry-After headers
* Malformed responses (empty/invalid JSON, empty streaming)
* Non-retryable errors (422, 500, 404)
* Retry behavior through the proxy handler
* Delay simulation and custom handler overrides

Co-Authored-By: Claude <noreply@anthropic.com>
2026-07-02 18:14:31 -04:00
jedarden
1b597190b1 test(bf-4lid): add comprehensive test environment config helper tests
- Add GetTestMaxRetries_WithOverride test to verify MAX_RETRIES env var handling
- Add ConfigureTestEnv test to verify all required environment variables are set
- Test coverage includes: valid/invalid env values, all 7 required vars
- All acceptance criteria for bead bf-4lid are now verified
2026-07-02 17:39:34 -04:00
jedarden
2d508816e8 test(bf-4lid): add comprehensive test environment config helper tests
Added proxy/helpers_env_test.go with thorough coverage of:
- IsTestMode(): Verifies test mode detection via testing.Testing()
  and ZAI_PROXY_TEST_MODE env var
- GetTestMaxRetries(): Tests default value (1), valid overrides,
  and invalid value handling
- ConfigureTestEnv(): Validates all 7 required environment variables
  are set correctly (MAX_RETRIES, ZAI_PROXY_TEST_MODE,
  DEPLOYMENT_VARIANT, TOKEN_COUNTING_ENABLED, RATE_LIMIT_*)

Acceptance criteria met:
1. IsTestMode() correctly detects test mode ✓
2. GetTestMaxRetries() returns DefaultTestMaxRetries (1) ✓
3. GetTestMaxRetries() respects MAX_RETRIES override ✓
4. ConfigureTestEnv() sets all required env vars ✓

Co-Authored-By: Claude <noreply@anthropic.com>
2026-07-02 17:39:34 -04:00
jedarden
55fe16e130 test(bf-244): add comprehensive 429 retry logic unit tests
Add unit tests covering all 429 retry scenarios with proper backoff behavior:

- Test429WithRetryAfterMetricVerification: Verifies 429 with Retry-After header
  honours the delay before retry, returns success, makes exactly 2 upstream calls,
  and increments zai_proxy_retry_attempts_total{reason="429"} once

- Test429WithoutRetryAfterMetricVerification: Verifies 429 without Retry-After
  uses exponential backoff up to MAX_RETRIES, surfaces 429, makes MAX_RETRIES+1
  upstream calls, and increments metric MAX_RETRIES times

- Test429MultipleRetriesMetricVerification: Verifies multiple 429 retries with
  correct metric increments and upstream call counts

- Test429MetricLabelVerification: Verifies retry metric uses correct reason labels

- Test429ConcurrentMetricVerification: Verifies concurrent 429 responses are
  tracked correctly in metrics

- Integration tests: TestIntegration429WithRetryAfter, TestIntegration429NoHeader
  test retry behavior through real proxy handler

All tests pass with -race detector. Uses test infrastructure from bf-3zp.
2026-07-02 15:01:04 -04:00
jedarden
fa9a54faca chore: remove unused Dockerfile variants
Delete Dockerfile.minimal, Dockerfile.simple, and Dockerfile.binary
which were not referenced by CI, scripts, or documentation.
The production Dockerfile remains unchanged.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-07-02 14:06:16 -04:00
jedarden
1edb75ef1a fix(bf-3zp): correct package declaration in ratelimiter_test.go
Change package from 'proxy' to 'main' to match other test files in the
proxy directory. This fixes the package mismatch that prevented tests
from running properly.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-07-02 14:00:46 -04:00
jedarden
a9a8324c31 test(bf-3zp): validate test infrastructure for mock upstream server
Confirm that test infrastructure in helpers_test.go meets all acceptance criteria:

 MockUpstream and CountingMockServer for httptest-based mock upstreams
 Request builders (CreateProxyRequest, CreateMessagesRequest, etc.)
 Response assertions (AssertStatusCode, AssertJSONBody, etc.)
 Test-mode configuration (ConfigureTestEnv, GetTestMaxRetries)
 TestHelperFunctions and TestMockUpstreamBasic tests pass
 All tests use mock servers, never hit real api.z.ai

The infrastructure was already implemented. This commit validates it works correctly.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-07-02 13:26:28 -04:00
jedarden
2cdef80126 test(bf-3zp): add mock upstream server test infrastructure
Add comprehensive test infrastructure for retry/response-validation tests
in proxy package. Provides httptest-based mock upstream server, test
helpers for request/response handling, and test-mode configuration for
fast test execution.

New file: proxy/helpers_test.go
- MockUpstream: Configurable HTTP server simulating Z.AI upstream
- Test scenarios: 429 with/without Retry-After, empty/invalid JSON body,
  empty streaming, 422/500/404 responses, network errors, success
- Request builders: CreateProxyRequest, CreateMessagesRequest,
  CreateStreaming/NonStreaming* helpers
- Response assertions: AssertStatusCode, AssertJSONBody, AssertResponseField,
  AssertEmptyBody, AssertHeader, AssertContentType
- Proxy handler factory: CreateTestProxyHandler for configured test handlers
- Test execution helpers: ExecuteProxyRequest, ExecuteMessagesRequest
- Test-mode config: ConfigureTestEnv, GetTestMaxRetries (defaults to 1 for fast tests)
- Backoff delay helpers: CalculateBackoffDelay, CalculateTotalMaxDelay

Acceptance criteria met:
 New test helpers with httptest servers
 Helper functions for requests and assertions
 Test-mode env var for fast tests (MAX_RETRIES=1 default)
 go test ./proxy/ -run TestHelper passes

Co-Authored-By: Claude <noreply@anthropic.com>
2026-07-02 12:45:10 -04:00
jedarden
22644eab33 test(ratelimiter): improve TestAdaptiveRateLimiter_BasicBounds to use injected window duration
- Use NewAdaptiveRateLimiterWithWindow with 10ms window for fast test execution
- Replace manual lastAdjustment manipulation with proper testWindow variable
- Maintain all existing test scenarios and verifications
- Tests now run faster without sleep calls while maintaining correctness

Co-Authored-By: Claude <noreply@anthropic.com>
2026-07-02 12:38:25 -04:00
jedarden
f878bf4f6e test(ratelimiter): verify TestAdaptiveRateLimiter_BasicState passes all acceptance criteria 2026-07-02 11:53:23 -04:00
jedarden
91746e79ac refactor(module): move go.mod to root and consolidate dependencies
- Move go.mod and go.sum from proxy/ to repository root
- Enables running tests with 'go test ./proxy' from project root
- Module path: git.ardenone.com/jedarden/zai-proxy
- Go 1.23 with toolchain go1.24.13

Co-Authored-By: Claude <noreply@anthropic.com>
Bead-Id: bf-1rb
2026-07-02 11:52:23 -04:00
jedarden
88358f949a test(ratelimiter): add basic state and bounds tests for AdaptiveRateLimiter
Add table-driven unit tests covering:
- Initial rate starts at ceiling (TestAdaptiveRateLimiter_BasicState)
- Rate never drops below minRate (TestAdaptiveRateLimiter_BasicBounds)
- Rate never exceeds maxRate (TestAdaptiveRateLimiter_BasicBounds)
- Reset() restores initial rate and ceiling (TestAdaptiveRateLimiter_BasicReset)
- getCurrentRate() returns expected values (TestAdaptiveRateLimiter_BasicGetCurrentRate)
- Edge cases: minRate==maxRate, zero ceiling (TestAdaptiveRateLimiter_BasicEdgeCases)

Tests complete in <5ms without sleep calls using injected window duration.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-07-02 11:47:57 -04:00
jedarden
ee39121cd9 test(ratelimiter): make AdaptiveRateLimiter testable via window duration injection
Add NewAdaptiveRateLimiterWithWindow constructor for test-only refactor:
- Production code uses NewAdaptiveRateLimiter with default 30s window
- Tests can inject shorter durations (e.g., 100ms) for fast execution
- No behavior changes to production rate limiting logic

Acceptance criteria:
- NewAdaptiveRateLimiterWithWindow accepts configurable window duration
- Production callers continue using default 30s window
- Tests can inject millisecond-scale windows for fast iteration
- No changes to rate limiting logic or defaults

Co-Authored-By: Claude <noreply@anthropic.com>
2026-07-02 10:55:06 -04:00
jedarden
e5d0d11c3d docs(proxy): fix README - remove :latest tags, update namespace to devpod, fix go run command
- Change Kubernetes example image from ghcr.io/ardenone/zai-proxy:latest to ronaldraygun/zai-proxy:1.10.0
- Update namespace references from mcp to devpod (production deployment namespace)
- Fix 'go run main.go tokenizer.go' to 'go run .' (compilable command)
- Update Docker image examples to use version tag 1.10.0 instead of :latest/:dev
- Update cluster DNS from mcp.svc.cluster.local to devpod.svc.cluster.local

Verified against:
- docs/plan/plan.md (CI/CD, Deployment sections)
- proxy/VERSION (current version: 1.10.0)
- proxy/metrics.go (metric names)
- proxy/main.go (env vars)

Co-Authored-By: Claude <noreply@anthropic.com>
2026-07-02 08:29:33 -04:00
jedarden
dee82a76a3 chore: update module paths and add evaluation package
- proxy/go.mod: github.com/ardenone/zai-proxy → git.ardenone.com/jedarden/zai-proxy
- dashboard/go.mod: github.com/ardenone/ardenone-cluster/containers/zai-proxy-dashboard → git.ardenone.com/jedarden/zai-proxy/dashboard
- Update all Go import paths in proxy/ and dashboard/ to match new module paths
- Add proxy/evaluation/ package (was missing from initial commit)
- Add docs/plan/plan.md with architecture, security model, telemetry design, and migration checklist

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-16 16:03:50 -04:00
jedarden
e7c24a0c08 feat: initial zai-proxy ecosystem repo
Extracted from ardenone-cluster/containers/zai-proxy and
ardenone-cluster/containers/zai-proxy-dashboard.

- proxy/: OpenAI-compatible ZAI reverse proxy (Go, v1.10.0)
  - Token counting, rate limiting, Prometheus metrics, canary support
- dashboard/: Metrics dashboard backend + React frontend (Go, v1.0.0)
  - Prometheus collector, SQLite storage, SSE live updates
- docs/: Operational notes, research, and plan subdirs

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-16 15:53:52 -04:00