gix

app.py

@@ -3,4 +3,4 @@ from create_app import create_app
 app = create_app()
 
 if __name__ == '__main__':
-    app.run(host="0.0.0.0", port=7860)
+    app.run(host="0.0.0.0", port=7860, debug=True)

create_app.py

@@ -17,6 +17,8 @@ LONGFORMER_MODEL = None
 QWEN_TOKENIZER = None
 QWEN_MODEL = None
 MODEL_SESSION = None
+TOKEN_STORE = {}
+LOGGED = False
 
 def load_models():
     global MODELS_LOADED, LONGFORMER_TOKENIZER, LONGFORMER_MODEL, QWEN_TOKENIZER, QWEN_MODEL

database.py

@@ -16,6 +16,13 @@ class User(UserMixin, db.Model):
     def check_password(self, password):
         return check_password_hash(self.password_hash, password)
 
+    def get_id(self):
+        return str(self.id)
+    
+    @property
+    def is_active(self):
+        return True
+
 class History(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     user_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False)

templates/login.html

@@ -17,7 +17,6 @@
             <button type="submit" class="btn btn-primary">Login</button>
         </div>
     </form>
-    <!-- Modal HTML -->
     <div class="modal fade" id="loginAlertModal" tabindex="-1" role="dialog" aria-labelledby="loginModalLabel" aria-hidden="true">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
@@ -28,7 +27,6 @@
                     </button>
                 </div>
                 <div class="modal-body">
-                    <!-- Message will be inserted here via JavaScript -->
                 </div>
             </div>
         </div>
@@ -47,3 +45,4 @@
     });
 </script>
 {% endblock %}
+

views/auth.py

@@ -2,6 +2,10 @@ from flask import render_template, request, redirect, url_for
 from flask_login import login_user, logout_user, login_required
 from . import auth_bp
 from database import User, db
+from create_app import *
+import secrets
+from flask import make_response
+
 
 @auth_bp.route('/register', methods=['GET', 'POST'])
 def register():
@@ -34,19 +38,26 @@ def login():
     if request.method == 'POST':
         email = request.form['email']
         password = request.form['password']
-        print(email, password, flush=True)
         user = User.query.filter_by(email=email).first()
-        print(user, flush=True)
+        
         if user and user.check_password(password):
-            print("LOGIN?", flush=True)
+            # Use Flask-Login's login_user
             login_user(user)
             
-            return redirect(url_for('dashboard.dashboard'))
+            # Generate token (if still needed for API calls)
+            token = secrets.token_urlsafe(32)
+            TOKEN_STORE[token] = user.id
+            
+            # Create response with token in cookie
+            response = make_response(redirect(url_for('dashboard.dashboard')))
+            response.set_cookie('auth_token', token, httponly=True, secure=True)
+            return response
         else:
             return render_template('login.html', message="Invalid email or password.")
     return render_template('login.html')
 
 
+
 @auth_bp.route('/logout')
 @login_required
 def logout():

views/dashboard.py

@@ -2,34 +2,33 @@ from flask import render_template, redirect, url_for, request, flash
 from flask_login import login_required, current_user
 from . import dashboard_bp
 from database import History, db
-
+from create_app import * 
 
 @dashboard_bp.route('/dashboard', defaults={'page': 1})
 @dashboard_bp.route('/dashboard/page/<int:page>')
-@login_required
+@login_required  # Use Flask-Login's decorator
 def dashboard(page):
+    # Get user ID from current_user (Flask-Login)
+    user_id = current_user.id
+    
     per_page = 10
-    pagination = History.query.filter_by(user_id=current_user.id).order_by(History.created_at.desc()).paginate(page=page, per_page=per_page, error_out=False)
+    pagination = History.query.filter_by(user_id=user_id).order_by(History.created_at.desc()).paginate(
+        page=page, per_page=per_page, error_out=False
+    )
     histories = pagination.items
 
-    scores_tr = [history.score_tr for history in histories]
-    scores_cc = [history.score_cc for history in histories]
-    scores_lr = [history.score_lr for history in histories]
-    scores_gra = [history.score_gra for history in histories]
-    creation_times = [history.created_at.strftime('%Y-%m-%d %H:%M:%S') for history in histories]
-
     return render_template(
         'dashboard.html',
         histories=histories,
         pagination=pagination,
-        scores_tr=scores_tr,
-        scores_cc=scores_cc,
-        scores_lr=scores_lr,
-        scores_gra=scores_gra,
-        creation_times=creation_times
+        scores_tr=[h.score_tr for h in histories],
+        scores_cc=[h.score_cc for h in histories],
+        scores_lr=[h.score_lr for h in histories],
+        scores_gra=[h.score_gra for h in histories],
+        creation_times=[h.created_at.strftime('%Y-%m-%d %H:%M:%S') for h in histories]
     )
+
 @dashboard_bp.route('/delete_histories', methods=['POST'])
-@login_required
 def delete_histories():
     history_ids = request.form.getlist('history_ids')
     History.query.filter(History.id.in_(history_ids), History.user_id == current_user.id).delete(synchronize_session=False)