-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Add Z AI provider #6657
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
Merged
Merged
Add Z AI provider #6657
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| import type { ModelInfo } from "../model.js" | ||
|
|
||
| // Z AI | ||
| // https://docs.z.ai/guides/llm/glm-4.5 | ||
| // https://docs.z.ai/guides/overview/pricing | ||
jues marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| export type InternationalZAiModelId = keyof typeof internationalZAiModels | ||
| export const internationalZAiDefaultModelId: InternationalZAiModelId = "glm-4.5" | ||
| export const internationalZAiModels = { | ||
| "glm-4.5": { | ||
| maxTokens: 98_304, | ||
| contextWindow: 131_072, | ||
| supportsImages: false, | ||
| supportsPromptCache: true, | ||
| inputPrice: 0.6, | ||
| outputPrice: 2.2, | ||
| cacheWritesPrice: 0, | ||
| cacheReadsPrice: 0.11, | ||
| 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": { | ||
| maxTokens: 98_304, | ||
| contextWindow: 131_072, | ||
| supportsImages: false, | ||
| supportsPromptCache: true, | ||
| inputPrice: 0.2, | ||
| outputPrice: 1.1, | ||
| cacheWritesPrice: 0, | ||
| cacheReadsPrice: 0.03, | ||
| 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.", | ||
| }, | ||
| } as const satisfies Record<string, ModelInfo> | ||
|
|
||
| export type MainlandZAiModelId = keyof typeof mainlandZAiModels | ||
| export const mainlandZAiDefaultModelId: MainlandZAiModelId = "glm-4.5" | ||
| export const mainlandZAiModels = { | ||
| "glm-4.5": { | ||
| maxTokens: 98_304, | ||
| contextWindow: 131_072, | ||
| supportsImages: false, | ||
| supportsPromptCache: true, | ||
| inputPrice: 0.29, | ||
| outputPrice: 1.14, | ||
| cacheWritesPrice: 0, | ||
| cacheReadsPrice: 0.057, | ||
| 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.", | ||
| tiers: [ | ||
| { | ||
| contextWindow: 32_000, | ||
| inputPrice: 0.21, | ||
| outputPrice: 1.0, | ||
| cacheReadsPrice: 0.043, | ||
| }, | ||
| { | ||
| contextWindow: 128_000, | ||
| inputPrice: 0.29, | ||
| outputPrice: 1.14, | ||
| cacheReadsPrice: 0.057, | ||
| }, | ||
| { | ||
| contextWindow: Infinity, | ||
| inputPrice: 0.29, | ||
| outputPrice: 1.14, | ||
| cacheReadsPrice: 0.057, | ||
| }, | ||
| ], | ||
| }, | ||
| "glm-4.5-air": { | ||
| maxTokens: 98_304, | ||
| contextWindow: 131_072, | ||
| supportsImages: false, | ||
| supportsPromptCache: true, | ||
| inputPrice: 0.1, | ||
| outputPrice: 0.6, | ||
| cacheWritesPrice: 0, | ||
| cacheReadsPrice: 0.02, | ||
| 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.", | ||
| tiers: [ | ||
| { | ||
| contextWindow: 32_000, | ||
| inputPrice: 0.07, | ||
| outputPrice: 0.4, | ||
| cacheReadsPrice: 0.014, | ||
| }, | ||
| { | ||
| contextWindow: 128_000, | ||
| inputPrice: 0.1, | ||
| outputPrice: 0.6, | ||
| cacheReadsPrice: 0.02, | ||
| }, | ||
| { | ||
| contextWindow: Infinity, | ||
| inputPrice: 0.1, | ||
| outputPrice: 0.6, | ||
| cacheReadsPrice: 0.02, | ||
| }, | ||
| ], | ||
| }, | ||
| } as const satisfies Record<string, ModelInfo> | ||
|
|
||
| export const ZAI_DEFAULT_TEMPERATURE = 0 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import { | ||
| internationalZAiModels, | ||
| mainlandZAiModels, | ||
| internationalZAiDefaultModelId, | ||
| mainlandZAiDefaultModelId, | ||
| type InternationalZAiModelId, | ||
| type MainlandZAiModelId, | ||
| ZAI_DEFAULT_TEMPERATURE, | ||
| } from "@roo-code/types" | ||
|
|
||
| import type { ApiHandlerOptions } from "../../shared/api" | ||
|
|
||
| import { BaseOpenAiCompatibleProvider } from "./base-openai-compatible-provider" | ||
|
|
||
| export class ZAiHandler extends BaseOpenAiCompatibleProvider<InternationalZAiModelId | MainlandZAiModelId> { | ||
jues marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| constructor(options: ApiHandlerOptions) { | ||
| const isChina = options.zaiApiLine === "china" | ||
| const models = isChina ? mainlandZAiModels : internationalZAiModels | ||
| const defaultModelId = isChina ? mainlandZAiDefaultModelId : internationalZAiDefaultModelId | ||
|
|
||
| super({ | ||
| ...options, | ||
| providerName: "Z AI", | ||
| baseURL: isChina ? "https://open.bigmodel.cn/api/paas/v4" : "https://api.z.ai/api/paas/v4", | ||
| apiKey: options.zaiApiKey ?? "not-provided", | ||
| defaultProviderModelId: defaultModelId, | ||
| providerModels: models, | ||
| defaultTemperature: ZAI_DEFAULT_TEMPERATURE, | ||
| }) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| import { useCallback } from "react" | ||
| import { VSCodeTextField, VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react" | ||
|
|
||
| import type { ProviderSettings } from "@roo-code/types" | ||
|
|
||
| import { useAppTranslation } from "@src/i18n/TranslationContext" | ||
| import { VSCodeButtonLink } from "@src/components/common/VSCodeButtonLink" | ||
|
|
||
| import { inputEventTransform } from "../transforms" | ||
| import { cn } from "@/lib/utils" | ||
|
|
||
| type ZAiProps = { | ||
| apiConfiguration: ProviderSettings | ||
| setApiConfigurationField: (field: keyof ProviderSettings, value: ProviderSettings[keyof ProviderSettings]) => void | ||
| } | ||
|
|
||
| export const ZAi = ({ apiConfiguration, setApiConfigurationField }: ZAiProps) => { | ||
| const { t } = useAppTranslation() | ||
|
|
||
| const handleInputChange = useCallback( | ||
| <K extends keyof ProviderSettings, E>( | ||
| field: K, | ||
| transform: (event: E) => ProviderSettings[K] = inputEventTransform, | ||
| ) => | ||
| (event: E | Event) => { | ||
| setApiConfigurationField(field, transform(event as E)) | ||
| }, | ||
| [setApiConfigurationField], | ||
| ) | ||
|
|
||
| return ( | ||
| <> | ||
| <div> | ||
| <label className="block font-medium mb-1">Z AI Entrypoint</label> | ||
jues marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
jues marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| <VSCodeDropdown | ||
| value={apiConfiguration.zaiApiLine || "international"} | ||
| onChange={handleInputChange("zaiApiLine")} | ||
| className={cn("w-full")}> | ||
| <VSCodeOption value="international" className="p-2"> | ||
| api.z.ai | ||
| </VSCodeOption> | ||
| <VSCodeOption value="china" className="p-2"> | ||
| open.bigmodel.cn | ||
| </VSCodeOption> | ||
| </VSCodeDropdown> | ||
| <div className="text-xs text-vscode-descriptionForeground mt-1"> | ||
jues marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Please select the appropriate API entrypoint based on your location. If you are in China, choose | ||
| open.bigmodel.cn. Otherwise, choose api.z.ai. | ||
| </div> | ||
| </div> | ||
| <div> | ||
| <VSCodeTextField | ||
| value={apiConfiguration?.zaiApiKey || ""} | ||
| type="password" | ||
| onInput={handleInputChange("zaiApiKey")} | ||
| placeholder={t("settings:placeholders.apiKey")} | ||
| className="w-full"> | ||
| <label className="block font-medium mb-1">Z AI API Key</label> | ||
jues marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
jues marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| </VSCodeTextField> | ||
| <div className="text-sm text-vscode-descriptionForeground"> | ||
| {t("settings:providers.apiKeyStorageNotice")} | ||
| </div> | ||
| {!apiConfiguration?.zaiApiKey && ( | ||
| <VSCodeButtonLink | ||
| href={ | ||
| apiConfiguration.zaiApiLine === "china" | ||
| ? "https://open.bigmodel.cn/console/overview" | ||
| : "https://z.ai/manage-apikey/apikey-list" | ||
| } | ||
| appearance="secondary"> | ||
| Get Z AI API Key | ||
jues marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
jues marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| </VSCodeButtonLink> | ||
| )} | ||
| </div> | ||
| </> | ||
| ) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.