Skip to content

Commit b8b6180

Browse files
authored
Merge branch 'dev' into dev
2 parents 1c4caca + 17dddbf commit b8b6180

Some content is hidden

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

42 files changed

+73
-4654
lines changed

.github/workflows/python-tests.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ jobs:
2525
matrix:
2626
os:
2727
- "ubuntu-latest"
28+
- "windows-latest"
29+
- "macos-14"
30+
- "macos-15"
31+
# Ref: https://docs.github.com/en/actions/how-tos/writing-workflows/choosing-where-your-workflow-runs/choosing-the-runner-for-a-job
2832
python-version:
2933
- "3.10"
3034
- "3.11"
@@ -51,4 +55,4 @@ jobs:
5155
poetry run ruff format --check
5256
- name: Test with pytest
5357
run: |
54-
PYTHONPATH=src poetry run pytest tests -vv
58+
poetry run pytest tests -vv

Makefile

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: test docs
1+
.PHONY: test
22

33
install:
44
poetry install --with dev --with test
@@ -11,7 +11,7 @@ clean:
1111
rm -rf tmp
1212

1313
test:
14-
PYTHONPATH=src poetry run pytest tests
14+
poetry run pytest tests
1515

1616
format:
1717
poetry run ruff check --fix
@@ -23,24 +23,5 @@ pre_commit:
2323
serve:
2424
poetry run uvicorn memos.api.start_api:app
2525

26-
docs:
27-
pytest tests/test_docs.py -xq
28-
pip install mkdocs mkdocs-material -q
29-
mkdir -p tmp
30-
rm -f tmp/mkdocs.yml
31-
echo "site_name: MemOS Documentation" > tmp/mkdocs.yml
32-
echo "docs_dir: `pwd`/docs" >> tmp/mkdocs.yml
33-
echo "theme: material" >> tmp/mkdocs.yml
34-
echo "markdown_extensions:" >> tmp/mkdocs.yml
35-
echo " - pymdownx.highlight:" >> tmp/mkdocs.yml
36-
echo " anchor_linenums: true" >> tmp/mkdocs.yml
37-
echo " line_spans: __span" >> tmp/mkdocs.yml
38-
echo " pygments_lang_class: true" >> tmp/mkdocs.yml
39-
echo " - pymdownx.inlinehilite" >> tmp/mkdocs.yml
40-
echo " - pymdownx.snippets" >> tmp/mkdocs.yml
41-
echo " - pymdownx.superfences" >> tmp/mkdocs.yml
42-
cat docs/settings.yml >> tmp/mkdocs.yml
43-
mkdocs serve -f tmp/mkdocs.yml --no-livereload
44-
4526
openapi:
4627
poetry run python scripts/export_openapi.py --output docs/openapi.json

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<a href="https://discord.gg/Txbx3gebZR">
3232
<img src="https://img.shields.io/badge/Discord-join%20chat-7289DA.svg?logo=discord" alt="Discord">
3333
</a>
34-
<a href="docs/assets/memos-wechat-group.png">
34+
<a href="docs/assets/qr_code.png">
3535
<img src="https://img.shields.io/badge/WeChat-Group-07C160.svg?logo=wechat" alt="WeChat Group">
3636
</a>
3737
<a href="https://opensource.org/license/apache-2-0/">
@@ -43,7 +43,7 @@
4343
---
4444

4545
<a href="https://memos.openmem.net/">
46-
<img src="docs/assets/SOTA_Score.jpg" alt="SOTA SCORE">
46+
<img src="docs/assets/sota_score.jpg" alt="SOTA SCORE">
4747
</a>
4848

4949

@@ -151,7 +151,11 @@ For more detailed examples, please check out the [`examples`](./examples) direct
151151
## 📦 Installation
152152

153153
> [!WARNING]
154-
> Currently, MemOS primarily supports Linux platforms. You may encounter issues on Windows and macOS temporarily.
154+
> MemOS is compatible with Linux, Windows, and macOS.
155+
>
156+
> However, if you're using macOS, please note that there may be dependency issues that are difficult to resolve.
157+
>
158+
> For example, compatibility with macOS 13 Ventura is currently challenging.
155159
156160
### Install via pip
157161

docs/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
All documentation has been moved to a separate repository: https://github.com/MemTensor/MemOS-Docs. Please edit documentation there.
2+
3+
所有文档已迁移至独立仓库:https://github.com/MemTensor/MemOS-Docs。请在该仓库中编辑文档。

docs/assets/memos-architecture.png

-810 KB
Binary file not shown.

docs/assets/memos-banner.png

-1.42 MB
Binary file not shown.

docs/best_practice/common_errors_solutions.md

Lines changed: 0 additions & 74 deletions
This file was deleted.

docs/best_practice/memory_structure_design.md

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)