Merge branch 'main' into main

bin/cli.js

@@ -29,9 +29,12 @@ async function main() {
     .option('-s, --store', 'Enables the local message cache', {
       default: true
     })
-    .option('-t, --timeout', 'Timeout in milliseconds')
+    .option('-t, --timeout <timeout>', 'Timeout in milliseconds')
     .option('-k, --apiKey <apiKey>', 'OpenAI API key')
     .option('-o, --apiOrg <apiOrg>', 'OpenAI API key')
+    .option('-m, --model <model>', 'Model (gpt-3.5-turbo, gpt-4)', {
+      default: 'gpt-3.5-turbo'
+    })
     .option(
       '-n, --conversationName <conversationName>',
       'Unique name for the conversation'
@@ -52,6 +55,7 @@ async function main() {
         options.continue && options.store
           ? config.get(conversationKey, {}) || {}
           : {}
+      const model = options.model
       let conversationId = undefined
       let parentMessageId = undefined
 
@@ -71,6 +75,9 @@ async function main() {
         apiKey,
         apiOrg,
         debug: options.debug,
+        completionParams: {
+          model
+        },
         getMessageById: async (id) => {
           if (options.store) {
             return conversation[id]

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "chatgpt",
-  "version": "5.1.3",
+  "version": "5.1.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "chatgpt",
-      "version": "5.1.3",
+      "version": "5.1.4",
       "license": "MIT",
       "dependencies": {
         "@dqbd/tiktoken": "^0.4.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatgpt",
-  "version": "5.1.3",
+  "version": "5.1.4",
   "description": "Node.js client for the official ChatGPT API.",
   "author": "Travis Fischer <travis@transitivebullsh.it>",
   "repository": "transitive-bullshit/chatgpt-api",

readme.md

@@ -445,6 +445,7 @@ All of these awesome projects are built using the `chatgpt` package. 🤯
 - [WeChat Bot #4](https://github.com/darknightlab/wechat-bot)
 - [WeChat Bot #5](https://github.com/sunshanpeng/wechaty-chatgpt)
 - [WeChat Bot #6](https://github.com/formulahendry/chatgpt-wechat-bot)
+- [WeChat Bot #7](https://github.com/gfl94/Chatbot004)
 - [QQ Bot (plugin for Yunzai-bot)](https://github.com/ikechan8370/chatgpt-plugin)
 - [QQ Bot (plugin for KiviBot)](https://github.com/KiviBotLab/kivibot-plugin-chatgpt)
 - [QQ Bot (oicq)](https://github.com/easydu2002/chat_gpt_oicq)
@@ -472,6 +473,8 @@ All of these awesome projects are built using the `chatgpt` package. 🤯
 - [Slack Bot #2](https://github.com/lokwkin/chatgpt-slackbot-node/) (with queueing mechanism)
 - [Slack Bot #3](https://github.com/NessunKim/slack-chatgpt/)
 - [Slack Bot #4](https://github.com/MarkusGalant/chatgpt-slackbot-serverless/) ( Serverless AWS Lambda )
+- [Slack Bot #5](https://github.com/benjiJanssens/SlackGPT) (Hosted)
+  - [Add to Slack](https://slackgpt.benji.sh/slack/install)
 - [Electron Bot](https://github.com/ShiranAbir/chaty)
 - [Kodyfire CLI](https://github.com/nooqta/chatgpt-kodyfire)
 - [Twitch Bot](https://github.com/BennyDeeDev/chatgpt-twitch-bot)
@@ -491,7 +494,8 @@ All of these awesome projects are built using the `chatgpt` package. 🤯
 - [ai-commit – GPT-3 Commit Message Generator](https://github.com/insulineru/ai-commit)
 - [AItinerary – ChatGPT itinerary Generator](https://aitinerary.ai)
 - [wechaty-chatgpt - A chatbot based on Wechaty & ChatGPT](https://github.com/zhengxs2018/wechaty-chatgpt)
-- [Julius GPT](https://github.com/christophebe/julius-gpt) : Generate and publish your content from the command line with the help of AI (GPT).
+- [Julius GPT](https://github.com/christophebe/julius-gpt) - Generate and publish your content from the CLI
+- [OpenAI-API-Service](https://github.com/Jarvan-via/api-service) - Provides OpenAI related APIs for businesses
 
 If you create a cool integration, feel free to open a PR and add it to the list.