Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix saving chat settings #935

Merged
merged 2 commits into from
Aug 6, 2024
Merged

Fix saving chat settings #935

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
970cd50
fix settings save
dlqqq Aug 5, 2024
1adc4b3
show placeholder message when API keys section is empty
dlqqq Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 36 additions & 25 deletions packages/jupyter-ai/src/components/chat-settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,20 +146,31 @@ export function ChatSettings(props: ChatSettingsProps): JSX.Element {
const newApiKeys: Record<string, string> = {};
const lmAuth = lmProvider?.auth_strategy;
const emAuth = emProvider?.auth_strategy;
if (lmAuth?.type === 'env') {
if (
lmAuth?.type === 'env' &&
!server.config.api_keys.includes(lmAuth.name)
) {
newApiKeys[lmAuth.name] = '';
}
if (lmAuth?.type === 'multienv') {
lmAuth.names.forEach(apiKey => {
newApiKeys[apiKey] = '';
if (!server.config.api_keys.includes(apiKey)) {
newApiKeys[apiKey] = '';
}
});
}
if (emAuth?.type === 'env') {

if (
emAuth?.type === 'env' &&
!server.config.api_keys.includes(emAuth.name)
) {
newApiKeys[emAuth.name] = '';
}
if (emAuth?.type === 'multienv') {
emAuth.names.forEach(apiKey => {
newApiKeys[apiKey] = '';
if (!server.config.api_keys.includes(apiKey)) {
newApiKeys[apiKey] = '';
}
});
}

Expand Down Expand Up @@ -471,28 +482,28 @@ export function ChatSettings(props: ChatSettingsProps): JSX.Element {

{/* API Keys section */}
<h2 className="jp-ai-ChatSettings-header">API Keys</h2>

{Object.entries(apiKeys).length === 0 &&
server.config.api_keys.length === 0 ? (
<p>No API keys are required by the selected models.</p>
) : null}

{/* API key inputs for newly-used providers */}
{Object.entries(apiKeys).length === 0 ? (
<p>No API Keys needed for selected model.</p>
) : (
Object.entries(apiKeys).map(([apiKeyName, apiKeyValue], idx) =>
!server.config.api_keys.includes(apiKeyName) ? (
<TextField
key={idx}
label={apiKeyName}
value={apiKeyValue}
fullWidth
type="password"
onChange={e =>
setApiKeys(apiKeys => ({
...apiKeys,
[apiKeyName]: e.target.value
}))
}
/>
) : null
)
)}
{Object.entries(apiKeys).map(([apiKeyName, apiKeyValue], idx) => (
<TextField
key={idx}
label={apiKeyName}
value={apiKeyValue}
fullWidth
type="password"
onChange={e =>
setApiKeys(apiKeys => ({
...apiKeys,
[apiKeyName]: e.target.value
}))
}
/>
))}
{/* Pre-existing API keys */}
<ExistingApiKeys
alert={apiKeysAlert}
Expand Down
Loading