1, migrate to mysql. 2, support docker-compose

2023-04-18 02:35:35 +08:00
12 changed files with 61 additions and 166 deletions
--- a/README.md
+++ b/README.md
@ -1,9 +0,0 @@
-https://chat.w-q.top:520
-
-OpenAI官方API的套壳网站。
-
-试图规避ChatGPT的使用门槛，把科技带给更多人。
-
-雷锋同志做好事从不留名。
-
-如果一定要一个姓名，请叫我Prometheus.
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@ -0,0 +1,33 @@
+version: '3'
+
+volumes:
+  web-gpt:
+  db:
+
+
+services:
+  web-gpt:
+    image: web-gpt
+    restart: always
+    depends_on:
+      - db
+    build:
+      context: .
+
+    volumes:
+      - ./instance:/web-gpt/instance
+
+    ports:
+      - 5000:5000
+
+  db:
+    image: mariadb
+    restart: always
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    volumes:
+      - ./db:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=
+      - MYSQL_PASSWORD=
+      - MYSQL_DATABASE=web-gpt
+      - MYSQL_USER=web-gpt
--- a/instance/config.yaml
+++ b/instance/config.yaml
@ -1,16 +1,15 @@
 app:
-  NAME: web-gpt
+  NAME: APP_NAME
  SECRET_KEY: SOME_RANDOM_STRING
  HOMEPAGE_NOTICE: |
    1. 此网站基于openAI的API提供服务
-    2. 为了支持多轮对话，历史聊天会保存在服务端
-    3. 网站不做关键词过滤，但请不要违反相关法律
-    4. GPT生成的任何内容不保证准确性，请自行甄别
-    5. 项目仓库如下，欢迎提交代码
-    https://gitea.w-q.top:520/wangjiacai/web-gpt
+    2. 为了限制滥用，注册后需要管理员激活才能使用
+    3. 为了支持多轮对话，历史聊天会保存在服务端
+    4. 网站不做关键词过滤，但请不要违反相关法律
+    5. GPT生成的任何内容不保证准确性，请自行甄别

-  SQLALCHEMY_DATABASE_URI: sqlite:///sqlite.db
-  # SQLALCHEMY_DATABASE_URI: mysql://username:password@server/db
+  # SQLALCHEMY_DATABASE_URI: sqlite:///sqlite.db
+  SQLALCHEMY_DATABASE_URI: mysql+pymysql://web-gpt:@db/web-gpt
  
  # LOGGING_LEVEL: CRITICAL | FATAL | ERROR | WARN | WARNING | INFO | DEBUG | NOTSET
  LOGGING_LEVEL: INFO
@ -23,11 +22,3 @@ openai:
  API_KEY:
  MODEL_NAME: gpt-3.5-turbo
  PROMPT: 你是一个有用的人工智能助理，你尽力确保回答的准确性，避免给出误导信息。
-
-
-mail:
-  host:
-  port:
-  username:
-  from:
-  password:
--- a/project/init.py
+++ b/project/init.py
@ -7,6 +7,7 @@ import time
 import traceback
 import os
 import waitress
+import pymysql

 # init SQLAlchemy so we can use it later in our models
 db = SQLAlchemy()
@ -20,7 +21,6 @@ def create_app():
    print("config file path: ", config_file)
    with open(config_file) as config_file:
        conf = yaml.safe_load(config_file)
-        app.config['NAME'] = conf['app']['NAME']
        app.config['SECRET_KEY'] = conf['app']['SECRET_KEY']
        app.config['LOGGING_LEVEL'] = conf['app']['LOGGING_LEVEL']
        app.config['SQLALCHEMY_DATABASE_URI'] = conf['app']['SQLALCHEMY_DATABASE_URI']
@ -29,9 +29,6 @@ def create_app():
        app.config['OPENAI_API_KEY'] = conf['openai']['API_KEY']
        app.config['OPENAI_MODEL_NAME'] = conf['openai']['MODEL_NAME']
        app.config['OPENAI_PROMPT'] = conf['openai']['PROMPT']
-        app.config['mail'] = conf['mail']
-
-        app.add_template_global(app.config['NAME'], "web_title")

    db.init_app(app)
    login_manager = LoginManager()
--- a/project/auth.py
+++ b/project/auth.py
@ -1,38 +1,14 @@
 from flask_login import login_user, logout_user
-from flask import Blueprint, render_template, redirect, url_for, request, flash, current_app
+from flask import Blueprint, render_template, redirect, url_for, request, flash
 from werkzeug.security import generate_password_hash, check_password_hash
 from flask_login import login_required, current_user, login_manager
 from .models import User, Conversation
 from . import db
 import time
-import hashlib

 auth = Blueprint('auth', __name__)


-def hash_to_digit(instr: str) -> str:
-    outstr = hashlib.md5(instr.encode('utf-8')).hexdigest()
-    outstr = f"{int(outstr, 16) % 1000000:0>6d}"
-    return outstr
-
-
-def gen_activation_code(email:  str) -> str:
-    current_time_slot = int(time.time() // 60)
-    s = email + current_app.config['SECRET_KEY'] + str(current_time_slot)
-    activation_code = hash_to_digit(s)
-    return activation_code
-
-
-def check_activation_code(email: str, activation_code: str) -> bool:
-    current_time_slot = int(time.time() // 60)
-    for time_slot in range(current_time_slot-10, current_time_slot+1):
-        s = email + current_app.config['SECRET_KEY'] + str(time_slot)
-        expected_code = hash_to_digit(s)
-        if expected_code == activation_code:
-            return True
-    return False
-
-
@auth.route('/login')
 def login():
    return render_template('login.html')
@ -59,22 +35,6 @@ def login_post():
    return redirect(url_for('main.index'))


-@auth.route('/activate', methods=['POST'])
-@login_required
-def activate():
-    activation_code = request.form.get('activation_code')
-    if check_activation_code(current_user.email, activation_code):
-        account = User.query.filter_by(
-            id=current_user.id, email=current_user.email, name=current_user.name).first()
-        if account:
-            if db.session.query(User).filter(User.id == account.id).update({"isActivated": True}) and not db.session.commit():
-                time.sleep(0.05)
-                return redirect(url_for('main.index'))
-    time.sleep(1)
-    flash("激活码不匹配")
-    return redirect(url_for('main.index'))
-
-
@auth.route('/signup')
 def signup():
    return render_template('signup.html')
@ -93,12 +53,12 @@ def signup_post():
        flash('此邮箱已注册！')
        return redirect(url_for('auth.signup'))
    if not (email):
-        flash('请输入邮箱！')
+        flash('Email missing!')
        return redirect(url_for('auth.signup'))
    if not (name):
        name = email
    if not (password):
-        flash('请输入密码')
+        flash('Password missing!')
        return redirect(url_for('auth.signup'))
    # create a new user with the form data. Hash the password so the plaintext version isn't saved.
    new_user = User(email=email,
@ -114,14 +74,6 @@ def signup_post():
    # add the new user to the database
    db.session.add(new_user)
    db.session.commit()
-
-    activation_code = gen_activation_code(new_user.email)
-    from . import smtp
-    content = f"Hi {new_user.name}，欢迎注册！\n"
-    content += f"您的激活码是：\n{activation_code}\n\n"
-    content += "此激活码十分钟内有效，过期请联系管理员激活，谢谢！"
-    smtp.sendmail(new_user.email, "web-gpt激活码", content)
-
    return redirect(url_for('auth.login'))


--- a/project/main.py
+++ b/project/main.py
@ -4,13 +4,9 @@ from .models import User, Conversation
 from . import db
 from datetime import datetime, timedelta
 import openai
-import logging
-import time

 main = Blueprint('main', __name__)

-logger = logging.getLogger('waitress')
-

@main.route('/')
 def index():
@ -103,11 +99,8 @@ def chat_post():
                messages=messages
            )
            msg_resp = openai_resp['choices'][0]['message']['content']
-        except Exception as e:
-            logger.error("OpenAI API request failed: %s", repr(e))
-            msg_resp = "请求错误，请尝试重发。如果持续错误，请联系管理员检查。" + "\n"+"错误信息: " + repr(e)
-            time.sleep(1)
-
+        except:
+            msg_resp = "请求错误，请尝试重发。如果持续错误，请联系管理员检查。"
        if msg_resp:
            response = {"message": msg_resp, "status": "success"}
        else:
--- a/project/models.py
+++ b/project/models.py
@ -18,6 +18,6 @@ class Conversation(db.Model):
    userid = db.Column(db.Integer)
    useremail = db.Column(db.String(100), nullable=False)
    username = db.Column(db.String(100), nullable=False)
-    request = db.Column(db.String(10000))
-    response = db.Column(db.String(10000))
+    request = db.Column(db.TEXT)
+    response = db.Column(db.TEXT)
    datetime = db.Column(db.DateTime, server_default=func.now())
--- a/project/requirements.txt
+++ b/project/requirements.txt
@ -2,6 +2,7 @@ Flask==2.2.3
 Flask_Login==0.6.2
 flask_sqlalchemy==3.0.3
 openai==0.27.2
+PyMySQL==1.0.3
 PyYAML==6.0
 SQLAlchemy==2.0.7
 waitress==2.1.2
--- a/project/smtp.py
+++ b/project/smtp.py
@ -1,31 +0,0 @@
-import smtplib
-import logging
-import email
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
-from email.header import Header
-from flask import current_app
-
-mail_config = current_app.config['mail']
-logger = logging.getLogger('waitress')
-
-
-def sendmail(to: str, subject: str, message: str):
-    if not (mail_config['username'] and mail_config['password']):
-        logger.error("smtp email account is not configured")
-    mail = MIMEMultipart('alternative')
-    mail['Subject'] = Header(subject).encode()
-    mail['From'] = '%s <%s>' % (
-        Header(mail_config['from']).encode(), mail_config['username'])
-    mail['To'] = to
-    mail['Message-id'] = email.utils.make_msgid()
-    mail['Date'] = email.utils.formatdate()
-
-    mail.attach(MIMEText(message, "plain"))
-    try:
-        smtp = smtplib.SMTP_SSL(mail_config['host'], int(mail_config['port']))
-        smtp.login(mail_config['username'], mail_config['password'])
-        smtp.sendmail(mail_config['username'], to, mail.as_string())
-    except Exception as e:
-        logger.error("sendmail error: %s", repr(e))
-    smtp.quit()
--- a/project/templates/base.html
+++ b/project/templates/base.html
@ -6,13 +6,12 @@
    <meta charset="utf-8"/>
    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
    <meta name="viewport" content="width=device-width, initial-scale=1"/>
-    <title>{{ web_title }}</title>
-    <link rel="shortcut icon"
-          href="{{ url_for('static', filename='favicon.ico') }}"/>
+    <title>Flask</title>
+    <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}"/>
    <link rel="stylesheet"
          href="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/css/bootstrap.min.css"/>
-    <link href="https://cdn.staticfile.org/bulma/0.9.4/css/bulma.min.css"
-          rel="stylesheet"/>
+    <link rel="stylesheet"
+          href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.2/css/bulma.min.css"/>
    <script src="https://cdn.staticfile.org/jquery/2.1.1/jquery.min.js"></script>
    <script src="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
  </head>
--- a/project/templates/chat.html
+++ b/project/templates/chat.html
@ -7,16 +7,11 @@
        </ul>
      </div>
      <div class="fixed-bottom form-inline">
-        <textarea id="msgbox"
-                  class="form-control"
-                  style="width:85%;
-                         float: left;
-                         margin-bottom: 20px"
-                  placeholder="说点什么吧"></textarea>
+        <textarea id="msgbox" class="form-control" style="width:85%; float: left; margin-bottom: 20px;" placeholder="说点什么吧"></textarea>
        <button id="btn-send"
                class="btn btn-info"
                type="button"
-                style="width: 10%"
+                style="width: 10%;"
                onclick="send_message()"
                disabled>
          <svg xmlns="http://www.w3.org/2000/svg"
@ -42,14 +37,8 @@
              btn_send.disabled = true;
            }
        });
-
-        var textarea = document.getElementById("msgbox")
-        textarea.addEventListener('keydown', function(e) {
-          if (e.ctrlKey && e.keyCode == 13) {
-            send_message()
-          }
-        });
-
+      </script>
+      <script>
        function get_history() {
          var msgs
          $.ajax({
--- a/project/templates/index.html
+++ b/project/templates/index.html
@ -7,36 +7,13 @@
      你好，游客！
    {% endif %}
  </h2>
-  {% with messages = get_flashed_messages() %}
-    {% if messages %}<div class="notification is-danger">{{ messages[0] }}</div>{% endif %}
-  {% endwith %}
  {% if user and user.is_authenticated %}
    {% if user.isActivated %}
      <a href="{{ url_for('main.chat') }}">
        <button type="button" class="btn btn-primary">开始聊天</button>
      </a>
    {% else %}
-      <div class="column is-4 is-offset-4">
-        <div class="box">
-          <p class="text-warning">您的账号暂未激活。</p>
-          <p class="text-warning">如未收到激活码邮件，请联系管理员处理</p>
-          <br/>
-          <form method="post" action="{{ url_for('auth.activate') }}">
-            <div class="field">
-              <div class="control">
-                <input class="input is-large"
-                       type="text"
-                       name="activation_code"
-                       placeholder="激活码"
-                       autofocus=""
-                       required="required"/>
-              </div>
-            </div>
-            <button class="button is-block is-info is-large is-fullwidth">激活</button>
-          </form>
-
-        </div>
-      </div>
+      <p class="text-warning">您的账号暂未激活，请等待管理员激活此账号。</p>
    {% endif %}
  {% else %}
    <a href="{{ url_for('auth.login') }}">
@ -47,6 +24,9 @@
      <button type="button" class="btn btn-default">注册</button>
    </a>
  {% endif %}
+  {% with messages = get_flashed_messages() %}
+    {% if messages %}<div class="notification is-danger">{{ messages[0] }}</div>{% endif %}
+  {% endwith %}
  <div id="homepage-notice" class="row" style="margin-top: 100px;">
    {% if homepage_notice %}
      <h3 class="subtitle">公告栏</h3>