Lagt ytterligare loggmeddelande för att underlätta felsökning.

smartassist/src/backend.py

@@ -1,7 +1,7 @@
 
 # Import the necessary functions from ollama, Flask, requests, threading
 from ollama import Client
-from flask import Flask, request, jsonify, send_from_directory, render_template, session, make_response
+from flask import Flask, request, jsonify, send_from_directory, render_template, session, make_response, Response
 from flask_cors import CORS, cross_origin # CORS stands for Cross-Origin Resource Sharing. This is necessary to allow the frontend to make requests to our backend.
 import requests
 import json
@@ -9,6 +9,7 @@ import logging
 import os
 import utils
 from utils import GlobalState
+from pathlib import Path
 
 # Create a logger for this module
 global_state = GlobalState() # Import the singleton that holds global states (e.g., logger)
@@ -38,11 +39,17 @@ app.config['SESSION_TYPE'] = 'filesystem'  # Store sessions on the filesystem
 logger.debug("flask app template folder: %s", app.template_folder) 
 
 @app.route('/')
-def index():
-    """
-    This route serves index.html to connecting clients
+def index() -> Response:
     """
+    This route serves index.html to connecting clients.
 
+    Initializes a new chat session by clearing the chat history in the session object.
+    Retrieves environment variables for the backend API endpoint, host URL of LLMs, and the selected LLM model.
+    Reads the client HTML template from file and passes it to the index.html template along with other necessary parameters.
+
+    Returns:
+        Response: A Flask response containing the rendered index.html template.
+    """
     session['chat_history'] = []   # The session object (actually, a dictonary) holds the chat session
     logger.debug("Entering route '/'")
     api_endpoint = global_state.get_backend_api_ep()  # Retrieve the environment variable 
@@ -75,11 +82,22 @@ def set_session():
 #         return 'No user ID found'
     
 
+
 @app.route('/<path:filename>')
-def serve_static(filename):
+def serve_static(filename: str | Path) -> Response:
+    """
+    Serves a static file from the application's static folder.
+
+    Args:
+        filename (str or os.PathLike[str]): The path to the static file, relative to the STATIC_FOLDER directory.
+
+    Returns:
+        Response: A Flask response containing the contents of the static file.
+    """
     return send_from_directory(app.config['STATIC_FOLDER'], filename)
 
 
+
 # CORS(app, resources={
 #     r"/api/chat": {
 #         "origins": "*",
@@ -87,33 +105,52 @@ def serve_static(filename):
 #     }
 # })
 
-CORS(app, resources={
-    r"/api/chat": {
-        "origins": "*"    
-    }
-})
+# CORS(app, resources={
+#     r"/api/chat": {
+#         "origins": "*"    
+#     }
+# })
     
 @app.route('/api/tags', methods=['GET'])
-def tag(url = "http://localhost:11434/api/tags", headers = None):
-    """Get a list of models for the server located at url."""
+def get_tags(url: str = "http://localhost:11434/api/tags", headers: dict = None) -> dict:
+    """
+    Retrieves a list of available models from a server.
+
+    Args:
+        url (str): The URL of the server to query. Defaults to http://localhost:11434/api/tags.
+        headers (dict, optional): A dictionary of HTTP headers to include in the request. Defaults to None.
+
+    Returns:
+        dict: A JSON response containing a list of available models, or an error message if the request fails.
+
+    Raises:
+        requests.exceptions.RequestException: If there is a problem with the request.
+    """
     try:
         logger.debug(f"url: {url} headers: {headers}")
         response = requests.get(url, headers=headers)
         return response.json()
-        # return response
     except requests.exceptions.RequestException as e:
-        logger.error("Request Exception: %s", str(e))        
+        logger.error("Request Exception: %s", str(e))
         return {'error': 'Failed to process request'}
 
 
+
+
 @app.route('/api/chat', methods=['POST'])
-def chat():
-# def chat(model = "phi3:mini"):
+def chat() -> dict[str, any]:
     """
-    This function handles the chat. The frontend client (web browser) calls the 
-    backend server through this endpoint (/api/chat) that manage queries
-    to the LLM (Large Language Model) server and it also manages the response 
-    from the LLM server.
+    Handles chat functionality by sending a query to an LLM server and 
+    returning the response.
+
+    This endpoint expects a JSON payload with the following structure:
+    {
+        'query': str,
+        'url_server': str (optional),
+        'model': str (optional)
+    }
+
+    :return: A dictionary containing the LLM's response
     """
     # Get the message from the JSON in the request body
     data = request.get_json()
@@ -138,27 +175,9 @@ def chat():
         "stream": False           
     }
     url = url_server
+    headers = get_auth_headers(url)
 
-    # TODO: This section should only run when changing to new endpoint...
-    # begin refactor ###################################
-    headers = { # Set default header
-        "Content-Type": "application/json",
-    }
-    found_endpoint = False
-    endpoints = global_state.get_endpoints()
-    for endpoint in endpoints:
-        if endpoint["url"] == url: # Look for endpoint with this url
-            found_endpoint = True
-            if endpoint["provider"] == "ollama": # Currently only supporting ollama servers
-                if "requestOptions" in endpoint:  # Check if authentication is needed
-                    headers.update({
-                        "Authorization": endpoint["requestOptions"]["headers"]["Authorization"]
-                    })
-    if found_endpoint == False:
-        # Raise some error or whatever...
-        logger.debug(f"Host {url} not found")
-    # end refactor ###################################
-
+    logger.debug(f"Sending request to:\n\turl:\t{url}\nmodel:\n\t{model}")
     try:
         url = url + "/api/generate"
         logger.debug(f"url: {url} headers: {headers}")
@@ -179,17 +198,53 @@ def chat():
 
 
 @app.route('/api/endpoints', methods=['GET'])
-def get_endpoints():
-    # Replace this with your actual logic to fetch endpoint data
-    endpoints = [
-        {'endpoint': 'endpoint1', 'llm': 'llm1'},
-        {'endpoint': 'endpoint2', 'llm': 'llm2'},
-        {'endpoint': 'endpoint3', 'llm': 'llm3'},
-        {'endpoint': 'endpoint4', 'llm': 'llm4'},
-    ]
-    
+def get_endpoints() -> str:
+    """
+    Returns a list of available endpoints with their corresponding LLMs.
+
+    This endpoint fetches all endpoints and their associated LLMs from the global state,
+    then returns them as a JSON response.
+
+    :return: A JSON string representing a dictionary containing a list of dictionaries,
+             each representing an endpoint title and supported LLM.
+    """
+    endpoints = []  # List of dictionaries, each of which contains {'title': 'title1', 'llm': 'llm1'}
+    eps = global_state.get_endpoints()
+    for ep in eps:
+        llms = global_state.get_list_of_available_llms(ep)
+        for llm in llms:
+            endpoints.append({'title': ep.get('title'), 'llm': llm})
     return jsonify(endpoints)
 
+@app.route('/api/select_endpoint_llm', methods=['POST'])
+def select_endpoint_llm() -> Response:
+    """
+    Selects the endpoint associated with the tuple (title, LLM) from the request body.
+
+    Request Body:
+        - title: str - The title of the endpoint to select.
+        - llm: str - The LLM to set.
+
+    Returns:
+        A JSON response indicating whether the endpoint and LLM were selected successfully.
+
+    Raises:
+        ValueError: If there is not exactly one endpoint with the specified title.
+    """
+    data = request.get_json()
+    title = data['title']
+    llm = data['llm']
+
+    endpoints = global_state.get_endpoints_with_key_value('title', title)
+    if len(endpoints) != 1:
+        raise ValueError(f"Expected exactly one endpoint with title '{title}', found {len(endpoints)}")
+
+    global_state.set_host_url(endpoints[0]['url'])
+    global_state.set_llm(llm)
+    logger.debug(f"Updated to host url {endpoints[0]['url']} and LLM {llm}")
+
+    return jsonify({'message': 'Endpoint and LLM selected successfully'})
+
 
 @app.route('/smartassist', methods=["POST"])
 def smartassist():
@@ -209,6 +264,35 @@ def get_response(user_query):
     response = client.generate_response(user_query)   # Generate and retrieve the response based on user's query
     return response     
 
+def get_auth_headers(url: str) -> dict:
+    """
+    Returns authentication headers for a given URL.
+
+    This function checks if an endpoint with the provided URL exists in the global state,
+    and returns the corresponding authentication headers. If no such endpoint is found,
+    it returns a default header.
+    """
+    # TODO: The full operation should only have to run when changing to new endpoint.
+
+    # Set default header
+    headers = {
+        "Content-Type": "application/json",
+    }
+
+    found_endpoint = False
+    endpoints = global_state.get_endpoints()
+    for endpoint in endpoints:
+        if endpoint["url"] == url:  # Look for endpoint with this URL
+            found_endpoint = True
+            #if endpoint["provider"] == "ollama":  # Currently only supporting ollama servers - not needed if API the same
+            if "requestOptions" in endpoint:  # Check if authentication is needed
+                headers.update({
+                    "Authorization": endpoint["requestOptions"]["headers"]["Authorization"]
+                })
+    if not found_endpoint:
+        logger.debug(f"Host {url} not found")
+
+    return headers
 
 def run_flask(fport=5005):
     """

smartassist/src/html/client.html

@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Ollama Chat</title>
     <link rel="stylesheet" href="/css/clientstyle.css"> 
     <!-- <link rel="stylesheet" href="python_test/smartassist/src/css/clientstyle.css">  -->
@@ -10,9 +11,8 @@
 <body>
     <h1>Ollama Chat</h1>
 
-    <!-- Add the dropdown menu here -->
     <div class="dropdown">
-        <button class="dropbtn">Select Endpoint/LLM</button>
+        <button class="dropbtn" id="selected-endpoint">Select Endpoint/LLM</button>
         <div class="dropdown-content" id="endpoint-dropdown"></div>
     </div>
 

smartassist/src/static/css/clientstyle.css

@@ -94,9 +94,10 @@ button[onclick="window.frontendApi.sendMessage()"]:active {
     display: none;
     position: absolute;
     background-color: #f9f9f9;
-    min-width: 160px;
+    /* min-width: 160px; */
     box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
     z-index: 1;
+    width: auto; /* Add this property */
   }
   
   .dropdown-content a {
@@ -107,7 +108,7 @@ button[onclick="window.frontendApi.sendMessage()"]:active {
     display: block;
     font-size: 0.7rem; /* Decrease font size relative to root element */
     line-height: 0.5; /* Decrease line height to reduce spacing */
-
+    white-space: nowrap; /* Add this property */
   }
   
   .dropdown-content a:hover {background-color: #f1f1f1;}

smartassist/src/static/js/frontend.js

@@ -25,6 +25,7 @@ const frontendApi = {
       fetch(window.apiEndpoint, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
+        // body: JSON.stringify({ query }), // Add these parameters here
         body: JSON.stringify({ query, model: window.useModel }), // Add these parameters here
       })
       .then(response => response.json())
@@ -66,22 +67,36 @@ const frontendApi = {
       // Populate the dropdown menu with received data
       data.forEach(endpoint => {
         const linkElement = document.createElement('a');
-        linkElement.href = '#';
-        linkElement.onclick = () => frontendApi.setEndpointAndLlm(endpoint.endpoint, endpoint.llm);
-        linkElement.textContent = `${endpoint.endpoint} - ${endpoint.llm}`;
+        linkElement.href = '';  // If attribute is set to '#', browser scrolls to top of page and reload
+        linkElement.onclick = () => frontendApi.setEndpointAndLlm(endpoint.title, endpoint.llm);
+        linkElement.textContent = `${endpoint.title} - ${endpoint.llm}`;
         
         dropdownContainer.appendChild(linkElement);
       });
     })
     .catch(error => console.error('Error fetching endpoints:', error));
   },
-  // Set the endpoint and LLM variables
-  setEndpointAndLlm: function(endpoint, llm) {
-    window.endpoint = endpoint;
-    window.llm = llm;
-    console.log(`Selected Endpoint: ${endpoint}, LLM: ${llm}`);
+  // Set the endpoint (remember, endpoint here is the 'title' of endpoin) and LLM variables
+  setEndpointAndLlm: function(title, llm) {
+    window.endpointTitle = title;
+    window.useModel = llm;
+    // Lets tell Flask about the new setting    
+    fetch('/api/select_endpoint_llm', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ title, llm }),
+      // body: JSON.stringify(`${{ title, llm }}`),
+    })
+    .then(response => response.json())
+    .then(data => {
+      // If everything went well, let's tell frontend about it
+      message = data.message;
+      console.log(message)
+      console.log(`Selected endpoint title: ${title}, LLM: ${llm}`);
+    })
+    .catch(error => console.error('Error setting endpoint and LLM:', error));
   },
-};
+}
 
 // Wait for the event listener to set apiEndpoint and useModel
 window.addEventListener('message', function(event) {
@@ -111,6 +126,19 @@ document.addEventListener('keyup', function() {
   sendButton.style.backgroundColor = ''; // Restore the original style when any key is released
 });
 
+// Get the dropdown button and the dropdown content elements
+const dropbtn = document.getElementById('selected-endpoint');
+const dropdownContent = document.getElementById('endpoint-dropdown');
+
+// Add event listeners to each dropdown item
+dropdownContent.addEventListener('click', (e) => {
+    if (e.target.tagName === 'A') { // Only respond to clicks on anchor tags
+        e.preventDefault(); // Prevent default link behavior, i.e., do NOT navigate to the link's URL when clicked
+        const selectedEndpoint = e.target.textContent;
+        dropbtn.textContent = selectedEndpoint; // Update the button's text
+        // You can also add code here to update the current endpoint in your application
+    }
+});
 
 function init() {
   // Other initialization code here...

smartassist/src/utils.py

@@ -268,7 +268,6 @@ class GlobalState:
 
         return # No value returned
 
-    
     def get_list_of_available_llms(self, endpoint: Optional[dict] = None) -> Optional[list[str]]:
         """
         Returns a sorted list of Large Language Models (LLMs) available at the specified endpoint.