Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ollama integration #36

Merged
merged 20 commits into from
May 20, 2024
Merged

Ollama integration #36

merged 20 commits into from
May 20, 2024

Conversation

kevinl424
Copy link
Collaborator

@kevinl424 kevinl424 commented May 11, 2024 •
edited

  • ollama llama3 and llava integrated into recursive retrieva, final response generation, and routing agent
  • llm/vision switching interface in UI

@kevinl424 kevinl424 linked an issue May 11, 2024 that may be closed by this pull request
Make memary free to use through Llama 3 8B and Ollama #31
Closed
seyeong-han
seyeong-han requested changes May 11, 2024
View reviewed changes
Copy link
Collaborator

@seyeong-han seyeong-han left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work!!

src/memary/agent/base_agent.py Outdated Show resolved Hide resolved
src/memary/agent/base_agent.py Outdated Show resolved Hide resolved
src/memary/agent/chat_agent.py Show resolved Hide resolved
streamlit_app/app.py Outdated Show resolved Hide resolved
test.py Outdated Show resolved Hide resolved
streamlit_app/app.py Outdated Show resolved Hide resolved
src/memary/agent/chat_agent.py Show resolved Hide resolved
src/memary/agent/base_agent.py Outdated Show resolved Hide resolved
This was linked to issues May 13, 2024
Remove external_response and routing_response files #24
Closed
UI integrations #23
Closed
@kevinl424 kevinl424 marked this pull request as ready for review May 13, 2024 03:58
@kevinl424 kevinl424 linked an issue May 13, 2024 that may be closed by this pull request
persona improvements #25
Closed
@kevinl424
Copy link
Collaborator Author

See issue #35 for additional details regarding the use of Ollama as well.

kingjulio8238
kingjulio8238 reviewed May 14, 2024
View reviewed changes
test.py Outdated Show resolved Hide resolved
seyeong-han
seyeong-han requested changes May 15, 2024
View reviewed changes
Copy link
Collaborator

@seyeong-han seyeong-han left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could know the problem by reading your detailed issues.
Thanks for writing the issues.

As you said, the problem was caused by the Ollama API.
Please check my reviews.

src/memary/agent/llm_api/tools.py Outdated Show resolved Hide resolved
streamlit_app/data/user_persona.txt Outdated Show resolved Hide resolved
kingjulio8238
kingjulio8238 reviewed May 15, 2024
View reviewed changes
README.md Outdated Show resolved Hide resolved
seyeong-han
seyeong-han reviewed May 20, 2024
View reviewed changes
Copy link
Collaborator

@seyeong-han seyeong-han left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good progress!

src/memary/agent/base_agent.py Show resolved Hide resolved
src/memary/agent/base_agent.py Show resolved Hide resolved
src/memary/agent/llm_api/tools.py Outdated Show resolved Hide resolved
seyeong-han
seyeong-han reviewed May 20, 2024
View reviewed changes
Copy link
Collaborator

@seyeong-han seyeong-han left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lovely documents!
Changing the final request message format is the only thing left!

@seyeong-han seyeong-han self-requested a review May 20, 2024 20:03
seyeong-han
seyeong-han approved these changes May 20, 2024
View reviewed changes
Copy link
Collaborator

@seyeong-han seyeong-han left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice job Kevin!!
Thanks for all your work!

kingjulio8238
kingjulio8238 approved these changes May 20, 2024
View reviewed changes
Copy link
Owner

@kingjulio8238 kingjulio8238 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great progress! memary is now available to users for free which is a major milestone!

@kevinl424 kevinl424 merged commit 97320bb into main May 20, 2024
This was referenced May 21, 2024
Closed
Closed
@kingjulio8238 kingjulio8238 deleted the ollama-integration branch May 22, 2024 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@seyeong-han seyeong-han seyeong-han approved these changes

@kingjulio8238 kingjulio8238 kingjulio8238 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@kevinl424 @seyeong-han @kingjulio8238