Merge pull request #26 from jakobhoeg/develop

fix: prefix OLLAMA_URL with NEXT_PUBLIC to make it accessible on client siden in production

Author: jakobhoeg

.example.env

@@ -1 +1 @@
-OLLAMA_URL="http://localhost:11434"
+NEXT_PUBLIC_OLLAMA_URL="http://localhost:11434"

README.md

@@ -65,7 +65,7 @@ mv .example.env .env
 **4. If your instance of Ollama is NOT running on the default ip-address and port, change the variable in the .env file to fit your usecase:**
 
 ```
-OLLAMA_URL="http://localhost:11434"
+NEXT_PUBLIC_OLLAMA_URL="http://localhost:11434"
 ```
 
 **5. Install dependencies:**

src/app/[id]/page.tsx

@@ -32,7 +32,7 @@ export default function Page({ params }: { params: { id: string } }) {
   useEffect(() => {
     if (env === "production") {
       const newOllama = new ChatOllama({
-        baseUrl: process.env.OLLAMA_URL || "http://localhost:11434",
+        baseUrl: process.env.NEXT_PUBLIC_OLLAMA_URL || "http://localhost:11434",
         model: selectedModel,
       });
       setOllama(newOllama);

src/app/api/chat/route.ts

@@ -10,7 +10,7 @@ export async function POST(req: Request) {
   const { messages, selectedModel } = await req.json();
 
   const model = new ChatOllama({
-    baseUrl: process.env.OLLAMA_URL,
+    baseUrl: process.env.NEXT_PUBLIC_OLLAMA_URL || "http://localhost:11434",
     model: selectedModel,
   });
 

src/app/api/model/route.ts

@@ -1,7 +1,9 @@
 export async function POST(req: Request) {
     const { name } = await req.json();
 
-    const response = await fetch(process.env.OLLAMA_URL + "/api/pull", {
+    const ollamaUrl = process.env.NEXT_PUBLIC_OLLAMA_URL || "http://localhost:11434";
+
+    const response = await fetch(ollamaUrl + "/api/pull", {
         method: "POST",
         body: JSON.stringify({ name }),
     });

src/app/api/tags/route.ts

@@ -1,7 +1,7 @@
 export const dynamic = "force-dynamic";
 
 export async function GET(req: Request) {
-  const OLLAMA_URL = process.env.OLLAMA_URL || "http://localhost:11434";
+  const OLLAMA_URL = process.env.NEXT_PUBLIC_OLLAMA_URL || "http://localhost:11434";
   const res = await fetch(
     OLLAMA_URL + "/api/tags"
   );

src/app/page.tsx

@@ -52,7 +52,7 @@ export default function Home() {
   useEffect(() => {
     if (env === "production") {
       const newOllama = new ChatOllama({
-        baseUrl: process.env.OLLAMA_URL || "http://localhost:11434",
+        baseUrl: process.env.NEXT_PUBLIC_OLLAMA_URL || "http://localhost:11434",
         model: selectedModel,
       });
       setOllama(newOllama);

src/components/chat/chat-topbar.tsx

@@ -45,7 +45,7 @@ export default function ChatTopbar({
 
     const fetchModels = async () => {
       if (env === "production") {
-        const fetchedModels = await fetch(process.env.OLLAMA_URL + "/api/tags");
+        const fetchedModels = await fetch(process.env.NEXT_PUBLIC_OLLAMA_URL + "/api/tags");
         const json = await fetchedModels.json();
         const apiModels = json.models.map((model : any) => model.name);
         setModels([...apiModels]);

src/components/pull-model-form.tsx

@@ -40,7 +40,7 @@ export default function PullModelForm() {
     if (env === "production") {
       // Make a post request to localhost
       const pullModel = async () => {
-        const response = await fetch(process.env.OLLAMA_URL + "/api/pull", {
+        const response = await fetch(process.env.NEXT_PUBLIC_OLLAMA_URL + "/api/pull", {
           method: "POST",
           headers: {
             "Content-Type": "application/json",