@pippit-dev/cli 1.0.3 → 1.0.5

package/checksums.txt

@@ -1,6 +1,6 @@
-e344cebed19cb97f0aef66df54118cb7425714d614f2488c1072ff72d24d91cf  pippit-tool-cli-1.0.3-darwin-amd64.tar.gz
-a1a516570d4553ef0514442f938da11f0147ad524c9fa7fb078a1ab5d1d0e27d  pippit-tool-cli-1.0.3-darwin-arm64.tar.gz
-b7840c3b3d6cab08d74de8af15a88f09e9bc5f7c98cc14f7d80487edad505bfe  pippit-tool-cli-1.0.3-linux-amd64.tar.gz
-9ef478103cf1e04d825da9a9e1065e76fec6e8e79407fa4543c8010c54ca1bb6  pippit-tool-cli-1.0.3-linux-arm64.tar.gz
-f691764e9d5be6fe2d05b2039318458bb1c5763c5e17060389ba39d2b358f2b6  pippit-tool-cli-1.0.3-windows-amd64.zip
-58899eafda91b4d1c9768d3aaa8d1d04279b7f7f7c2a18541a9873da33882960  pippit-tool-cli-1.0.3-windows-arm64.zip
+49044de4df08065cb51223c192dffa9e67d19c7a7013d5cd1c9e40125c5f4481  pippit-tool-cli-1.0.5-darwin-amd64.tar.gz
+22708f0a82207cbf1715297a71f0c926b2a29a1adf6cfc7192767ea5cbc43f0c  pippit-tool-cli-1.0.5-darwin-arm64.tar.gz
+9a0b0139343013f3296fa81b4ea21060580a682485ffa34a8b4241621496ae89  pippit-tool-cli-1.0.5-linux-amd64.tar.gz
+4b08d015ea34b3e92a00fed7c91731614bd19571812889c5c84b36d976c5d667  pippit-tool-cli-1.0.5-linux-arm64.tar.gz
+74932104a77ddb87c9388eb8549fe1951c1d437433e0bd836e66995b0dfb5d32  pippit-tool-cli-1.0.5-windows-amd64.zip
+1219784da1a712bb722a1348d342371783b21141db061817c672a3dd488c868c  pippit-tool-cli-1.0.5-windows-arm64.zip

package/cmd/generate_video/query_result.go

@@ -26,7 +26,7 @@ func NewQueryResultCommand(stdout, stderr io.Writer, runner *common.Runner) *cob
 					"run_id":       strings.TrimSpace(opts.RunID),
 					"download_dir": strings.TrimSpace(opts.DownloadDir),
 				})
-				return err
+				result = queryResultFromError(err, opts)
 			}
 			encoder := json.NewEncoder(stdout)
 			encoder.SetIndent("", "  ")
@@ -40,3 +40,15 @@ func NewQueryResultCommand(stdout, stderr io.Writer, runner *common.Runner) *cob
 	cmd.Flags().StringVar(&opts.DownloadDir, "download-dir", "", "directory to download completed videos into")
 	return cmd
 }
+
+func queryResultFromError(err error, opts *internalgen.QueryResultOptions) *internalgen.QueryResultResult {
+	result := &internalgen.QueryResultResult{
+		ErrorMessage: err.Error(),
+		Videos:       []internalgen.QueryResultVideo{},
+	}
+	if opts != nil {
+		result.ThreadID = strings.TrimSpace(opts.ThreadID)
+		result.RunID = strings.TrimSpace(opts.RunID)
+	}
+	return result
+}

package/cmd/generate_video_test.go

@@ -384,30 +384,64 @@ func TestQueryResultIgnoresVideoDataWithoutVideoSubType(t *testing.T) {
 		"--download-dir", t.TempDir(),
 	})
 
-	err := root.Execute()
-	if err == nil {
-		t.Fatal("Execute() error = nil, want no downloadable video error")
+	if err := root.Execute(); err != nil {
+		t.Fatalf("Execute() error = %v, stderr = %s", err, stderr.String())
+	}
+	got := decodeJSON(t, stdout.Bytes())
+	if got["completed"] != false {
+		t.Fatalf("completed = %v, want false", got["completed"])
+	}
+	if got["thread_id"] != "thread_123" || got["run_id"] != "run_456" {
+		t.Fatalf("ids = (%v, %v), want thread/run ids", got["thread_id"], got["run_id"])
 	}
-	if !strings.Contains(err.Error(), "下载失败：未找到可下载的视频产物") {
-		t.Fatalf("error = %q, want no downloadable video error", err)
+	if got["error_message"] != "下载失败：未找到可下载的视频产物" {
+		t.Fatalf("error_message = %v, want no downloadable video error", got["error_message"])
 	}
-	if stdout.Len() != 0 {
-		t.Fatalf("stdout = %q, want empty", stdout.String())
+	videos, ok := got["videos"].([]any)
+	if !ok || len(videos) != 0 {
+		t.Fatalf("videos = %#v, want empty", got["videos"])
 	}
 }
 
-func TestQueryResultErrorLogIncludesLogID(t *testing.T) {
+func TestQueryResultValidationErrorReturnsJSON(t *testing.T) {
+	var stdout, stderr bytes.Buffer
+	root := newTestRootCommand(t, &stdout, &stderr, "http://127.0.0.1")
+	root.SetArgs([]string{
+		"query-result",
+		"--run-id", "run_456",
+		"--download-dir", t.TempDir(),
+	})
+
+	if err := root.Execute(); err != nil {
+		t.Fatalf("Execute() error = %v, stderr = %s", err, stderr.String())
+	}
+	got := decodeJSON(t, stdout.Bytes())
+	if got["completed"] != false {
+		t.Fatalf("completed = %v, want false", got["completed"])
+	}
+	if got["thread_id"] != "" || got["run_id"] != "run_456" {
+		t.Fatalf("ids = (%v, %v), want empty thread_id and run_id", got["thread_id"], got["run_id"])
+	}
+	if got["error_message"] != "查询失败：缺少必填参数 --thread-id" {
+		t.Fatalf("error_message = %v, want validation error", got["error_message"])
+	}
+	videos, ok := got["videos"].([]any)
+	if !ok || len(videos) != 0 {
+		t.Fatalf("videos = %#v, want empty", got["videos"])
+	}
+}
+
+func TestQueryResultGetThreadBusinessErrorReturnsErrorMessage(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		switch r.URL.Path {
 		case "/api/biz/v1/skill/get_thread":
-			_, _ = w.Write([]byte(`{"ret":"5","errmsg":"创作失败","log_id":"log_456"}`))
+			_, _ = w.Write([]byte(`{"ret":"5","errmsg":"创作失败：暂时无法生成","log_id":"log_456"}`))
 		default:
 			t.Fatalf("unexpected path %s", r.URL.Path)
 		}
 	}))
 	defer server.Close()
 
-	clearDailyErrorLog(t)
 	var stdout, stderr bytes.Buffer
 	root := newTestRootCommand(t, &stdout, &stderr, server.URL)
 	root.SetArgs([]string{
@@ -417,23 +451,22 @@ func TestQueryResultErrorLogIncludesLogID(t *testing.T) {
 		"--download-dir", t.TempDir(),
 	})
 
-	err := root.Execute()
-	if err == nil {
-		t.Fatal("Execute() error = nil, want get_thread error")
+	if err := root.Execute(); err != nil {
+		t.Fatalf("Execute() error = %v, stderr = %s", err, stderr.String())
 	}
-	entries := readDailyErrorLog(t)
-	if len(entries) != 1 {
-		t.Fatalf("log entries = %d, want 1: %#v", len(entries), entries)
+	got := decodeJSON(t, stdout.Bytes())
+	if got["completed"] != true {
+		t.Fatalf("completed = %v, want true", got["completed"])
 	}
-	fields, ok := entries[0]["fields"].(map[string]any)
-	if !ok {
-		t.Fatalf("fields = %#v, want object", entries[0]["fields"])
+	if got["thread_id"] != "thread_123" || got["run_id"] != "run_456" {
+		t.Fatalf("ids = (%v, %v), want thread/run ids", got["thread_id"], got["run_id"])
 	}
-	if fields["log_id"] != "log_456" {
-		t.Fatalf("log_id = %v, want log_456", fields["log_id"])
+	if got["error_message"] != "创作失败：暂时无法生成 log_id=log_456" {
+		t.Fatalf("error_message = %v, want get_thread business error", got["error_message"])
 	}
-	if fields["thread_id"] != "thread_123" || fields["run_id"] != "run_456" {
-		t.Fatalf("fields = %#v, want thread/run ids", fields)
+	videos, ok := got["videos"].([]any)
+	if !ok || len(videos) != 0 {
+		t.Fatalf("videos = %#v, want empty", got["videos"])
 	}
 }
 

package/internal/common/upload_file.go

@@ -89,9 +89,6 @@ func UploadFile(ctx context.Context, opts UploadFileOptions, runner *Runner) (*U
 	}
 
 	assetID := strings.TrimSpace(resp.Data.PippitAssetID)
-	if assetID == "" {
-		assetID = strings.TrimSpace(resp.Data.AssetID)
-	}
 	if assetID == "" {
 		return nil, fmt.Errorf("上传文件响应缺少 pippit_asset_id")
 	}

package/internal/generate_video/query_result.go

@@ -3,6 +3,7 @@ package generate_video
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"path/filepath"
 	"strconv"
@@ -89,6 +90,9 @@ func QueryResult(ctx context.Context, opts *QueryResultOptions, runner *common.R
 		RunID:    opts.RunID,
 	}, runner)
 	if err != nil {
+		if result, ok := queryResultFromGetThreadBusinessError(err, opts); ok {
+			return result, nil
+		}
 		return nil, fmt.Errorf("查询失败：%w", err)
 	}
 
@@ -159,6 +163,35 @@ func QueryResult(ctx context.Context, opts *QueryResultOptions, runner *common.R
 	}, nil
 }
 
+func queryResultFromGetThreadBusinessError(err error, opts *QueryResultOptions) (*QueryResultResult, bool) {
+	var logErr *common.LogIDError
+	if !errors.As(err, &logErr) {
+		return nil, false
+	}
+	message := getThreadBusinessErrorMessage(logErr.Message)
+	if message == "" {
+		message = "查询失败"
+	}
+	if logID := logErr.LogID(); logID != "" {
+		message = fmt.Sprintf("%s log_id=%s", message, logID)
+	}
+	return &QueryResultResult{
+		Completed:    true,
+		ThreadID:     opts.ThreadID,
+		RunID:        opts.RunID,
+		ErrorMessage: message,
+		Videos:       []QueryResultVideo{},
+	}, true
+}
+
+func getThreadBusinessErrorMessage(message string) string {
+	message = strings.TrimSpace(message)
+	if idx := strings.Index(message, "errmsg="); idx >= 0 {
+		return strings.TrimSpace(message[idx+len("errmsg="):])
+	}
+	return message
+}
+
 func validateQueryResultOptions(opts *QueryResultOptions) error {
 	if opts == nil {
 		return fmt.Errorf("查询失败：缺少必填参数 --thread-id")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pippit-dev/cli",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Pippit CLI",
   "bin": {
     "pippit-tool-cli": "scripts/run.js"