chuan/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-02-03 13:00:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(gemini-web): Consolidate conversation data into single BoltDB file

Browse Source
This commit is contained in:
hkfires
2025-09-25 09:40:27 +08:00
parent 9810834f20
commit 7f2e2fee56
2 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/provider/gemini-web/client.go
View File

@@ -420,13 +420,10 @@ func (c *GeminiClient) generateOnce(prompt string, files []string, model Model,
form.Set("f.req", string(outerJSON)) form.Set("f.req", string(outerJSON))
req, _ := http.NewRequest(http.MethodPost, EndpointGenerate, strings.NewReader(form.Encode())) req, _ := http.NewRequest(http.MethodPost, EndpointGenerate, strings.NewReader(form.Encode()))
// headers
applyHeaders(req, HeadersGemini) applyHeaders(req, HeadersGemini)
applyHeaders(req, model.ModelHeader) applyHeaders(req, model.ModelHeader)
req.Header.Set("Content-Type", "application/x-www-form-urlencoded;charset=utf-8") req.Header.Set("Content-Type", "application/x-www-form-urlencoded;charset=utf-8")
for k, v := range c.Cookies { applyCookies(req, c.Cookies)
req.AddCookie(&http.Cookie{Name: k, Value: v})
}
resp, err := c.httpClient.Do(req) resp, err := c.httpClient.Do(req)
if err != nil { if err != nil {

40
internal/provider/gemini-web/state.go
View File

@@ -82,12 +82,12 @@ func NewGeminiWebState(cfg *config.Config, token *gemini.GeminiWebTokenStorage,
} }
func (s *GeminiWebState) loadConversationCaches() { func (s *GeminiWebState) loadConversationCaches() {
if path := s.convStorePath(); path != "" { if path := s.convPath(); path != "" {
if store, err := LoadConvStore(path); err == nil { if store, err := LoadConvStore(path); err == nil {
s.convStore = store s.convStore = store
} }
} }
if path := s.convDataPath(); path != "" { if path := s.convPath(); path != "" {
if items, index, err := LoadConvData(path); err == nil { if items, index, err := LoadConvData(path); err == nil {
s.convData = items s.convData = items
s.convIndex = index s.convIndex = index
@@ -95,20 +95,14 @@ func (s *GeminiWebState) loadConversationCaches() {
} }
} }
func (s *GeminiWebState) convStorePath() string { // convPath returns the BoltDB file path used for both account metadata and conversation data.
func (s *GeminiWebState) convPath() string {
base := s.storagePath base := s.storagePath
if base == "" { if base == "" {
base = s.accountID + ".json" // Use accountID directly as base name; ConvBoltPath will append .bolt.
base = s.accountID
} }
return ConvStorePath(base) return ConvBoltPath(base)
}
func (s *GeminiWebState) convDataPath() string {
base := s.storagePath
if base == "" {
base = s.accountID + ".json"
}
return ConvDataPath(base)
} }
func (s *GeminiWebState) GetRequestMutex() *sync.Mutex { return &s.reqMu } func (s *GeminiWebState) GetRequestMutex() *sync.Mutex { return &s.reqMu }
@@ -392,7 +386,7 @@ func (s *GeminiWebState) persistConversation(modelName string, prep *geminiWebPr
storeSnapshot[k] = cp storeSnapshot[k] = cp
} }
s.convMu.Unlock() s.convMu.Unlock()
_ = SaveConvStore(s.convStorePath(), storeSnapshot) _ = SaveConvStore(s.convPath(), storeSnapshot)
} }
if !s.useReusableContext() { if !s.useReusableContext() {
@@ -420,7 +414,7 @@ func (s *GeminiWebState) persistConversation(modelName string, prep *geminiWebPr
indexSnapshot[k] = v indexSnapshot[k] = v
} }
s.convMu.Unlock() s.convMu.Unlock()
_ = SaveConvData(s.convDataPath(), dataSnapshot, indexSnapshot) _ = SaveConvData(s.convPath(), dataSnapshot, indexSnapshot)
} }
func (s *GeminiWebState) addAPIResponseData(ctx context.Context, line []byte) { func (s *GeminiWebState) addAPIResponseData(ctx context.Context, line []byte) {
@@ -557,19 +551,9 @@ func HashConversation(clientID, model string, msgs []StoredMessage) string {
return Sha256Hex(b.String()) return Sha256Hex(b.String())
} }
// ConvStorePath returns the path for account-level metadata persistence based on token file path. // ConvBoltPath returns the BoltDB file path used for both account metadata and conversation data.
func ConvStorePath(tokenFilePath string) string { // Different logical datasets are kept in separate buckets within this single DB file.
wd, err := os.Getwd() func ConvBoltPath(tokenFilePath string) string {
if err != nil || wd == "" {
wd = "."
}
convDir := filepath.Join(wd, "conv")
base := strings.TrimSuffix(filepath.Base(tokenFilePath), filepath.Ext(tokenFilePath))
return filepath.Join(convDir, base+".bolt")
}
// ConvDataPath returns the path for full conversation persistence based on token file path.
func ConvDataPath(tokenFilePath string) string {
wd, err := os.Getwd() wd, err := os.Getwd()
if err != nil || wd == "" { if err != nil || wd == "" {
wd = "." wd = "."