tiennm99/ccs
1
0
Fork 0
mirror of https://github.com/tiennm99/ccs.git synced 2026-07-16 12:15:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cliproxy): address code review feedback (attempt 4/5)

Browse Source 
- Add default_tier and provider validation in POST/PUT routes
- Extract shared validateCompositeTiers() helper for DRY
- Validate providers against CLIPROXY_SUPPORTED_PROVIDERS
This commit is contained in:
Tam Nhu Tran
2026-02-12 08:46:38 +07:00
parent 6cfbdd649b
commit 4c002caee1
1 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/web-server/routes/variant-routes.ts
+46 -26
View File
@@ -7,6 +7,7 @@
import { Router, Request, Response } from 'express';
import { isReservedName, RESERVED_PROFILE_NAMES } from '../../config/reserved-names';
import type { CLIProxyProvider } from '../../cliproxy/types';
import { CLIPROXY_SUPPORTED_PROVIDERS } from '../../config/unified-config-types';
import {
createVariant,
removeVariant,
@@ -19,6 +20,33 @@ import {
const router = Router();
const VALID_TIERS = ['opus', 'sonnet', 'haiku'] as const;
/** Validate composite tiers shape and provider/default_tier values. Returns error string or null. */
function validateCompositeTiers(
tiers: Record<string, { provider?: string; model?: string }>,
defaultTier?: string
): string | null {
// Validate default_tier
if (defaultTier && !VALID_TIERS.includes(defaultTier as (typeof VALID_TIERS)[number])) {
return `Invalid default_tier '${defaultTier}': must be one of ${VALID_TIERS.join(', ')}`;
}
// Validate each tier
for (const tier of VALID_TIERS) {
if (
!tiers[tier] ||
typeof tiers[tier].provider !== 'string' ||
typeof tiers[tier].model !== 'string'
) {
return `Invalid tier config for '${tier}': requires 'provider' and 'model' strings`;
}
if (!CLIPROXY_SUPPORTED_PROVIDERS.includes(tiers[tier].provider as CLIProxyProvider)) {
return `Invalid provider '${tiers[tier].provider}' for tier '${tier}': must be one of ${CLIPROXY_SUPPORTED_PROVIDERS.join(', ')}`;
}
}
return null;
}
/**
* GET /api/cliproxy - List cliproxy variants
* Uses variant-service for consistent behavior with CLI
@@ -75,19 +103,11 @@ router.post('/', (req: Request, res: Response): void => {
return;
}
// Validate tiers shape
const requiredTiers = ['opus', 'sonnet', 'haiku'] as const;
for (const tier of requiredTiers) {
if (
!tiers[tier] ||
typeof tiers[tier].provider !== 'string' ||
typeof tiers[tier].model !== 'string'
) {
res.status(400).json({
error: `Invalid tier config for '${tier}': requires 'provider' and 'model' strings`,
});
return;
}
// Validate tiers shape, providers, and default_tier
const tierError = validateCompositeTiers(tiers, default_tier);
if (tierError) {
res.status(400).json({ error: tierError });
return;
}
const result = createCompositeVariant({ name, defaultTier: default_tier, tiers });
@@ -162,21 +182,21 @@ router.put('/:name', (req: Request, res: Response): void => {
return;
}
// Validate tiers shape if provided
// Validate tiers shape, providers, and default_tier if provided
if (tiers) {
const requiredTiers = ['opus', 'sonnet', 'haiku'] as const;
for (const tier of requiredTiers) {
if (
!tiers[tier] ||
typeof tiers[tier].provider !== 'string' ||
typeof tiers[tier].model !== 'string'
) {
res.status(400).json({
error: `Invalid tier config for '${tier}': requires 'provider' and 'model' strings`,
});
return;
}
const tierError = validateCompositeTiers(tiers, default_tier);
if (tierError) {
res.status(400).json({ error: tierError });
return;
}
} else if (
default_tier &&
!VALID_TIERS.includes(default_tier as (typeof VALID_TIERS)[number])
) {
res.status(400).json({
error: `Invalid default_tier '${default_tier}': must be one of ${VALID_TIERS.join(', ')}`,
});
return;
}
const result = updateCompositeVariant(name, { defaultTier: default_tier, tiers });