Unverified Commit aab12ecf authored by Timothy Jaeryang Baek's avatar Timothy Jaeryang Baek Committed by GitHub
Browse files

Merge branch 'main' into patch-1

parents 6fb5a371 83c81df3
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
ChatGPT-Style Web Interface for Ollama 🦙 ChatGPT-Style Web Interface for Ollama 🦙
**Disclaimer:** *ollama-webui is a community-driven project and is not affiliated with the Ollama team in any way. This initiative is independent, and any inquiries or feedback should be directed to [our community on Discord](https://discord.gg/5rJgQTnV4s). We kindly request users to refrain from contacting or harassing the Ollama team regarding this project.*
![Ollama Web UI Demo](./demo.gif) ![Ollama Web UI Demo](./demo.gif)
Also check our sibling project, [OllamaHub](https://ollamahub.com/), where you can discover, download, and explore customized Modelfiles for Ollama! 🦙🔍 Also check our sibling project, [OllamaHub](https://ollamahub.com/), where you can discover, download, and explore customized Modelfiles for Ollama! 🦙🔍
...@@ -123,6 +125,10 @@ docker run -d -p 3000:8080 -e OLLAMA_API_BASE_URL=https://example.com/api --name ...@@ -123,6 +125,10 @@ docker run -d -p 3000:8080 -e OLLAMA_API_BASE_URL=https://example.com/api --name
While we strongly recommend using our convenient Docker container installation for optimal support, we understand that some situations may require a non-Docker setup, especially for development purposes. Please note that non-Docker installations are not officially supported, and you might need to troubleshoot on your own. While we strongly recommend using our convenient Docker container installation for optimal support, we understand that some situations may require a non-Docker setup, especially for development purposes. Please note that non-Docker installations are not officially supported, and you might need to troubleshoot on your own.
**Warning: Backend Dependency for Proper Functionality**
In order to ensure the seamless operation of our application, it is crucial to run both the backend and frontend components simultaneously. Serving only the frontend in isolation is not supported and may lead to unpredictable outcomes, rendering the application inoperable. Attempting to raise an issue when solely serving the frontend will not be addressed, as it falls outside the intended usage. To achieve optimal results, please strictly adhere to the specified steps outlined in this documentation. Utilize the frontend solely for building static files, and subsequently run the complete application with the provided backend commands. Failure to follow these instructions may result in unsupported configurations, and we may not be able to provide assistance in such cases. Your cooperation in following the prescribed procedures is essential for a smooth user experience and effective issue resolution.
### TL;DR 🚀 ### TL;DR 🚀
Run the following commands to install: Run the following commands to install:
......
...@@ -236,36 +236,39 @@ ...@@ -236,36 +236,39 @@
<div <div
class="absolute rounded-xl w-full h-full backdrop-blur bg-gray-900/60 flex justify-center" class="absolute rounded-xl w-full h-full backdrop-blur bg-gray-900/60 flex justify-center"
> >
<div class="m-auto pb-44"> <div class="m-auto pb-44 flex flex-col justify-center">
<div class="text-center dark:text-white text-2xl font-medium z-50"> <div class="max-w-md">
Ollama Update Required <div class="text-center dark:text-white text-2xl font-medium z-50">
</div> Connection Issue or Update Needed
</div>
<div class=" mt-4 text-center max-w-md text-sm dark:text-gray-200">
Oops! It seems like your Ollama needs a little attention. <br <div class=" mt-4 text-center text-sm dark:text-gray-200 w-full">
class=" hidden sm:flex" Oops! It seems like your Ollama needs a little attention. <br
/> class=" hidden sm:flex"
We encountered a connection issue or noticed that you're running an outdated version. Please />We've detected either a connection hiccup or observed that you're using an older
update to version. Ensure you're on the latest Ollama version
<span class=" dark:text-white font-medium">{requiredOllamaVersion} or above</span>. <br class=" hidden sm:flex" />(version
</div> <span class=" dark:text-white font-medium">{requiredOllamaVersion} or higher</span>)
or check your connection.
<div class=" mt-6 mx-auto relative group w-fit"> </div>
<button
class="relative z-20 flex px-5 py-2 rounded-full bg-gray-100 hover:bg-gray-200 transition font-medium text-sm" <div class=" mt-6 mx-auto relative group w-fit">
on:click={async () => { <button
await setOllamaVersion(await getOllamaVersion()); class="relative z-20 flex px-5 py-2 rounded-full bg-gray-100 hover:bg-gray-200 transition font-medium text-sm"
}} on:click={async () => {
> await setOllamaVersion(await getOllamaVersion());
Check Again }}
</button> >
Check Again
<button </button>
class="text-xs text-center w-full mt-2 text-gray-400 underline"
on:click={async () => { <button
await setOllamaVersion(requiredOllamaVersion); class="text-xs text-center w-full mt-2 text-gray-400 underline"
}}>Close</button on:click={async () => {
> await setOllamaVersion(requiredOllamaVersion);
}}>Close</button
>
</div>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment