minor bug fixes

ChitChat/__init__.py

@@ -9,7 +9,7 @@ bcrypt = Bcrypt()
 def create_app(config_class = Config):
     app = Flask(__name__)
     CORS(app)
-    app.config.from_object(Config)
+    app.config.from_object(config_class)
     db.init_app(app)
     bcrypt.init_app(app)
 

ChitChat/common/utils.py

@@ -1,9 +1,10 @@
 from transformers import AutoTokenizer, AutoModelForCausalLM
 from transformers import T5Tokenizer, T5ForConditionalGeneration 
 import torch
-from flask import current_app
+from flask import current_app, session
 from ChitChat import db
-
+import numpy as np
+import pandas as pd
 
 small_model_name = 'Th3BossC/DialoGPT-medium-AICLUB_NITC'
 default_model = 'microsoft/DialoGPT-medium'
@@ -68,4 +69,4 @@ def complexChat(userInput):
                          top_k = 150,
                          top_p = 0.92,
                          repetition_penalty = 2.1)
-    return large_tokenizer.decode(outputs[0], skip_special_tokens = True)
+    return large_tokenizer.decode(outputs[0], skip_special_tokens = True)

ChitChat/config.py

@@ -1,4 +1,7 @@
+from datetime import timedelta
+
 class Config:
     SECRET_KEY = '7a2b25ca707a5be465f9a8894f528999'
     SQLALCHEMY_DATABASE_URI = 'sqlite:///site.db'
-    SAVE_FOLDER = 'ChitChat/common/files/'
+    SAVE_FOLDER = 'ChitChat/common/files/'
+    # PERMENANT_SESSION_LIFETIME = timedelta(minutes = 180)

ChitChat/resources/routes.py

@@ -1,25 +1,32 @@
-from flask import Blueprint, request, current_app
+from flask import Blueprint, request, session
 from flask_restful import Api, Resource 
 from ChitChat.models import User
 from ChitChat import bcrypt, db
 from ChitChat.common.utils import conversation, complexChat
-
+import secrets
 resources = Blueprint('resources', __name__)
 api = Api(resources)
 
 
 class UserLogin(Resource):
+    def get(self):
+        user_id = request.args.get('user_id')
+        return {'username' : User.query.get(int(user_id)).username}
+    
     def post(self):
         userInfo = request.json
         user = User.query.filter_by(username = userInfo['username']).first()
 
+        if user is None:
+            user = User.query.filter_by(email = userInfo['username']).first()
+
         if user is None:
             return {'status' : "Account doesn't exist", 'user_id' : None}
         elif bcrypt.check_password_hash(pw_hash = user.password, password = userInfo['password']):
             return {'status' : "login successful", 'user_id' : str(user.id)}
         else:
             return {'status' : "Invalid password", 'user_id' : None}
-api.add_resource(UserLogin, '/login/')
+api.add_resource(UserLogin, '/login')
 
 class RegisterUser(Resource):
     def post(self):
@@ -37,7 +44,7 @@ class RegisterUser(Resource):
         db.session.add(newUser)
         db.session.commit()
         return {'status' : 'User created successfully'} 
-api.add_resource(RegisterUser, '/register/')
+api.add_resource(RegisterUser, '/register')
 
 
 class ChatBot(Resource):
@@ -58,8 +65,3 @@ class ComplexChatBot(Resource):
         reply = complexChat(userInput)
         return {'reply' : reply}
 api.add_resource(ComplexChatBot, '/chat/smartbot/')
-        
-        
-        
-        
-