From 9c4cf1be4cf4513a42ce9cbf699fcda74b8340c4 Mon Sep 17 00:00:00 2001
From: Clemens Pohle <clemens.pohle@stud.h-da.de>
Date: Fri, 7 Jun 2024 13:54:21 +0200
Subject: [PATCH] Improve environment usage

---
 backend/artguide/ollama_views.py                 | 3 ++-
 backend/artguide/sparql_views.py                 | 2 +-
 docker-compose.yaml                              | 1 +
 frontend/src/app/services/backend-api.service.ts | 6 ++----
 frontend/src/environments/environment.ts         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/artguide/ollama_views.py b/backend/artguide/ollama_views.py
index 5fcd7b2..02bab8e 100644
--- a/backend/artguide/ollama_views.py
+++ b/backend/artguide/ollama_views.py
@@ -3,9 +3,10 @@
 from django.http import JsonResponse
 import requests
 import json
+import os
 from django.views.decorators.csrf import csrf_exempt
 
-OLLAMA_URL = 'http://ollama:11434/api/chat'
+OLLAMA_URL = os.environ.get("OLLAMA_ENDPOINT") + '/api/chat'
 
 @csrf_exempt
 def ollama_query(request):
diff --git a/backend/artguide/sparql_views.py b/backend/artguide/sparql_views.py
index f02cb33..9bd5f02 100644
--- a/backend/artguide/sparql_views.py
+++ b/backend/artguide/sparql_views.py
@@ -13,7 +13,7 @@ def sparql_query(request):
     This function executes a SPARQL query received from the frontend and returns the results in JSON format.
     The SPARQL endpoint is read from the environment variables. (set in Docker-compose)
     """
-    sparql_endpoint = 'http://fuseki:3030/data/query'
+    sparql_endpoint = os.environ.get("SPARQL_ENDPOINT") + '/data/query'
     sparql = SPARQLWrapper(sparql_endpoint)
     sparql.setReturnFormat(JSON)
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b34a070..f71d2e7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -18,6 +18,7 @@ services:
       - "8000:8000"
     environment:
       - SPARQL_ENDPOINT=http://fuseki:3030
+      - OLLAMA_ENDPOINT=http://ollama:11434
 
   fuseki:
     image: secoresearch/fuseki
diff --git a/frontend/src/app/services/backend-api.service.ts b/frontend/src/app/services/backend-api.service.ts
index 162f7c9..a43a9e8 100644
--- a/frontend/src/app/services/backend-api.service.ts
+++ b/frontend/src/app/services/backend-api.service.ts
@@ -13,18 +13,16 @@ export class BackendApiService {
   constructor(private http: HttpClient) { }
 
   postRequest(query: string): Observable<any> {
-    const url = `${this.apiUrl}/sparql?query=${query}`;
-    console.log('sending request to: ', url)
     const headers = new HttpHeaders({ 'Content-Type': 'application/json' });
     headers.set('Access-Control-Allow-Origin', '*')
     const body = { query: query };
 
-    return this.http.post<any>(this.apiUrl, body, { headers: headers });
+    return this.http.post<any>(`${this.apiUrl}/sparql`, body, { headers: headers });
   }
 
   requestLlamaAnswer(userQuestion: string): Observable<any> {
     const payload = { message: userQuestion };
-    const url = `${this.apiUrl}ollama-query/`;
+    const url = `${this.apiUrl}/ollama-query/`;
 
     console.log('Sending request to:', url);
     console.log('Request payload:', payload);
diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts
index 17634ba..837417a 100644
--- a/frontend/src/environments/environment.ts
+++ b/frontend/src/environments/environment.ts
@@ -1,4 +1,4 @@
 export const environment = {
   production: false,
-  apiUrl: 'http://localhost:8000/'  // Beispiel-URL für die Entwicklung
+  apiUrl: 'http://localhost:8000'
 };
-- 
GitLab