From 916b6f9e52a445e36b6915de571c532be432ea83 Mon Sep 17 00:00:00 2001 From: Joakim Persson Date: Thu, 1 Aug 2024 17:03:25 +0200 Subject: [PATCH] =?UTF-8?q?Testar=20med=20fj=C3=A4rrserver=20f=C3=B6r=20ol?= =?UTF-8?q?lama.=20Endast=20tillf=C3=A4llig=20l=C3=B6sning.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- smartassist/src/backend.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/smartassist/src/backend.py b/smartassist/src/backend.py index 9f6498f..6615830 100644 --- a/smartassist/src/backend.py +++ b/smartassist/src/backend.py @@ -58,15 +58,15 @@ def set_session(): resp.set_cookie('session', 'some-value', samesite='None', secure=True) # Add SameSite attribute here return resp -@app.route('/profile') -def profile(): - # Retrieve data from the session - user_id = session.get('user_id') +# @app.route('/profile') +# def profile(): +# # Retrieve data from the session +# user_id = session.get('user_id') - if user_id: - return f'User ID: {user_id}' - else: - return 'No user ID found' +# if user_id: +# return f'User ID: {user_id}' +# else: +# return 'No user ID found' @app.route('/') @@ -89,7 +89,8 @@ CORS(app, resources={ @app.route('/api/chat', methods=['POST']) -def chat(url_server = "http://localhost:11434/api/generate", model = "phi3:mini"): +def chat(model = "phi3:mini"): +# def chat(url_server = "http://localhost:11434/api/generate", model = "phi3:mini"): """ This function handles the chat. The frontend client (web browser) calls the backend server through this endpoint (/api/chat) that manage queries @@ -99,7 +100,7 @@ def chat(url_server = "http://localhost:11434/api/generate", model = "phi3:mini" # Get the message from the JSON in the request body data = request.get_json() message = data.get('query') - url_server = data.get('url_server', url_server) # Use provided URL or default + url_server = data.get('url_server', "https://ollama-test.wara-ops.org/api/generate") # Use provided URL or default model = data.get('model', model) # Use provided model or default # Get chat history from session storage (e.g., a dictionary) @@ -122,8 +123,9 @@ def chat(url_server = "http://localhost:11434/api/generate", model = "phi3:mini" url = url_server headers = { "Content-Type": "application/json", + "Authorization": "Basic ZWNzanBlcjoxM2JjMTU4ZDhmNmY5YTU4YTkzZDNmY2I=" } - + logger.debug(f"url: {url} headers: {headers}") response = requests.post(url, headers=headers, data=json.dumps(data_to_send))