feat: veo video url use proxy download
This commit is contained in:
@@ -4,8 +4,10 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"net/url"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/QuantumNous/new-api/constant"
|
||||||
"github.com/QuantumNous/new-api/logger"
|
"github.com/QuantumNous/new-api/logger"
|
||||||
"github.com/QuantumNous/new-api/model"
|
"github.com/QuantumNous/new-api/model"
|
||||||
|
|
||||||
@@ -36,7 +38,7 @@ func VideoProxy(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if !exists || task == nil {
|
if !exists || task == nil {
|
||||||
logger.LogError(c.Request.Context(), fmt.Sprintf("Failed to get task %s: %s", taskID, err.Error()))
|
logger.LogError(c.Request.Context(), fmt.Sprintf("Failed to get task %s: %v", taskID, err))
|
||||||
c.JSON(http.StatusNotFound, gin.H{
|
c.JSON(http.StatusNotFound, gin.H{
|
||||||
"error": gin.H{
|
"error": gin.H{
|
||||||
"message": "Task not found",
|
"message": "Task not found",
|
||||||
@@ -71,15 +73,15 @@ func VideoProxy(c *gin.Context) {
|
|||||||
if baseURL == "" {
|
if baseURL == "" {
|
||||||
baseURL = "https://api.openai.com"
|
baseURL = "https://api.openai.com"
|
||||||
}
|
}
|
||||||
videoURL := fmt.Sprintf("%s/v1/videos/%s/content", baseURL, task.TaskID)
|
|
||||||
|
|
||||||
|
var videoURL string
|
||||||
client := &http.Client{
|
client := &http.Client{
|
||||||
Timeout: 60 * time.Second,
|
Timeout: 60 * time.Second,
|
||||||
}
|
}
|
||||||
|
|
||||||
req, err := http.NewRequestWithContext(c.Request.Context(), http.MethodGet, videoURL, nil)
|
req, err := http.NewRequestWithContext(c.Request.Context(), http.MethodGet, "", nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.LogError(c.Request.Context(), fmt.Sprintf("Failed to create request for %s: %s", videoURL, err.Error()))
|
logger.LogError(c.Request.Context(), fmt.Sprintf("Failed to create request: %s", err.Error()))
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{
|
c.JSON(http.StatusInternalServerError, gin.H{
|
||||||
"error": gin.H{
|
"error": gin.H{
|
||||||
"message": "Failed to create proxy request",
|
"message": "Failed to create proxy request",
|
||||||
@@ -89,7 +91,26 @@ func VideoProxy(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
req.Header.Set("Authorization", "Bearer "+channel.Key)
|
if channel.Type == constant.ChannelTypeGemini {
|
||||||
|
videoURL = fmt.Sprintf("%s&key=%s", c.Query("url"), channel.Key)
|
||||||
|
req.Header.Set("x-goog-api-key", channel.Key)
|
||||||
|
} else {
|
||||||
|
// Default (Sora, etc.): Use original logic
|
||||||
|
videoURL = fmt.Sprintf("%s/v1/videos/%s/content", baseURL, task.TaskID)
|
||||||
|
req.Header.Set("Authorization", "Bearer "+channel.Key)
|
||||||
|
}
|
||||||
|
|
||||||
|
req.URL, err = url.Parse(videoURL)
|
||||||
|
if err != nil {
|
||||||
|
logger.LogError(c.Request.Context(), fmt.Sprintf("Failed to parse URL %s: %s", videoURL, err.Error()))
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{
|
||||||
|
"error": gin.H{
|
||||||
|
"message": "Failed to create proxy request",
|
||||||
|
"type": "server_error",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
resp, err := client.Do(req)
|
resp, err := client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import (
|
|||||||
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
||||||
"github.com/QuantumNous/new-api/service"
|
"github.com/QuantumNous/new-api/service"
|
||||||
"github.com/QuantumNous/new-api/setting/model_setting"
|
"github.com/QuantumNous/new-api/setting/model_setting"
|
||||||
|
"github.com/QuantumNous/new-api/setting/system_setting"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -87,10 +88,6 @@ func (a *TaskAdaptor) ValidateRequestAndSetAction(c *gin.Context, info *relaycom
|
|||||||
// BuildRequestURL constructs the upstream URL.
|
// BuildRequestURL constructs the upstream URL.
|
||||||
func (a *TaskAdaptor) BuildRequestURL(info *relaycommon.RelayInfo) (string, error) {
|
func (a *TaskAdaptor) BuildRequestURL(info *relaycommon.RelayInfo) (string, error) {
|
||||||
modelName := info.OriginModelName
|
modelName := info.OriginModelName
|
||||||
if modelName == "" {
|
|
||||||
modelName = "veo-3.0-generate-001"
|
|
||||||
}
|
|
||||||
|
|
||||||
version := model_setting.GetGeminiVersionSetting(modelName)
|
version := model_setting.GetGeminiVersionSetting(modelName)
|
||||||
|
|
||||||
return fmt.Sprintf(
|
return fmt.Sprintf(
|
||||||
@@ -178,13 +175,18 @@ func (a *TaskAdaptor) DoResponse(c *gin.Context, resp *http.Response, info *rela
|
|||||||
if strings.TrimSpace(s.Name) == "" {
|
if strings.TrimSpace(s.Name) == "" {
|
||||||
return "", nil, service.TaskErrorWrapper(fmt.Errorf("missing operation name"), "invalid_response", http.StatusInternalServerError)
|
return "", nil, service.TaskErrorWrapper(fmt.Errorf("missing operation name"), "invalid_response", http.StatusInternalServerError)
|
||||||
}
|
}
|
||||||
localID := encodeLocalTaskID(s.Name)
|
taskID = encodeLocalTaskID(s.Name)
|
||||||
c.JSON(http.StatusOK, gin.H{"task_id": localID})
|
ov := dto.NewOpenAIVideo()
|
||||||
return localID, responseBody, nil
|
ov.ID = taskID
|
||||||
|
ov.TaskID = taskID
|
||||||
|
ov.CreatedAt = time.Now().Unix()
|
||||||
|
ov.Model = info.OriginModelName
|
||||||
|
c.JSON(http.StatusOK, ov)
|
||||||
|
return taskID, responseBody, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *TaskAdaptor) GetModelList() []string {
|
func (a *TaskAdaptor) GetModelList() []string {
|
||||||
return []string{"veo-3.0-generate-001"}
|
return []string{"veo-3.0-generate-001", "veo-3.1-generate-preview", "veo-3.1-fast-generate-preview"}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *TaskAdaptor) GetChannelName() string {
|
func (a *TaskAdaptor) GetChannelName() string {
|
||||||
@@ -204,7 +206,7 @@ func (a *TaskAdaptor) FetchTask(baseUrl, key string, body map[string]any) (*http
|
|||||||
}
|
}
|
||||||
|
|
||||||
// For Gemini API, we use GET request to the operations endpoint
|
// For Gemini API, we use GET request to the operations endpoint
|
||||||
version := model_setting.GetGeminiVersionSetting("veo-3.0-generate-001")
|
version := model_setting.GetGeminiVersionSetting("default")
|
||||||
url := fmt.Sprintf("%s/%s/%s", baseUrl, version, upstreamName)
|
url := fmt.Sprintf("%s/%s/%s", baseUrl, version, upstreamName)
|
||||||
|
|
||||||
req, err := http.NewRequest(http.MethodGet, url, nil)
|
req, err := http.NewRequest(http.MethodGet, url, nil)
|
||||||
@@ -245,7 +247,8 @@ func (a *TaskAdaptor) ParseTaskResult(respBody []byte) (*relaycommon.TaskInfo, e
|
|||||||
// Extract URL from generateVideoResponse if available
|
// Extract URL from generateVideoResponse if available
|
||||||
if len(op.Response.GenerateVideoResponse.GeneratedSamples) > 0 {
|
if len(op.Response.GenerateVideoResponse.GeneratedSamples) > 0 {
|
||||||
if uri := op.Response.GenerateVideoResponse.GeneratedSamples[0].Video.URI; uri != "" {
|
if uri := op.Response.GenerateVideoResponse.GeneratedSamples[0].Video.URI; uri != "" {
|
||||||
ti.Url = uri
|
taskID := encodeLocalTaskID(op.Name)
|
||||||
|
ti.Url = fmt.Sprintf("%s/v1/videos/%s/content?url=%s", system_setting.ServerAddress, taskID, uri)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -257,10 +260,7 @@ func (a *TaskAdaptor) ParseTaskResult(respBody []byte) (*relaycommon.TaskInfo, e
|
|||||||
// ============================
|
// ============================
|
||||||
|
|
||||||
func encodeLocalTaskID(name string) string {
|
func encodeLocalTaskID(name string) string {
|
||||||
// Add timestamp to ensure uniqueness
|
return base64.RawURLEncoding.EncodeToString([]byte(name))
|
||||||
timestamp := time.Now().Unix()
|
|
||||||
data := fmt.Sprintf("%s:%d", name, timestamp)
|
|
||||||
return base64.RawURLEncoding.EncodeToString([]byte(data))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func decodeLocalTaskID(local string) (string, error) {
|
func decodeLocalTaskID(local string) (string, error) {
|
||||||
@@ -268,12 +268,5 @@ func decodeLocalTaskID(local string) (string, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extract the operation name from encoded data (remove timestamp if present)
|
|
||||||
parts := strings.Split(string(b), ":")
|
|
||||||
if len(parts) > 0 {
|
|
||||||
return parts[0], nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return string(b), nil
|
return string(b), nil
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user