From 71a44fac284d4438dc90c274d7d04cb5b635de1d Mon Sep 17 00:00:00 2001
From: EmilienMottet <emilien.mottet@grenoble-inp.org>
Date: Wed, 30 Apr 2025 14:46:54 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor=20OpenAI=20client?=
 =?UTF-8?q?=20options=20and=20unify=20custom=20headers=20parsing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use OpenAI.ClientOptions for stronger typing and clarity
Extract custom headers parsing into parseCustomHeaders util
Simplify getEngine by delegating header parsing to helper
Improve maintainability and reduce code duplication
---
 src/engine/openAi.ts |  7 +------
 src/utils/engine.ts  | 38 ++++++++++++++++++++++----------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/engine/openAi.ts b/src/engine/openAi.ts
index 9f2a1c8..f87bcd1 100644
--- a/src/engine/openAi.ts
+++ b/src/engine/openAi.ts
@@ -14,21 +14,17 @@ export class OpenAiEngine implements AiEngine {
   constructor(config: OpenAiConfig) {
     this.config = config;
 
-    // Configuration options for the OpenAI client
-    const clientOptions: any = {
+    const clientOptions: OpenAI.ClientOptions = {
       apiKey: config.apiKey
     };
     
-    // Add baseURL if present
     if (config.baseURL) {
       clientOptions.baseURL = config.baseURL;
     }
     
-    // Add custom headers if present
     if (config.customHeaders) {
       try {
         let headers = config.customHeaders;
-        // If the headers are a string, try to parse them as JSON
         if (typeof config.customHeaders === 'string') {
           headers = JSON.parse(config.customHeaders);
         }
@@ -37,7 +33,6 @@ export class OpenAiEngine implements AiEngine {
           clientOptions.defaultHeaders = headers;
         }
       } catch (error) {
-        // Silently ignore parsing errors
       }
     }
     
diff --git a/src/utils/engine.ts b/src/utils/engine.ts
index e4a9cea..e265b5b 100644
--- a/src/utils/engine.ts
+++ b/src/utils/engine.ts
@@ -12,25 +12,31 @@ import { GroqEngine } from '../engine/groq';
 import { MLXEngine } from '../engine/mlx';
 import { DeepseekEngine } from '../engine/deepseek';
 
+function parseCustomHeaders(headers: any): Record<string, string> {
+  let parsedHeaders = {};
+  
+  if (!headers) {
+    return parsedHeaders;
+  }
+  
+  try {
+    if (typeof headers === 'object' && !Array.isArray(headers)) {
+      parsedHeaders = headers;
+    } else {
+      parsedHeaders = JSON.parse(headers);
+    }
+  } catch (error) {
+    console.warn('Invalid OCO_API_CUSTOM_HEADERS format, ignoring custom headers');
+  }
+  
+  return parsedHeaders;
+}
+
 export function getEngine(): AiEngine {
   const config = getConfig();
   const provider = config.OCO_AI_PROVIDER;
 
-  // Parse custom headers if provided
-  let customHeaders = {};
-  if (config.OCO_API_CUSTOM_HEADERS) {
-    try {
-      // If it's already an object, no need to parse it
-      if (typeof config.OCO_API_CUSTOM_HEADERS === 'object' && !Array.isArray(config.OCO_API_CUSTOM_HEADERS)) {
-        customHeaders = config.OCO_API_CUSTOM_HEADERS;
-      } else {
-        // Try to parse as JSON
-        customHeaders = JSON.parse(config.OCO_API_CUSTOM_HEADERS);
-      }
-    } catch (error) {
-      console.warn('Invalid OCO_API_CUSTOM_HEADERS format, ignoring custom headers');
-    }
-  }
+  const customHeaders = parseCustomHeaders(config.OCO_API_CUSTOM_HEADERS);
 
   const DEFAULT_CONFIG = {
     model: config.OCO_MODEL!,
@@ -38,7 +44,7 @@ export function getEngine(): AiEngine {
     maxTokensInput: config.OCO_TOKENS_MAX_INPUT!,
     baseURL: config.OCO_API_URL!,
     apiKey: config.OCO_API_KEY!,
-    customHeaders // Add custom headers to the configuration
+    customHeaders
   };
 
   switch (provider) {