()
+ for (const [incomingPath, rows] of routeRowsByPath) {
+ orderedRowsByPath.set(incomingPath, [
+ ...rows.filter((routeRow) => !isCatchAllRoute(routeRow.route)),
+ ...rows.filter((routeRow) => isCatchAllRoute(routeRow.route)),
+ ])
+ }
+
+ const nextRows = routeRows.map((routeRow) => {
+ const incomingPath = getRouteIncomingPath(routeRow.route)
+ const orderedRows = orderedRowsByPath.get(incomingPath)
+ return orderedRows?.shift() || routeRow
+ })
+ replaceRoutes(
+ nextRows.map((routeRow) => routeRow.route),
+ nextRows.map((routeRow) => routeRow.routeKey)
+ )
+ }
+
const parseJsonEditorConfig = (): AdvancedCustomConfig | null => {
const parsed = parseAdvancedCustomConfig(jsonText)
if (!parsed) {
@@ -302,7 +505,7 @@ export function AdvancedCustomEditorDialog({
{t('Cancel')}
@@ -395,18 +598,30 @@ export function AdvancedCustomEditorDialog({
size='sm'
onClick={addRoute}
>
-
+
{t('Add route')}
{validationError ? (
-
- {validationError.routeIndex !== undefined
- ? `${t('Route')} ${validationError.routeIndex + 1}: `
- : ''}
- {t(validationError.message)}
+
+
+ {validationError.routeIndex !== undefined
+ ? `${t('Route')} ${validationError.routeIndex + 1}: `
+ : ''}
+ {t(validationError.message)}
+
+ {canFixCatchAllOrder ? (
+
+ ) : null}
) : null}
@@ -415,27 +630,24 @@ export function AdvancedCustomEditorDialog({
{t(upstreamPathDescriptionKey)}
-
-
- {t('Route')}
- {t('Incoming path')}
- {t('Upstream path')}
- {t('Converter')}
- {t('Auth')}
-
-
- {routeRows.map((routeRow, index) => (
-
updateRoute(index, patch)}
- onRemove={() => removeRoute(index)}
+
+ {routeGroups.map((routeGroup) => (
+
+ addRouteForIncomingPath(routeGroup.incomingPath)
+ }
+ onIncomingPathChange={(nextIncomingPath) =>
+ updateGroupIncomingPath(routeGroup, nextIncomingPath)
+ }
+ onMoveRoute={(index, direction) =>
+ moveRouteWithinGroup(index, direction)
+ }
+ onMoveRouteToEnd={moveRouteToGroupEnd}
+ onRemoveRoute={removeRoute}
+ onRouteChange={updateRoute}
/>
))}
@@ -476,15 +688,191 @@ export function AdvancedCustomEditorDialog({
)
}
+function RouteGroupEditor({
+ group,
+ validationError,
+ onAddRoute,
+ onIncomingPathChange,
+ onMoveRoute,
+ onMoveRouteToEnd,
+ onRemoveRoute,
+ onRouteChange,
+}: {
+ group: AdvancedCustomRouteGroup
+ validationError: ReturnType
+ onAddRoute: () => void
+ onIncomingPathChange: (incomingPath: string | null) => void
+ onMoveRoute: (index: number, direction: -1 | 1) => void
+ onMoveRouteToEnd: (index: number) => void
+ onRemoveRoute: (index: number) => void
+ onRouteChange: (index: number, patch: Partial) => void
+}) {
+ const { t } = useTranslation()
+ const incomingPath = group.incomingPath || '/v1/chat/completions'
+ const incomingPathLabel = getAdvancedCustomIncomingPathLabel(incomingPath)
+ const catchAllRoute = group.routeRows.find((routeRow) =>
+ isCatchAllRoute(routeRow.route)
+ )
+ const catchAllRoutePosition = catchAllRoute
+ ? group.routeRows.findIndex(
+ (routeRow) => routeRow.index === catchAllRoute.index
+ )
+ : -1
+ const hasCatchAll = catchAllRoute !== undefined
+ const catchAllIsLast =
+ !hasCatchAll || catchAllRoutePosition === group.routeRows.length - 1
+ const groupHasError =
+ validationError?.routeIndex !== undefined &&
+ group.routeRows.some(
+ (routeRow) => routeRow.index === validationError.routeIndex
+ )
+
+ return (
+
+
+
+
+ {t('Route group')}
+
+ {group.routeRows.length} {t('Routes')}
+
+
+ {hasCatchAll ? t('Fallback route') : t('Model-scoped only')}
+
+ {!catchAllIsLast ? (
+ {t('Fallback must be last')}
+ ) : null}
+
+
+
+
+
+
+
+ {t(
+ 'Routes with the same incoming path are split by client model rules. Unmatched requests use the final fallback.'
+ )}
+
+ {groupHasError && validationError ? (
+
+ {validationError.routeIndex !== undefined
+ ? `${t('Route')} ${validationError.routeIndex + 1}: `
+ : ''}
+ {t(validationError.message)}
+
+ ) : null}
+
+ {t('Route')}
+
+ {t('Client model')}
+
+
+ {t('Upstream path')}
+ {t('Converter')}
+ {t('Auth')}
+ {t('Actions')}
+
+
+
+ {group.routeRows.map((routeRow, position) => {
+ const canMoveUp = position > 0
+ const canMoveDown = position < group.routeRows.length - 1
+ const catchAllOutOfOrder =
+ isCatchAllRoute(routeRow.route) && canMoveDown
+ const routeErrorMessage =
+ validationError?.routeIndex === routeRow.index
+ ? validationError.message
+ : undefined
+
+ return (
+ onRouteChange(routeRow.index, patch)}
+ onMoveDown={() => onMoveRoute(routeRow.index, 1)}
+ onMoveUp={() => onMoveRoute(routeRow.index, -1)}
+ onMoveCatchAllToEnd={() => onMoveRouteToEnd(routeRow.index)}
+ onRemove={() => onRemoveRoute(routeRow.index)}
+ />
+ )
+ })}
+
+
+ )
+}
+
function RouteEditor({
route,
index,
+ errorMessage,
+ canMoveUp,
+ canMoveDown,
+ catchAllOutOfOrder,
onChange,
+ onMoveUp,
+ onMoveDown,
+ onMoveCatchAllToEnd,
onRemove,
}: {
route: AdvancedCustomRoute
index: number
+ errorMessage?: string
+ canMoveUp: boolean
+ canMoveDown: boolean
+ catchAllOutOfOrder: boolean
onChange: (patch: Partial) => void
+ onMoveUp: () => void
+ onMoveDown: () => void
+ onMoveCatchAllToEnd: () => void
onRemove: () => void
}) {
const { t } = useTranslation()
@@ -496,39 +884,52 @@ function RouteEditor({
() => getAdvancedCustomConverterOptions(incomingPath),
[incomingPath]
)
- const incomingPathLabel = getAdvancedCustomIncomingPathLabel(incomingPath)
const converterLabel = getOptionLabel(
ADVANCED_CUSTOM_CONVERTER_OPTIONS,
converter
)
+ const converterTriggerLabel =
+ ADVANCED_CUSTOM_CONVERTER_OPTIONS.find(
+ (option) => option.value === converter
+ )?.triggerLabel || converterLabel
const authLabel = getOptionLabel(ADVANCED_CUSTOM_AUTH_MODE_OPTIONS, authMode)
const isNativeConverter = converter === 'none'
const ConverterVisualIcon = isNativeConverter ? ArrowRight : Shuffle
+ const modelsInputValue = route.models?.join(', ') || ''
+ const parsedRouteModels = parseAdvancedCustomRouteModels(modelsInputValue)
+ const isFallback = parsedRouteModels.length === 0
const setConverter = (nextConverter: AdvancedCustomConverter) => {
- const patch: Partial = { converter: nextConverter }
- if (!isAdvancedCustomIncomingPathAllowed(incomingPath, nextConverter)) {
- patch.incoming_path = getDefaultAdvancedCustomIncomingPath(nextConverter)
- }
- onChange(patch)
- }
-
- const setIncomingPath = (nextIncomingPath: string | null) => {
- const resolvedIncomingPath =
- nextIncomingPath || getDefaultAdvancedCustomIncomingPath(converter)
- const patch: Partial = {
- incoming_path: resolvedIncomingPath,
+ let nextIncomingPath = incomingPath
+ if (!isAdvancedCustomIncomingPathAllowed(nextIncomingPath, nextConverter)) {
+ nextIncomingPath = getDefaultAdvancedCustomIncomingPath(nextConverter)
}
- if (!isAdvancedCustomIncomingPathAllowed(resolvedIncomingPath, converter)) {
- patch.converter = 'none'
- }
- onChange(patch)
+ const defaults = getAdvancedCustomConverterDefaults(
+ nextConverter,
+ nextIncomingPath
+ )
+ onChange({
+ converter: nextConverter,
+ incoming_path: nextIncomingPath,
+ upstream_path: defaults.upstream_path,
+ auth: defaults.auth,
+ })
}
const setAuthMode = (mode: AdvancedCustomAuthMode) => {
onChange({ auth: buildAdvancedCustomAuth(mode, route.auth) })
}
+ const setModelsInput = (value: string) => {
+ onChange({
+ models: value === '' ? [] : value.split(','),
+ })
+ }
+
+ const normalizeModelsInput = (value: string) => {
+ onChange({ models: parseAdvancedCustomRouteModels(value) })
+ }
+
const updateAuth = (
field: Exclude, 'type'>,
value: string
@@ -546,7 +947,12 @@ function RouteEditor({
}
return (
-
+
{t('Route')} {index + 1}
+ {isFallback ? (
+
{t('Fallback')}
+ ) : null}
+
+
+ {catchAllOutOfOrder ? (
+
+ ) : null}
+
+
{t(upstreamPathDescriptionKey)}
@@ -665,7 +1106,7 @@ function RouteEditor({
>
- {t(converterLabel)}
+ {t(converterTriggerLabel)}
-
+
+
+
+ {catchAllOutOfOrder ? (
+
+ ) : null}
+
+
+ {errorMessage ? (
+ {t(errorMessage)}
+ ) : null}
+
{authMode === 'header' || authMode === 'query' ? (
<>
@@ -775,13 +1236,101 @@ function RouteEditor({
)
}
+function ModelRuleHelpPopover() {
+ const { t } = useTranslation()
+
+ return (
+
+
+ }
+ >
+
+
+
+
+ {t('Client model matching')}
+
+ {t(
+ 'Rules match the original model value from the client request body.'
+ )}
+
+
+
+
+ {t(
+ 'Use exact model names such as gpt-4o, or regex rules prefixed with re: such as re:^gemini-.'
+ )}
+
+
+ {t(
+ 'Separate multiple rules with English commas. For regex patterns that need commas, switch to JSON Text.'
+ )}
+
+
+ {t(
+ 'Leave the final split empty as the fallback for models not matched above.'
+ )}
+
+