allow empty config for object storage

.github/workflows/ci.yml

@@ -5,6 +5,8 @@ on:
     branches: [ main, dev ]
   pull_request:
     branches: [ main ]
+  release:
+    types: [ published ]
 
 jobs:
   test:
@@ -25,7 +27,7 @@ jobs:
   build-and-push:
     runs-on: ubuntu-latest
     needs: test
-    if: github.event_name == 'push'
+    if: github.event_name == 'release' || (github.event_name == 'push' && github.ref_name == 'dev')
     steps:
       - uses: actions/checkout@v4
       - name: Set up Docker Buildx
@@ -36,7 +38,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push Docker image (main)
-        if: github.ref_name == 'main'
+        if: github.event_name == 'release'
         run: make push
       - name: Build and push Docker image (dev)
         if: github.ref_name == 'dev'

docs/podcast.md

@@ -46,7 +46,7 @@ llms:
 
 首先，您需要在 Cloudflare R2 中创建一个存储桶（Bucket）。然后获取以下信息：
 
--   `endpoint`: 您的 R2 API 端点。通常格式为 `https://<account_id>.r2.cloudflarestorage.com`。您可以在 R2 存储桶的主页找到它。
+-   `endpoint`: 您的 R2 API 端点。通常格式为 `<account_id>.r2.cloudflarestorage.com`。您可以在 R2 存储桶的主页找到它。
 -   `access_key_id` 和 `secret_access_key`: R2 API 令牌。您可以在 "R2" -> "管理 R2 API 令牌" 页面创建。
 -   `bucket`: 您创建的存储桶的名称。
 -   `bucket_url`: 存储桶的公开访问 URL。要获取此 URL，您需要将存储桶连接到一个自定义域，或者使用 R2 提供的 `r2.dev` 公开访问地址。
@@ -56,7 +56,7 @@ llms:
 ```yaml
 storage:
   object:
-    endpoint: "https://<your_account_id>.r2.cloudflarestorage.com"
+    endpoint: "<your_account_id>.r2.cloudflarestorage.com"
     access_key_id: "..."
     secret_access_key: "..."
     bucket: "zenfeed-podcasts"
@@ -91,10 +91,10 @@ storage:
           to_podcast:
             llm: "openai-chat"
             tts_llm: "gemini-tts"
-            transcript_additional_prompt: "请让对话更生动有趣一些。使用中文回复"
+            transcript_additional_prompt: "使用中文回复"
             speakers:
               - name: "主持人小雅"
-                role: "一位经验丰富、声音甜美、风格活泼的科技播客主持人。"
+                role: "一位经验丰富、声音甜美、风格活泼的科技播客主持人。擅长联系实际生活场景。"
                 voice: "zh-CN-Standard-A" # 女声
               - name: "技术评论员老王"
                 role: "一位对技术有深入见解、观点犀利的评论员，说话直接，偶尔有些愤世嫉俗。"

pkg/storage/object/object.go

@@ -19,7 +19,7 @@ import (
 	"context"
 	"io"
 	"net/url"
-	"reflect"
+	"strings"
 
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
@@ -46,26 +46,50 @@ type Config struct {
 	Endpoint        string
 	AccessKeyID     string
 	SecretAccessKey string
-	Bucket          string
-	BucketURL       string
+	client          *minio.Client
+
+	Bucket    string
+	BucketURL string
+	bucketURL *url.URL
 }
 
 func (c *Config) Validate() error {
+	if c.Empty() {
+		return nil
+	}
+
 	if c.Endpoint == "" {
 		return errors.New("endpoint is required")
 	}
+	c.Endpoint = strings.TrimPrefix(c.Endpoint, "https://") // S3 endpoint should not have https:// prefix.
+	c.Endpoint = strings.TrimPrefix(c.Endpoint, "http://")
+
 	if c.AccessKeyID == "" {
 		return errors.New("access key id is required")
 	}
 	if c.SecretAccessKey == "" {
 		return errors.New("secret access key is required")
 	}
+	client, err := minio.New(c.Endpoint, &minio.Options{
+		Creds:  credentials.NewStaticV4(c.AccessKeyID, c.SecretAccessKey, ""),
+		Secure: true,
+	})
+	if err != nil {
+		return errors.Wrap(err, "new minio client")
+	}
+	c.client = client
+
 	if c.Bucket == "" {
 		return errors.New("bucket is required")
 	}
 	if c.BucketURL == "" {
 		return errors.New("bucket url is required")
 	}
+	u, err := url.Parse(c.BucketURL)
+	if err != nil {
+		return errors.Wrap(err, "parse public url")
+	}
+	c.bucketURL = u
 
 	return nil
 }
@@ -82,6 +106,10 @@ func (c *Config) From(app *config.App) *Config {
 	return c
 }
 
+func (c *Config) Empty() bool {
+	return c.Endpoint == "" && c.AccessKeyID == "" && c.SecretAccessKey == "" && c.Bucket == "" && c.BucketURL == ""
+}
+
 type Dependencies struct{}
 
 // --- Factory code block ---
@@ -109,19 +137,6 @@ func new(instance string, app *config.App, dependencies Dependencies) (Storage,
 		return nil, errors.Wrap(err, "validate config")
 	}
 
-	client, err := minio.New(config.Endpoint, &minio.Options{
-		Creds:  credentials.NewStaticV4(config.AccessKeyID, config.SecretAccessKey, ""),
-		Secure: true,
-	})
-	if err != nil {
-		return nil, errors.Wrap(err, "new minio client")
-	}
-
-	u, err := url.Parse(config.BucketURL)
-	if err != nil {
-		return nil, errors.Wrap(err, "parse public url")
-	}
-
 	return &s3{
 		Base: component.New(&component.BaseConfig[Config, Dependencies]{
 			Name:         "ObjectStorage",
@@ -129,39 +144,40 @@ func new(instance string, app *config.App, dependencies Dependencies) (Storage,
 			Config:       config,
 			Dependencies: dependencies,
 		}),
-		client:    client,
-		bucketURL: u,
 	}, nil
 }
 
 // --- Implementation code block ---
 type s3 struct {
 	*component.Base[Config, Dependencies]
-
-	client    *minio.Client
-	bucketURL *url.URL
 }
 
 func (s *s3) Put(ctx context.Context, key string, body io.Reader, contentType string) (publicURL string, err error) {
 	ctx = telemetry.StartWith(ctx, append(s.TelemetryLabels(), telemetrymodel.KeyOperation, "Put")...)
 	defer func() { telemetry.End(ctx, err) }()
-	bucket := s.Config().Bucket
+	config := s.Config()
+	if config.Empty() {
+		return "", errors.New("not configured")
+	}
 
-	if _, err := s.client.PutObject(ctx, bucket, key, body, -1, minio.PutObjectOptions{
+	if _, err := config.client.PutObject(ctx, config.Bucket, key, body, -1, minio.PutObjectOptions{
 		ContentType: contentType,
 	}); err != nil {
 		return "", errors.Wrap(err, "put object")
 	}
 
-	return s.bucketURL.JoinPath(key).String(), nil
+	return config.bucketURL.JoinPath(key).String(), nil
 }
 
 func (s *s3) Get(ctx context.Context, key string) (publicURL string, err error) {
 	ctx = telemetry.StartWith(ctx, append(s.TelemetryLabels(), telemetrymodel.KeyOperation, "Get")...)
 	defer func() { telemetry.End(ctx, err) }()
-	bucket := s.Config().Bucket
+	config := s.Config()
+	if config.Empty() {
+		return "", errors.New("not configured")
+	}
 
-	if _, err := s.client.StatObject(ctx, bucket, key, minio.StatObjectOptions{}); err != nil {
+	if _, err := config.client.StatObject(ctx, config.Bucket, key, minio.StatObjectOptions{}); err != nil {
 		errResponse := minio.ToErrorResponse(err)
 		if errResponse.Code == minio.NoSuchKey {
 			return "", ErrNotFound
@@ -170,7 +186,7 @@ func (s *s3) Get(ctx context.Context, key string) (publicURL string, err error)
 		return "", errors.Wrap(err, "stat object")
 	}
 
-	return s.bucketURL.JoinPath(key).String(), nil
+	return config.bucketURL.JoinPath(key).String(), nil
 }
 
 func (s *s3) Reload(app *config.App) (err error) {
@@ -183,29 +199,7 @@ func (s *s3) Reload(app *config.App) (err error) {
 		return errors.Wrap(err, "validate config")
 	}
 
-	if reflect.DeepEqual(s.Config(), newConfig) {
-		log.Debug(ctx, "object storage config not changed")
-
-		return nil
-	}
-
-	client, err := minio.New(newConfig.Endpoint, &minio.Options{
-		Creds:  credentials.NewStaticV4(newConfig.AccessKeyID, newConfig.SecretAccessKey, ""),
-		Secure: true,
-	})
-	if err != nil {
-		return errors.Wrap(err, "new minio client")
-	}
-
-	u, err := url.Parse(newConfig.BucketURL)
-	if err != nil {
-		return errors.Wrap(err, "parse public url")
-	}
-
-	s.client = client
-	s.bucketURL = u
 	s.SetConfig(newConfig)
-
 	log.Info(ctx, "object storage reloaded")
 
 	return nil