supporting local model for jupyter-ai with ollama #868
Conversation
…l","tinyllama","qwen2"!
# Conflicts: # docs/source/users/index.md # packages/jupyter-ai-magics/jupyter_ai_magics/embedding_providers.py
for more information, see https://pre-commit.ci
|
how do i use this update? |
Ref: https://jupyter-ai.readthedocs.io/en/latest/contributors/index.html |
There was a problem hiding this comment.
Thanks @767472021 for this PR. I left some comments herein. Please refer to PR #646 as well. Nice work! I have also tested the code on a few Ollama models.
There was a problem hiding this comment.
Thank you very much for adding this PR, which also complements PR #646.
[1] It would be nice to add more documentation on Ollama, directing the user to install it first and how, pointing to the necessary Ollama resources. Specific examples of Ollama CLI commands needed would help the user. See the note by @pedrogutobjj above for example. Hopefully, people who use Ollama with its CLI will know what to do, but the docs should reflect the requirement that the Ollama local server should be kicked off with ollama serve.
[2] Since the number of models in Ollama is very large, the drop down list can become unwieldy. Would it be possible to implement Ollama in the same way as Huggingface is implemented with a input box for the model in chat settings?
It would also need a similar approach for choice of Embedding Model.
| @@ -728,6 +730,84 @@ async def _acall(self, *args, **kwargs) -> Coroutine[Any, Any, str]: | |||
| return await self._call_in_executor(*args, **kwargs) | |||
|
|
|||
|
|
|||
| class OllamaProvider(BaseProvider, Ollama): | |||
There was a problem hiding this comment.
Please see a similar implementation in PR #646 with a much simpler class and see if all the functions defined in your file from line 760 onwards are necessary, or being called to produce the response.
| def _send_request(self, endpoint: str, data: dict) -> dict: | ||
| """Send a POST request to the specified Ollama API endpoint.""" | ||
| url = f"{self.base_url}/{endpoint}" | ||
| print("url is : ", url) |
There was a problem hiding this comment.
Do you need this print statement? If so, use self.log.info() as is the approach in much of the code base.
| @@ -18,6 +18,7 @@ | |||
| Union, | |||
| ) | |||
|
|
|||
| import requests | |||
There was a problem hiding this comment.
If the functions in your new class can be removed, then you will not need this line.
| def _generate(self, prompt: str, model: str = "mistral", stop: list = None) -> str: | ||
| """Generate text using the /generate endpoint.""" | ||
| data = { | ||
| "model": model, | ||
| "prompt": prompt, | ||
| **({"stop": stop} if stop else {}), | ||
| } | ||
| response = self._send_request("api/generate", data) | ||
| return response.get("response", "") | ||
|
|
||
| def _chat(self, messages: list, model: str = "mistral") -> str: | ||
| """Chat using the /chat endpoint.""" | ||
| data = { | ||
| "model": model, | ||
| "messages": messages, | ||
| } | ||
| response = self._send_request("api/chat", data) | ||
| return response.get("response", "") | ||
|
|
||
| def _call(self, prompt: str = None, messages: list = None, **kwargs) -> str: | ||
| """Determine which API endpoint to use based on input and call it.""" | ||
| print(self.base_url) | ||
| if prompt is not None: | ||
| return self._generate(prompt=prompt, **kwargs) | ||
| elif messages is not None: | ||
| return self._chat(messages=messages, **kwargs) | ||
| else: | ||
| raise ValueError("Either 'prompt' or 'messages' must be provided.") |
There was a problem hiding this comment.
Is there a need for implementing the Ollama class methods? Ollama chat model provides these methods, forking the code might deviate from the official LangChain LLMs.
https://python.langchain.com/v0.1/docs/integrations/chat/ollama/
There was a problem hiding this comment.
Agree, I noted the same above, and I have also tested removing these functions that the functionality is not impaired.
|
How long will it take for the final implementation of ollama in jupyter there and to release the update to everyone? |
|
Thanks very much for revisiting this important enhancement that was raised in PR #646 -- which has now been implemented and merged, closing this one out now, and very grateful for your contribution. |
Add Ollama, now supporting the following local models: "gemma", "gemma2", "llama2", "llama3", "phi3", "mistral", "tinyllama", and "qwen2"!
Magic commands can also be used 【learn、 ask ....】.
test completed and work well