The answer and the feedback to the answer are stored in persistent storage.

main.py

@@ -26,9 +26,18 @@ HF_DATASET_AUTH_TOKEN = os.environ.get('HF_DATASET_AUTH_TOKEN', "none")
 
 LOCAL_STORAGE_PATH = ""
 
-FILE_EVENTS = f"events-{datetime.utcnow()}-{uuid4()}.jsonl"
+datetime_now = datetime.isoformat(datetime.utcnow())
+
+FILE_EVENTS_NAME = f"events-{datetime_now}-{uuid4()}.jsonl"
+FILE_SUBMITTED_NAME = f"submitted-{datetime_now}-{uuid4()}.jsonl"
 
 if "localhost" in SPACE_HOST:
+    IS_LOCALHOST = True
+else:
+    IS_LOCALHOST = False
+
+
+if IS_LOCALHOST:
     DATABASE_NAME = "data/sessions_meta.db"
     LOCAL_STORAGE_PATH = Path("data/persistent/")
     pathlib.Path(DATABASE_NAME).unlink(missing_ok=True)
@@ -39,7 +48,8 @@ else:
 
 
 LOCAL_STORAGE_PATH.mkdir(exist_ok=True, parents=True)
-EVENTS_FILE_PATH = LOCAL_STORAGE_PATH / FILE_EVENTS
+EVENTS_FILE_PATH = LOCAL_STORAGE_PATH / FILE_EVENTS_NAME
+SUBMITTED_FILE_PATH = LOCAL_STORAGE_PATH / FILE_SUBMITTED_NAME
 
 
 scheduler = None
@@ -74,8 +84,8 @@ session_state_table = global_database_tables.session_state
 if session_state_table not in global_database_tables:
     # session_id stored in cookies
     # see EVAL_STATUS_x below for state
-    session_state_table.create(id=int, session_id=str, state=int, submitted=datetime,
-                               completed=datetime, current_qeval=int, pk='id',)
+    session_state_table.create(id=int, session_id=str, state=int, submitted_date=str, evaluated_date=str,
+                               current_qeval=int, pk='id',)
                                # Can't really nail the fk specs
                                # foreign_keys=[("current_qeval", question_evaluation_table, "id")])
 Session_State_cls = session_state_table.dataclass()
@@ -96,7 +106,7 @@ HTML_SUBMIT_FEEDBACK = "submit_feedback"
 
 hdrs = (HighlightJS(langs=['python', 'javascript', 'html', 'css']),)
 
-if "localhost" in SPACE_HOST:
+if IS_LOCALHOST:
     # Are we hacking locally?
     print("Localhost detected in SPACE_HOST. App started in debug+live mode!")
     app, rt = fast_app(debug=True, live=True, hdrs=hdrs)
@@ -108,7 +118,13 @@ else:
 ################# STORAGE
 
 def untyped_save_to_storage(dc, filename):
-    if scheduler is None: return
+    if scheduler is None and IS_LOCALHOST:
+        # this is on local system, dump without checking for backup strategy
+        # TODO duplicate code, refactor!
+        js_str = json.dumps(dataclasses.asdict(dc)) + "\n"
+        with open(filename, "a") as f:
+            f.write(js_str)
+        return
     with scheduler.lock:
         js_str = json.dumps(dataclasses.asdict(dc)) + "\n"
         with open(filename, "a") as f:
@@ -120,26 +136,34 @@ def save_to_storage(nav_event:storage.NavigationEvent):
     untyped_save_to_storage(nav_event, EVENTS_FILE_PATH)
 
 
+@typedispatch
+def save_to_storage(eval_event:storage.CodeSubmittedEvent):
+    untyped_save_to_storage(eval_event, SUBMITTED_FILE_PATH)
+
+
+
+########## EVALUATION FEEDBACK
+
 
 def validate_and_get_question_evaluation_objectid(session, qe_id:int):
     if 'session_id' not in session:
         print("validate_and_get_question_evaluation_objectid bad session data")
-        return None
+        return False, None, None
     session_id = session["session_id"]
     state_rows = session_state_table(limit=1, where=f"session_id == '{session_id}'", order_by="id DESC")
     if len(state_rows) <= 0:
         print("validate_and_get_question_evaluation_objectid there is no state")
-        return False, None
+        return False, None, None
     answer_id = state_rows[0].current_qeval
     qa_obj_row = question_evaluation_table(limit=1, where=f"id == {answer_id}")
     if len(qa_obj_row) <= 0:
         print("validate_and_get_question_evaluation_objectid There is no answer recorded")
-        return False, None
+        return False, None, None
     qe_obj = qa_obj_row[0]
     if qe_id != qe_obj.id:
         print("validate_and_get_question_evaluation_objectid QE {qe_id} does not belong to {qe_obj.id}")
-        return False, None
-    return True, qe_obj
+        return False, None, None
+    return True, qe_obj, state_rows[0]
 
 
 def html_create_feedback_updown_button(qe_id, ans_id, selected=0, disabled=False):
@@ -191,7 +215,7 @@ def get(session, qe_id:int, ans_id:int, which:int):
         return None
     print(f"{qe_id=} {ans_id=} {which=}")
 
-    is_ok, qe_obj = validate_and_get_question_evaluation_objectid(session, qe_id)
+    is_ok, qe_obj, session_obj = validate_and_get_question_evaluation_objectid(session, qe_id)
     if not is_ok:
         print("toggle_up_down made session/object error")
         return "Error"
@@ -228,24 +252,36 @@ def html_get_textual_feedback_form(qe_obj, thank=False):
 
 @rt("/submit_feedback/{qe_id}")
 def post(session, qe_id:int, freeform_feedback:str):
-    # Update the object
-    # session_id = session.get("session_id", "Not set")
-    # save_to_storage(
-    #     storage.NavigationEvent(event_type="/submit_feedback", event_session_id=session_id,
-    #                             event_params={"qe_id":qe_id})
-    # )
-    is_ok, qe_obj = validate_and_get_question_evaluation_objectid(session, qe_id)
+    is_ok, qe_obj, session_obj = validate_and_get_question_evaluation_objectid(session, qe_id)
     if not is_ok:
         print("submit_feedback made session/object error")
         return "Error"
 
+    # Update the object
+    session_id = session.get("session_id", "Not set")
+    save_to_storage(
+        storage.NavigationEvent(event_type="/submit_feedback", event_session_id=session_id,
+                                event_params={"qe_id":qe_id})
+    )
+
     answer_eval_js = json.loads(qe_obj.answer_eval_text)
     answer_eval_js[0]["explanation"] = freeform_feedback
     qe_obj.submitted = True
+    qe_obj.answer_eval_text = json.dumps(answer_eval_js)
     question_evaluation_table.upsert(qe_obj)
+
+    save_to_storage(
+        storage.CodeSubmittedEvent(event_session_id=session["session_id"], db_question_evaluation_id=qe_obj.id,
+                                   submitted_date=session_obj.submitted_date,
+                                   received_date=session_obj.evaluated_date,
+                                   code_to_eval=qe_obj.code_text, evaluation_response=qe_obj.answer_eval_text,
+                                   has_feedback=True, feedback_date=datetime.isoformat(datetime.utcnow()))
+    )
+
     return html_get_textual_feedback_form(qe_obj, thank=True)
 
 
+#######  EVALUATE CODE
 
 def html_format_code_review_form(qe_obj, html_id=""):
     """
@@ -296,6 +332,12 @@ def html_error_results(message, html_id):
     div = Div(P("There was an error:", P(message)), id=html_id)
     return div
 
+
+def html_render_code_output(code):
+    txtarea = Pre(Code(code))
+    return txtarea
+
+
 def html_render_answer_from_db(session_id, html_id):
     eval_request_status, state_obj = get_latest_eval_request_status(session_id)
     # state_rows = session_state_table(limit=1, where=f"session_id == '{session_id}'", order_by="id DESC")
@@ -344,24 +386,36 @@ def call_gpt_and_store_result(session_obj_id, code_to_check):
         enhanced_answer = eval_code.eval_the_piece_of_c_code(openai_client=None, ccode=code_to_check)
 
         # we create a new QA entry.
-        qa_obj = Question_Evaluation_cls(code_text=code_to_check, answer_eval_text=enhanced_answer, submitted=0)
-        qa_obj = question_evaluation_table.insert(qa_obj)
-        local_sess_obj.current_qeval = qa_obj.id
+        qe_obj = Question_Evaluation_cls(code_text=code_to_check, answer_eval_text=enhanced_answer, submitted=0)
+        qe_obj = question_evaluation_table.insert(qe_obj)
+        local_sess_obj.current_qeval = qe_obj.id
 
-        # TODO save the outcome in a table, where it will be backed-up later. SqlLite is volatile.
+        evaluation_date = datetime.isoformat(datetime.utcnow())
+
+        # save to persistent storage
+        save_to_storage(
+            storage.CodeSubmittedEvent(event_session_id=local_sess_obj.session_id, db_question_evaluation_id=qe_obj.id,
+                                       submitted_date=local_sess_obj.submitted_date,
+                                       received_date=evaluation_date,
+                                       code_to_eval=code_to_check, evaluation_response=json.dumps(enhanced_answer))
+        )
+
+        # Update the session object.
 
         if "error" in enhanced_answer:
             local_sess_obj.state = EVAL_STATE_ERROR
             local_sess_obj.answer = enhanced_answer["error"]
-            local_sess_obj.completed = datetime.utcnow()
+            local_sess_obj.evaluated_date = evaluation_date
         else:
             local_sess_obj.state = EVAL_STATE_ANSWER
-            local_sess_obj.completed = datetime.utcnow()
+            local_sess_obj.evaluated_date = evaluation_date
         local_sess_state.update(local_sess_obj)
     except:
         import traceback
         traceback.print_exc()
 
+########  CODE INPUT FORM
+
 
 def html_render_inputbox(target_html_id, region_html_id):
     txtarea = Textarea(id="ccodetoeval", name="ccodetoeval", placeholder="Enter a piece of C code", rows=3)
@@ -372,14 +426,6 @@ def html_render_inputbox(target_html_id, region_html_id):
                 )
     return Div(form, id=region_html_id, hx_swap_oob='true')
 
-def html_render_code_output(code):
-    txtarea = Pre(Code(code))
-    return txtarea
-
-
-def render_conditional_inputbox_results(session_id):
-    eval_request_status, _ = get_latest_eval_request_status(session_id)
-    pass
 
 ##########  CLEAR FORM
 
@@ -411,6 +457,9 @@ def get(session):
     if 'session_id' not in session:
         session['session_id'] = str(uuid.uuid4())
     session_id = session["session_id"]
+    if len(session_state_table(where=f"session_id=='{session_id}'")) <= 0:
+        # old session ID, "resetting".
+        session['session_id'] = str(uuid.uuid4())
     save_to_storage(
         storage.NavigationEvent(event_type="/", event_session_id=session_id)
     )
@@ -438,7 +487,6 @@ def get(session):
 #         session_id=session_id,
 #         state=EVAL_STATE_ANSWER,
 #         submitted=datetime.utcnow(),
-#         completed=datetime.utcnow(),
 #     )
 #
 #     # we create a new QA entry.
@@ -472,7 +520,7 @@ def post(session, ccodetoeval:str):
     session_obj = Session_State_cls(
         session_id=session_id,
         state=EVAL_STATE_QUERY,
-        submitted=datetime.utcnow(),
+        submitted_date=datetime.isoformat(datetime.utcnow()),
     )
     # we insert and we get the new primary key
     session_obj = session_state_table.insert(session_obj)
@@ -496,7 +544,7 @@ def get(session):
     session_obj = Session_State_cls(
         session_id=session_id,
         state=EVAL_STATE_NEW,
-        submitted=datetime.utcnow(),
+        submitted_date=datetime.isoformat(datetime.utcnow()),
     )
     session_state_table.insert(session_obj)
     # re-issue forms

storage.py

@@ -10,3 +10,19 @@ class NavigationEvent():
     event_session_id:str = ""
     event_params:dict=dataclasses.field(default_factory=dict)
 
+@dataclasses.dataclass(slots=True)
+class CodeSubmittedEvent():
+    version:int = 1
+    submitted_date: str = datetime.isoformat(datetime.utcnow())
+    received_date: str = datetime.isoformat(datetime.utcnow())
+    event_session_id:str = ""
+    db_question_evaluation_id:int = 0
+    code_to_eval:str = ""
+    evaluation_engine:str = "chatGPT"
+    prompt_version:int = 1
+    evaluation_response:str = ""
+    has_feedback:bool = False
+    feedback_date:str = ""
+
+
+

test/test_eval_code.py

@@ -1,4 +1,5 @@
 import pytest
+
 import eval_code
 
 TYPICAL_ANSWER = """[
@@ -24,5 +25,3 @@ def test_parse_chatgpt_answer():
     an_eval = ans[0]
     assert "criteria" in an_eval.keys()
     assert "explanation" in an_eval.keys()
-
-

test/test_storage.py

@@ -0,0 +1,29 @@
+from pathlib import Path
+import json
+
+import storage
+
+def test_loading_submitted():
+    sub_file = Path("../data/persistent/submitted-2024-08-14 07:16:27.351924-02978438-3a8a-413b-84f1-2d3198cba2f8.jsonl")
+    submits = []
+    with open(sub_file, "r") as f:
+        for line in f:
+            js_dict = json.loads(line)
+            piece = storage.CodeSubmittedEvent(**js_dict)
+            submits.append(piece)
+    assert len(submits) > 0
+    eval_obj = json.loads(submits[0].evaluation_response)
+    assert len(eval_obj) > 0
+
+def test_loading_submitted2():
+    sub_file = Path(
+        "../data/persistent/submitted-2024-08-14 07:42:05.411354-9030c34a-a31a-47ad-a399-1b0b0dbd6e33.jsonl")
+    submits = []
+    with open(sub_file, "r") as f:
+        for line in f:
+            js_dict = json.loads(line)
+            piece = storage.CodeSubmittedEvent(**js_dict)
+            submits.append(piece)
+    assert len(submits) > 0
+    eval_obj = json.loads(submits[0].evaluation_response)
+    assert len(eval_obj) > 0