From b0174a5db33b256d29a3fdeafc8ae52e543b51a8 Mon Sep 17 00:00:00 2001
From: Zhang Minghan <zmh13054618081@dingtalk.com>
Date: Wed, 20 Dec 2023 15:05:48 +0800
Subject: [PATCH] feat: update charge api

---
 addition/article/generate.go       | 17 +++++++++++++----
 app/src-tauri/tauri.conf.json      |  2 +-
 app/src/components/app/MenuBar.tsx |  1 -
 app/src/conf.ts                    | 18 +++++++++++++++++-
 globals/constant.go                |  8 ++++++++
 manager/router.go                  |  1 +
 manager/transhipment.go            |  4 ++++
 7 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/addition/article/generate.go b/addition/article/generate.go
index b35f854..a5ea56c 100644
--- a/addition/article/generate.go
+++ b/addition/article/generate.go
@@ -7,6 +7,7 @@ import (
 	"chat/utils"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"github.com/spf13/viper"
 	"strings"
 )
 
@@ -48,10 +49,18 @@ func CreateGenerationWorker(c *gin.Context, user *auth.User, model string, promp
 	titles := ParseTitle(title)
 	result := make(chan Response, len(titles))
 
-	for _, name := range titles {
-		go func(title string) {
-			result <- GenerateArticle(c, user, model, hash, title, prompt, enableWeb)
-		}(name)
+	if viper.GetBool("accept_concurrent") {
+		for _, name := range titles {
+			go func(title string) {
+				result <- GenerateArticle(c, user, model, hash, title, prompt, enableWeb)
+			}(name)
+		}
+	} else {
+		go func() {
+			for _, title := range titles {
+				result <- GenerateArticle(c, user, model, hash, title, prompt, enableWeb)
+			}
+		}()
 	}
 
 	return len(titles), result
diff --git a/app/src-tauri/tauri.conf.json b/app/src-tauri/tauri.conf.json
index 1aa0fca..5a3e931 100644
--- a/app/src-tauri/tauri.conf.json
+++ b/app/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "chatnio",
-    "version": "3.7.7"
+    "version": "3.7.8"
   },
   "tauri": {
     "allowlist": {
diff --git a/app/src/components/app/MenuBar.tsx b/app/src/components/app/MenuBar.tsx
index 7a168e0..418d3be 100644
--- a/app/src/components/app/MenuBar.tsx
+++ b/app/src/components/app/MenuBar.tsx
@@ -16,7 +16,6 @@ import {
   CalendarPlus,
   Cloud,
   CloudOff,
-  Cloudy,
   Gift,
   ListStart,
   Plug,
diff --git a/app/src/conf.ts b/app/src/conf.ts
index 2bf2e42..d2deff8 100644
--- a/app/src/conf.ts
+++ b/app/src/conf.ts
@@ -12,7 +12,7 @@ import { getMemory } from "@/utils/memory.ts";
 import { Compass, Image, Newspaper } from "lucide-react";
 import React from "react";
 
-export const version = "3.7.7";
+export const version = "3.7.8";
 export const dev: boolean = getDev();
 export const deploy: boolean = true;
 export let rest_api: string = getRestApi(deploy);
@@ -41,6 +41,20 @@ export const supportModels: Model[] = [
     auth: true,
     tag: ["free", "official"],
   },
+  {
+    id: "gpt-3.5-turbo-fast",
+    name: "GPT-3.5 Fast",
+    free: false,
+    auth: true,
+    tag: ["official"],
+  },
+  {
+    id: "gpt-3.5-turbo-16k-fast",
+    name: "GPT-3.5 16K Fast",
+    free: false,
+    auth: true,
+    tag: ["official"],
+  },
   {
     id: "gpt-4-0613",
     name: "GPT-4",
@@ -373,6 +387,8 @@ export const modelAvatars: Record<string, string> = {
   "gpt-3.5-turbo-0613": "gpt35turbo.png",
   "gpt-3.5-turbo-16k-0613": "gpt35turbo16k.webp",
   "gpt-3.5-turbo-1106": "gpt35turbo16k.webp",
+  "gpt-3.5-turbo-fast": "gpt35turbo16k.webp",
+  "gpt-3.5-turbo-16k-fast": "gpt35turbo16k.webp",
   "gpt-4-0613": "gpt4.png",
   "gpt-4-1106-preview": "gpt432k.webp",
   "gpt-4-vision-preview": "gpt4v.png",
diff --git a/globals/constant.go b/globals/constant.go
index 131c399..55fd28d 100644
--- a/globals/constant.go
+++ b/globals/constant.go
@@ -29,3 +29,11 @@ const (
 	TimesBilling = "times-billing"
 	TokenBilling = "token-billing"
 )
+
+const (
+	AnonymousType = "anonymous"
+	NormalType    = "normal"
+	BasicType     = "basic"    // basic subscription
+	StandardType  = "standard" // standard subscription
+	ProType       = "pro"      // pro subscription
+)
diff --git a/manager/router.go b/manager/router.go
index 5d11cba..0dc26bb 100644
--- a/manager/router.go
+++ b/manager/router.go
@@ -8,6 +8,7 @@ import (
 func Register(app *gin.Engine) {
 	app.GET("/chat", ChatAPI)
 	app.GET("/v1/models", ModelAPI)
+	app.GET("/v1/charge", ChargeAPI)
 	app.GET("/dashboard/billing/usage", GetBillingUsage)
 	app.GET("/dashboard/billing/subscription", GetSubscription)
 	app.POST("/v1/chat/completions", TranshipmentAPI)
diff --git a/manager/transhipment.go b/manager/transhipment.go
index ea8b8fb..a0e0ba5 100644
--- a/manager/transhipment.go
+++ b/manager/transhipment.go
@@ -84,6 +84,10 @@ func ModelAPI(c *gin.Context) {
 	c.JSON(http.StatusOK, channel.ConduitInstance.GetModels())
 }
 
+func ChargeAPI(c *gin.Context) {
+	c.JSON(http.StatusOK, channel.ChargeInstance.ListRules())
+}
+
 func sendErrorResponse(c *gin.Context, err error, types ...string) {
 	var errType string
 	if len(types) > 0 {