fix info env when partial info

microsoft · Jul 16, 2024 · f05875e · f05875e
1 parent 8c34c55
commit f05875e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/packages/cli/src/info.ts b/packages/cli/src/info.ts
@@ -1,5 +1,6 @@
 import { parseTokenFromEnv } from "../../core/src/connection"
 import { MODEL_PROVIDERS } from "../../core/src/constants"
+import { errorMessage } from "../../core/src/error"
 import { host } from "../../core/src/host"
 import {
     ModelConnectionInfo,
@@ -26,11 +27,18 @@ export async function envInfo(provider: string, options?: { token?: boolean }) {
     for (const modelProvider of MODEL_PROVIDERS.filter(
         (mp) => !provider || mp.id === provider
     )) {
-        const conn = await parseTokenFromEnv(env, `${modelProvider.id}:*`)
-        if (conn) {
-            if (!token && conn.token)
-                conn.token = conn.token.slice(0, 5) + "***"
-            res.providers.push(conn)
+        try {
+            const conn = await parseTokenFromEnv(env, `${modelProvider.id}:*`)
+            if (conn) {
+                if (!token && conn.token)
+                    conn.token = "***"
+                res.providers.push(conn)
+            }
+        } catch (e) {
+            res.providers.push({
+                provider: modelProvider.id,
+                error: errorMessage(e),
+            })
         }
     }
     console.log(YAMLStringify(res))

diff --git a/packages/core/src/connection.ts b/packages/core/src/connection.ts
@@ -109,6 +109,7 @@ export async function parseTokenFromEnv(
                 env.AZURE_API_BASE ||
                 env.AZURE_OPENAI_API_ENDPOINT
         )
+        if (!token && !base) return undefined
         if (!token)
             throw new Error("AZURE_OPENAI_API_KEY or AZURE_API_KEY missing")
         if (token === PLACEHOLDER_API_KEY)
@@ -135,7 +136,9 @@ export async function parseTokenFromEnv(
             base,
             token,
             type: "azure",
-            source: token ? "env: AZURE_..." : "env: AZURE_... + Entra ID",
+            source: token
+                ? "env: AZURE_OPENAI_API_..."
+                : "env: AZURE_OPENAI_API_... + Entra ID",
             version,
             curlHeaders: tokenVar
                 ? {