s

templates/index.html

@@ -64,4 +64,11 @@
 
 {% block extra_scripts %}
 <script src="{{ url_for('static', filename='js/home_page.js') }}"></script>
+<script>
+document.getElementById('essayForm').addEventListener('submit', function(e) {
+    // This ensures the form submits properly in all environments
+    e.preventDefault();
+    this.submit();
+});
+</script>
 {% endblock %}

views/infer.py

@@ -1,127 +1,34 @@
-# from flask import render_template, session, request, redirect, url_for, flash
-# from . import infer_bp
-# import secrets
-# from database import History, db
-# from flask_login import current_user
-# from inference.infer_single import * 
-# from utils.util_func import *
-# @infer_bp.route('/infer', methods=['GET'])
-# def infer():
-#     print("Infer function entered", flush=True)
-#     scores = session.get('scores', [])
-#     topic = session.get('topic', "")
-#     essay = session.get('essay', "")
-#     feedback = session.get('feedback', {}) or {}
-#     feedback = dict(feedback)
-#     print("Feedback:", feedback, flush=True)
-#     tr_feedback = feedback.get('TR_feedback', 'No feedback available. Your essay does not make sense, try to refine it.')
-#     cc_feedback = feedback.get('CC_feedback', 'No feedback available. Your essay does not make sense, try to refine it.')
-#     lr_feedback = feedback.get('LR_feedback', 'No feedback available. Your essay does not make sense, try to refine it.')
-#     gra_feedback = feedback.get('GRA_feedback', 'No feedback available. Your essay does not make sense, try to refine it.')
-#     corrected_essay = feedback.get('Corrected_essay', "No suggestions available. Your essay does not make sense, try to refine it.")
-#     essay = essay.replace('\n', '<br>')
-#     corrected_essay = corrected_essay.replace('\\n\\n', '\\n').replace('\\n', '<br>')
-#     print("Essay:", essay, flush=True)
-#     print("Corrected essay:", corrected_essay, flush=True)
-#     print("Feedback:", feedback, flush=True)
-#     print("Scores:", scores, flush=True)
-#     print("Topic:", topic, flush=True)
-#     print("Everything loaded", flush=True)
-#     try:
-#         return render_template('infer.html', result=scores, topic=topic, essay=essay, tr=tr_feedback, cc=cc_feedback, lr=lr_feedback, gra=gra_feedback, corrected_essay=corrected_essay)
-#     except Exception as e:
-#         print(e, flush=True)
-#         return render_template('error.html', error=str(e)), 500
-        
-
-# @infer_bp.route('/', methods=['GET', 'POST'])
-# def index():
-#     set_seed(42)
-#     if request.method == 'POST':
-#         topic = request.form['topic'].strip()
-#         essay = request.form['essay'].strip()
-#         print("ESSAY TOPIC", essay, topic, flush=True)
-#         if not topic or not essay:
-#             flash('Please provide both a topic and an essay text.')
-#             return render_template('index.html', isempty='True')
-#         num_words = len(essay.split())
-#         if num_words < 20:
-#             session['scores'] = [1, 1, 1, 1]
-#             session['topic'] = topic
-#             session['essay'] = essay
-#             session['feedback'] = {}
-#             print("LESS THAN 20 WORDS", flush=True)
-#         else:
-#             scores, feedback = generate_and_score_essay(
-#                 topic, essay
-#             )
-#             session['scores'] = scores
-#             session['topic'] = topic
-#             session['essay'] = essay.replace('\\n', '\n')
-#             session['feedback'] = feedback or {}  # Ensure feedback is at least an empty dict
-#         session.modified = True
-#         if current_user.is_authenticated:
-#             scores = [int(score) for score in session['scores']]
-#             new_history = History(
-#                 user_id=current_user.id,
-#                 topic=topic,
-#                 essay=essay,
-#                 score_tr=scores[0],
-#                 score_cc=scores[1],
-#                 score_lr=scores[2],
-#                 score_gra=scores[3]
-#             )
-#             db.session.add(new_history)
-#             db.session.commit()
-#         print("REDIRECT TO INFER", flush=True)
-#         return redirect(url_for('infer.infer'))
-#     return render_template('index.html', isempty='False', username=current_user.nickname if current_user.is_authenticated else '')
-
-
-from flask import render_template, request, redirect, url_for, flash, make_response
+from flask import render_template, request, redirect, url_for, flash
 from . import infer_bp
 from database import History, db
 from flask_login import current_user
 from inference.infer_single import *
 from utils.util_func import *
-from .cache import store_result, get_result
+import uuid
+
+# In-memory storage for results (works in Spaces)
+results_db = {}
 
-@infer_bp.route('/infer', methods=['GET'])
+@infer_bp.route('/infer')
 def infer():
-    cache_id = request.cookies.get('result_id')
-    if not cache_id:
-        flash('No essay results found. Please submit an essay first.')
-        return redirect(url_for('infer.index'))
-        
-    cached_data = get_result(cache_id)
-    if not cached_data:
-        flash('Results expired. Please submit your essay again.')
+    result_id = request.args.get('result_id')
+    
+    if not result_id or result_id not in results_db:
+        flash('No results found. Please submit an essay first.')
         return redirect(url_for('infer.index'))
     
-    # Process cached data
-    scores = cached_data['scores']
-    topic = cached_data['topic']
-    essay = cached_data['essay']
-    feedback = cached_data.get('feedback', {})
+    data = results_db[result_id]
     
-    tr_feedback = feedback.get('TR_feedback', 'No feedback available. Your essay does not make sense, try to refine it.')
-    cc_feedback = feedback.get('CC_feedback', 'No feedback available. Your essay does not make sense, try to refine it.')
-    lr_feedback = feedback.get('LR_feedback', 'No feedback available. Your essay does not make sense, try to refine it.')
-    gra_feedback = feedback.get('GRA_feedback', 'No feedback available. Your essay does not make sense, try to refine it.')
-    corrected_essay = feedback.get('Corrected_essay', "No suggestions available. Your essay does not make sense, try to refine it.")
-    essay = essay.replace('\n', '<br>')
-    corrected_essay = corrected_essay.replace('\\n\\n', '\\n').replace('\\n', '<br>')
-    print("Essay:", essay, flush=True)
-    print("Corrected essay:", corrected_essay, flush=True)
-    print("Feedback:", feedback, flush=True)
-    print("Scores:", scores, flush=True)
-    print("Topic:", topic, flush=True)
-    print("Everything loaded", flush=True)
-    try:
-        return render_template('infer.html', result=scores, topic=topic, essay=essay, tr=tr_feedback, cc=cc_feedback, lr=lr_feedback, gra=gra_feedback, corrected_essay=corrected_essay)
-    except Exception as e:
-        print(e, flush=True)
-        return render_template('error.html', error=str(e)), 500
+    return render_template('infer.html',
+        result=data['scores'],
+        topic=data['topic'],
+        essay=data['essay'].replace('\n', '<br>'),
+        corrected_essay=data['feedback'].get('Corrected_essay', '').replace('\n', '<br>'),
+        tr=data['feedback'].get('TR_feedback', ''),
+        cc=data['feedback'].get('CC_feedback', ''),
+        lr=data['feedback'].get('LR_feedback', ''),
+        gra=data['feedback'].get('GRA_feedback', '')
+    )
 
 @infer_bp.route('/', methods=['GET', 'POST'])
 def index():
@@ -134,10 +41,12 @@ def index():
             flash('Please provide both a topic and an essay text.')
             return render_template('index.html', isempty='True')
             
-        num_words = len(essay.split())
+        # Generate unique ID for this submission
+        result_id = str(uuid.uuid4())
         
-        if num_words < 20:
-            result_data = {
+        # Process essay
+        if len(essay.split()) < 20:
+            results_db[result_id] = {
                 'scores': [1, 1, 1, 1],
                 'topic': topic,
                 'essay': essay,
@@ -151,38 +60,32 @@ def index():
             }
         else:
             scores, feedback = generate_and_score_essay(topic, essay)
-            result_data = {
+            results_db[result_id] = {
                 'scores': scores,
                 'topic': topic,
                 'essay': essay.replace('\\n', '\n'),
                 'feedback': feedback or {}
             }
         
-        # Store in cache and set cookie
-        cache_id = store_result(result_data)
-        response = make_response(redirect(url_for('infer.infer')))
-        response.set_cookie('result_id', cache_id, max_age=3600)  # 1 hour expiry
-        
         # Save to database if authenticated
         if current_user.is_authenticated:
-            scores = [int(score) for score in result_data['scores']]
             new_history = History(
                 user_id=current_user.id,
                 topic=topic,
                 essay=essay,
-                score_tr=scores[0],
-                score_cc=scores[1],
-                score_lr=scores[2],
-                score_gra=scores[3]
+                score_tr=int(results_db[result_id]['scores'][0]),
+                score_cc=int(results_db[result_id]['scores'][1]),
+                score_lr=int(results_db[result_id]['scores'][2]),
+                score_gra=int(results_db[result_id]['scores'][3])
             )
             db.session.add(new_history)
             db.session.commit()
-            
-        return response
+        
+        # Redirect to infer page with result_id in URL
+        return redirect(url_for('infer.infer', result_id=result_id))
         
     return render_template('index.html', isempty='False',
                          username=current_user.nickname if current_user.is_authenticated else '')
-
 @infer_bp.route('/rubric_explanation')
 def rubric_explanation():
     return render_template('rubric_explanation.html')