Merge branch 'chaitin:main' into develop

Author: GavanHub

backend/cmd/server/main.go

@@ -19,7 +19,7 @@ import (
 // @version 1.0
 // @description MonkeyCode API
 func main() {
-	s, err := newServer("/app/config")
+	s, err := newServer()
 	if err != nil {
 		panic(err)
 	}
@@ -58,7 +58,7 @@ func (s *Server) Name() string {
 
 // Start implements service.Servicer.
 func (s *Server) Start() error {
-	return s.web.Run(s.config.Server.Http.Host)
+	return s.web.Run(s.config.Server.Addr)
 }
 
 // Stop implements service.Servicer.

backend/cmd/server/wire.go

@@ -33,7 +33,7 @@ type Server struct {
 	billingV1   *billingv1.BillingHandler
 }
 
-func newServer(dir string) (*Server, error) {
+func newServer() (*Server, error) {
 	wire.Build(
 		wire.Struct(new(Server), "*"),
 		appSet,

backend/cmd/server/wire_gen.go

@@ -2,10 +2,10 @@ package config
 
 import (
 	_ "embed"
+	"strings"
 
 	"github.com/spf13/viper"
 
-	"github.com/chaitin/MonkeyCode/backend/pkg/cvt"
 	"github.com/chaitin/MonkeyCode/backend/pkg/logger"
 )
 
@@ -20,9 +20,7 @@ type Config struct {
 	BaseUrl string `mapstructure:"base_url"`
 
 	Server struct {
-		Http struct {
-			Host string `mapstructure:"host"`
-		} `mapstructure:"http"`
+		Addr string `mapstructure:"addr"`
 	} `mapstructure:"server"`
 
 	Admin struct {
@@ -51,52 +49,61 @@ type Config struct {
 	} `mapstructure:"redis"`
 
 	LLMProxy struct {
-		Timeout        string `mapstructure:"timeout"`
-		KeepAlive      string `mapstructure:"keep_alive"`
-		ClientPoolSize int    `mapstructure:"client_pool_size"`
-		RequestLogPath string `mapstructure:"request_log_path"`
+		Timeout              string `mapstructure:"timeout"`
+		KeepAlive            string `mapstructure:"keep_alive"`
+		ClientPoolSize       int    `mapstructure:"client_pool_size"`
+		StreamClientPoolSize int    `mapstructure:"stream_client_pool_size"`
+		RequestLogPath       string `mapstructure:"request_log_path"`
 	} `mapstructure:"llm_proxy"`
 
 	InitModel struct {
-		ModelName string `mapstructure:"model_name"`
-		ModelKey  string `mapstructure:"model_key"`
-		ModelURL  string `mapstructure:"model_url"`
+		Name string `mapstructure:"name"`
+		Key  string `mapstructure:"key"`
+		URL  string `mapstructure:"url"`
 	} `mapstructure:"init_model"`
 
 	Extension struct {
 		Baseurl string `mapstructure:"baseurl"`
 	} `mapstructure:"extension"`
 }
 
-func Init(dir string) (*Config, error) {
-	viper.SetConfigName("config")
-	viper.SetConfigType("yaml")
-	viper.AddConfigPath(dir)
-	if err := viper.ReadInConfig(); err != nil {
-		return nil, err
-	}
+func Init() (*Config, error) {
+	v := viper.New()
+	v.AutomaticEnv()
+	v.SetEnvPrefix("MONKEYCODE")
+	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+
+	v.SetDefault("debug", false)
+	v.SetDefault("logger.level", "info")
+	v.SetDefault("base_url", "")
+	v.SetDefault("server.addr", ":8888")
+	v.SetDefault("admin.user", "admin")
+	v.SetDefault("admin.password", "")
+	v.SetDefault("session.expire_day", 30)
+	v.SetDefault("database.master", "")
+	v.SetDefault("database.slave", "")
+	v.SetDefault("database.max_open_conns", 50)
+	v.SetDefault("database.max_idle_conns", 10)
+	v.SetDefault("database.conn_max_lifetime", 30)
+	v.SetDefault("redis.host", "monkeycode-redis")
+	v.SetDefault("redis.port", "6379")
+	v.SetDefault("redis.pass", "")
+	v.SetDefault("redis.db", 0)
+	v.SetDefault("redis.idle_conn", 20)
+	v.SetDefault("llm_proxy.timeout", "30s")
+	v.SetDefault("llm_proxy.keep_alive", "60s")
+	v.SetDefault("llm_proxy.client_pool_size", 100)
+	v.SetDefault("llm_proxy.stream_client_pool_size", 5000)
+	v.SetDefault("llm_proxy.request_log_path", "/app/request/logs")
+	v.SetDefault("init_model.name", "qwen2.5-coder-3b-instruct")
+	v.SetDefault("init_model.key", "")
+	v.SetDefault("init_model.url", "https://model-square.app.baizhi.cloud/v1")
+	v.SetDefault("extension.baseurl", "https://release.baizhi.cloud")
 
 	c := Config{}
-	if err := viper.Unmarshal(&c); err != nil {
+	if err := v.Unmarshal(&c); err != nil {
 		return nil, err
 	}
 
-	c = defaultValue(c)
 	return &c, nil
 }
-
-func defaultValue(c Config) Config {
-	c.Server.Http.Host = cvt.ZeroWithDefault(c.Server.Http.Host, ":8888")
-	c.Redis.IdleConn = cvt.ZeroWithDefault(c.Redis.IdleConn, 20)
-	c.Database.MaxOpenConns = cvt.ZeroWithDefault(c.Database.MaxOpenConns, 50)
-	c.Database.MaxIdleConns = cvt.ZeroWithDefault(c.Database.MaxIdleConns, 10)
-	c.Database.ConnMaxLifetime = cvt.ZeroWithDefault(c.Database.ConnMaxLifetime, 30)
-	c.Session.ExpireDay = cvt.ZeroWithDefault(c.Session.ExpireDay, 15)
-
-	c.LLMProxy.Timeout = cvt.ZeroWithDefault(c.LLMProxy.Timeout, "30s")
-	c.LLMProxy.KeepAlive = cvt.ZeroWithDefault(c.LLMProxy.KeepAlive, "60s")
-	c.LLMProxy.ClientPoolSize = cvt.ZeroWithDefault(c.LLMProxy.ClientPoolSize, 100)
-	c.LLMProxy.RequestLogPath = cvt.ZeroWithDefault(c.LLMProxy.RequestLogPath, "/app/request/logs")
-
-	return c
-}

backend/config/config.go

@@ -28,3 +28,10 @@ type OAuthKind string
 const (
 	OAuthKindSignUpOrIn OAuthKind = "signup_or_in"
 )
+
+type InviteCodeStatus string
+
+const (
+	InviteCodeStatusPending InviteCodeStatus = "pending"
+	InviteCodeStatusUsed    InviteCodeStatus = "used"
+)