-
Notifications
You must be signed in to change notification settings - Fork 2.3k
feat(zai): consolidate to two coding entrypoints and update endpoints/tests/UI #8162
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
7bc7291
3ad654d
ea48d53
023ea9a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not sure if it's necessary for this to handle keys with dots, I would think that would be a bad practice for translation keys. |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -92,14 +92,44 @@ function findKeys(obj, parentKey = "") { | |||||
|
||||||
// Get value at a dotted path in an object | ||||||
function getValueAtPath(obj, path) { | ||||||
const parts = path.split(".") | ||||||
// Handle the case where keys might contain dots (like "glm-4.5") | ||||||
// We need to be smarter about splitting the path | ||||||
let current = obj | ||||||
let remainingPath = path | ||||||
|
||||||
while (remainingPath && current && typeof current === "object") { | ||||||
let found = false | ||||||
|
||||||
// Try to find the longest matching key first | ||||||
for (const key of Object.keys(current)) { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The comment indicates 'Try to find the longest matching key first,' but the code iterates over Object.keys(current) without sorting by key length. This may cause ambiguous matches when multiple keys (e.g. 'aaa' and 'aaa.b') exist. Consider sorting the keys in descending order by length to ensure the longest matching key is selected.
Suggested change
|
||||||
if (remainingPath === key) { | ||||||
// Exact match - we're done | ||||||
return current[key] | ||||||
} else if (remainingPath.startsWith(key + ".")) { | ||||||
// Key matches the start of remaining path | ||||||
current = current[key] | ||||||
remainingPath = remainingPath.slice(key.length + 1) | ||||||
found = true | ||||||
break | ||||||
} | ||||||
} | ||||||
|
||||||
for (const part of parts) { | ||||||
if (current === undefined || current === null) { | ||||||
return undefined | ||||||
if (!found) { | ||||||
// No matching key found, try the old method as fallback | ||||||
const dotIndex = remainingPath.indexOf(".") | ||||||
if (dotIndex === -1) { | ||||||
// No more dots, this should be the final key | ||||||
return current[remainingPath] | ||||||
} else { | ||||||
const nextKey = remainingPath.slice(0, dotIndex) | ||||||
if (current[nextKey] !== undefined) { | ||||||
current = current[nextKey] | ||||||
remainingPath = remainingPath.slice(dotIndex + 1) | ||||||
} else { | ||||||
return undefined | ||||||
} | ||||||
} | ||||||
} | ||||||
current = current[part] | ||||||
} | ||||||
|
||||||
return current | ||||||
|
Original file line number | Diff line number | Diff line change | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -15,14 +15,14 @@ import { BaseOpenAiCompatibleProvider } from "./base-openai-compatible-provider" | |||||||||||
|
||||||||||||
export class ZAiHandler extends BaseOpenAiCompatibleProvider<InternationalZAiModelId | MainlandZAiModelId> { | ||||||||||||
constructor(options: ApiHandlerOptions) { | ||||||||||||
const isChina = zaiApiLineConfigs[options.zaiApiLine ?? "international_coding"].isChina | ||||||||||||
const isChina = zaiApiLineConfigs[options.zaiApiLine ?? "international"].isChina | ||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since this removes existing enum values ('international_coding' and 'china_coding'), users with existing configurations using these values might encounter runtime issues. Could we consider adding a migration handler here?
Suggested change
This would gracefully handle legacy configurations. |
||||||||||||
const models = isChina ? mainlandZAiModels : internationalZAiModels | ||||||||||||
const defaultModelId = isChina ? mainlandZAiDefaultModelId : internationalZAiDefaultModelId | ||||||||||||
|
||||||||||||
super({ | ||||||||||||
...options, | ||||||||||||
providerName: "Z AI", | ||||||||||||
baseURL: zaiApiLineConfigs[options.zaiApiLine ?? "international_coding"].baseUrl, | ||||||||||||
baseURL: zaiApiLineConfigs[options.zaiApiLine ?? "international"].baseUrl, | ||||||||||||
apiKey: options.zaiApiKey ?? "not-provided", | ||||||||||||
defaultProviderModelId: defaultModelId, | ||||||||||||
providerModels: models, | ||||||||||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,14 +33,15 @@ export const ZAi = ({ apiConfiguration, setApiConfigurationField }: ZAiProps) => | |
<div> | ||
<label className="block font-medium mb-1">{t("settings:providers.zaiEntrypoint")}</label> | ||
<VSCodeDropdown | ||
value={apiConfiguration.zaiApiLine || zaiApiLineSchema.enum.international_coding} | ||
value={apiConfiguration.zaiApiLine || zaiApiLineSchema.enum.international} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good job updating the default value here. This ensures the UI properly reflects the new simplified options. |
||
onChange={handleInputChange("zaiApiLine")} | ||
className={cn("w-full")}> | ||
{zaiApiLineSchema.options.map((zaiApiLine) => { | ||
const config = zaiApiLineConfigs[zaiApiLine] | ||
const label = t(`settings:providers.zaiEntrypointOptions.${zaiApiLine}`) | ||
return ( | ||
<VSCodeOption key={zaiApiLine} value={zaiApiLine} className="p-2"> | ||
{config.name} ({config.baseUrl}) | ||
{label} ({config.baseUrl}) | ||
</VSCodeOption> | ||
) | ||
})} | ||
|
@@ -64,7 +65,7 @@ export const ZAi = ({ apiConfiguration, setApiConfigurationField }: ZAiProps) => | |
{!apiConfiguration?.zaiApiKey && ( | ||
<VSCodeButtonLink | ||
href={ | ||
zaiApiLineConfigs[apiConfiguration.zaiApiLine ?? "international_coding"].isChina | ||
zaiApiLineConfigs[apiConfiguration.zaiApiLine ?? "international"].isChina | ||
? "https://open.bigmodel.cn/console/overview" | ||
: "https://z.ai/manage-apikey/apikey-list" | ||
} | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -294,6 +294,18 @@ | |
"getZaiApiKey": "Get Z AI API Key", | ||
"zaiEntrypoint": "Z AI Entrypoint", | ||
"zaiEntrypointDescription": "Please select the appropriate API entrypoint based on your location. If you are in China, choose open.bigmodel.cn. Otherwise, choose api.z.ai.", | ||
"zaiEntrypointOptions": { | ||
"international": "International", | ||
"china": "China" | ||
}, | ||
"zaiModels": { | ||
"glm-4.5": { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Currently we save these descriptions in the types package and they are all in English, unless we want to change all of them I think it makes sense to keep them like that |
||
"description": "GLM-4.5 is Zhipu's latest featured model. Its comprehensive capabilities in reasoning, coding, and agent reach the state-of-the-art (SOTA) level among open-source models, with a context length of up to 128k." | ||
}, | ||
"glm-4.5-air": { | ||
"description": "GLM-4.5-Air is the lightweight version of GLM-4.5. It balances performance and cost-effectiveness, and can flexibly switch to hybrid thinking models." | ||
} | ||
}, | ||
"geminiApiKey": "Gemini API Key", | ||
"getGroqApiKey": "Get Groq API Key", | ||
"groqApiKey": "Groq API Key", | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the naming convention intentional where the enum uses lowercase 'international' and 'china' but the display names are 'International' and 'China'? Just confirming this is the desired pattern - it's consistent throughout, which is good.