Skip to content

Commit acf65f4

Browse files
authored
feat: merge dev into main and change api-server (#376)
## Description <!-- Please include a summary of the changes below; Fill in the issue number that this PR addresses (if applicable); Fill in the related MemOS-Docs repository issue or PR link (if applicable); Mention the person who will review this PR (if you know who it is); Replace (summary), (issue), (docs-issue-or-pr-link), and (reviewer) with the appropriate information. 请在下方填写更改的摘要; 填写此 PR 解决的问题编号(如果适用); 填写相关的 MemOS-Docs 仓库 issue 或 PR 链接(如果适用); 提及将审查此 PR 的人(如果您知道是谁); 替换 (summary)、(issue)、(docs-issue-or-pr-link) 和 (reviewer) 为适当的信息。 --> Summary: (summary) Fix: #(issue) Docs Issue/PR: (docs-issue-or-pr-link) Reviewer: @(reviewer) ## Checklist: - [ ] I have performed a self-review of my own code | 我已自行检查了自己的代码 - [ ] I have commented my code in hard-to-understand areas | 我已在难以理解的地方对代码进行了注释 - [ ] I have added tests that prove my fix is effective or that my feature works | 我已添加测试以证明我的修复有效或功能正常 - [ ] I have created related documentation issue/PR in [MemOS-Docs](https://github.com/MemTensor/MemOS-Docs) (if applicable) | 我已在 [MemOS-Docs](https://github.com/MemTensor/MemOS-Docs) 中创建了相关的文档 issue/PR(如果适用) - [ ] I have linked the issue to this PR (if applicable) | 我已将 issue 链接到此 PR(如果适用) - [ ] I have mentioned the person who will review this PR | 我已提及将审查此 PR 的人
2 parents 78746c0 + a5322fe commit acf65f4

File tree

105 files changed

+21964
-2684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+21964
-2684
lines changed

evaluation/.env-example

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# memory process model
12
MODEL="gpt-4o-mini"
23
OPENAI_API_KEY="sk-***REDACTED***"
34
OPENAI_BASE_URL="http://***.***.***.***:3000/v1"
@@ -6,6 +7,35 @@ MEM0_API_KEY="m0-***REDACTED***"
67

78
ZEP_API_KEY="z_***REDACTED***"
89

10+
# response model
911
CHAT_MODEL="gpt-4o-mini"
1012
CHAT_MODEL_BASE_URL="http://***.***.***.***:3000/v1"
1113
CHAT_MODEL_API_KEY="sk-***REDACTED***"
14+
15+
MEMOS_KEY="Token mpg-xxxxx"
16+
MEMOS_URL="https://apigw-pre.memtensor.cn/api/openmem/v1"
17+
PRE_SPLIT_CHUNK=false # pre split chunk in client end
18+
19+
MEMOBASE_API_KEY="xxxxx"
20+
MEMOBASE_PROJECT_URL="http://xxx.xxx.xxx.xxx:8019"
21+
22+
# Configuration Only For Scheduler
23+
# RabbitMQ Configuration
24+
MEMSCHEDULER_RABBITMQ_HOST_NAME=rabbitmq-cn-***.cn-***.amqp-32.net.mq.amqp.aliyuncs.com
25+
MEMSCHEDULER_RABBITMQ_USER_NAME=***
26+
MEMSCHEDULER_RABBITMQ_PASSWORD=***
27+
MEMSCHEDULER_RABBITMQ_VIRTUAL_HOST=memos
28+
MEMSCHEDULER_RABBITMQ_ERASE_ON_CONNECT=true
29+
MEMSCHEDULER_RABBITMQ_PORT=5672
30+
31+
# OpenAI Configuration
32+
MEMSCHEDULER_OPENAI_API_KEY=sk-***
33+
MEMSCHEDULER_OPENAI_BASE_URL=http://***.***.***.***:3000/v1
34+
MEMSCHEDULER_OPENAI_DEFAULT_MODEL=gpt-4o-mini
35+
36+
# Graph DB Configuration
37+
MEMSCHEDULER_GRAPHDBAUTH_URI=bolt://localhost:7687
38+
MEMSCHEDULER_GRAPHDBAUTH_USER=neo4j
39+
MEMSCHEDULER_GRAPHDBAUTH_PASSWORD=***
40+
MEMSCHEDULER_GRAPHDBAUTH_DB_NAME=neo4j
41+
MEMSCHEDULER_GRAPHDBAUTH_AUTO_CREATE=true

evaluation/README.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,21 @@ This repository provides tools and scripts for evaluating the LoCoMo dataset usi
3434
```
3535

3636
✍️ For evaluating OpenAI's native memory feature with the LoCoMo dataset, please refer to the detailed guide: [OpenAI Memory on LoCoMo - Evaluation Guide](./scripts/locomo/openai_memory_locomo_eval_guide.md).
37+
38+
### LongMemEval Evaluation
39+
First prepare the dataset `longmemeval_s` from https://huggingface.co/datasets/xiaowu0162/longmemeval-cleaned
40+
, and save it as `data/longmemeval/longmemeval_s.json`
41+
42+
```bash
43+
# Edit the configuration in ./scripts/run_lme_eval.sh
44+
# Specify the model and memory backend you want to use (e.g., mem0, zep, etc.)
45+
./scripts/run_lme_eval.sh
46+
```
47+
48+
### prefEval Evaluation
49+
50+
### personaMem Evaluation
51+
get `questions_32k.csv` and `shared_contexts_32k.jsonl` from https://huggingface.co/datasets/bowen-upenn/PersonaMem and save them at `data/personamem/`
52+
```bash
53+
./scripts/run_pm_eval.sh
54+
```
File renamed without changes.

evaluation/scripts/PrefEval/irrelevant_conv.py

Lines changed: 13870 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)