@aetherai/aether 0.0.7 → 0.0.9

package/dist/CLI/packages/core/src/models/modelConfigResolver.js

@@ -1,204 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen Team
- * SPDX-License-Identifier: Apache-2.0
- */
-/**
- * ModelConfigResolver - Unified resolver for model-related configuration.
- *
- * This module consolidates all model configuration resolution logic,
- * eliminating duplicate code between CLI and Core layers.
- *
- * Configuration priority (highest to lowest):
- * 1. modelProvider - Explicit selection from ModelProviders config
- * 2. CLI arguments - Command line flags (--model, --openaiApiKey, etc.)
- * 3. Environment variables - OPENAI_API_KEY, OPENAI_MODEL, etc.
- * 4. Settings - User/workspace settings file
- * 5. Defaults - Built-in default values
- */
-import { AuthType } from '../core/contentGenerator.js';
-import { DEFAULT_AETHER_MODEL } from '../config/models.js';
-import { resolveField, resolveOptionalField, layer, envLayer, cliSource, settingsSource, modelProvidersSource, defaultSource, computedSource, } from '../utils/configResolver.js';
-import { AUTH_ENV_MAPPINGS, DEFAULT_MODELS, AETHER_OAUTH_ALLOWED_MODELS, MODEL_GENERATION_CONFIG_FIELDS, } from './constants.js';
-export { validateModelConfig, } from '../core/contentGenerator.js';
-/**
- * Resolve model configuration from all input sources.
- *
- * This is the single entry point for model configuration resolution.
- * It replaces the duplicate logic in:
- * - packages/cli/src/utils/modelProviderUtils.ts (resolveCliGenerationConfig)
- * - packages/core/src/core/contentGenerator.ts (resolveContentGeneratorConfigWithSources)
- *
- * @param input - All configuration sources
- * @returns Resolved configuration with source tracking
- */
-export function resolveModelConfig(input) {
-    const { authType, cli, settings, env, modelProvider, proxy } = input;
-    const warnings = [];
-    const sources = {};
-    // Special handling for Aether OAuth
-    if (authType === AuthType.AETHER_OAUTH) {
-        return resolveaetherOAuthConfig(input, warnings);
-    }
-    // Get auth-specific env var mappings.
-    // If authType is not provided, do not read any auth env vars.
-    const envMapping = authType
-        ? AUTH_ENV_MAPPINGS[authType]
-        : { model: [], apiKey: [], baseUrl: [] };
-    // Build layers for each field in priority order
-    // Priority: modelProvider > cli > env > settings > default
-    // ---- Model ----
-    const modelLayers = [];
-    if (authType && modelProvider) {
-        modelLayers.push(layer(modelProvider.id, modelProvidersSource(authType, modelProvider.id, 'model.id')));
-    }
-    if (cli?.model) {
-        modelLayers.push(layer(cli.model, cliSource('--model')));
-    }
-    for (const envKey of envMapping.model) {
-        modelLayers.push(envLayer(env, envKey));
-    }
-    if (settings?.model) {
-        modelLayers.push(layer(settings.model, settingsSource('model.name')));
-    }
-    const defaultModel = authType ? DEFAULT_MODELS[authType] : '';
-    const modelResult = resolveField(modelLayers, defaultModel, defaultSource(defaultModel));
-    sources['model'] = modelResult.source;
-    // ---- API Key ----
-    const apiKeyLayers = [];
-    // For modelProvider, read from the specified envKey
-    if (authType && modelProvider?.envKey) {
-        const apiKeyFromEnv = env[modelProvider.envKey];
-        if (apiKeyFromEnv) {
-            apiKeyLayers.push(layer(apiKeyFromEnv, {
-                kind: 'env',
-                envKey: modelProvider.envKey,
-                via: modelProvidersSource(authType, modelProvider.id, 'envKey'),
-            }));
-        }
-    }
-    if (cli?.apiKey) {
-        apiKeyLayers.push(layer(cli.apiKey, cliSource('--openaiApiKey')));
-    }
-    for (const envKey of envMapping.apiKey) {
-        apiKeyLayers.push(envLayer(env, envKey));
-    }
-    if (settings?.apiKey) {
-        apiKeyLayers.push(layer(settings.apiKey, settingsSource('security.auth.apiKey')));
-    }
-    const apiKeyResult = resolveOptionalField(apiKeyLayers);
-    if (apiKeyResult) {
-        sources['apiKey'] = apiKeyResult.source;
-    }
-    // ---- Base URL ----
-    const baseUrlLayers = [];
-    if (authType && modelProvider?.baseUrl) {
-        baseUrlLayers.push(layer(modelProvider.baseUrl, modelProvidersSource(authType, modelProvider.id, 'baseUrl')));
-    }
-    if (cli?.baseUrl) {
-        baseUrlLayers.push(layer(cli.baseUrl, cliSource('--openaiBaseUrl')));
-    }
-    for (const envKey of envMapping.baseUrl) {
-        baseUrlLayers.push(envLayer(env, envKey));
-    }
-    if (settings?.baseUrl) {
-        baseUrlLayers.push(layer(settings.baseUrl, settingsSource('security.auth.baseUrl')));
-    }
-    const baseUrlResult = resolveOptionalField(baseUrlLayers);
-    if (baseUrlResult) {
-        sources['baseUrl'] = baseUrlResult.source;
-    }
-    // ---- API Key Env Key (for error messages) ----
-    let apiKeyEnvKey;
-    if (authType && modelProvider?.envKey) {
-        apiKeyEnvKey = modelProvider.envKey;
-        sources['apiKeyEnvKey'] = modelProvidersSource(authType, modelProvider.id, 'envKey');
-    }
-    // ---- Generation Config (from settings or modelProvider) ----
-    const generationConfig = resolveGenerationConfig(settings?.generationConfig, modelProvider?.generationConfig, authType, modelProvider?.id, sources);
-    // Build final config
-    const config = {
-        authType,
-        model: modelResult.value || '',
-        apiKey: apiKeyResult?.value,
-        apiKeyEnvKey,
-        baseUrl: baseUrlResult?.value,
-        proxy,
-        ...generationConfig,
-    };
-    // Add proxy source
-    if (proxy) {
-        sources['proxy'] = computedSource('Config.getProxy()');
-    }
-    // Add authType source
-    sources['authType'] = computedSource('provided by caller');
-    return { config, sources, warnings };
-}
-/**
- * Special resolver for Aether OAuth authentication.
- * Aether OAuth has fixed model options and uses dynamic tokens.
- */
-function resolveaetherOAuthConfig(input, warnings) {
-    const { cli, settings, proxy, modelProvider } = input;
-    const sources = {};
-    // Aether OAuth only allows specific models
-    const allowedModels = new Set(AETHER_OAUTH_ALLOWED_MODELS);
-    // Determine requested model
-    const requestedModel = cli?.model || settings?.model;
-    let resolvedModel;
-    let modelSource;
-    if (requestedModel && allowedModels.has(requestedModel)) {
-        resolvedModel = requestedModel;
-        modelSource = cli?.model
-            ? cliSource('--model')
-            : settingsSource('model.name');
-    }
-    else {
-        if (requestedModel) {
-            const isVisionModel = requestedModel.includes('vl') || requestedModel.includes('vision');
-            const extraMessage = isVisionModel
-                ? ` Note: vision-model has been removed since coder-model now supports vision capabilities.`
-                : '';
-            warnings.push(`Warning: Unsupported Aether OAuth model '${requestedModel}', falling back to '${DEFAULT_AETHER_MODEL}'.${extraMessage}`);
-        }
-        resolvedModel = DEFAULT_AETHER_MODEL;
-        modelSource = defaultSource(`fallback to '${DEFAULT_AETHER_MODEL}'`);
-    }
-    sources['model'] = modelSource;
-    sources['apiKey'] = computedSource('Aether OAuth dynamic token');
-    sources['authType'] = computedSource('provided by caller');
-    if (proxy) {
-        sources['proxy'] = computedSource('Config.getProxy()');
-    }
-    // Resolve generation config from settings and modelProvider
-    const generationConfig = resolveGenerationConfig(settings?.generationConfig, modelProvider?.generationConfig, AuthType.AETHER_OAUTH, resolvedModel, sources);
-    const config = {
-        authType: AuthType.AETHER_OAUTH,
-        model: resolvedModel,
-        apiKey: 'AETHER_OAUTH_DYNAMIC_TOKEN',
-        proxy,
-        ...generationConfig,
-    };
-    return { config, sources, warnings };
-}
-/**
- * Resolve generation config fields (samplingParams, timeout, etc.)
- */
-function resolveGenerationConfig(settingsConfig, modelProviderConfig, authType, modelId, sources) {
-    const result = {};
-    for (const field of MODEL_GENERATION_CONFIG_FIELDS) {
-        // ModelProvider config takes priority over settings config
-        if (authType && modelProviderConfig && field in modelProviderConfig) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            result[field] = modelProviderConfig[field];
-            sources[field] = modelProvidersSource(authType, modelId || '', `generationConfig.${field}`);
-        }
-        else if (settingsConfig && field in settingsConfig) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            result[field] = settingsConfig[field];
-            sources[field] = settingsSource(`model.generationConfig.${field}`);
-        }
-    }
-    return result;
-}
-//# sourceMappingURL=modelConfigResolver.js.map

package/dist/CLI/packages/core/src/models/modelConfigResolver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"modelConfigResolver.js","sourceRoot":"","sources":["../../../../../../../core/src/models/modelConfigResolver.ts"],"names":[],"mappings":"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"}

package/dist/CLI/packages/core/src/models/modelRegistry.d.ts

@@ -1,56 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen Team
- * SPDX-License-Identifier: Apache-2.0
- */
-import { AuthType } from '../core/contentGenerator.js';
-import { type ModelProvidersConfig, type ResolvedModelConfig, type AvailableModel } from './types.js';
-export { AETHER_OAUTH_MODELS } from './constants.js';
-/**
- * Central registry for managing model configurations.
- * Models are organized by authType.
- */
-export declare class ModelRegistry {
-    private modelsByAuthType;
-    private getDefaultBaseUrl;
-    constructor(modelProvidersConfig?: ModelProvidersConfig, runtimeModelProvidersConfig?: ModelProvidersConfig);
-    /**
-     * Register models for an authType.
-     * If multiple models have the same id, the first one takes precedence.
-     */
-    private registerAuthTypeModels;
-    private isSelectableModel;
-    /**
-     * Get all models for a specific authType.
-     * This is used by /model command to show only relevant models.
-     */
-    getModelsForAuthType(authType: AuthType): AvailableModel[];
-    /**
-     * Get model configuration by authType and modelId
-     */
-    getModel(authType: AuthType, modelId: string): ResolvedModelConfig | undefined;
-    /**
-     * Check if model exists for given authType
-     */
-    hasModel(authType: AuthType, modelId: string): boolean;
-    /**
-     * Get default model for an authType.
-     * For aether-oauth, returns the coder model.
-     * For others, returns the first configured model.
-     */
-    getDefaultModelForAuthType(authType: AuthType): ResolvedModelConfig | undefined;
-    /**
-     * Resolve model config by applying defaults
-     */
-    private resolveModelConfig;
-    /**
-     * Validate model configuration
-     */
-    private validateModelConfig;
-    /**
-     * Reload models from updated configuration.
-     * Clears existing user-configured models and re-registers from new config.
-     * Preserves hard-coded aether-oauth models.
-     */
-    reloadModels(modelProvidersConfig?: ModelProvidersConfig, runtimeModelProvidersConfig?: ModelProvidersConfig): void;
-}

package/dist/CLI/packages/core/src/models/modelRegistry.js

@@ -1,187 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen Team
- * SPDX-License-Identifier: Apache-2.0
- */
-import { AuthType } from '../core/contentGenerator.js';
-import { defaultModalities } from '../core/modalityDefaults.js';
-import { resolveGlobalTokenLimits, DEFAULT_CONTEXT_LENGTH, DEFAULT_MAX_OUTPUT_TOKENS } from '../index.js';
-import { DEFAULT_OPENAI_BASE_URL } from '../core/openaiContentGenerator/constants.js';
-import {} from './types.js';
-import { DEFAULT_AETHER_MODEL } from '../config/models.js';
-import { AETHER_OAUTH_MODELS } from './constants.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-const debugLogger = createDebugLogger('MODEL_REGISTRY');
-export { AETHER_OAUTH_MODELS } from './constants.js';
-/**
- * Validates if a string key is a valid AuthType enum value.
- * @param key - The key to validate
- * @returns The validated AuthType or undefined if invalid
- */
-function validateAuthTypeKey(key) {
-    // Check if the key is a valid AuthType enum value
-    if (Object.values(AuthType).includes(key)) {
-        return key;
-    }
-    // Invalid key
-    return undefined;
-}
-/**
- * Central registry for managing model configurations.
- * Models are organized by authType.
- */
-export class ModelRegistry {
-    modelsByAuthType;
-    getDefaultBaseUrl(authType) {
-        switch (authType) {
-            case AuthType.AETHER_OAUTH:
-                return 'DYNAMIC_AETHER_OAUTH_BASE_URL';
-            case AuthType.USE_OPENAI:
-                return DEFAULT_OPENAI_BASE_URL;
-            default:
-                return '';
-        }
-    }
-    constructor(modelProvidersConfig, runtimeModelProvidersConfig) {
-        this.modelsByAuthType = new Map();
-        // Always register aether-oauth models (hard-coded, cannot be overridden)
-        this.registerAuthTypeModels(AuthType.AETHER_OAUTH, AETHER_OAUTH_MODELS);
-        // Register user-configured models for other authTypes
-        this.reloadModels(modelProvidersConfig, runtimeModelProvidersConfig);
-    }
-    /**
-     * Register models for an authType.
-     * If multiple models have the same id, the first one takes precedence.
-     */
-    registerAuthTypeModels(authType, models) {
-        const modelMap = new Map();
-        for (const config of models) {
-            // Skip if a model with the same id is already registered (first one wins)
-            if (modelMap.has(config.id)) {
-                debugLogger.warn(`Duplicate model id "${config.id}" for authType "${authType}". Using the first registered config.`);
-                continue;
-            }
-            const resolved = this.resolveModelConfig(config, authType);
-            modelMap.set(config.id, resolved);
-        }
-        this.modelsByAuthType.set(authType, modelMap);
-    }
-    isSelectableModel(model) {
-        return !model.fetchModels;
-    }
-    /**
-     * Get all models for a specific authType.
-     * This is used by /model command to show only relevant models.
-     */
-    getModelsForAuthType(authType) {
-        const models = this.modelsByAuthType.get(authType);
-        if (!models)
-            return [];
-        return Array.from(models.values())
-            .filter((model) => this.isSelectableModel(model))
-            .map((model) => ({
-            id: model.id,
-            label: model.name,
-            description: model.description,
-            capabilities: model.capabilities,
-            authType: model.authType,
-            provider: model.provider,
-            isVision: model.capabilities?.vision ?? false,
-            contextWindowSize: model.generationConfig.contextWindowSize ?? resolveGlobalTokenLimits(model.id, DEFAULT_CONTEXT_LENGTH, {
-                defaultContextLength: DEFAULT_CONTEXT_LENGTH,
-                defaultMaxOutputTokens: DEFAULT_MAX_OUTPUT_TOKENS
-            }).maxInputTokens,
-            modalities: model.generationConfig.modalities ?? defaultModalities(model.id),
-            baseUrl: model.baseUrl,
-            envKey: model.envKey,
-        }));
-    }
-    /**
-     * Get model configuration by authType and modelId
-     */
-    getModel(authType, modelId) {
-        const models = this.modelsByAuthType.get(authType);
-        return models?.get(modelId);
-    }
-    /**
-     * Check if model exists for given authType
-     */
-    hasModel(authType, modelId) {
-        const models = this.modelsByAuthType.get(authType);
-        return models?.has(modelId) ?? false;
-    }
-    /**
-     * Get default model for an authType.
-     * For aether-oauth, returns the coder model.
-     * For others, returns the first configured model.
-     */
-    getDefaultModelForAuthType(authType) {
-        if (authType === AuthType.AETHER_OAUTH) {
-            return this.getModel(authType, DEFAULT_AETHER_MODEL);
-        }
-        const models = this.modelsByAuthType.get(authType);
-        if (!models || models.size === 0)
-            return undefined;
-        return Array.from(models.values()).find((model) => this.isSelectableModel(model));
-    }
-    /**
-     * Resolve model config by applying defaults
-     */
-    resolveModelConfig(config, authType) {
-        this.validateModelConfig(config, authType);
-        return {
-            ...config,
-            authType,
-            name: config.name || config.id,
-            baseUrl: config.baseUrl || this.getDefaultBaseUrl(authType),
-            generationConfig: config.generationConfig ?? {},
-            capabilities: config.capabilities || {},
-        };
-    }
-    /**
-     * Validate model configuration
-     */
-    validateModelConfig(config, authType) {
-        if (!config.id) {
-            throw new Error(`Model config in authType '${authType}' missing required field: id`);
-        }
-    }
-    /**
-     * Reload models from updated configuration.
-     * Clears existing user-configured models and re-registers from new config.
-     * Preserves hard-coded aether-oauth models.
-     */
-    reloadModels(modelProvidersConfig, runtimeModelProvidersConfig) {
-        // Clear existing user-configured models (preserve aether-oauth)
-        for (const authType of this.modelsByAuthType.keys()) {
-            if (authType !== AuthType.AETHER_OAUTH) {
-                this.modelsByAuthType.delete(authType);
-            }
-        }
-        // Re-register user-configured models for other authTypes
-        const mergedConfigs = new Map();
-        const appendConfig = (config) => {
-            if (!config) {
-                return;
-            }
-            for (const [rawKey, models] of Object.entries(config)) {
-                const authType = validateAuthTypeKey(rawKey);
-                if (!authType) {
-                    debugLogger.warn(`Invalid authType key "${rawKey}" in modelProviders config. Expected one of: ${Object.values(AuthType).join(', ')}. Skipping.`);
-                    continue;
-                }
-                if (authType === AuthType.AETHER_OAUTH) {
-                    continue;
-                }
-                const existing = mergedConfigs.get(authType) || [];
-                mergedConfigs.set(authType, [...existing, ...models]);
-            }
-        };
-        appendConfig(runtimeModelProvidersConfig);
-        appendConfig(modelProvidersConfig);
-        for (const [authType, models] of mergedConfigs.entries()) {
-            this.registerAuthTypeModels(authType, models);
-        }
-    }
-}
-//# sourceMappingURL=modelRegistry.js.map

package/dist/CLI/packages/core/src/models/modelRegistry.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"modelRegistry.js","sourceRoot":"","sources":["../../../../../../../core/src/models/modelRegistry.ts"],"names":[],"mappings":"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"}