feat: add Azure OpenAI provider support
This commit is contained in:
@@ -13,6 +13,8 @@ export default function AddApiKeyModal({ isOpen, provider, providerName, isCompa
|
||||
? (provider === "grok-web" ? "sso=xxxxx... or just the raw value" : "eyJhbGciOi...")
|
||||
: "";
|
||||
|
||||
const isAzure = provider === "azure";
|
||||
|
||||
const [formData, setFormData] = useState({
|
||||
name: "",
|
||||
apiKey: "",
|
||||
@@ -20,6 +22,12 @@ export default function AddApiKeyModal({ isOpen, provider, providerName, isCompa
|
||||
proxyPoolId: NONE_PROXY_POOL_VALUE,
|
||||
ollamaHostUrl: "",
|
||||
});
|
||||
const [azureData, setAzureData] = useState({
|
||||
azureEndpoint: "",
|
||||
apiVersion: "2024-10-01-preview",
|
||||
deployment: "",
|
||||
organization: "",
|
||||
});
|
||||
const [validating, setValidating] = useState(false);
|
||||
const [validationResult, setValidationResult] = useState(null);
|
||||
const [saving, setSaving] = useState(false);
|
||||
@@ -28,6 +36,14 @@ export default function AddApiKeyModal({ isOpen, provider, providerName, isCompa
|
||||
if (isOllamaLocal && formData.ollamaHostUrl.trim()) {
|
||||
return { baseUrl: formData.ollamaHostUrl.trim() };
|
||||
}
|
||||
if (isAzure) {
|
||||
return {
|
||||
azureEndpoint: azureData.azureEndpoint,
|
||||
apiVersion: azureData.apiVersion,
|
||||
deployment: azureData.deployment,
|
||||
organization: azureData.organization,
|
||||
};
|
||||
}
|
||||
return undefined;
|
||||
};
|
||||
|
||||
@@ -164,6 +180,38 @@ export default function AddApiKeyModal({ isOpen, provider, providerName, isCompa
|
||||
}
|
||||
</p>
|
||||
)}
|
||||
{isAzure && (
|
||||
<div className="bg-sidebar/50 p-4 rounded-lg border border-accent/20">
|
||||
<h3 className="font-semibold mb-3 text-sm">Azure OpenAI Configuration</h3>
|
||||
<div className="flex flex-col gap-3">
|
||||
<Input
|
||||
label="Azure Endpoint"
|
||||
value={azureData.azureEndpoint}
|
||||
onChange={(e) => setAzureData({ ...azureData, azureEndpoint: e.target.value })}
|
||||
placeholder="https://your-resource.openai.azure.com"
|
||||
/>
|
||||
<Input
|
||||
label="Deployment Name"
|
||||
value={azureData.deployment}
|
||||
onChange={(e) => setAzureData({ ...azureData, deployment: e.target.value })}
|
||||
placeholder="gpt-4"
|
||||
/>
|
||||
<Input
|
||||
label="API Version"
|
||||
value={azureData.apiVersion}
|
||||
onChange={(e) => setAzureData({ ...azureData, apiVersion: e.target.value })}
|
||||
placeholder="2024-10-01-preview"
|
||||
/>
|
||||
<Input
|
||||
label="Organization"
|
||||
value={azureData.organization}
|
||||
onChange={(e) => setAzureData({ ...azureData, organization: e.target.value })}
|
||||
placeholder="Organization ID"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<Input
|
||||
label="Priority"
|
||||
type="number"
|
||||
@@ -193,7 +241,8 @@ export default function AddApiKeyModal({ isOpen, provider, providerName, isCompa
|
||||
</p>
|
||||
|
||||
<div className="flex gap-2">
|
||||
<Button onClick={handleSubmit} fullWidth disabled={saving || (!isOllamaLocal && (!formData.name || !formData.apiKey))}>
|
||||
<Button onClick={handleSubmit} fullWidth disabled={saving || (!isOllamaLocal && (!formData.name || !formData.apiKey)) || (isAzure && (!azureData.azureEndpoint || !azureData.deployment || !azureData.organization))}>
|
||||
|
||||
{saving ? "Saving..." : "Save"}
|
||||
</Button>
|
||||
<Button onClick={onClose} variant="ghost" fullWidth>
|
||||
|
||||
@@ -366,6 +366,21 @@ async function testApiKeyConnection(connection, effectiveProxy = null) {
|
||||
|
||||
try {
|
||||
switch (connection.provider) {
|
||||
case "azure": {
|
||||
const psd = connection.providerSpecificData || {};
|
||||
const endpoint = (psd.azureEndpoint || "").replace(/\/$/, "");
|
||||
const deployment = psd.deployment || "gpt-4";
|
||||
const apiVersion = psd.apiVersion || "2024-10-01-preview";
|
||||
const url = `${endpoint}/openai/deployments/${deployment}/chat/completions?api-version=${apiVersion}`;
|
||||
const headers = { "api-key": connection.apiKey, "Content-Type": "application/json" };
|
||||
if (psd.organization) headers["OpenAI-Organization"] = psd.organization;
|
||||
const res = await fetchWithConnectionProxy(url, {
|
||||
method: "POST", headers,
|
||||
body: JSON.stringify({ messages: [{ role: "user", content: "test" }], max_completion_tokens: 1 }),
|
||||
}, effectiveProxy);
|
||||
const valid = res.status !== 401 && res.status !== 403;
|
||||
return { valid, error: valid ? null : "Invalid API key or Azure configuration" };
|
||||
}
|
||||
case "openai": {
|
||||
const res = await fetchWithConnectionProxy("https://api.openai.com/v1/models", { headers: { Authorization: `Bearer ${connection.apiKey}` } }, effectiveProxy);
|
||||
return { valid: res.ok, error: res.ok ? null : "Invalid API key" };
|
||||
|
||||
@@ -116,7 +116,7 @@ export async function POST(request) {
|
||||
return NextResponse.json({ error: "Name is required" }, { status: 400 });
|
||||
}
|
||||
|
||||
let providerSpecificData = null;
|
||||
let providerSpecificData = body.providerSpecificData || null;
|
||||
|
||||
if (isOpenAICompatibleProvider(provider)) {
|
||||
const node = await getProviderNodeById(provider);
|
||||
|
||||
@@ -63,6 +63,35 @@ export async function POST(request) {
|
||||
});
|
||||
}
|
||||
|
||||
if (provider === "azure") {
|
||||
const { providerSpecificData } = body;
|
||||
const endpoint = (providerSpecificData?.azureEndpoint || "").replace(/\/$/, "");
|
||||
const deployment = providerSpecificData?.deployment || "gpt-4";
|
||||
const apiVersion = providerSpecificData?.apiVersion || "2024-10-01-preview";
|
||||
const organization = providerSpecificData?.organization;
|
||||
|
||||
const url = `${endpoint}/openai/deployments/${deployment}/chat/completions?api-version=${apiVersion}`;
|
||||
const headers = {
|
||||
"api-key": apiKey,
|
||||
"Content-Type": "application/json",
|
||||
};
|
||||
if (organization) headers["OpenAI-Organization"] = organization;
|
||||
|
||||
const azureRes = await fetch(url, {
|
||||
method: "POST",
|
||||
headers,
|
||||
body: JSON.stringify({
|
||||
messages: [{ role: "user", content: "test" }],
|
||||
max_tokens: 1,
|
||||
}),
|
||||
});
|
||||
isValid = azureRes.status !== 401 && azureRes.status !== 403;
|
||||
return NextResponse.json({
|
||||
valid: isValid,
|
||||
error: isValid ? null : "Invalid API key or Azure configuration",
|
||||
});
|
||||
}
|
||||
|
||||
switch (provider) {
|
||||
case "openai":
|
||||
const openaiRes = await fetch("https://api.openai.com/v1/models", {
|
||||
|
||||
Reference in New Issue
Block a user