|
@@ -149,7 +149,7 @@ func getVertexVideoURL(channel *model.Channel, task *model.Task) (string, error)
|
|
|
if channel == nil || task == nil {
|
|
if channel == nil || task == nil {
|
|
|
return "", fmt.Errorf("invalid channel or task")
|
|
return "", fmt.Errorf("invalid channel or task")
|
|
|
}
|
|
}
|
|
|
- if url := strings.TrimSpace(task.GetResultURL()); url != "" {
|
|
|
|
|
|
|
+ if url := strings.TrimSpace(task.GetResultURL()); url != "" && !isTaskProxyContentURL(url, task.TaskID) {
|
|
|
return url, nil
|
|
return url, nil
|
|
|
}
|
|
}
|
|
|
if url := extractVertexVideoURLFromTaskData(task); url != "" {
|
|
if url := extractVertexVideoURLFromTaskData(task); url != "" {
|
|
@@ -198,6 +198,13 @@ func getVertexVideoURL(channel *model.Channel, task *model.Task) (string, error)
|
|
|
return "", fmt.Errorf("vertex video url not found")
|
|
return "", fmt.Errorf("vertex video url not found")
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+func isTaskProxyContentURL(url string, taskID string) bool {
|
|
|
|
|
+ if strings.TrimSpace(url) == "" || strings.TrimSpace(taskID) == "" {
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
|
|
+ return strings.Contains(url, "/v1/videos/"+taskID+"/content")
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
func getVertexTaskKey(channel *model.Channel, task *model.Task) string {
|
|
func getVertexTaskKey(channel *model.Channel, task *model.Task) string {
|
|
|
if task != nil {
|
|
if task != nil {
|
|
|
if key := strings.TrimSpace(task.PrivateData.Key); key != "" {
|
|
if key := strings.TrimSpace(task.PrivateData.Key); key != "" {
|