Skip to content

Commit

Permalink
Merge branch 'main' into beta144
Browse files Browse the repository at this point in the history
  • Loading branch information
Hoshinonyaruko authored Jun 8, 2024
2 parents 49b6c27 + 5a209ae commit 256e4dd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions applogic/tongyiqianwen.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func (app *App) ChatHandlerTyqw(w http.ResponseWriter, r *http.Request) {
}
}
}

// TODO: msgid是空的开始第一句也要处理 插入
// 获取历史信息
if msg.ParentMessageID != "" {
userhistory, err := app.getHistory(msg.ConversationID, msg.ParentMessageID)
Expand All @@ -159,8 +159,6 @@ func (app *App) ChatHandlerTyqw(w http.ResponseWriter, r *http.Request) {
fmtf.Printf("Error getting system history: %v,promptstr[%v]\n", err, promptstr)
return
}

// 处理增强QA逻辑
if config.GetEnhancedQA(promptstr) {
systemHistory, err := prompt.GetMessagesExcludingSystem(promptstr)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -463,4 +463,4 @@ GetAIPromptkeyboardPath可以是自身地址,可以带有prompt参数

3. **Inklewriter**
- **项目主页**,[Ink on GitHub](https://github.com/inkle/ink).
- 它是一个允许用户创建交互式故事的网页平台。它设计了**ink**语言,它是一个开源项目,用于编写交互式叙述和游戏。
- 它是一个允许用户创建交互式故事的网页平台。它设计了**ink**语言,它是一个开源项目,用于编写交互式叙述和游戏。

0 comments on commit 256e4dd

Please sign in to comment.