feat: update version to 4.0.0

Author: Sh1n3zZ

.gitignore

@@ -25,6 +25,10 @@ access/*.json
 db
 redis
 config
+presets
 
-# for opencommit
+key/*
+!key/.gitkeep
+
+# for https://github.com/di-sukharev/opencommit
 .env

admin/analysis.go admin/analysis/analysis.goadmin/analysis.go renamed to admin/analysis/analysis.go

@@ -1,12 +1,13 @@
-package admin
+package analysis
 
 import (
 	"chat/channel"
 	"chat/globals"
 	"chat/utils"
 	"database/sql"
-	"github.com/go-redis/redis/v8"
 	"time"
+
+	"github.com/go-redis/redis/v8"
 )
 
 type UserTypeForm struct {
@@ -28,6 +29,10 @@ func getFormat(t time.Time) string {
 	return t.Format("2006-01-02")
 }
 
+func getMinuteFormat(t time.Time) string {
+	return t.Format("2006-01-02 15:04")
+}
+
 func GetSubscriptionUsers(db *sql.DB) int64 {
 	var count int64
 	err := globals.QueryRowDb(db, `
@@ -44,10 +49,30 @@ func GetBillingToday(cache *redis.Client) float32 {
 	return float32(utils.MustInt(cache, getBillingFormat(getDay()))) / 100
 }
 
+func GetBillingYesterday(cache *redis.Client) float32 {
+	return float32(utils.MustInt(cache, getBillingFormat(getLastDay()))) / 100
+}
+
 func GetBillingMonth(cache *redis.Client) float32 {
 	return float32(utils.MustInt(cache, getMonthBillingFormat(getMonth()))) / 100
 }
 
+func GetBillingLastMonth(cache *redis.Client) float32 {
+	return float32(utils.MustInt(cache, getMonthBillingFormat(getLastMonth()))) / 100
+}
+
+func GetTpmToday(cache *redis.Client, user string) int64 {
+	// this minute and last minute
+	return utils.MustInt(cache, getTpmFormat(getMinuteFormat(time.Now()), user)) +
+		utils.MustInt(cache, getTpmFormat(getMinuteFormat(time.Now().Add(-time.Minute)), user))
+}
+
+func GetRpmToday(cache *redis.Client, user string) int64 {
+	// this minute and last minute
+	return utils.MustInt(cache, getRpmFormat(getMinuteFormat(time.Now()), user)) +
+		utils.MustInt(cache, getRpmFormat(getMinuteFormat(time.Now().Add(-time.Minute)), user))
+}
+
 func GetModelData(cache *redis.Client) ModelChartForm {
 	dates := getDays(7)
 

admin/analysis/format.go

@@ -0,0 +1,64 @@
+package analysis
+
+import (
+	"fmt"
+	"time"
+)
+
+func getMonth() string {
+	date := time.Now()
+	return date.Format("2006-01")
+}
+
+func getLastMonth() string {
+	date := time.Now().AddDate(0, -1, 0)
+	return date.Format("2006-01")
+}
+
+func getDay() string {
+	date := time.Now()
+	return date.Format("2006-01-02")
+}
+
+func getLastDay() string {
+	date := time.Now().AddDate(0, 0, -1)
+	return date.Format("2006-01-02")
+}
+
+func getDays(n int) []time.Time {
+	current := time.Now()
+	var days []time.Time
+	for i := n; i > 0; i-- {
+		days = append(days, current.AddDate(0, 0, -i+1))
+	}
+
+	return days
+}
+
+func getErrorFormat(t string) string {
+	return fmt.Sprintf("nio:err-analysis-%s", t)
+}
+
+func getBillingFormat(t string) string {
+	return fmt.Sprintf("nio:billing-analysis-%s", t)
+}
+
+func getMonthBillingFormat(t string) string {
+	return fmt.Sprintf("nio:billing-analysis-%s", t)
+}
+
+func getRequestFormat(t string) string {
+	return fmt.Sprintf("nio:request-analysis-%s", t)
+}
+
+func getModelFormat(t string, model string) string {
+	return fmt.Sprintf("nio:model-analysis-%s-%s", model, t)
+}
+
+func getTpmFormat(t string, user string) string {
+	return fmt.Sprintf("nio:tpm-analysis-%s-%s", user, t)
+}
+
+func getRpmFormat(t string, user string) string {
+	return fmt.Sprintf("nio:rpm-analysis-%s-%s", user, t)
+}

admin/analysis/reflect.go

@@ -0,0 +1,10 @@
+package analysis
+
+import "reflect"
+
+var _ = reflect.TypeOf(UserTypeForm{})
+var _ = reflect.TypeOf(ModelData{})
+var _ = reflect.TypeOf(ModelChartForm{})
+var _ = reflect.TypeOf(RequestChartForm{})
+var _ = reflect.TypeOf(BillingChartForm{})
+var _ = reflect.TypeOf(ErrorChartForm{})

admin/analysis/statistic.go

@@ -0,0 +1,63 @@
+package analysis
+
+import (
+	"chat/adapter"
+	"chat/connection"
+	"chat/utils"
+	"time"
+
+	"github.com/go-redis/redis/v8"
+)
+
+func IncrErrorRequest(cache *redis.Client) {
+	utils.IncrOnce(cache, getErrorFormat(getDay()), time.Hour*24*7*2)
+}
+
+func IncrBillingRequest(cache *redis.Client, amount int64, isAdmin bool) {
+	if isAdmin {
+		// do not count billing for admin user
+		return
+	}
+
+	utils.IncrWithExpire(cache, getBillingFormat(getDay()), amount, time.Hour*24*90)        // 90 days
+	utils.IncrWithExpire(cache, getMonthBillingFormat(getMonth()), amount, time.Hour*24*90) // 90 days
+}
+
+func IncrRequest(cache *redis.Client) {
+	utils.IncrOnce(cache, getRequestFormat(getDay()), time.Hour*24*7*2)
+}
+
+func IncrModelRequest(cache *redis.Client, model string, tokens int64) {
+	utils.IncrWithExpire(cache, getModelFormat(getDay(), model), tokens, time.Hour*24*7*2)
+}
+
+func AnalyseRequest(model string, user string, buffer *utils.Buffer, err error) {
+	instance := connection.Cache
+
+	if adapter.IsAvailableError(err) {
+		IncrErrorRequest(instance)
+		return
+	}
+
+	token := int64(buffer.CountInputToken() + buffer.CountOutputToken(false))
+
+	IncrRequest(instance)
+	IncrModelRequest(instance, model, token)
+
+	if buffer != nil {
+		IncrRpm(instance, user, 1)
+		IncrTpm(instance, user, token)
+
+		// add rpm/tpm to root
+		IncrRpm(instance, "root", 1)
+		IncrTpm(instance, "root", token)
+	}
+}
+
+func IncrTpm(cache *redis.Client, user string, n int64) {
+	utils.IncrWithExpire(cache, getTpmFormat(getMinuteFormat(time.Now()), user), n, time.Minute*5)
+}
+
+func IncrRpm(cache *redis.Client, user string, n int64) {
+	utils.IncrWithExpire(cache, getRpmFormat(getMinuteFormat(time.Now()), user), n, time.Minute*5)
+}

admin/analysis/types.go

@@ -0,0 +1,26 @@
+package analysis
+
+type ModelData struct {
+	Model string  `json:"model"`
+	Data  []int64 `json:"data"`
+}
+
+type ModelChartForm struct {
+	Date  []string    `json:"date"`
+	Value []ModelData `json:"value"`
+}
+
+type RequestChartForm struct {
+	Date  []string `json:"date"`
+	Value []int64  `json:"value"`
+}
+
+type BillingChartForm struct {
+	Date  []string  `json:"date"`
+	Value []float32 `json:"value"`
+}
+
+type ErrorChartForm struct {
+	Date  []string `json:"date"`
+	Value []int64  `json:"value"`
+}

admin/controller.go

@@ -1,6 +1,7 @@
 package admin
 
 import (
+	"chat/admin/analysis"
 	"chat/utils"
 	"net/http"
 	"strconv"
@@ -48,7 +49,8 @@ type BanForm struct {
 type QuotaOperationForm struct {
 	Id       int64    `json:"id" binding:"required"`
 	Quota    *float32 `json:"quota" binding:"required"`
-	Override bool     `json:"override"`}
+	Override bool     `json:"override"`
+}
 
 type SubscriptionOperationForm struct {
 	Id      int64  `json:"id" binding:"required"`
@@ -97,36 +99,39 @@ func InfoAPI(c *gin.Context) {
 	cache := utils.GetCacheFromContext(c)
 
 	c.JSON(http.StatusOK, InfoForm{
-		SubscriptionCount: GetSubscriptionUsers(db),
-		BillingToday:      GetBillingToday(cache),
-		BillingMonth:      GetBillingMonth(cache),
+		OnlineChats:       utils.GetConns(),
+		SubscriptionCount: analysis.GetSubscriptionUsers(db),
+		BillingToday:      analysis.GetBillingToday(cache),
+		BillingMonth:      analysis.GetBillingMonth(cache),
+		BillingYesterday:  analysis.GetBillingYesterday(cache),
+		BillingLastMonth:  analysis.GetBillingLastMonth(cache),
 	})
 }
 
 func ModelAnalysisAPI(c *gin.Context) {
 	cache := utils.GetCacheFromContext(c)
-	c.JSON(http.StatusOK, GetSortedModelData(cache))
+	c.JSON(http.StatusOK, analysis.GetSortedModelData(cache))
 }
 
 func RequestAnalysisAPI(c *gin.Context) {
 	cache := utils.GetCacheFromContext(c)
-	c.JSON(http.StatusOK, GetRequestData(cache))
+	c.JSON(http.StatusOK, analysis.GetRequestData(cache))
 }
 
 func BillingAnalysisAPI(c *gin.Context) {
 	cache := utils.GetCacheFromContext(c)
-	c.JSON(http.StatusOK, GetBillingData(cache))
+	c.JSON(http.StatusOK, analysis.GetBillingData(cache))
 }
 
 func ErrorAnalysisAPI(c *gin.Context) {
 	cache := utils.GetCacheFromContext(c)
-	c.JSON(http.StatusOK, GetErrorData(cache))
+	c.JSON(http.StatusOK, analysis.GetErrorData(cache))
 }
 
 func UserTypeAnalysisAPI(c *gin.Context) {
 	db := utils.GetDBFromContext(c)
-	if form, err := GetUserTypeData(db); err != nil {
-		c.JSON(http.StatusOK, &UserTypeForm{})
+	if form, err := analysis.GetUserTypeData(db); err != nil {
+		c.JSON(http.StatusOK, &analysis.UserTypeForm{})
 	} else {
 		c.JSON(http.StatusOK, form)
 	}
@@ -364,26 +369,26 @@ func UserSubscriptionAPI(c *gin.Context) {
 		return
 	}
 
-// convert to time
-if _, err := time.Parse("2006-01-02 15:04:05", form.Expired); err != nil {
-	c.JSON(http.StatusOK, gin.H{
-		"status":  false,
-		"message": err.Error(),
-	})
-	return
-}
+	// convert to time
+	if _, err := time.Parse("2006-01-02 15:04:05", form.Expired); err != nil {
+		c.JSON(http.StatusOK, gin.H{
+			"status":  false,
+			"message": err.Error(),
+		})
+		return
+	}
+
+	if err := subscriptionMigration(db, form.Id, form.Expired); err != nil {
+		c.JSON(http.StatusOK, gin.H{
+			"status":  false,
+			"message": err.Error(),
+		})
+		return
+	}
 
-if err := subscriptionMigration(db, form.Id, form.Expired); err != nil {
 	c.JSON(http.StatusOK, gin.H{
-		"status":  false,
-		"message": err.Error(),
+		"status": true,
 	})
-	return
-}
-
-c.JSON(http.StatusOK, gin.H{
-	"status": true,
-})
 }
 
 func SubscriptionLevelAPI(c *gin.Context) {

admin/types.go

@@ -5,7 +5,10 @@ var pagination int64 = 10
 type InfoForm struct {
 	BillingToday      float32 `json:"billing_today"`
 	BillingMonth      float32 `json:"billing_month"`
+	BillingYesterday  float32 `json:"billing_yesterday"`
+	BillingLastMonth  float32 `json:"billing_last_month"`
 	SubscriptionCount int64   `json:"subscription_count"`
+	OnlineChats       int64   `json:"online_chats"`
 }
 
 type ModelData struct {