Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
open-webui
Commits
597bc89f
Unverified
Commit
597bc89f
authored
Nov 03, 2023
by
Timothy Jaeryang Baek
Committed by
GitHub
Nov 03, 2023
Browse files
Merge pull request #53 from ollama-webui/dev
feat: gpt-* model support added
parents
019dbbe7
d3b0b8eb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
src/lib/components/chat/SettingsModal.svelte
src/lib/components/chat/SettingsModal.svelte
+1
-1
src/routes/+page.svelte
src/routes/+page.svelte
+8
-6
No files found.
src/lib/components/chat/SettingsModal.svelte
View file @
597bc89f
...
@@ -334,7 +334,7 @@
...
@@ -334,7 +334,7 @@
</div>
</div>
</div>
</div>
<div class="mt-2 text-xs text-gray-500">
<div class="mt-2 text-xs text-gray-500">
Adds optional support for 'gpt-
3.5-turbo'
.
Adds optional support for 'gpt-
*' models available
.
</div>
</div>
</div>
</div>
...
...
src/routes/+page.svelte
View file @
597bc89f
...
@@ -365,7 +365,7 @@
...
@@ -365,7 +365,7 @@
if
(
settings
.
OPENAI_API_KEY
)
{
if
(
settings
.
OPENAI_API_KEY
)
{
// Validate OPENAI_API_KEY
// Validate OPENAI_API_KEY
const
openaiModels
=
await
fetch
(
`https://api.openai.com/v1/models`
,
{
const
openaiModel
Re
s
=
await
fetch
(
`https://api.openai.com/v1/models`
,
{
method
:
'
GET
'
,
method
:
'
GET
'
,
headers
:
{
headers
:
{
'
Content-Type
'
:
'
application/json
'
,
'
Content-Type
'
:
'
application/json
'
,
...
@@ -381,14 +381,16 @@
...
@@ -381,14 +381,16 @@
toast
.
error
(
`OpenAI:
${
error
.
error
.
message
}
`
);
toast
.
error
(
`OpenAI:
${
error
.
error
.
message
}
`
);
return
null
;
return
null
;
});
});
const
openaiModels
=
openaiModelRes
.
data
;
console
.
log
(
openaiModels
);
if
(
openaiModels
)
{
if
(
openaiModels
)
{
models
=
[
models
=
[
...(
res
?.
models
??
[]),
...(
res
?.
models
??
[]),
{
name
:
'
hr
'
},
{
name
:
'
hr
'
},
{
name
:
'
gpt-3.5-turbo
'
,
label
:
'
(OpenAI)
'
}
...
openaiModels
.
map
((
model
)
=>
({
name
:
model
.
id
,
label
:
'
OpenAI
'
}))
.
filter
((
model
)
=>
model
.
name
.
includes
(
'
gpt
'
))
];
];
}
else
{
}
else
{
models
=
res
?.
models
??
[];
models
=
res
?.
models
??
[];
...
@@ -401,7 +403,7 @@
...
@@ -401,7 +403,7 @@
};
};
const
sendPrompt
=
async
(
userPrompt
)
=>
{
const
sendPrompt
=
async
(
userPrompt
)
=>
{
if
(
selectedModel
===
'
gpt-3.5-turbo
'
)
{
if
(
selectedModel
.
includes
(
'
gpt-
'
)
)
{
await
sendPromptOpenAI
(
userPrompt
);
await
sendPromptOpenAI
(
userPrompt
);
}
else
{
}
else
{
await
sendPromptOllama
(
userPrompt
);
await
sendPromptOllama
(
userPrompt
);
...
@@ -532,7 +534,7 @@
...
@@ -532,7 +534,7 @@
Authorization
:
`Bearer
${
settings
.
OPENAI_API_KEY
}
`
Authorization
:
`Bearer
${
settings
.
OPENAI_API_KEY
}
`
},
},
body
:
JSON
.
stringify
({
body
:
JSON
.
stringify
({
model
:
'
gpt-3.5-turbo
'
,
model
:
selectedModel
,
stream
:
true
,
stream
:
true
,
messages
:
messages
.
map
((
message
)
=>
({
...
message
,
done
:
undefined
}))
messages
:
messages
.
map
((
message
)
=>
({
...
message
,
done
:
undefined
}))
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment