feat: 升级模型为gpt-3.5 (#58)

.github/release-drafter.yml

@@ -0,0 +1,42 @@
+# Configuration for Release Drafter: https://github.com/toolmantim/release-drafter
+name-template: 'v$NEXT_PATCH_VERSION 🌈'
+tag-template: 'v$NEXT_PATCH_VERSION'
+version-template: $MAJOR.$MINOR.$PATCH
+# Emoji reference: https://gitmoji.carloscuesta.me/
+categories:
+ - title: '🚀 Features'
+ labels:
+ - 'feature'
+ - 'enhancement'
+ - 'kind/feature'
+ - title: '🐛 Bug Fixes'
+ labels:
+ - 'fix'
+ - 'bugfix'
+ - 'bug'
+ - 'regression'
+ - 'kind/bug'
+ - title: 📝 Documentation updates
+ labels:
+ - 'doc'
+ - 'documentation'
+ - 'kind/doc'
+ - title: 👻 Maintenance
+ labels:
+ - chore
+ - dependencies
+ - 'kind/chore'
+ - 'kind/dep'
+ - title: 🚦 Tests
+ labels:
+ - test
+ - tests
+exclude-labels:
+ - reverted
+ - no-changelog
+ - skip-changelog
+ - invalid
+change-template: '* $TITLE (#$NUMBER) @$AUTHOR'
+template: |
+ ## What’s Changed
+ $CHANGES

.github/workflows/docker-image.yml

@@ -7,6 +7,8 @@ on:
  push:
  branches:
  - main
+ release:
+ types: [created,published] # 表示在创建新的 Release 时触发
 
 # Allows you to run this workflow manually from the Actions tab
  # 可以手动触发
@@ -26,9 +28,8 @@ jobs:
  - name: Checkout
  uses: actions/checkout@v2
 
- - name: Get current date
- id: date
- run: echo "::set-output name=today::$(date +'%Y-%m-%d_%H-%M')"
+ - name: Inject slug/short variables
+ uses: rlespinasse/github-slug-action@v4
 
  - name: Set up QEMU
  uses: docker/setup-qemu-action@v1
@@ -57,5 +58,5 @@ jobs:
  push: ${{ github.event_name != 'pull_request' }}
  # 给清单打上多个标签
  tags: |
- ${{ secrets.DOCKERHUB_USERNAME }}/chatgpt-dingtalk:${{ steps.date.outputs.today }}
- ${{ secrets.DOCKERHUB_USERNAME }}/chatgpt-dingtalk:latest
+ ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.GITHUB_REPOSITORY_NAME_PART }}:${{ env.GITHUB_REF_NAME }}
+ ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.GITHUB_REPOSITORY_NAME_PART }}:latest

.github/workflows/go-binary-release.yml

@@ -2,7 +2,7 @@ name: build
 
 on:
  release:
- types: [created] # 表示在创建新的 Release 时触发
+ types: [created,published] # 表示在创建新的 Release 时触发
 
 jobs:
  build-go-binary:

.github/workflows/release.yml

@@ -0,0 +1,38 @@
+name: Release Drafter
+
+on:
+ push:
+ # branches to consider in the event; optional, defaults to all
+ branches:
+ - main
+ # pull_request event is required only for autolabeler
+ pull_request:
+ # Only following types are handled by the action, but one can default to all as well
+ types: [opened, reopened, synchronize]
+ # pull_request_target event is required for autolabeler to support PRs from forks
+ # pull_request_target:
+ # types: [opened, reopened, synchronize]
+
+permissions:
+ contents: read
+
+jobs:
+ update_release_draft:
+ permissions:
+ contents: write # for release-drafter/release-drafter to create a github release
+ pull-requests: write # for release-drafter/release-drafter to add label to PR
+ runs-on: ubuntu-latest
+ steps:
+ # (Optional) GitHub Enterprise requires GHE_HOST variable set
+ #- name: Set GHE_HOST
+ # run: |
+ # echo "GHE_HOST=${GITHUB_SERVER_URL##https:\/\/}" >> $GITHUB_ENV
+
+ # Drafts your next Release notes as Pull Requests are merged into "master"
+ - uses: release-drafter/release-drafter@v5
+ # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
+ # with:
+ # config-name: my-config.yml
+ # disable-autolabeler: true
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

go.mod

@@ -3,16 +3,14 @@ module github.com/eryajf/chatgpt-dingtalk
 go 1.18
 
 require (
- github.com/go-resty/resty/v2 v2.7.0
  github.com/patrickmn/go-cache v2.1.0+incompatible
  github.com/solywsh/chatgpt v0.0.14
 )
 
 require (
  github.com/joho/godotenv v1.5.1 // indirect
- github.com/sashabaranov/go-gpt3 v1.0.1 // indirect
+ github.com/sashabaranov/go-gpt3 v1.3.0 // indirect
  github.com/stretchr/testify v1.8.1 // indirect
- golang.org/x/net v0.0.0-20211029224645-99673261e6eb // indirect
 )
 
 replace github.com/solywsh/chatgpt => ./pkg/chatgpt

go.sum

@@ -1,30 +1,21 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
-github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sashabaranov/go-gpt3 v1.0.1 h1:KHwY4uroFlX1qI1Hui7d31ZI6uzbNGL9zAkh1FkfhuM=
-github.com/sashabaranov/go-gpt3 v1.0.1/go.mod h1:BIZdbwdzxZbCrcKGMGH6u2eyGe1xFuX9Anmh3tCP8lQ=
+github.com/sashabaranov/go-gpt3 v1.3.0 h1:IbvaK2yTnlm7f/oiC2HC9cbzu/4Znt4GkarFiwZ60uI=
+github.com/sashabaranov/go-gpt3 v1.3.0/go.mod h1:BIZdbwdzxZbCrcKGMGH6u2eyGe1xFuX9Anmh3tCP8lQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-golang.org/x/net v0.0.0-20211029224645-99673261e6eb h1:pirldcYWx7rx7kE5r+9WsOXPXK0+WH5+uZ7uPmJ44uM=
-golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

pkg/chatgpt/context.go

@@ -161,33 +161,31 @@ func (c *ChatGPT) ChatWithContext(question string) (answer string, err error) {
  if len(prompt) > c.maxText-c.maxAnswerLen {
  return "", OverMaxTextLength
  }
- req := gogpt.CompletionRequest{
- Model: gogpt.GPT3TextDavinci003,
- MaxTokens: c.maxAnswerLen,
- Prompt: prompt,
- Temperature: 0.9,
- TopP: 1,
- N: 1,
- FrequencyPenalty: 0,
- PresencePenalty: 0.5,
- User: c.userId,
- Stop: []string{c.ChatContext.aiRole.Name + ":", c.ChatContext.humanRole.Name + ":"},
- }
- resp, err := c.client.CreateCompletion(c.ctx, req)
+ c1 := gogpt.ChatCompletionRequest{
+ Model: gogpt.GPT3Dot5Turbo,
+ Messages: []gogpt.ChatCompletionMessage{
+ {
+ Role: "user",
+ Content: prompt,
+ },
+ }}
+ req := c1
+
+ resp, err := c.client.CreateChatCompletion(c.ctx, req)
  if err != nil {
  return "", err
  }
- resp.Choices[0].Text = formatAnswer(resp.Choices[0].Text)
+ resp.Choices[0].Message.Content = formatAnswer(resp.Choices[0].Message.Content)
  c.ChatContext.old = append(c.ChatContext.old, conversation{
  Role: c.ChatContext.humanRole,
  Prompt: question,
  })
  c.ChatContext.old = append(c.ChatContext.old, conversation{
  Role: c.ChatContext.aiRole,
- Prompt: resp.Choices[0].Text,
+ Prompt: resp.Choices[0].Message.Content,
  })
  c.ChatContext.seqTimes++
- return resp.Choices[0].Text, nil
+ return resp.Choices[0].Message.Content, nil
 }
 
 func WithMaxSeqTimes(times int) ChatContextOption {