[deploy] Merge pull request #149 from microsoft/dev

fix the openai endpoint issue with custom api_base and api_keys

Author: Chenglong-MS

py-src/data_formulator/agent_routes.py

@@ -158,6 +158,7 @@ def test_model():
                     "message": ""
                 }
         except Exception as e:
+            print(f"Error: {e}")
             logger.info(f"Error: {e}")
             result = {
                 "model": content['model'],

py-src/data_formulator/agents/client_utils.py

@@ -54,6 +54,7 @@ def __init__(self, endpoint, model, api_key=None,  api_base=None, api_version=No
                 self.model = model
             else:
                 self.model = f"ollama/{model}"
+        
 
     def get_completion(self, messages):
         """
@@ -63,12 +64,28 @@ def get_completion(self, messages):
         # Configure LiteLLM 
 
         if self.endpoint == "openai":
+
+            print("--------------------------------")
+            print(f"self.params: {self.params}")
+            print(f"self.model: {self.model}")
+            print(f"self.endpoint: {self.endpoint}")
+            print(f"self.params['api_key']: {self.params.get('api_key', 'None')}")
+            print(f"self.params['api_base']: {self.params.get('api_base', 'None')}")
+            print(f"self.params['api_version']: {self.params.get('api_version', 'None')}")
+            print("--------------------------------")
+
+
             client = openai.OpenAI(
-                api_key=self.params["api_key"], 
-                base_url=self.params["api_base"] if "api_base" in self.params else None,
+                base_url=self.params.get("api_base", 'placeholder'),
+                api_key=self.params.get("api_key", 'placeholder'),
                 timeout=120
             )
 
+
+            print("--------------------------------")
+            print(f"client: {client}")
+            print("--------------------------------")
+
             completion_params = {
                 "model": self.model,
                 "messages": messages,

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "data_formulator"
-version = "0.2"
+version = "0.2.1"
 
 requires-python = ">=3.9"
 authors = [

src/views/ModelSelectionDialog.tsx

@@ -100,9 +100,9 @@ export const ModelSelectionButton: React.FC<{}> = ({ }) => {
 
     const [newEndpoint, setNewEndpoint] = useState<string>(""); // openai, azure, ollama etc
     const [newModel, setNewModel] = useState<string>("");
-    const [newApiKey, setNewApiKey] = useState<string | undefined>(undefined);
-    const [newApiBase, setNewApiBase] = useState<string | undefined>(undefined);
-    const [newApiVersion, setNewApiVersion] = useState<string | undefined>(undefined);
+    const [newApiKey, setNewApiKey] = useState<string>("");
+    const [newApiBase, setNewApiBase] = useState<string>("");
+    const [newApiVersion, setNewApiVersion] = useState<string>("");
 
     // Fetch available models from the API
     useEffect(() => {
@@ -145,23 +145,6 @@ export const ModelSelectionButton: React.FC<{}> = ({ }) => {
         fetchModelOptions();
     }, []);
 
-    useEffect(() => {
-        if (newEndpoint == 'ollama') {
-            if (!newApiBase) {
-                setNewApiBase('http://localhost:11434');
-            }
-        }
-        if (newEndpoint == "openai") {
-            if (!newModel && providerModelOptions.openai.length > 0) {
-                setNewModel(providerModelOptions.openai[0]);
-            }
-        }
-        if (newEndpoint == "anthropic") {
-            if (!newModel && providerModelOptions.anthropic.length > 0) {
-                setNewModel(providerModelOptions.anthropic[0]);
-            }
-        }
-    }, [newEndpoint, providerModelOptions]);
 
     let modelExists = models.some(m => 
         m.endpoint == newEndpoint && m.model == newModel && m.api_base == newApiBase 
@@ -247,8 +230,8 @@ export const ModelSelectionButton: React.FC<{}> = ({ }) => {
             <TextField fullWidth size="small" type={showKeys ? "text" : "password"} 
                 InputProps={{ style: { fontSize: "0.875rem" } }} 
                 placeholder='leave blank if using keyless access'
-                error={!(newEndpoint == "azure" || newEndpoint == "ollama" || newEndpoint == "") && !newApiKey}
-                value={newApiKey}  onChange={(event: any) => { setNewApiKey(event.target.value); }} 
+                value={newApiKey}  
+                onChange={(event: any) => { setNewApiKey(event.target.value); }} 
                 autoComplete='off'
             />
         </TableCell>
@@ -304,7 +287,6 @@ export const ModelSelectionButton: React.FC<{}> = ({ }) => {
         <TableCell align="right">
             <TextField size="small" type="text" fullWidth
                 placeholder="api_base"
-                error={newEndpoint === "azure" && !newApiBase}
                 InputProps={{ style: { fontSize: "0.875rem" } }}
                 value={newApiBase}  
                 onChange={(event: any) => { setNewApiBase(event.target.value); }} 
@@ -343,9 +325,9 @@ export const ModelSelectionButton: React.FC<{}> = ({ }) => {
 
                         setNewEndpoint("");
                         setNewModel("");
-                        setNewApiKey(undefined);
-                        setNewApiBase(undefined);
-                        setNewApiVersion(undefined);
+                        setNewApiKey("");
+                        setNewApiBase("");
+                        setNewApiVersion("");
                     }}>
                     <AddCircleIcon />
                 </IconButton>
@@ -358,9 +340,9 @@ export const ModelSelectionButton: React.FC<{}> = ({ }) => {
                         event.stopPropagation()
                         setNewEndpoint("");
                         setNewModel("");
-                        setNewApiKey(undefined);
-                        setNewApiBase(undefined);
-                        setNewApiVersion(undefined);
+                        setNewApiKey("");
+                        setNewApiBase("");
+                        setNewApiVersion("");
                     }}>
                     <ClearIcon />
                 </IconButton>
@@ -527,7 +509,7 @@ export const ModelSelectionButton: React.FC<{}> = ({ }) => {
                 {modelTable}
             </DialogContent>
             <DialogActions>
-                {appConfig.DISABLE_DISPLAY_KEYS && (
+                {!appConfig.DISABLE_DISPLAY_KEYS && (
                     <Button sx={{marginRight: 'auto'}} endIcon={showKeys ? <VisibilityOffIcon /> : <VisibilityIcon />} onClick={()=>{
                         setShowKeys(!showKeys);}}>
                             {showKeys ? 'hide' : 'show'} keys