mirror of
https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git
synced 2025-10-03 00:26:40 +08:00
Merge remote-tracking branch 'origin/main' into dev
This commit is contained in:
commit
bc634d96f8
4
.github/workflows/dockerToHub-dev.yml
vendored
4
.github/workflows/dockerToHub-dev.yml
vendored
@ -8,8 +8,8 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: build test image to aly
|
name: build test image to aly
|
||||||
runs-on: thinkpad
|
# runs-on: thinkpad
|
||||||
# runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# runs-on: self-hosted
|
# runs-on: self-hosted
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repo
|
- name: Check out the repo
|
||||||
|
4
.github/workflows/dockerToHub.yml
vendored
4
.github/workflows/dockerToHub.yml
vendored
@ -16,8 +16,8 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
name: build image to aly
|
name: build image to aly
|
||||||
# runs-on: "103.200"
|
# runs-on: "103.200"
|
||||||
runs-on: thinkpad
|
# runs-on: thinkpad
|
||||||
# runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# runs-on: self-hosted
|
# runs-on: self-hosted
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repo
|
- name: Check out the repo
|
||||||
|
@ -118,7 +118,7 @@ export class ChatGPTApi implements LLMApi {
|
|||||||
enumerable: true,
|
enumerable: true,
|
||||||
configurable: true,
|
configurable: true,
|
||||||
writable: true,
|
writable: true,
|
||||||
value: Math.max(modelConfig.max_tokens, 4096),
|
value: modelConfig.max_tokens,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -292,8 +292,8 @@ export function getMessageImages(message: RequestMessage): string[] {
|
|||||||
|
|
||||||
export function isVisionModel(model: string) {
|
export function isVisionModel(model: string) {
|
||||||
return (
|
return (
|
||||||
model.startsWith("gpt-4-vision") ||
|
// model.startsWith("gpt-4-vision") ||
|
||||||
model.startsWith("gemini-pro-vision") ||
|
// model.startsWith("gemini-pro-vision") ||
|
||||||
!DEFAULT_MODELS.find((m) => m.name == model)
|
model.includes("vision")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user