Skip to content

[ENH]: Switching Ollama JS EF to ollama js client #2948

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
Merged
merged 1 commit into from
Jan 23, 2025
Merged

[ENH]: Switching Ollama JS EF to ollama js client #2948

merged 1 commit into from
Jan 23, 2025

Conversation

tazarov
Copy link
Contributor

@tazarov tazarov commented Oct 13, 2024

Description of changes

Summarize the changes made by this PR.

  • Improvements & Bug fixes
    • Switching to ollama js client - https://www.npmjs.com/package/ollama
    • Default model is all-mini
    • Default URL is ollam's localhost url and port
    • Using test containers to test the EF
    • Conditional tests when ollama package is installed
    • Moved tests to test/embeddings/ollama.test.ts

Test plan

How are these changes tested?

  • Tests pass locally with yarn test for js with and without ollama package

Documentation Changes

Updated integration example (simplified)

@github-actions GitHub Actions
Copy link

Reviewer Checklist

Please leverage this checklist to ensure your code review is thorough before approving

Testing, Bugs, Errors, Logs, Documentation

  • Can you think of any use case in which the code does not behave as intended? Have they been tested?
  • Can you think of any inputs or external events that could break the code? Is user input validated and safe? Have they been tested?
  • If appropriate, are there adequate property based tests?
  • If appropriate, are there adequate unit tests?
  • Should any logging, debugging, tracing information be added or removed?
  • Are error messages user-friendly?
  • Have all documentation changes needed been made?
  • Have all non-obvious changes been commented?

System Compatibility

  • Are there any potential impacts on other parts of the system or backward compatibility?
  • Does this change intersect with any items on our roadmap, and if so, is there a plan for fitting them together?

Quality

  • Is this code of a unexpectedly high quality (Readability, Modularity, Intuitiveness)

@tazarov Graphite App
Copy link
Contributor Author

tazarov commented Oct 13, 2024 •
edited
Loading

This stack of pull requests is managed by Graphite. Learn more about stacking.

@tazarov tazarov mentioned this pull request Oct 13, 2024
Merged
1 task
@tazarov tazarov requested a review from codetheweb October 13, 2024 18:10
@tazarov tazarov force-pushed the trayan-10-13-feat_switching_to_official_ollama_python_client branch from c7ee067 to 136e56f Compare January 15, 2025 19:13
@tazarov tazarov force-pushed the trayan-10-13-feat_switching_to_ollama_js_client branch 5 times, most recently from bf28d99 to d615b13 Compare January 16, 2025 13:04
@tazarov tazarov force-pushed the trayan-10-13-feat_switching_to_official_ollama_python_client branch from 5f6a38b to fe71dfb Compare January 20, 2025 13:32
@tazarov tazarov force-pushed the trayan-10-13-feat_switching_to_ollama_js_client branch from d615b13 to 8e99640 Compare January 20, 2025 13:32
@tazarov tazarov requested a review from itaismith January 20, 2025 14:42
@tazarov
Copy link
Contributor Author

tazarov commented Jan 20, 2025

@itaismith, PTAL.

@tazarov
feat: Switching to ollama js client
10a2037 
# Conflicts:
#	clients/js/package.json
#	clients/js/pnpm-lock.yaml
#	docs/docs.trychroma.com/pages/integrations/ollama.md
@tazarov tazarov force-pushed the trayan-10-13-feat_switching_to_ollama_js_client branch from c63fc5e to 10a2037 Compare January 20, 2025 16:08
@tazarov tazarov changed the base branch from trayan-10-13-feat_switching_to_official_ollama_python_client to main January 20, 2025 16:08
@tazarov tazarov merged commit 356f37e into main Jan 23, 2025
79 checks passed
@tazarov tazarov deleted the trayan-10-13-feat_switching_to_ollama_js_client branch January 23, 2025 13:10
@tazarov tazarov mentioned this pull request Feb 17, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codetheweb codetheweb Awaiting requested review from codetheweb

@itaismith itaismith Awaiting requested review from itaismith

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@tazarov