feat(config): export OCO_AI_PROVIDER_ENUM to allow external access to…

… AI provider constants

refactor(config): simplify mergeObjects function to improve readability and maintainability
refactor(setConfig): remove unnecessary keysToSet variable to streamline logging
refactor(engine): update switch cases to use OCO_AI_PROVIDER_ENUM for better consistency and clarity

src/commands/config.ts

@@ -355,7 +355,8 @@ export const configValidators = {
   }
 };
 
-enum OCO_AI_PROVIDER_ENUM {
+export enum OCO_AI_PROVIDER_ENUM {
+  OLLAMA = 'ollama',
   OPENAI = 'openai',
   ANTHROPIC = 'anthropic',
   GEMINI = 'gemini',
@@ -458,7 +459,7 @@ export const getConfig = ({
 }: {
   configPath?: string;
   envPath?: string;
-} = {}) => {
+} = {}): ConfigType => {
   dotenv.config({ path: envPath });
 
   const configFromEnv = {
@@ -501,15 +502,12 @@ export const getConfig = ({
     globalConfig = iniParse(configFile) as ConfigType;
   }
 
-  function mergeObjects(main: Partial<ConfigType>, fallback: ConfigType) {
-    return Object.keys(fallback).reduce(
-      (acc, key) => {
-        acc[key] = main[key] !== undefined ? main[key] : fallback[key];
-        return acc;
-      },
-      { ...main }
-    );
-  }
+  const mergeObjects = (main: Partial<ConfigType>, fallback: ConfigType) =>
+    Object.keys(fallback).reduce((acc, key) => {
+      acc[key] = parseEnvVarValue(main[key] || fallback[key]);
+
+      return acc;
+    }, {} as ConfigType);
 
   // env config takes precedence over global ~/.opencommit config file
   const config = mergeObjects(configFromEnv, globalConfig);
@@ -521,10 +519,6 @@ export const setConfig = (
   keyValues: [key: string, value: string][],
   configPath: string = defaultConfigPath
 ) => {
-  const keysToSet = keyValues
-    .map(([key, value]) => `${key} to ${value}`)
-    .join(', ');
-
   const config = getConfig();
 
   for (let [key, value] of keyValues) {
@@ -548,14 +542,14 @@ export const setConfig = (
       config
     );
 
-    config[key as CONFIG_KEYS] = validValue;
+    config[key] = validValue;
   }
 
   writeFileSync(configPath, iniStringify(config), 'utf8');
 
   assertConfigsAreValid(config);
 
-  outro(`${chalk.green('✔')} config successfully set: ${keysToSet}`);
+  outro(`${chalk.green('✔')} config successfully set`);
 };
 
 export const configCommand = command(

src/utils/engine.ts

@@ -1,4 +1,4 @@
-import { getConfig } from '../commands/config';
+import { getConfig, OCO_AI_PROVIDER_ENUM } from '../commands/config';
 import { AnthropicEngine } from '../engine/anthropic';
 import { AzureEngine } from '../engine/azure';
 import { AiEngine } from '../engine/Engine';
@@ -20,38 +20,36 @@ export function getEngine(): AiEngine {
   };
 
   switch (provider) {
-    case provider?.startsWith('ollama') && provider:
-      const model = provider.substring('ollama/'.length);
+    case OCO_AI_PROVIDER_ENUM.OLLAMA:
       return new OllamaAi({
         ...DEFAULT_CONFIG,
         apiKey: '',
-        model,
         baseURL: config.OCO_OLLAMA_API_URL!
       });
 
-    case 'anthropic':
+    case OCO_AI_PROVIDER_ENUM.ANTHROPIC:
       return new AnthropicEngine({
         ...DEFAULT_CONFIG,
         apiKey: config.OCO_ANTHROPIC_API_KEY!
       });
 
-    case 'test':
+    case OCO_AI_PROVIDER_ENUM.TEST:
       return new TestAi(config.OCO_TEST_MOCK_TYPE as TestMockType);
 
-    case 'gemini':
+    case OCO_AI_PROVIDER_ENUM.GEMINI:
       return new Gemini({
         ...DEFAULT_CONFIG,
         apiKey: config.OCO_GEMINI_API_KEY!,
         baseURL: config.OCO_GEMINI_BASE_PATH!
       });
 
-    case 'azure':
+    case OCO_AI_PROVIDER_ENUM.AZURE:
       return new AzureEngine({
         ...DEFAULT_CONFIG,
         apiKey: config.OCO_AZURE_API_KEY!
       });
 
-    case 'flowise':
+    case OCO_AI_PROVIDER_ENUM.FLOWISE:
       return new FlowiseAi({
         ...DEFAULT_CONFIG,
         baseURL: config.OCO_FLOWISE_ENDPOINT || DEFAULT_CONFIG.baseURL,