Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
new-api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
89713975
authored
Sep 05, 2024
by
Calcium-Ion
Committed by
GitHub
Sep 05, 2024
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #459 from HynoR/main
chore: 适配cohere的safety参数
parents
28c9675e
c3f2f337
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
1 deletions
+7
-1
README.md
+1
-1
common/constants.go
+3
-0
relay/channel/cohere/dto.go
+1
-0
relay/channel/cohere/relay-cohere.go
+2
-0
No files found.
README.md
View file @
89713975
...
...
@@ -66,7 +66,7 @@
-
`GET_MEDIA_TOKEN_NOT_STREAM`
:是否在非流(
`stream=false`
)情况下统计图片token,默认为
`true`
。
-
`UPDATE_TASK`
:是否更新异步任务(Midjourney、Suno),默认为
`true`
,关闭后将不会更新任务进度。
-
`GEMINI_MODEL_MAP`
:Gemini模型指定版本(v1/v1beta),使用“模型:版本”指定,","分隔,例如:-e GEMINI_MODEL_MAP="gemini-1.5-pro-latest:v1beta,gemini-1.5-pro-001:v1beta",为空则使用默认配置
-
`COHERE_SAFETY_SETTING`
:Cohere模型
[
安全设置
](
https://docs.cohere.com/docs/safety-modes#overview
)
,可选值为
`NONE`
,
`CONTEXTUAL`
,
`STRICT`
,默认为
`NONE`
。
## 部署
### 部署要求
-
本地数据库(默认):SQLite(Docker 部署默认使用 SQLite,必须挂载
`/data`
目录到宿主机)
...
...
common/constants.go
View file @
89713975
...
...
@@ -112,6 +112,9 @@ var RelayTimeout = GetEnvOrDefault("RELAY_TIMEOUT", 0) // unit is second
var
GeminiSafetySetting
=
GetEnvOrDefaultString
(
"GEMINI_SAFETY_SETTING"
,
"BLOCK_NONE"
)
// https://docs.cohere.com/docs/safety-modes Type; NONE/CONTEXTUAL/STRICT
var
CohereSafetySetting
=
GetEnvOrDefaultString
(
"COHERE_SAFETY_SETTING"
,
"NONE"
)
const
(
RequestIdKey
=
"X-Oneapi-Request-Id"
)
...
...
relay/channel/cohere/dto.go
View file @
89713975
...
...
@@ -8,6 +8,7 @@ type CohereRequest struct {
Message
string
`json:"message"`
Stream
bool
`json:"stream"`
MaxTokens
int
`json:"max_tokens"`
SafetyMode
string
`json:"safety_mode"`
}
type
ChatHistory
struct
{
...
...
relay/channel/cohere/relay-cohere.go
View file @
89713975
...
...
@@ -22,6 +22,7 @@ func requestOpenAI2Cohere(textRequest dto.GeneralOpenAIRequest) *CohereRequest {
Message
:
""
,
Stream
:
textRequest
.
Stream
,
MaxTokens
:
textRequest
.
GetMaxTokens
(),
SafetyMode
:
common
.
CohereSafetySetting
,
}
if
cohereReq
.
MaxTokens
==
0
{
cohereReq
.
MaxTokens
=
4000
...
...
@@ -44,6 +45,7 @@ func requestOpenAI2Cohere(textRequest dto.GeneralOpenAIRequest) *CohereRequest {
})
}
}
return
&
cohereReq
}
...
...
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