Skip to content

Commit d7ec764

Browse files
author
yuan.wang
committed
fix bug in make pre_commit
1 parent 6a28893 commit d7ec764

File tree

8 files changed

+40
-21
lines changed

8 files changed

+40
-21
lines changed

evaluation/scripts/PrefEval/pref_memos.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from openai import OpenAI
1313
from tqdm import tqdm
1414

15+
1516
ROOT_DIR = os.path.dirname(
1617
os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
1718
)
@@ -20,13 +21,6 @@
2021
sys.path.insert(0, ROOT_DIR)
2122
sys.path.insert(0, EVAL_SCRIPTS_DIR)
2223

23-
from utils.pref_mem_utils import (
24-
add_pref_instruction,
25-
create_mem_string,
26-
remove_pref_mem_from_mem_string,
27-
)
28-
from utils.prompts import PREFEVAL_ANSWER_PROMPT
29-
3024

3125
load_dotenv()
3226
OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
@@ -78,6 +72,8 @@ def search_memory_for_line(line_data: tuple, mem_client, top_k_value: int) -> di
7872
"""
7973
Processes a single line of data, searching memory based on the question.
8074
"""
75+
from utils.pref_mem_utils import create_mem_string
76+
8177
i, line = line_data
8278
try:
8379
original_data = json.loads(line)
@@ -123,6 +119,9 @@ def generate_response_for_line(line_data: tuple, openai_client: OpenAI, lib: str
123119
"""
124120
Generates a response for a single line of data using pre-fetched memories.
125121
"""
122+
from utils.pref_mem_utils import add_pref_instruction, remove_pref_mem_from_mem_string
123+
from utils.prompts import PREFEVAL_ANSWER_PROMPT
124+
126125
i, line = line_data
127126
try:
128127
original_data = json.loads(line)

evaluation/scripts/locomo/locomo_responses.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import json
44
import os
55
import sys
6+
67
from time import time
78

89
import pandas as pd
@@ -12,6 +13,7 @@
1213
from prompts import ANSWER_PROMPT_MEM0, ANSWER_PROMPT_MEMOS, ANSWER_PROMPT_ZEP
1314
from tqdm import tqdm
1415

16+
1517
ROOT_DIR = os.path.dirname(
1618
os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
1719
)
@@ -34,6 +36,7 @@ async def locomo_response(frame, llm_client, context: str, question: str) -> str
3436
)
3537
else:
3638
from utils.pref_mem_utils import add_pref_instruction
39+
3740
template = add_pref_instruction(ANSWER_PROMPT_MEMOS, frame=frame)
3841
prompt = template.format(
3942
context=context,
@@ -53,6 +56,7 @@ async def locomo_response(frame, llm_client, context: str, question: str) -> str
5356

5457
async def process_qa(frame, qa, search_result, oai_client):
5558
from utils.pref_mem_utils import remove_pref_mem_from_mem_string
59+
5660
start = time()
5761
query = qa.get("question")
5862
gold_answer = qa.get("answer")

evaluation/scripts/locomo/locomo_search.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from dotenv import load_dotenv
1313
from tqdm import tqdm
1414

15+
1516
ROOT_DIR = os.path.dirname(
1617
os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
1718
)
@@ -21,7 +22,6 @@
2122
sys.path.insert(0, EVAL_SCRIPTS_DIR)
2223

2324

24-
2525
def mem0_search(client, query, speaker_a_user_id, speaker_b_user_id, top_k, speaker_a, speaker_b):
2626
from prompts import TEMPLATE_MEM0
2727

evaluation/scripts/personamem/pm_ingestion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def ingest_session(session, user_id, session_id, frame, client):
3737
client.add(messages=session, user_id=user_id, conv_id=session_id)
3838
print(f"[{frame}] ✅ Session [{session_id}]: Ingested {len(session)} messages")
3939
elif frame == "memobase":
40-
for idx, msg in enumerate(session):
40+
for _idx, msg in enumerate(session):
4141
if msg["role"] != "system":
4242
messages.append(
4343
{

evaluation/scripts/personamem/pm_metric.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def calculate_scores(data, grade_path, output_path):
8080
print(f"📋 Processing response data for {len(data)} users...")
8181

8282
# First pass: determine number of runs and initialize run accuracy arrays
83-
for user_id, user_data in data.items():
83+
for _user_id, user_data in data.items():
8484
# Skip incomplete data (users with only topic field)
8585
if len(user_data) <= 2 and "topic" in user_data:
8686
continue

evaluation/scripts/utils/pref_mem_utils.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
import os
22
import sys
3+
4+
35
sys.path.append(os.path.dirname(os.path.abspath(__file__)))
46
from prompts import PREF_INSTRUCTIONS
57

8+
69
def create_mem_string(relevant_memories) -> str:
710
text_memories = []
811
explicit = []
912
implicit = []
1013
for item in relevant_memories["text_mem"]:
1114
for mem in item["memories"]:
1215
text_memories.append(mem["memory"])
13-
text_memories_text = "\n".join(f"{i+1}. {mem}" for i, mem in enumerate(text_memories)).strip()
16+
text_memories_text = "\n".join(f"{i + 1}. {mem}" for i, mem in enumerate(text_memories)).strip()
1417
text_context = f"Plaintext Memory:\n{text_memories_text}\n" if text_memories_text else ""
1518

1619
for item in relevant_memories.get("prefs", []):
@@ -19,9 +22,9 @@ def create_mem_string(relevant_memories) -> str:
1922
explicit.append(mem["metadata"]["explicit_preference"])
2023
elif mem["metadata"]["preference_type"] == "implicit_preference":
2124
implicit.append(mem["metadata"]["implicit_preference"])
22-
explicit_text = "\n".join(f"{i+1}. {pref}" for i, pref in enumerate(explicit)).strip()
25+
explicit_text = "\n".join(f"{i + 1}. {pref}" for i, pref in enumerate(explicit)).strip()
2326
explicit_context = f"Explicit Preference:\n{explicit_text}\n" if explicit_text else ""
24-
implicit_text = "\n".join(f"{i+1}. {pref}" for i, pref in enumerate(implicit)).strip()
27+
implicit_text = "\n".join(f"{i + 1}. {pref}" for i, pref in enumerate(implicit)).strip()
2528
implicit_context = f"Implicit Preference:\n{implicit_text}\n" if implicit_text else ""
2629
return text_context + explicit_context + implicit_context
2730

src/memos/api/routers/server_router.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,13 @@ def _format_memory_item(memory_data: Any) -> dict[str, Any]:
266266

267267
return memory
268268

269-
def _post_process_pref_mem(memories_result: list[dict[str, Any]], pref_formatted_mem: list[dict[str, Any]], mem_cube_id: str, handle_pref_mem: bool):
269+
270+
def _post_process_pref_mem(
271+
memories_result: list[dict[str, Any]],
272+
pref_formatted_mem: list[dict[str, Any]],
273+
mem_cube_id: str,
274+
handle_pref_mem: bool,
275+
):
270276
if os.getenv("RETURN_ORIGINAL_PREF_MEM", "false").lower() == "true" and pref_formatted_mem:
271277
memories_result["prefs"] = []
272278
memories_result["prefs"].append(
@@ -279,9 +285,8 @@ def _post_process_pref_mem(memories_result: list[dict[str, Any]], pref_formatted
279285
if handle_pref_mem:
280286
pref_instruction: str = instruct_completion(pref_formatted_mem)
281287
memories_result["pref_mem"] = pref_instruction
282-
283-
return memories_result
284288

289+
return memories_result
285290

286291

287292
@router.post("/search", summary="Search memories", response_model=SearchResponse)
@@ -325,7 +330,7 @@ def _search_text():
325330
return [_format_memory_item(data) for data in results]
326331

327332
def _search_pref():
328-
if not os.getenv("ENABLE_PREFERENCE_MEMORY", "false").lower() == "true":
333+
if os.getenv("ENABLE_PREFERENCE_MEMORY", "false").lower() != "true":
329334
return []
330335
results = naive_mem_cube.pref_mem.search(
331336
query=search_req.query,
@@ -351,7 +356,9 @@ def _search_pref():
351356
}
352357
)
353358

354-
memories_result = _post_process_pref_mem(memories_result, pref_formatted_memories, search_req.mem_cube_id, search_req.handle_pref_mem)
359+
memories_result = _post_process_pref_mem(
360+
memories_result, pref_formatted_memories, search_req.mem_cube_id, search_req.handle_pref_mem
361+
)
355362

356363
return SearchResponse(
357364
message="Search completed successfully",
@@ -402,7 +409,7 @@ def _process_text_mem() -> list[dict[str, str]]:
402409
]
403410

404411
def _process_pref_mem() -> list[dict[str, str]]:
405-
if not os.getenv("ENABLE_PREFERENCE_MEMORY", "false").lower() == "true":
412+
if os.getenv("ENABLE_PREFERENCE_MEMORY", "false").lower() != "true":
406413
return []
407414
pref_memories_local = naive_mem_cube.pref_mem.get_memory(
408415
[add_req.messages],

src/memos/templates/instruction_completion.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,16 @@ def instruct_completion(
2121
implicit_pref.append(pref)
2222

2323
explicit_pref_str = (
24-
"Explicit Preference:\n" + "\n".join(f"{i+1}. {pref}" for i, pref in enumerate(explicit_pref)) if explicit_pref else ""
24+
"Explicit Preference:\n"
25+
+ "\n".join(f"{i + 1}. {pref}" for i, pref in enumerate(explicit_pref))
26+
if explicit_pref
27+
else ""
2528
)
2629
implicit_pref_str = (
27-
"Implicit Preference:\n" + "\n".join(f"{i+1}. {pref}" for i, pref in enumerate(implicit_pref)) if implicit_pref else ""
30+
"Implicit Preference:\n"
31+
+ "\n".join(f"{i + 1}. {pref}" for i, pref in enumerate(implicit_pref))
32+
if implicit_pref
33+
else ""
2834
)
2935

3036
if not explicit_pref_str and not implicit_pref_str:

0 commit comments

Comments
 (0)