Skip to content

Commit 52dfed2

Browse files
abrookinsclaude
andcommitted
Resolve merge conflicts preserving vector store interface changes
- Resolved ULID import conflicts in models and client files - Fixed README.md merge conflict preserving vector store backends doc - Resolved pyproject.toml dependency conflicts - Fixed test file conflicts and cleaned up malformed merge resolutions - Preserved all vector store adapter functionality and interface - Tests passing, vector store factory working correctly 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
2 parents c348a25 + 74f6b2c commit 52dfed2

Some content is hidden

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

46 files changed

+4494
-5785
lines changed

.github/workflows/agent-memory-client.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
publish-testpypi:
5151
name: Publish to TestPyPI
5252
needs: test
53-
if: startsWith(github.ref, 'refs/tags/client/') && contains(github.ref, '-')
53+
if: startsWith(github.ref, 'refs/tags/client/') && contains(github.ref, '-test')
5454
runs-on: ubuntu-latest
5555
environment: testpypi
5656
permissions:
@@ -82,7 +82,7 @@ jobs:
8282
publish-pypi:
8383
name: Publish to PyPI
8484
needs: test
85-
if: startsWith(github.ref, 'refs/tags/client/') && !contains(github.ref, '-')
85+
if: startsWith(github.ref, 'refs/tags/client/') && !contains(github.ref, '-test')
8686
runs-on: ubuntu-latest
8787
environment: pypi
8888
permissions:
@@ -110,8 +110,17 @@ jobs:
110110
with:
111111
packages-dir: agent-memory-client/dist/
112112

113-
# Alternative: API Token Authentication (if trusted publishing doesn't work)
114-
# Uncomment the sections below and add these secrets to your repository:
113+
# Tag Format Guide:
114+
# - For TestPyPI (testing): client/v1.0.0-test
115+
# - For PyPI (production): client/v1.0.0
116+
#
117+
# Use the script: python scripts/tag_and_push_client.py --test (for TestPyPI)
118+
# python scripts/tag_and_push_client.py (for PyPI)
119+
#
120+
# Alternative: This project uses trusted publishing, but you can use API Token
121+
# Authentication (if trusted publishing doesn't work).
122+
#
123+
# To do so, uncomment the sections below and add these secrets to your repository:
115124
# - TEST_PYPI_API_TOKEN (for TestPyPI)
116125
# - PYPI_API_TOKEN (for PyPI)
117126
#

.github/workflows/python-tests.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,49 @@ jobs:
6060
pip install uv
6161
uv sync --all-extras
6262
63+
- name: Install agent-memory-client
64+
run: |
65+
uv pip install -e ./agent-memory-client
66+
6367
- name: Run tests
6468
run: |
6569
uv run pytest --run-api-tests
6670
env:
6771
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
72+
73+
docker:
74+
needs: test
75+
runs-on: ubuntu-latest
76+
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
77+
steps:
78+
- name: Checkout
79+
uses: actions/checkout@v4
80+
81+
- name: Set up Docker Buildx
82+
uses: docker/setup-buildx-action@v3
83+
84+
- name: Log in to Docker Hub
85+
uses: docker/login-action@v3
86+
with:
87+
username: ${{ secrets.DOCKER_USERNAME }}
88+
password: ${{ secrets.DOCKER_TOKEN }}
89+
90+
- name: Extract version from __init__.py
91+
id: version
92+
run: |
93+
VERSION=$(grep '__version__ =' agent_memory_server/__init__.py | sed 's/__version__ = "\(.*\)"/\1/' || echo "latest")
94+
echo "version=$VERSION" >> $GITHUB_OUTPUT
95+
echo "Version: $VERSION"
96+
97+
- name: Build and push Docker image
98+
uses: docker/build-push-action@v5
99+
with:
100+
context: .
101+
file: ./Dockerfile
102+
platforms: linux/amd64,linux/arm64
103+
push: true
104+
tags: |
105+
andrewbrookins510/agent-memory-server:latest
106+
andrewbrookins510/agent-memory-server:${{ steps.version.outputs.version }}
107+
cache-from: type=gha
108+
cache-to: type=gha,mode=max

CLAUDE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ uv run ruff check # Run linting
1616
uv run ruff format # Format code
1717
uv run pytest # Run tests
1818
uv run pytest tests/ # Run specific test directory
19+
uv add <dependency> # Add a dependency to pyproject.toml and update lock file
20+
uv remove <dependency> # Remove a dependency from pyproject.toml and update lock file
1921

2022
# Server commands
2123
uv run agent-memory api # Start REST API server (default port 8000)

Dockerfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim
22

3+
34
WORKDIR /app
45

56
ENV UV_COMPILE_BYTECODE=1
@@ -26,6 +27,12 @@ ENV PATH="/app/.venv/bin:$PATH"
2627

2728
ENTRYPOINT []
2829

30+
EXPOSE 8000
31+
32+
HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
33+
CMD curl -f http://localhost:8000/v1/health || exit 1
34+
35+
# Disable auth by default. Can be overridden with environment variable.
36+
ENV DISABLE_AUTH=true
2937

30-
# Run the API server
31-
CMD ["uv", "run", "agent-memory", "api"]
38+
CMD ["agent-memory", "api", "--host", "0.0.0.0", "--port", "8000"]

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ A Redis-powered memory server built for AI agents and applications. It manages b
88

99
- Session-scoped storage for messages, structured memories, context, and metadata
1010
- Automatically summarizes conversations when they exceed the window size
11-
- Client model-aware token limit management (adapts to the context window of the client's LLM)
11+
- Token limit management (adapts to the context window of the client's LLM)
1212
- Supports all major OpenAI and Anthropic models
1313
- Automatic promotion of structured memories to long-term storage
1414

@@ -96,6 +96,10 @@ For complete configuration details, see [Configuration Guide](docs/configuration
9696

9797
For vector store backend options and setup, see [Vector Store Backends](docs/vector-store-backends.md).
9898

99+
## License
100+
101+
Apache 2.0 License - see [LICENSE](LICENSE) file for details.
102+
99103
## Development
100104

101105
For development setup, testing, and contributing guidelines, see [Development Guide](docs/development.md).

agent-memory-client/LICENSE

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
Copyright (c) 2025 Redis, Inc. Released under the Apache License 2.0:
2+
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright 2023 Metal Technologies Inc
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

0 commit comments

Comments
 (0)