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
7197ea0d
authored
Sep 02, 2024
by
CalciumIon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: support jina embedding
parent
062eeb7f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
2 deletions
+29
-2
relay/channel/jina/adaptor.go
+3
-1
relay/channel/jina/relay-jina.go
+25
-0
relay/relay-text.go
+1
-1
No files found.
relay/channel/jina/adaptor.go
View file @
7197ea0d
...
...
@@ -32,7 +32,7 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
if
info
.
RelayMode
==
constant
.
RelayModeRerank
{
return
fmt
.
Sprintf
(
"%s/v1/rerank"
,
info
.
BaseUrl
),
nil
}
else
if
info
.
RelayMode
==
constant
.
RelayModeEmbeddings
{
return
fmt
.
Sprintf
(
"%s/v1/embeddings
"
,
info
.
BaseUrl
),
nil
return
fmt
.
Sprintf
(
"%s/v1/embeddings"
,
info
.
BaseUrl
),
nil
}
return
""
,
errors
.
New
(
"invalid relay mode"
)
}
...
...
@@ -58,6 +58,8 @@ func (a *Adaptor) ConvertRerankRequest(c *gin.Context, relayMode int, request dt
func
(
a
*
Adaptor
)
DoResponse
(
c
*
gin
.
Context
,
resp
*
http
.
Response
,
info
*
relaycommon
.
RelayInfo
)
(
usage
*
dto
.
Usage
,
err
*
dto
.
OpenAIErrorWithStatusCode
)
{
if
info
.
RelayMode
==
constant
.
RelayModeRerank
{
err
,
usage
=
jinaRerankHandler
(
c
,
resp
)
}
else
if
info
.
RelayMode
==
constant
.
RelayModeEmbeddings
{
err
,
usage
=
jinaEmbeddingHandler
(
c
,
resp
)
}
return
}
...
...
relay/channel/jina/relay-jina.go
View file @
7197ea0d
...
...
@@ -33,3 +33,28 @@ func jinaRerankHandler(c *gin.Context, resp *http.Response) (*dto.OpenAIErrorWit
_
,
err
=
c
.
Writer
.
Write
(
jsonResponse
)
return
nil
,
&
jinaResp
.
Usage
}
func
jinaEmbeddingHandler
(
c
*
gin
.
Context
,
resp
*
http
.
Response
)
(
*
dto
.
OpenAIErrorWithStatusCode
,
*
dto
.
Usage
)
{
responseBody
,
err
:=
io
.
ReadAll
(
resp
.
Body
)
if
err
!=
nil
{
return
service
.
OpenAIErrorWrapper
(
err
,
"read_response_body_failed"
,
http
.
StatusInternalServerError
),
nil
}
err
=
resp
.
Body
.
Close
()
if
err
!=
nil
{
return
service
.
OpenAIErrorWrapper
(
err
,
"close_response_body_failed"
,
http
.
StatusInternalServerError
),
nil
}
var
jinaResp
dto
.
OpenAIEmbeddingResponse
err
=
json
.
Unmarshal
(
responseBody
,
&
jinaResp
)
if
err
!=
nil
{
return
service
.
OpenAIErrorWrapper
(
err
,
"unmarshal_response_body_failed"
,
http
.
StatusInternalServerError
),
nil
}
jsonResponse
,
err
:=
json
.
Marshal
(
jinaResp
)
if
err
!=
nil
{
return
service
.
OpenAIErrorWrapper
(
err
,
"marshal_response_body_failed"
,
http
.
StatusInternalServerError
),
nil
}
c
.
Writer
.
Header
()
.
Set
(
"Content-Type"
,
"application/json"
)
c
.
Writer
.
WriteHeader
(
resp
.
StatusCode
)
_
,
err
=
c
.
Writer
.
Write
(
jsonResponse
)
return
nil
,
&
jinaResp
.
Usage
}
relay/relay-text.go
View file @
7197ea0d
...
...
@@ -52,7 +52,7 @@ func getAndValidateTextRequest(c *gin.Context, relayInfo *relaycommon.RelayInfo)
}
case
relayconstant
.
RelayModeEmbeddings
:
case
relayconstant
.
RelayModeModerations
:
if
textRequest
.
Input
==
""
{
if
textRequest
.
Input
==
""
||
textRequest
.
Input
==
nil
{
return
nil
,
errors
.
New
(
"field input is required"
)
}
case
relayconstant
.
RelayModeEdits
:
...
...
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