priority change and clear memory bug

mongo_utils.py

@@ -102,41 +102,49 @@ def new_completion_error(client, comparison_id, username, model):
 def get_non_assesed_comparison(client, username):
     from bson.son import SON
     pipeline = [
-        {'$lookup': {
-            'from': DB_BATTLES, 
-            'localField': '_id', 
-            'foreignField': 'comparison_id', 
-            "pipeline": [
-                {"$match": {"username":username}},
-            ],
-            'as': 'battles'
-        }},
-        {'$lookup': {
-            'from': DB_CONVOS, 
-            'localField': 'convo_id', 
-            'foreignField': '_id', 
-            'as': 'convo_info'
-        }},
-        {"$match":{
-            "battles": {"$size":0},
-        }},
-        {"$addFields": {
-        "priority": {
+    {'$lookup': {
+        'from': DB_BATTLES, 
+        'localField': '_id', 
+        'foreignField': 'comparison_id', 
+        "pipeline": [
+            {"$match": {"username":username}},
+        ],
+        'as': 'battles'
+    }},
+    {'$lookup': {
+        'from': DB_CONVOS, 
+        'localField': 'convo_id', 
+        'foreignField': '_id', 
+        'as': 'convo_info'
+    }},
+    {"$match":{
+        "battles": {"$size":0},
+    }},
+    {"$addFields": {
+        "is_manual": {
             "$cond":[
                 {"$eq": ["$source","manual"]},
                 1,
                 0
             ]
             },
-        }},
-        {"$sort": SON([
-                ("priority", -1),
-                ("prompt_timestamp", 1),
-                ("convo_id", 1),
-            ])
+        "is_eval":{
+            "$cond":[
+                {"$eq": ["$subset","eval"]},
+                1,
+                0
+            ]
         },
-        {"$limit": 1}
-    ]
+        "priority": {"$sum": ["is_manual","is_eval"]}
+    }},
+    {"$sort": SON([
+            ("priority", -1),
+            ("prompt_timestamp", 1),
+            ("convo_id", 1),
+        ])
+    },
+    {"$limit": 1}
+]
 
     db = client[DB_SCHEMA]
     return list(db[DB_COMPLETIONS].aggregate(pipeline))

pages/comparisor.py

@@ -129,7 +129,7 @@ with st.sidebar:
     
     # regenA = sbcol1.button("Regenerate A", on_click=regenerateA)
     # regenB = sbcol2.button("Regenerate B", on_click=regenerateB)
-    clear = st.button("Clear History", on_click=clear_memory, args=(memories,))
+    clear = st.button("Clear History", on_click=clear_memory, kwargs={"memories":memories, "username":username, "language":language})
 
 memories = {
     'memoryA': {"issue": issue, "source": sourceA},