Skip to content

Commit 4af98e6

Browse files
NyakultNyakult
committed
format code
1 parent cdd9447 commit 4af98e6

File tree

5 files changed

+47
-63
lines changed

5 files changed

+47
-63
lines changed

‎evaluation/scripts/locomo/locomo_ingestion.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,34 +89,34 @@ def process_user(conv_idx, frame, locomo_df, version):
8989

9090
client = None
9191
if frame == "mem0" or frame == "mem0_graph":
92-
from utils.client import mem0_client
92+
from utils.client import mem0Client
9393

94-
client = mem0_client(enable_graph="graph" in frame)
94+
client = mem0Client(enable_graph="graph" in frame)
9595
client.client.update_project(custom_instructions=custom_instructions)
9696
client.client.delete_all(user_id=speaker_a_user_id)
9797
client.client.delete_all(user_id=speaker_b_user_id)
9898
elif frame == "memos-api":
99-
from utils.client import memos_api_client
99+
from utils.client import memosApiClient
100100

101-
client = memos_api_client()
101+
client = memosApiClient()
102102
elif frame == "memobase":
103-
from utils.client import memobase_client
103+
from utils.client import memobaseClient
104104

105-
client = memobase_client()
105+
client = memobaseClient()
106106
all_users = client.client.get_all_users(limit=5000)
107107
for user in all_users:
108108
if user["additional_fields"]["user_id"] in [speaker_a_user_id, speaker_b_user_id]:
109109
client.client.delete_user(user["id"])
110110
speaker_a_user_id = client.client.add_user({"user_id": speaker_a_user_id})
111111
speaker_b_user_id = client.client.add_user({"user_id": speaker_b_user_id})
112112
elif frame == "memu":
113-
from utils.client import memu_client
113+
from utils.client import memuClient
114114

115-
client = memu_client()
115+
client = memuClient()
116116
elif frame == "supermemory":
117-
from utils.client import supermemory_client
117+
from utils.client import supermemoryClient
118118

119-
client = supermemory_client()
119+
client = supermemoryClient()
120120
sessions_to_process = []
121121
for session_idx in range(max_session_count):
122122
session_key = f"session_{session_idx}"

‎evaluation/scripts/locomo/locomo_search.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -233,31 +233,31 @@ def process_user(conv_idx, locomo_df, frame, version, top_k=20, num_workers=1):
233233

234234
client = None
235235
if frame == "mem0" or frame == "mem0_graph":
236-
from utils.client import mem0_client
236+
from utils.client import mem0Client
237237

238-
client = mem0_client(enable_graph="graph" in frame)
238+
client = mem0Client(enable_graph="graph" in frame)
239239
elif frame == "memos-api":
240-
from utils.client import memos_api_client
240+
from utils.client import memosApiClient
241241

242-
client = memos_api_client()
242+
client = memosApiClient()
243243
elif frame == "memobase":
244-
from utils.client import memobase_client
244+
from utils.client import memobaseClient
245245

246-
client = memobase_client()
246+
client = memobaseClient()
247247
users = client.client.get_all_users(limit=5000)
248248
for u in users:
249249
if u["additional_fields"]["user_id"] == speaker_a_user_id:
250250
speaker_a_user_id = u["id"]
251251
if u["additional_fields"]["user_id"] == speaker_b_user_id:
252252
speaker_b_user_id = u["id"]
253253
elif frame == "memu":
254-
from utils.client import memu_client
254+
from utils.client import memuClient
255255

256-
client = memu_client()
256+
client = memuClient()
257257
elif frame == "supermemory":
258-
from utils.client import supermemory_client
258+
from utils.client import supermemoryClient
259259

260-
client = supermemory_client()
260+
client = supermemoryClient()
261261

262262
metadata = {
263263
"speaker_a": speaker_a,

‎evaluation/scripts/longmemeval/lme_ingestion.py‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from datetime import datetime, timezone
66
import pandas as pd
77
from tqdm import tqdm
8+
89
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
910

1011

@@ -67,31 +68,31 @@ def ingest_conv(lme_df, version, conv_idx, frame, success_records, f):
6768
print("=" * 80)
6869

6970
if frame == "mem0" or frame == "mem0_graph":
70-
from utils.client import mem0_client
71+
from utils.client import mem0Client
7172

72-
client = mem0_client(enable_graph="graph" in frame)
73+
client = mem0Client(enable_graph="graph" in frame)
7374
client.client.delete_all(user_id=user_id)
7475
elif frame == "memos-api":
75-
from utils.client import memos_api_client
76+
from utils.client import memosApiClient
7677

77-
client = memos_api_client()
78+
client = memosApiClient()
7879
elif frame == "memobase":
79-
from utils.client import memobase_client
80+
from utils.client import memobaseClient
8081

81-
client = memobase_client()
82+
client = memobaseClient()
8283
all_users = client.client.get_all_users(limit=5000)
8384
for user in all_users:
8485
if user["additional_fields"]["user_id"] == user_id:
8586
client.client.delete_user(user["id"])
8687
user_id = client.client.add_user({"user_id": user_id})
8788
elif frame == "memu":
88-
from utils.client import memu_client
89+
from utils.client import memuClient
8990

90-
client = memu_client()
91+
client = memuClient()
9192
elif frame == "supermemory":
92-
from utils.client import supermemory_client
93+
from utils.client import supermemoryClient
9394

94-
client = supermemory_client()
95+
client = supermemoryClient()
9596

9697
for idx, session in enumerate(sessions):
9798
if f"{conv_idx}_{idx}" not in success_records:

‎evaluation/scripts/longmemeval/lme_search.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,33 +106,33 @@ def process_user(lme_df, conv_idx, frame, version, top_k=20):
106106
return existing_results
107107

108108
if "mem0" in frame:
109-
from utils.client import mem0_client
109+
from utils.client import mem0Client
110110

111-
client = mem0_client(enable_graph="graph" in frame)
111+
client = mem0Client(enable_graph="graph" in frame)
112112
context, duration_ms = mem0_search(client, question, user_id, top_k)
113113
elif frame == "memobase":
114-
from utils.client import memobase_client
114+
from utils.client import memobaseClient
115115

116-
client = memobase_client()
116+
client = memobaseClient()
117117
users = client.client.get_all_users(limit=5000)
118118
for u in users:
119119
if u["additional_fields"]["user_id"] == user_id:
120120
user_id = u["id"]
121121
context, duration_ms = memobase_search(client, question, user_id, top_k)
122122
elif frame == "memos-api":
123-
from utils.client import memos_api_client
123+
from utils.client import memosApiClient
124124

125-
client = memos_api_client()
125+
client = memosApiClient()
126126
context, duration_ms = memos_search(client, question, user_id, top_k)
127127
elif frame == "memu":
128-
from utils.client import memu_client
128+
from utils.client import memuClient
129129

130-
client = memu_client()
130+
client = memuClient()
131131
context, duration_ms = memu_search(client, question, user_id, top_k)
132132
elif frame == "supermemory":
133-
from utils.client import supermemory_client
133+
from utils.client import supermemoryClient
134134

135-
client = supermemory_client()
135+
client = supermemoryClient()
136136
context, duration_ms = supermemory_search(client, question, user_id, top_k)
137137

138138
search_results[user_id].append(

‎evaluation/scripts/utils/client.py‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
load_dotenv()
1111

1212

13-
class zep_client:
13+
class zepClient:
1414
def __init__(self):
1515
from zep_cloud.client import Zep
1616

@@ -42,7 +42,7 @@ def search(self, query, user_id, top_k):
4242
return nodes, edges
4343

4444

45-
class mem0_client:
45+
class mem0Client:
4646
def __init__(self, enable_graph=False):
4747
from mem0 import MemoryClient
4848

@@ -85,7 +85,7 @@ def search(self, query, user_id, top_k):
8585
return res
8686

8787

88-
class memobase_client:
88+
class memobaseClient:
8989
def __init__(self):
9090
from memobase import MemoBaseClient
9191

@@ -114,7 +114,7 @@ def search(self, query, user_id, top_k):
114114
return memories
115115

116116

117-
class memos_api_client:
117+
class memosApiClient:
118118
def __init__(self):
119119
self.memos_url = os.getenv("MEMOS_URL")
120120
self.headers = {"Content-Type": "application/json", "Authorization": os.getenv("MEMOS_KEY")}
@@ -155,7 +155,7 @@ def search(self, query, user_id, top_k):
155155
return json.loads(response.text)["data"]
156156

157157

158-
class supermemory_client:
158+
class supermemoryClient:
159159
def __init__(self):
160160
from supermemory import Supermemory
161161

@@ -197,7 +197,7 @@ def search(self, query, user_id, top_k):
197197
raise e
198198

199199

200-
class memu_client:
200+
class memuClient:
201201
def __init__(self):
202202
from memu import MemuClient
203203

@@ -245,20 +245,3 @@ def wait_for_completion(self, task_id):
245245
timestamp = 1682899200
246246
query = "杭州西湖有什么"
247247
top_k = 5
248-
249-
# # memu
250-
# memu_client = memu_client()
251-
# memu_client.add(messages, user_id, iso_date)
252-
# res = memu_client.search(query, user_id, top_k)
253-
254-
# # supermemory
255-
# supermemory_client = supermemory_client()
256-
# supermemory_client.delete('locomo_exp_user_5_speaker_b_default')
257-
258-
# # mem0
259-
# mem0_client = mem0_client(enable_graph=False)
260-
# mem0_client.add(messages, user_id, timestamp)
261-
# s = mem0_client.search(query, user_id, top_k)
262-
263-
# zep
264-
zep_client = zep_client()

0 commit comments

Comments
 (0)