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
3d7a05bd
authored
Aug 24, 2025
by
CaIon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: update ali image response handling
parent
488f6a2e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
relay/channel/ali/image.go
+8
-7
No files found.
relay/channel/ali/image.go
View file @
3d7a05bd
package
ali
package
ali
import
(
import
(
"encoding/json"
"errors"
"errors"
"fmt"
"fmt"
"io"
"io"
...
@@ -88,7 +87,7 @@ func updateTask(info *relaycommon.RelayInfo, taskID string) (*AliResponse, error
...
@@ -88,7 +87,7 @@ func updateTask(info *relaycommon.RelayInfo, taskID string) (*AliResponse, error
}
}
func
asyncTaskWait
(
c
*
gin
.
Context
,
info
*
relaycommon
.
RelayInfo
,
taskID
string
)
(
*
AliResponse
,
[]
byte
,
error
)
{
func
asyncTaskWait
(
c
*
gin
.
Context
,
info
*
relaycommon
.
RelayInfo
,
taskID
string
)
(
*
AliResponse
,
[]
byte
,
error
)
{
waitSeconds
:=
5
waitSeconds
:=
10
step
:=
0
step
:=
0
maxStep
:=
20
maxStep
:=
20
...
@@ -129,7 +128,7 @@ func asyncTaskWait(c *gin.Context, info *relaycommon.RelayInfo, taskID string) (
...
@@ -129,7 +128,7 @@ func asyncTaskWait(c *gin.Context, info *relaycommon.RelayInfo, taskID string) (
return
nil
,
nil
,
fmt
.
Errorf
(
"aliAsyncTaskWait timeout"
)
return
nil
,
nil
,
fmt
.
Errorf
(
"aliAsyncTaskWait timeout"
)
}
}
func
responseAli2OpenAIImage
(
c
*
gin
.
Context
,
response
*
AliResponse
,
info
*
relaycommon
.
RelayInfo
,
responseFormat
string
)
*
dto
.
ImageResponse
{
func
responseAli2OpenAIImage
(
c
*
gin
.
Context
,
response
*
AliResponse
,
originBody
[]
byte
,
info
*
relaycommon
.
RelayInfo
,
responseFormat
string
)
*
dto
.
ImageResponse
{
imageResponse
:=
dto
.
ImageResponse
{
imageResponse
:=
dto
.
ImageResponse
{
Created
:
info
.
StartTime
.
Unix
(),
Created
:
info
.
StartTime
.
Unix
(),
}
}
...
@@ -153,7 +152,9 @@ func responseAli2OpenAIImage(c *gin.Context, response *AliResponse, info *relayc
...
@@ -153,7 +152,9 @@ func responseAli2OpenAIImage(c *gin.Context, response *AliResponse, info *relayc
RevisedPrompt
:
""
,
RevisedPrompt
:
""
,
})
})
}
}
imageResponse
.
Extra
=
response
var
mapResponse
map
[
string
]
any
_
=
common
.
Unmarshal
(
originBody
,
&
mapResponse
)
imageResponse
.
Extra
=
mapResponse
return
&
imageResponse
return
&
imageResponse
}
}
...
@@ -166,7 +167,7 @@ func aliImageHandler(c *gin.Context, resp *http.Response, info *relaycommon.Rela
...
@@ -166,7 +167,7 @@ func aliImageHandler(c *gin.Context, resp *http.Response, info *relaycommon.Rela
return
types
.
NewOpenAIError
(
err
,
types
.
ErrorCodeReadResponseBodyFailed
,
http
.
StatusInternalServerError
),
nil
return
types
.
NewOpenAIError
(
err
,
types
.
ErrorCodeReadResponseBodyFailed
,
http
.
StatusInternalServerError
),
nil
}
}
service
.
CloseResponseBodyGracefully
(
resp
)
service
.
CloseResponseBodyGracefully
(
resp
)
err
=
js
on
.
Unmarshal
(
responseBody
,
&
aliTaskResponse
)
err
=
comm
on
.
Unmarshal
(
responseBody
,
&
aliTaskResponse
)
if
err
!=
nil
{
if
err
!=
nil
{
return
types
.
NewOpenAIError
(
err
,
types
.
ErrorCodeBadResponseBody
,
http
.
StatusInternalServerError
),
nil
return
types
.
NewOpenAIError
(
err
,
types
.
ErrorCodeBadResponseBody
,
http
.
StatusInternalServerError
),
nil
}
}
...
@@ -176,7 +177,7 @@ func aliImageHandler(c *gin.Context, resp *http.Response, info *relaycommon.Rela
...
@@ -176,7 +177,7 @@ func aliImageHandler(c *gin.Context, resp *http.Response, info *relaycommon.Rela
return
types
.
NewError
(
errors
.
New
(
aliTaskResponse
.
Message
),
types
.
ErrorCodeBadResponse
),
nil
return
types
.
NewError
(
errors
.
New
(
aliTaskResponse
.
Message
),
types
.
ErrorCodeBadResponse
),
nil
}
}
aliResponse
,
_
,
err
:=
asyncTaskWait
(
c
,
info
,
aliTaskResponse
.
Output
.
TaskId
)
aliResponse
,
originRespBody
,
err
:=
asyncTaskWait
(
c
,
info
,
aliTaskResponse
.
Output
.
TaskId
)
if
err
!=
nil
{
if
err
!=
nil
{
return
types
.
NewError
(
err
,
types
.
ErrorCodeBadResponse
),
nil
return
types
.
NewError
(
err
,
types
.
ErrorCodeBadResponse
),
nil
}
}
...
@@ -190,7 +191,7 @@ func aliImageHandler(c *gin.Context, resp *http.Response, info *relaycommon.Rela
...
@@ -190,7 +191,7 @@ func aliImageHandler(c *gin.Context, resp *http.Response, info *relaycommon.Rela
},
resp
.
StatusCode
),
nil
},
resp
.
StatusCode
),
nil
}
}
fullTextResponse
:=
responseAli2OpenAIImage
(
c
,
aliResponse
,
info
,
responseFormat
)
fullTextResponse
:=
responseAli2OpenAIImage
(
c
,
aliResponse
,
originRespBody
,
info
,
responseFormat
)
jsonResponse
,
err
:=
common
.
Marshal
(
fullTextResponse
)
jsonResponse
,
err
:=
common
.
Marshal
(
fullTextResponse
)
if
err
!=
nil
{
if
err
!=
nil
{
return
types
.
NewError
(
err
,
types
.
ErrorCodeBadResponseBody
),
nil
return
types
.
NewError
(
err
,
types
.
ErrorCodeBadResponseBody
),
nil
...
...
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