From e4a711fcbd290dd111e2af1f5fef4544998d00e4 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Sat, 20 Dec 2025 20:13:28 +0100
Subject: [PATCH 01/18] Added filtering query output to top n elements

---
 src/Server/Controllers/EntityController.cs |  4 ++--
 src/Server/Searchdomain.cs                 | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Server/Controllers/EntityController.cs b/src/Server/Controllers/EntityController.cs
index 4765311..36ac1a8 100644
--- a/src/Server/Controllers/EntityController.cs
+++ b/src/Server/Controllers/EntityController.cs
@@ -25,7 +25,7 @@ public class EntityController : ControllerBase
     }
 
     [HttpGet("Query")]
-    public ActionResult<EntityQueryResults> Query(string searchdomain, string query)
+    public ActionResult<EntityQueryResults> Query(string searchdomain, string query, int? topN)
     {
         Searchdomain searchdomain_;
         try
@@ -40,7 +40,7 @@ public class EntityController : ControllerBase
             _logger.LogError("Unable to retrieve the searchdomain {searchdomain} - {ex.Message} - {ex.StackTrace}", [searchdomain, ex.Message, ex.StackTrace]);
             return Ok(new EntityQueryResults() {Results = [], Success = false, Message = "Unable to retrieve the searchdomain - it likely exists, but some other error happened." });
         }
-        var results = searchdomain_.Search(query);
+        List<(float, string)> results = searchdomain_.Search(query, topN);
         List<EntityQueryResult> queryResults = [.. results.Select(r => new EntityQueryResult
         {
             Name = r.Item2,
diff --git a/src/Server/Searchdomain.cs b/src/Server/Searchdomain.cs
index 019eb79..7566363 100644
--- a/src/Server/Searchdomain.cs
+++ b/src/Server/Searchdomain.cs
@@ -154,7 +154,7 @@ public class Searchdomain
         embeddingCache = []; // TODO remove this and implement proper remediation to improve performance
     }
 
-    public List<(float, string)> Search(string query)
+    public List<(float, string)> Search(string query, int? topN = null)
     {
         if (searchCache.TryGetValue(query, out DateTimedSearchResult cachedResult))
         {
@@ -190,9 +190,14 @@ public class Searchdomain
             }
             result.Add((entity.probMethod(datapointProbs), entity.name));
         }
-        List<(float, string)> results = [.. result.OrderByDescending(s => s.Item1)];
+        IEnumerable<(float, string)> sortedResults = result.OrderByDescending(s => s.Item1);
+        if (topN is not null)
+        {
+            sortedResults = sortedResults.Take(topN ?? 0);
+        }
+        List<(float, string)> results = [.. sortedResults];
         List<ResultItem> searchResult = new(
-            [.. results.Select(r =>
+            [.. sortedResults.Select(r =>
                 new ResultItem(r.Item1, r.Item2 ))]
         );
         searchCache[query] = new DateTimedSearchResult(DateTime.Now, searchResult);

From ae2b9e9f41d99c11922d4458af16f1da5f2eac11 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Sat, 20 Dec 2025 22:02:57 +0100
Subject: [PATCH 02/18] Added models listing endpoint

---
 src/Server/AIProvider.cs                   | 73 ++++++++++++++++++++++
 src/Server/Controllers/ServerController.cs | 38 +++++++++++
 src/Shared/Models/ServerModels.cs          | 15 +++++
 3 files changed, 126 insertions(+)
 create mode 100644 src/Server/Controllers/ServerController.cs
 create mode 100644 src/Shared/Models/ServerModels.cs

diff --git a/src/Server/AIProvider.cs b/src/Server/AIProvider.cs
index 0a244a2..1e5c485 100644
--- a/src/Server/AIProvider.cs
+++ b/src/Server/AIProvider.cs
@@ -116,6 +116,79 @@ public class AIProvider
             throw;
         }
     }
+
+    public string[] GetModels()
+    {
+        var aIProviders = aIProvidersConfiguration.AiProviders;
+        List<string> results = [];
+        foreach (KeyValuePair<string, AIProviderConfiguration> aIProviderKV in aIProviders)
+        {
+            string aIProviderName = aIProviderKV.Key;
+            AIProviderConfiguration aIProvider = aIProviderKV.Value;
+
+            using var httpClient = new HttpClient();
+
+            string modelNameJsonPath = "";
+            Uri baseUri = new(aIProvider.BaseURL);
+            Uri requestUri;
+            string[][] requestHeaders = [];
+            switch (aIProvider.Handler)
+            {
+                case "ollama":
+                    modelNameJsonPath = "$.models[*].name";
+                    requestUri = new Uri(baseUri, "/api/tags");
+                    break;
+                case "openai":
+                    modelNameJsonPath = "$.data[*].id";
+                    requestUri = new Uri(baseUri, "/v1/models");
+                    if (aIProvider.ApiKey is not null)
+                    {
+                        requestHeaders = [
+                            ["Authorization", $"Bearer {aIProvider.ApiKey}"]
+                        ];
+                    }
+                    break;
+                default:
+                    _logger.LogError("Unknown handler {aIProvider.Handler} in AiProvider {provider}.", [aIProvider.Handler, aIProvider]);
+                    throw new ServerConfigurationException($"Unknown handler {aIProvider.Handler} in AiProvider {aIProvider}.");
+            }
+
+            var request = new HttpRequestMessage()
+            {
+                RequestUri = requestUri,
+                Method = HttpMethod.Post
+            };
+            
+            foreach (var header in requestHeaders)
+            {
+                request.Headers.Add(header[0], header[1]);
+            }
+            HttpResponseMessage response = httpClient.GetAsync(requestUri).Result;
+            string responseContent = response.Content.ReadAsStringAsync().Result;
+            try
+            {
+                JObject responseContentJson = JObject.Parse(responseContent);
+                IEnumerable<JToken>? responseContentTokens = responseContentJson.SelectTokens(modelNameJsonPath);
+                if (responseContentTokens is null)
+                {
+                    _logger.LogError("Unable to select tokens using JSONPath {modelNameJsonPath} for string: {responseContent}.", [modelNameJsonPath, responseContent]);
+                    throw new JSONPathSelectionException(modelNameJsonPath, responseContent);
+                }
+                IEnumerable<string?> aIProviderResult = responseContentTokens.Values<string>();
+                foreach (string? result in aIProviderResult)
+                {
+                    if (result is null) continue;
+                    results.Add(aIProviderName + ":" + result);
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("Unable to parse the response to valid models. {ex.Message}", [ex.Message]);
+                throw;
+            }
+        }
+        return [.. results];
+    }
 }
 
 public class AIProvidersConfiguration
diff --git a/src/Server/Controllers/ServerController.cs b/src/Server/Controllers/ServerController.cs
new file mode 100644
index 0000000..ca4d9b8
--- /dev/null
+++ b/src/Server/Controllers/ServerController.cs
@@ -0,0 +1,38 @@
+namespace Server.Controllers;
+
+using System.Text.Json;
+using ElmahCore;
+using Microsoft.AspNetCore.Mvc;
+using Server.Exceptions;
+using Server.Helper;
+using Shared.Models;
+
+[ApiController]
+[Route("[controller]")]
+public class ServerController : ControllerBase
+{
+    private readonly ILogger<ServerController> _logger;
+    private readonly IConfiguration _config;
+    private AIProvider _aIProvider;
+
+    public ServerController(ILogger<ServerController> logger, IConfiguration config, AIProvider aIProvider)
+    {
+        _logger = logger;
+        _config = config;
+        _aIProvider = aIProvider;
+    }
+
+    [HttpGet("GetModels")]
+    public ActionResult<ServerGetModelsResult> GetModels()
+    {
+        try
+        {
+            string[] models = _aIProvider.GetModels();
+            return new ServerGetModelsResult() { Models = models, Success = true };
+        } catch (Exception ex)
+        {
+            _logger.LogError("Unable to get models due to exception {ex.Message} - {ex.StackTrace}", [ex.Message, ex.StackTrace]);
+            return new ServerGetModelsResult() { Success = false, Message = ex.Message};
+        }
+    }
+}
diff --git a/src/Shared/Models/ServerModels.cs b/src/Shared/Models/ServerModels.cs
new file mode 100644
index 0000000..278582e
--- /dev/null
+++ b/src/Shared/Models/ServerModels.cs
@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace Shared.Models;
+
+public class ServerGetModelsResult
+{
+    [JsonPropertyName("Success")]
+    public required bool Success { get; set; }
+
+    [JsonPropertyName("Message")]
+    public string? Message { get; set; }
+
+    [JsonPropertyName("Models")]
+    public string[]? Models { get; set; }    
+}
\ No newline at end of file

From 20fc309b07eefe925a8d0c12ba95c58f38f0d02a Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Sun, 21 Dec 2025 00:15:28 +0100
Subject: [PATCH 03/18] Added SimilarityMethodsEnum

---
 src/Server/SimilarityMethods.cs | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/Server/SimilarityMethods.cs b/src/Server/SimilarityMethods.cs
index 9521825..9d02c22 100644
--- a/src/Server/SimilarityMethods.cs
+++ b/src/Server/SimilarityMethods.cs
@@ -21,20 +21,28 @@ public class SimilarityMethod
     }
 }
 
+public enum SimilarityMethodEnum
+{
+    Cosine,
+    Euclidian,
+    Manhattan,
+    Pearson
+}
+
 public static class SimilarityMethods
 {
     public delegate float similarityMethodProtoDelegate(float[] vector1, float[] vector2);
     public delegate float similarityMethodDelegate(float[] vector1, float[] vector2);
-    public static readonly Dictionary<string, similarityMethodProtoDelegate> probMethods;
+    public static readonly Dictionary<SimilarityMethodEnum, similarityMethodProtoDelegate> probMethods;
 
     static SimilarityMethods()
     {
-        probMethods = new Dictionary<string, similarityMethodProtoDelegate>
+        probMethods = new Dictionary<SimilarityMethodEnum, similarityMethodProtoDelegate>
         {
-            ["Cosine"] = CosineSimilarity,
-            ["Euclidian"] = EuclidianDistance,
-            ["Manhattan"] = ManhattanDistance,
-            ["Pearson"] = PearsonCorrelation
+            [SimilarityMethodEnum.Cosine] = CosineSimilarity,
+            [SimilarityMethodEnum.Euclidian] = EuclidianDistance,
+            [SimilarityMethodEnum.Manhattan] = ManhattanDistance,
+            [SimilarityMethodEnum.Pearson] = PearsonCorrelation
         };
     }
 
@@ -42,7 +50,12 @@ public static class SimilarityMethods
     {
         string methodName = name;
 
-        if (!probMethods.TryGetValue(methodName, out similarityMethodProtoDelegate? method))
+        SimilarityMethodEnum probMethodEnum = (SimilarityMethodEnum)Enum.Parse(
+            typeof(SimilarityMethodEnum),
+            methodName
+        );
+
+        if (!probMethods.TryGetValue(probMethodEnum, out similarityMethodProtoDelegate? method))
         {
             return null;
         }

From 8329beeca7be99365f2b31e6d6fb6cbe1da9e8b2 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Sun, 21 Dec 2025 00:57:47 +0100
Subject: [PATCH 04/18] Added entity creation

---
 src/Server/Controllers/EntityController.cs |   2 +-
 src/Server/Views/Home/Index.cshtml         | 305 +++++++++++++++++++++
 2 files changed, 306 insertions(+), 1 deletion(-)

diff --git a/src/Server/Controllers/EntityController.cs b/src/Server/Controllers/EntityController.cs
index 36ac1a8..e5866ff 100644
--- a/src/Server/Controllers/EntityController.cs
+++ b/src/Server/Controllers/EntityController.cs
@@ -85,7 +85,7 @@ public class EntityController : ControllerBase
         } catch (Exception ex)
         {
             if (ex.InnerException is not null) ex = ex.InnerException;
-            _logger.LogError("Unable to index the provided entities. {ex.Message}", [ex.Message]);
+            _logger.LogError("Unable to index the provided entities. {ex.Message} - {ex.StackTrace}", [ex.Message, ex.StackTrace]);
             return Ok(new EntityIndexResult() { Success = false, Message = ex.Message });
         }
 
diff --git a/src/Server/Views/Home/Index.cshtml b/src/Server/Views/Home/Index.cshtml
index 022967b..59bac16 100644
--- a/src/Server/Views/Home/Index.cshtml
+++ b/src/Server/Views/Home/Index.cshtml
@@ -1,11 +1,17 @@
 @using Server.Models
 @using System.Web
 @using Server.Services
+@using Server
+
 @inject LocalizationService T
+@inject AIProvider AIProvider
 @model HomeIndexViewModel
 @{
     ViewData["Title"] = "Home Page";
     int i = 0;
+    string[] probMethods = [.. Enum.GetValues(typeof(ProbMethodEnum)).Cast<ProbMethodEnum>().Select(e => e.ToString())];
+    string[] similarityMethods = [.. Enum.GetValues(typeof(SimilarityMethodEnum)).Cast<SimilarityMethodEnum>().Select(e => e.ToString())];
+    string[] models = AIProvider.GetModels();
     Dictionary<int, string> domains = [];
     Model.Searchdomains.ForEach(domain =>
     {
@@ -130,6 +136,7 @@
                 <tbody>
                 </tbody>
               </table>
+              <buttton class="btn btn-primary" id="entityCreate">@T["Add new entity"]</buttton>
             </div>
           </div>
 
@@ -314,11 +321,90 @@
   </div>
 </div>
 
+<!-- Create entity Modal -->
+<div class="modal fade" id="createEntityModal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog modal-xl modal-dialog-scrollable">
+    <div class="modal-content">
+
+      <div class="modal-header bg-primary text-white">
+        <h2 class="modal-title" id="createEntityTitle">@T["Create entity"]</h2>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+      </div>
+
+      <div class="modal-body">
+        <!-- Entity base -->
+        <div class="row g-3">
+          <div class="col-md-6">
+            <label for="createEntityName" class="form-label">@T["Entity name"]</label>
+            <input type="text" class="form-control mb-3" id="createEntityName" placeholder="@T["Entity name"]" />
+          </div>
+          <div class="col-md-6">
+            <label for="createEntityProbMethod" class="form-label">@T["Probmethod"]</label>
+            <input list="probMethods" id="createEntityProbMethod" class="form-control" aria-label="@T["Probmethod"]">
+            <datalist id="probMethods">
+              @foreach (string probMethod in probMethods)
+              {
+                <option value=@probMethod>@probMethod</option>
+              }
+            </datalist>
+          </div>
+        </div>
+        <!-- Attributes -->
+        <div class="row g-3">
+          <h3 class="fs-5">@T["Attributes"]</h3>
+          <table>
+            <thead>
+              <tr>
+                <td>@T["Name"]</td>
+                <td>@T["Value"]</td>
+                <td class="visually-hidden">@T["Action"]</td>
+              </tr>
+            </thead>
+            <tbody id="createEntityAttributesContainer"></tbody>
+          </table>
+          <button type="button" id="createEntityAttributesAdd" class="btn btn-primary">@T["Add attribute"]</button>
+        </div>
+        <!-- Datapoints -->
+        <div class="row g-3 mt-3">
+          <h3 class="fs-5">@T["Datapoints"]</h3>
+          <table>
+            <thead>
+              <tr>
+                <td>@T["Name"]</td>
+                <td>@T["Value"]</td>
+                <td>@T["Probmethod_embedding"]</td>
+                <td>@T["Similarity method"]</td>
+                <td>@T["Model"]</td>
+                <td class="visually-hidden">@T["Action"]</td>
+              </tr>
+            </thead>
+            <tbody id="createEntityDatapointsContainer"></tbody>
+          </table>
+          <button type="button" id="createEntityDatapointsAdd" class="btn btn-primary">@T["Add datapoint"]</button>
+        </div>
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" id="EntityConfirmCreate" class="btn btn-primary" data-bs-dismiss="modal">
+          @T["Create"]
+        </button>
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+          @T["Close"]
+        </button>
+      </div>
+
+    </div>
+  </div>
+</div>
+
 
 <script>
     var domains = JSON.parse('@Html.Raw(System.Text.Json.JsonSerializer.Serialize(domains))');
+    var probMethods = JSON.parse('@Html.Raw(System.Text.Json.JsonSerializer.Serialize(probMethods))');
+    var similarityMethods = JSON.parse('@Html.Raw(System.Text.Json.JsonSerializer.Serialize(similarityMethods))');
     var entities = null;
     var queries = null;
+    var models = JSON.parse('@Html.Raw(System.Text.Json.JsonSerializer.Serialize(models))');
 
     document.addEventListener('DOMContentLoaded', () => {
         const filterInput = document.getElementById('entitiesFilter');
@@ -387,6 +473,166 @@
                 );
                 modal.show();
             });
+        
+        document
+            .getElementById('entityCreate')
+            .addEventListener('click', () => {
+                const modal = new bootstrap.Modal(
+                    document.getElementById('createEntityModal')
+                );
+                modal.show();
+                document.getElementById('createEntityDatapointsAdd').click();
+            });
+
+        document
+            .getElementById('createEntityAttributesAdd')
+            .addEventListener('click', () => {
+                var uuid = crypto.randomUUID();
+                var entityAttributesContainer = document.getElementById('createEntityAttributesContainer');
+                var tr = document.createElement('tr');
+                tr.setAttribute('data-uid', uuid);
+                var tdKey = document.createElement('td');
+                var keyInput = document.createElement('input');
+                keyInput.classList.add('form-control')
+                keyInput.ariaLabel = '@T["Key"]';
+                tdKey.append(keyInput);
+                var tdValue = document.createElement('td');
+                var ValueInput = document.createElement('textarea');
+                ValueInput.classList.add('form-control')                
+                ValueInput.ariaLabel = '@T["Value"]';
+                tdValue.append(ValueInput);
+                var tdAction = document.createElement('td');
+                var tdButton = document.createElement('button');
+                tdButton.classList.add('btn', 'btn-danger');
+                tdButton.textContent = '@T["Remove"]';
+                tdButton.ariaLabel = '@T["Remove attribute"]';
+                tdAction.append(tdButton);
+                tdButton.onclick = function() {
+                  tr.remove();
+                };
+                tr.append(tdKey);
+                tr.append(tdValue);
+                tr.append(tdAction);
+                entityAttributesContainer.append(tr);
+            });
+
+        document
+            .getElementById('createEntityDatapointsAdd')
+            .addEventListener('click', () => {
+                var uuid = crypto.randomUUID();
+                var enntityDatapointsContainer = document.getElementById('createEntityDatapointsContainer');
+                var tr = document.createElement('tr');
+                tr.setAttribute('data-uid', uuid);
+                var tdName = document.createElement('td');
+                var nameInput = document.createElement('input');
+                nameInput.classList.add('form-control')
+                nameInput.ariaLabel = '@T["Name"]';
+                tdName.append(nameInput);
+                var tdValue = document.createElement('td');
+                var ValueInput = document.createElement('textarea');
+                ValueInput.classList.add('form-control')                
+                ValueInput.ariaLabel = '@T["Value"]';
+                tdValue.append(ValueInput);
+
+                var tdProbmethodEmbedding = document.createElement('td');
+                var probMethodSelect = document.createElement('select');
+                probMethodSelect.classList.add('probmethod');
+                for (i in probMethods)
+                {
+                    let probMethodSelectElement = document.createElement('option');
+                    probMethodSelectElement.value = probMethods[i];
+                    probMethodSelectElement.text = probMethods[i];
+                    probMethodSelect.append(probMethodSelectElement);
+                }
+                probMethodSelect.classList.add('form-control')                
+                probMethodSelect.ariaLabel = '@T["Probmethod_embedding"]';
+                tdProbmethodEmbedding.append(probMethodSelect);
+
+                var tdSimilarityMethod = document.createElement('td');
+                var similarityMethodSelect = document.createElement('select');
+                similarityMethodSelect.classList.add('similarityMethod');
+                for (i in similarityMethods)
+                {
+                    let similarityMethodSelectElement = document.createElement('option');
+                    similarityMethodSelectElement.value = similarityMethods[i];
+                    similarityMethodSelectElement.text = similarityMethods[i];
+                    similarityMethodSelect.append(similarityMethodSelectElement);
+                }
+                similarityMethodSelect.classList.add('form-control')                
+                similarityMethodSelect.ariaLabel = '@T["Similarity method"]';
+                tdSimilarityMethod.append(similarityMethodSelect);
+
+                var tdModel = document.createElement('td');
+                var modelSelect = document.createElement('select');
+                modelSelect.classList.add('model');
+                modelSelect.multiple = true;
+                for (i in models)
+                {
+                    let modelSelectElement = document.createElement('option');
+                    modelSelectElement.value = models[i];
+                    modelSelectElement.text = models[i];
+                    modelSelect.append(modelSelectElement);
+                }
+                modelSelect.classList.add('form-control')
+                modelSelect.ariaLabel = '@T["Probmethod_embedding"]';
+                tdModel.append(modelSelect);
+                
+                
+                var tdAction = document.createElement('td');
+                var tdButton = document.createElement('button');
+                tdButton.classList.add('btn', 'btn-danger');
+                tdButton.textContent = '@T["Remove"]';
+                tdButton.ariaLabel = '@T["Remove attribute"]';
+                tdAction.append(tdButton);
+                tdButton.onclick = function() {
+                  tr.remove();
+                };
+                tr.append(tdName);
+                tr.append(tdValue);
+                tr.append(tdProbmethodEmbedding);
+                tr.append(tdSimilarityMethod);
+                tr.append(tdModel);
+                tr.append(tdAction);
+                enntityDatapointsContainer.append(tr);
+
+            });
+
+        document
+            .getElementById('EntityConfirmCreate')
+            .addEventListener('click', () => {
+                var name = document.getElementById('createEntityName').value;
+                var probMethod = document.getElementById('createEntityProbMethod').value;
+                var attributes = getEntityAttributes();
+                var datapoints = getEntityDatapoints();
+                var data = [{
+                  "name": name,
+                  "probmethod": probMethod,
+                  "searchdomain": encodeURIComponent(domains[getSelectedDomainKey()]),
+                  "attributes": attributes,
+                  "datapoints": datapoints
+                }];
+                // TODO add throbber to indicate loading
+                fetch(`/Entity/Index`, {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    body: JSON.stringify(data)
+                }).then(async response => {
+                    result = await response.json();
+                    if (response.ok && result.Success) {
+                        // TODO add toast
+                        console.log('Entity was created successfully');
+                        selectDomain(getSelectedDomainKey());
+                    } else {
+                        // TODO add toast
+                        console.error('Failed to create entity:', result.Message);
+                    }
+                }).catch(error => {
+                    console.error('Error creating entity:', error);
+                });
+
+            });
 
         document
             .getElementById('searchdomainConfirmCreate')
@@ -819,4 +1065,63 @@
         modal.show();
     }
 
+
+    function getEntityAttributes(containerName = 'createEntityAttributesContainer') {
+        const container = document.getElementById(containerName);
+        const rows = container.querySelectorAll('tr[data-uid]');
+        const attributes = {};
+        
+        rows.forEach(row => {
+            const keyInput = row.querySelector('input.form-control');
+            const valueTextarea = row.querySelector('textarea.form-control');
+            
+            if (keyInput && valueTextarea) {
+                const key = keyInput.value.trim();
+                const value = valueTextarea.value.trim();
+                
+                if (key) {
+                    attributes[key] = value;
+                }
+            }
+        });
+        
+        return attributes;
+    }
+
+    function getEntityDatapoints(containerName = 'createEntityDatapointsContainer') {
+        const container = document.getElementById(containerName);
+        const rows = container.querySelectorAll('tr[data-uid]');
+        const datapoints = [];
+        
+        rows.forEach(row => {
+            const keyInput = row.querySelector('input.form-control');
+            const valueTextarea = row.querySelector('textarea.form-control');
+            const probmethodSelect = row.querySelector('select.probmethod');
+            const similaritymethodSelect = row.querySelector('select.similarityMethod');
+            const modelSelect = row.querySelector('select.model');
+            
+            if (keyInput && valueTextarea && probmethodSelect && modelSelect) {
+                const key = keyInput.value.trim();
+                const value = valueTextarea.value.trim();
+                const probMethod = probmethodSelect.selectedOptions[0].value;
+                const similarityMethod = similaritymethodSelect.selectedOptions[0].value;
+                const modelSelection = Array.from(modelSelect.selectedOptions)
+                    .map(option => option.value);
+                
+                if (key) {
+                    let datapoint = {
+                      "name": key,
+                      "text": value,
+                      "probmethod_embedding": probMethod,
+                      "similarityMethod": similarityMethod,
+                      "model": modelSelection
+                    };
+                    datapoints.push(datapoint);
+                }
+            }
+        });
+        
+        return datapoints;
+    }
+
 </script>
\ No newline at end of file

From bf6265882c0d2f73909238916e552313e40db805 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Sun, 21 Dec 2025 00:58:28 +0100
Subject: [PATCH 05/18] Improved size estimation display units

---
 src/Server/Views/Home/Index.cshtml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Server/Views/Home/Index.cshtml b/src/Server/Views/Home/Index.cshtml
index 59bac16..0fc4a0e 100644
--- a/src/Server/Views/Home/Index.cshtml
+++ b/src/Server/Views/Home/Index.cshtml
@@ -837,7 +837,7 @@
             if (cacheUtilization != null && cacheUtilization.SearchCacheSizeBytes != null)
             {
                 document.querySelector('#cacheUtilization').innerText =
-                    `${(cacheUtilization.SearchCacheSizeBytes / (1024 * 1024)).toFixed(2)}MiB`;
+                    `${NumberOfBytesAsHumanReadable(cacheUtilization.SearchCacheSizeBytes)}`;
             } else {
                 // TODO add toast
                 console.error('Failed to fetch searchdomain cache utilization');
@@ -848,7 +848,7 @@
             if (databaseUtilization != null && databaseUtilization.SearchdomainDatabaseSizeBytes != null)
             {
                 document.querySelector('#databaseUtilization').innerText =
-                    `${(databaseUtilization.SearchdomainDatabaseSizeBytes / (1024 * 1024)).toFixed(2)}MiB`;
+                    `${NumberOfBytesAsHumanReadable(databaseUtilization.SearchdomainDatabaseSizeBytes)}`;
             } else {
                 // TODO add toast
                 console.error('Failed to fetch searchdomain database utilization');
@@ -1065,6 +1065,16 @@
         modal.show();
     }
 
+    function NumberOfBytesAsHumanReadable(bytes, decimals = 2) {
+        if (bytes === 0) return '0 B';
+        if (bytes > 1.20892581961*(10**27)) return "∞ B";
+        const units = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB']; // 
+        const unitIndex = Math.floor(Math.log2(bytes) / 10);
+        const unit = units[Math.min(unitIndex, units.length - 1)];
+        const value = bytes / Math.pow(1024, unitIndex);
+        
+        return `${value.toFixed(decimals)} ${unit}`;
+    }
 
     function getEntityAttributes(containerName = 'createEntityAttributesContainer') {
         const container = document.getElementById(containerName);

From 29f910a65a0c76292e6f5c5af87e891e0251d9c4 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Sun, 21 Dec 2025 00:58:44 +0100
Subject: [PATCH 06/18] Fixed typos

---
 src/Server/Views/Home/Index.cshtml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Server/Views/Home/Index.cshtml b/src/Server/Views/Home/Index.cshtml
index 0fc4a0e..15dfbf6 100644
--- a/src/Server/Views/Home/Index.cshtml
+++ b/src/Server/Views/Home/Index.cshtml
@@ -63,7 +63,7 @@
             <h3>@T["Settings"]</h3>
             <div class="col-md-6">
               <input type="checkbox" class="form-check-input" id="searchdomainConfigCacheReconciliation" />
-              <label class="form-check-label" for="searchdomainConfigCacheReconciliation">@T["Cache reconsiliation"]</label>
+              <label class="form-check-label" for="searchdomainConfigCacheReconciliation">@T["Cache reconciliation"]</label>
             </div>
             <div class="col-md-2 mt-3 mt-md-0">
               <button class="btn btn-warning w-100" id="searchdomainConfigUpdate">@T["Update"]</button>
@@ -305,7 +305,7 @@
         <label for="createSearchdomainName" class="form-label">@T["Searchdomain name"]</label>
         <input type="text" class="form-control mb-3" id="createSearchdomainName" placeholder="@T["Searchdomain name"]" />
         <input type="checkbox" class="form-check-input" id="createSearchdomainWithCacheReconciliation" />
-        <label class="form-check-label" for="createSearchdomainWithCacheReconciliation">@T["Enable cache reconsiliation"]</label>
+        <label class="form-check-label" for="createSearchdomainWithCacheReconciliation">@T["Enable cache reconciliation"]</label>
       </div>
 
       <div class="modal-footer">
@@ -778,7 +778,7 @@
         document.querySelector('#searchdomainName').innerText = domainName;
 
         let searchdomainConfigPromise = getSearchdomainConfig(getSelectedDomainKey());
-        let configElementCacheReconsiliation = document.getElementById('searchdomainConfigCacheReconciliation');
+        let configElementCachereconciliation = document.getElementById('searchdomainConfigCacheReconciliation');
 
         let cacheUtilizationPromise = getSearchdomainCacheUtilization(getSelectedDomainKey());
         let databaseUtilizationPromise = getSearchdomainDatabaseUtilization(getSelectedDomainKey());
@@ -824,11 +824,11 @@
             if (searchdomainConfig != null && searchdomainConfig.Settings != null)
             {
                 console.log(searchdomainConfig);
-                configElementCacheReconsiliation.checked = searchdomainConfig.Settings.CacheReconciliation;
-                configElementCacheReconsiliation.disabled = false;
+                configElementCachereconciliation.checked = searchdomainConfig.Settings.CacheReconciliation;
+                configElementCachereconciliation.disabled = false;
             } else {
                 //configElement.value = 'Error fetching searchdomain config';
-                configElementCacheReconsiliation.disabled = true;
+                configElementCachereconciliation.disabled = true;
                 // TODO add toast
                 console.error('Failed to fetch searchdomain config');
             }

From 74481ac8461f8c48771f646539cb8d79e6b10236 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Sun, 21 Dec 2025 02:11:09 +0100
Subject: [PATCH 07/18] Fixed deleting entities not working

---
 src/Server/Controllers/EntityController.cs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Server/Controllers/EntityController.cs b/src/Server/Controllers/EntityController.cs
index e5866ff..b5c7499 100644
--- a/src/Server/Controllers/EntityController.cs
+++ b/src/Server/Controllers/EntityController.cs
@@ -146,13 +146,28 @@ public class EntityController : ControllerBase
     [HttpGet("Delete")]
     public ActionResult<EntityDeleteResults> Delete(string searchdomain, string entityName)
     {
-        Entity? entity_ = SearchdomainHelper.CacheGetEntity([], entityName);
+        Searchdomain searchdomain_;
+        try
+        {
+            searchdomain_ = _domainManager.GetSearchdomain(searchdomain);
+        } catch (SearchdomainNotFoundException)
+        {
+            _logger.LogError("Unable to retrieve the searchdomain {searchdomain} - it likely does not exist yet", [searchdomain]);
+            return Ok(new EntityQueryResults() {Results = [], Success = false, Message = "Searchdomain not found" });
+        } catch (Exception ex)
+        {
+            _logger.LogError("Unable to retrieve the searchdomain {searchdomain} - {ex.Message} - {ex.StackTrace}", [searchdomain, ex.Message, ex.StackTrace]);
+            return Ok(new EntityQueryResults() {Results = [], Success = false, Message = "Unable to retrieve the searchdomain - it likely exists, but some other error happened." });
+        }
+        
+        Entity? entity_ = SearchdomainHelper.CacheGetEntity(searchdomain_.entityCache, entityName);
         if (entity_ is null)
         {
             _logger.LogError("Unable to delete the entity {entityName} in {searchdomain} - it was not found under the specified name", [entityName, searchdomain]);
             return Ok(new EntityDeleteResults() {Success = false, Message = "Entity not found"});
         }
         _databaseHelper.RemoveEntity([], _domainManager.helper, entityName, searchdomain);
+        searchdomain_.entityCache.RemoveAll(entity => entity.name == entityName);
         return Ok(new EntityDeleteResults() {Success = true});
     }
 }

From fbfaff29530b30605264b70732e506e8f8ff96db Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Sun, 21 Dec 2025 02:11:59 +0100
Subject: [PATCH 08/18] Added entity edit and delete buttons, added entity
 delete functionality

---
 src/Server/Views/Home/Index.cshtml | 74 +++++++++++++++++++++++++++++-
 1 file changed, 73 insertions(+), 1 deletion(-)

diff --git a/src/Server/Views/Home/Index.cshtml b/src/Server/Views/Home/Index.cshtml
index 15dfbf6..ad5575d 100644
--- a/src/Server/Views/Home/Index.cshtml
+++ b/src/Server/Views/Home/Index.cshtml
@@ -397,6 +397,32 @@
   </div>
 </div>
 
+<!-- Delete entity Modal -->
+<div class="modal fade" id="deleteEntityModal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog modal-m modal-dialog-scrollable">
+    <div class="modal-content">
+
+      <div class="modal-header bg-danger text-white">
+        <h2 class="modal-title" id="deleteEntityTitle">@T["Delete entity"]</h2>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+      </div>
+
+      <div class="modal-body">
+        <p>@T["Are you sure you want to delete this entity? This action cannot be undone."]</p>
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" id="EntityConfirmDelete" class="btn btn-danger" data-bs-dismiss="modal">
+          @T["Delete"]
+        </button>
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+          @T["Close"]
+        </button>
+      </div>
+
+    </div>
+  </div>
+</div>
 
 <script>
     var domains = JSON.parse('@Html.Raw(System.Text.Json.JsonSerializer.Serialize(domains))');
@@ -681,6 +707,28 @@
                     console.error('Error clearing searchdomain cache:', error);
                 });
             });
+
+        document
+          .getElementById('EntityConfirmDelete')
+          .addEventListener('click', () => {
+                const domainKey = getSelectedDomainKey();
+                const entityName = document.getElementById('EntityConfirmDelete').getAttribute('data-name');
+                fetch(`/Entity/Delete?searchdomain=${encodeURIComponent(domains[domainKey])}&entityName=${entityName}`, {
+                    method: 'GET'
+                }).then(async response => {
+                    let result = await response.json();
+                    if (response.ok && result.Success) {
+                        // TODO add toast
+                        console.log('Entity deleted successfully');
+                        selectDomain(getSelectedDomainKey());
+                    } else {
+                        // TODO add toast
+                        console.error('Failed to delete entity:', result.Message);
+                    }
+                }).catch(error => {
+                    console.error('Error deleting entity:', error);
+                });
+          });
     });
 
     function deleteSearchdomain(domainKey) {
@@ -888,15 +936,39 @@
             row.appendChild(nameCell);
 
             var actionCell = document.createElement('td');
+            actionCell.classList.add('btn-group');
             var detailsButton = document.createElement('button');
             detailsButton.className = 'btn btn-info btn-sm';
-            detailsButton.textContent = 'Details';
+            detailsButton.textContent = '@T["Details"]';
             detailsButton.setAttribute("data-index", entities.findIndex(en => en == entity));
             detailsButton.addEventListener('click', () => {
               showEntityDetails(entity);
             });
 
+            var updateButton = document.createElement('button');
+            updateButton.className = 'btn btn-warning btn-sm';
+            updateButton.textContent = '@T["Update"]';
+            updateButton.setAttribute("data-index", entities.findIndex(en => en == entity));
+            updateButton.addEventListener('click', () => {
+              updateEntity(entity);
+            });
+
+            var deleteButton = document.createElement('button');
+            deleteButton.className = 'btn btn-danger btn-sm';
+            deleteButton.textContent = '@T["Delete"]';
+            deleteButton.setAttribute("data-index", entities.findIndex(en => en == entity));
+            deleteButton.addEventListener('click', () => {
+              const modal = new bootstrap.Modal(
+                  document.getElementById('deleteEntityModal')
+              );
+                modal.show();
+              let entityConfirmDelete = document.getElementById('EntityConfirmDelete');
+              entityConfirmDelete.setAttribute('data-name', entity.Name);
+            });
+
             actionCell.appendChild(detailsButton);
+            actionCell.appendChild(updateButton);
+            actionCell.appendChild(deleteButton);
             row.appendChild(actionCell);
 
             tableBody.appendChild(row);

From b5545bb5c8e9f32e7833c30ac26f045705281b68 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Sun, 21 Dec 2025 14:17:02 +0100
Subject: [PATCH 09/18] Added entity/searchdomain name to deletion confirmation
 warning for searchdomain and entity

---
 src/Server/Resources/SharedResources.de.resx |  6 ++++++
 src/Server/Resources/SharedResources.en.resx |  6 ++++++
 src/Server/Views/Home/Index.cshtml           | 11 +++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/Server/Resources/SharedResources.de.resx b/src/Server/Resources/SharedResources.de.resx
index e18c07d..95fd591 100644
--- a/src/Server/Resources/SharedResources.de.resx
+++ b/src/Server/Resources/SharedResources.de.resx
@@ -18,4 +18,10 @@
   <data name="InvalidCredentials" xml:space="preserve">
     <value>Ungültiger Benutzername oder Passwort.</value>
   </data>
+  <data name="GenericDeleteConfirmation" xml:space="preserve">
+    <value>Sind Sie sicher, dass Sie &lt;strong id="{0}"&gt;diese Entity&lt;/strong&gt; löschen wollen?</value>
+  </data>
+  <data name="IrreversibleActionWarning" xml:space="preserve">
+    <value>Diese Aktion kann nicht rückgängig gemacht werden.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Server/Resources/SharedResources.en.resx b/src/Server/Resources/SharedResources.en.resx
index bd6e064..c9635ee 100644
--- a/src/Server/Resources/SharedResources.en.resx
+++ b/src/Server/Resources/SharedResources.en.resx
@@ -18,4 +18,10 @@
   <data name="InvalidCredentials" xml:space="preserve">
     <value>Invalid credentials.</value>
   </data>
+  <data name="GenericDeleteConfirmation" xml:space="preserve">
+    <value>Are you sure you want to delete &lt;strong id="{0}"&gt;this entity&lt;/strong&gt;?</value>
+  </data>
+  <data name="IrreversibleActionWarning" xml:space="preserve">
+    <value>This action cannot be undone.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Server/Views/Home/Index.cshtml b/src/Server/Views/Home/Index.cshtml
index ad5575d..2db39ee 100644
--- a/src/Server/Views/Home/Index.cshtml
+++ b/src/Server/Views/Home/Index.cshtml
@@ -275,7 +275,8 @@
       </div>
 
       <div class="modal-body">
-        <p>@T["Are you sure you want to delete this searchdomain? This action cannot be undone."]</p>
+        <p>@Html.Raw(T["GenericDeleteConfirmation", "deleteSearchdomainConfirmationModalName"])</p>
+        <p>@T["IrreversibleActionWarning"]</p>
       </div>
 
       <div class="modal-footer">
@@ -408,7 +409,8 @@
       </div>
 
       <div class="modal-body">
-        <p>@T["Are you sure you want to delete this entity? This action cannot be undone."]</p>
+        <p>@Html.Raw(T["GenericDeleteConfirmation", "deleteEntityConfirmationModalName"])</p>
+        <p>@T["IrreversibleActionWarning"]</p>
       </div>
 
       <div class="modal-footer">
@@ -475,6 +477,9 @@
                     document.getElementById('deleteSearchdomainModal')
                 );
                 modal.show();
+                let searchdomain = domains[getSelectedDomainKey()];
+                let deleteSearchdomainConfirmationModalName = document.getElementById('deleteSearchdomainConfirmationModalName');
+                deleteSearchdomainConfirmationModalName.textContent = searchdomain;
             });
         document
             .getElementById('searchdomainConfirmDelete')
@@ -964,6 +969,8 @@
                 modal.show();
               let entityConfirmDelete = document.getElementById('EntityConfirmDelete');
               entityConfirmDelete.setAttribute('data-name', entity.Name);
+              let deleteEntityConfirmationModalName = document.getElementById('deleteEntityConfirmationModalName');
+              deleteEntityConfirmationModalName.textContent = entity.Name;
             });
 
             actionCell.appendChild(detailsButton);

From 33502640a2ec993b930dbf6c2bc505ad68d6f2fe Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Mon, 22 Dec 2025 00:16:30 +0100
Subject: [PATCH 10/18] Added model return for entity list endpoint

---
 src/Server/Controllers/EntityController.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Server/Controllers/EntityController.cs b/src/Server/Controllers/EntityController.cs
index b5c7499..0891ba5 100644
--- a/src/Server/Controllers/EntityController.cs
+++ b/src/Server/Controllers/EntityController.cs
@@ -92,8 +92,13 @@ public class EntityController : ControllerBase
     }
 
     [HttpGet("List")]
-    public ActionResult<EntityListResults> List(string searchdomain, bool returnEmbeddings = false)
+    public ActionResult<EntityListResults> List(string searchdomain, bool returnModels = false, bool returnEmbeddings = false)
     {
+        if (returnEmbeddings && !returnModels)
+        {
+            _logger.LogError("Invalid request for {searchdomain} - embeddings return requested but without models - not possible!", [searchdomain]);
+            return Ok(new EntityQueryResults() {Results = [], Success = false, Message = "Invalid request" });            
+        }
         Searchdomain searchdomain_;
         try
         {
@@ -118,12 +123,12 @@ public class EntityController : ControllerBase
             List<DatapointResult> datapointResults = [];
             foreach (Datapoint datapoint in entity.datapoints)
             {
-                if (returnEmbeddings)
+                if (returnModels)
                 {
                     List<EmbeddingResult> embeddingResults = [];
                     foreach ((string, float[]) embedding in datapoint.embeddings)
                     {
-                        embeddingResults.Add(new EmbeddingResult() {Model = embedding.Item1, Embeddings = embedding.Item2});
+                        embeddingResults.Add(new EmbeddingResult() {Model = embedding.Item1, Embeddings = returnEmbeddings ? embedding.Item2 : []});
                     }
                     datapointResults.Add(new DatapointResult() {Name = datapoint.name, ProbMethod = datapoint.probMethod.name, SimilarityMethod = datapoint.similarityMethod.name, Embeddings = embeddingResults});
                 }
@@ -135,6 +140,7 @@ public class EntityController : ControllerBase
             EntityListResult entityListResult = new()
             {
                 Name = entity.name,
+                ProbMethod = entity.probMethodName,
                 Attributes = attributeResults,
                 Datapoints = datapointResults
             };

From fc5e8ceeee7b362cd0ed8420c8550ee4ec85ca14 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Mon, 22 Dec 2025 00:17:16 +0100
Subject: [PATCH 11/18] Added missing model fix for last commit

---
 src/Shared/Models/EntityResults.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Shared/Models/EntityResults.cs b/src/Shared/Models/EntityResults.cs
index 025a2e7..03db7a5 100644
--- a/src/Shared/Models/EntityResults.cs
+++ b/src/Shared/Models/EntityResults.cs
@@ -41,6 +41,8 @@ public class EntityListResult
 {
     [JsonPropertyName("Name")]
     public required string Name { get; set; }
+    [JsonPropertyName("ProbMethod")]
+    public required string ProbMethod { get; set; }
     [JsonPropertyName("Attributes")]
     public required List<AttributeResult> Attributes { get; set; }
     [JsonPropertyName("Datapoints")]

From 6fe96d41a28da36c605223ecb4c795634c125c22 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Mon, 22 Dec 2025 00:18:13 +0100
Subject: [PATCH 12/18] Improved entity updating

---
 src/Server/Controllers/EntityController.cs |   5 +-
 src/Server/Entity.cs                       |   3 +-
 src/Server/Helper/SearchdomainHelper.cs    | 229 ++++++++++++++-------
 src/Server/Searchdomain.cs                 |   2 +-
 src/Shared/Models/JSONModels.cs            |   2 +-
 5 files changed, 164 insertions(+), 77 deletions(-)

diff --git a/src/Server/Controllers/EntityController.cs b/src/Server/Controllers/EntityController.cs
index 0891ba5..3326310 100644
--- a/src/Server/Controllers/EntityController.cs
+++ b/src/Server/Controllers/EntityController.cs
@@ -55,10 +55,7 @@ public class EntityController : ControllerBase
         try
         {
             List<Entity>? entities = _searchdomainHelper.EntitiesFromJSON(
-                [],
-                _domainManager.embeddingCache,
-                _domainManager.aIProvider,
-                _domainManager.helper,
+                _domainManager,
                 _logger,
                 JsonSerializer.Serialize(jsonEntities));
             if (entities is not null && jsonEntities is not null)
diff --git a/src/Server/Entity.cs b/src/Server/Entity.cs
index edf4104..681b96b 100644
--- a/src/Server/Entity.cs
+++ b/src/Server/Entity.cs
@@ -1,9 +1,10 @@
 namespace Server;
 
-public class Entity(Dictionary<string, string> attributes, Probmethods.probMethodDelegate probMethod, List<Datapoint> datapoints, string name)
+public class Entity(Dictionary<string, string> attributes, Probmethods.probMethodDelegate probMethod, string probMethodName, List<Datapoint> datapoints, string name)
 {
     public Dictionary<string, string> attributes = attributes;
     public Probmethods.probMethodDelegate probMethod = probMethod;
+    public string probMethodName = probMethodName;
     public List<Datapoint> datapoints = datapoints;
     public int id;
     public string name = name;
diff --git a/src/Server/Helper/SearchdomainHelper.cs b/src/Server/Helper/SearchdomainHelper.cs
index 7b137bd..7f18f7c 100644
--- a/src/Server/Helper/SearchdomainHelper.cs
+++ b/src/Server/Helper/SearchdomainHelper.cs
@@ -44,8 +44,12 @@ public class SearchdomainHelper(ILogger<SearchdomainHelper> logger, DatabaseHelp
         return null;
     }
 
-    public List<Entity>? EntitiesFromJSON(List<Entity> entityCache, Dictionary<string, Dictionary<string, float[]>> embeddingCache, AIProvider aIProvider, SQLHelper helper, ILogger logger, string json)
+    public List<Entity>? EntitiesFromJSON(SearchdomainManager searchdomainManager, ILogger logger, string json)
     {
+        Dictionary<string, Dictionary<string, float[]>> embeddingCache = searchdomainManager.embeddingCache;
+        AIProvider aIProvider = searchdomainManager.aIProvider;
+        SQLHelper helper = searchdomainManager.helper;
+
         List<JSONEntity>? jsonEntities = JsonSerializer.Deserialize<List<JSONEntity>>(json);
         if (jsonEntities is null)
         {
@@ -72,8 +76,7 @@ public class SearchdomainHelper(ILogger<SearchdomainHelper> logger, DatabaseHelp
         ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = 16 }; // <-- This is needed! Otherwise if we try to index 100+ entities at once, it spawns 100 threads, exploding the SQL pool
         Parallel.ForEach(jsonEntities, parallelOptions, jSONEntity =>
         {
-            using var tempHelper = helper.DuplicateConnection();
-            var entity = EntityFromJSON(entityCache, embeddingCache, aIProvider, tempHelper, logger, jSONEntity);
+            var entity = EntityFromJSON(searchdomainManager, logger, jSONEntity);
             if (entity is not null)
             {
                 retVal.Enqueue(entity);
@@ -82,87 +85,173 @@ public class SearchdomainHelper(ILogger<SearchdomainHelper> logger, DatabaseHelp
         return [.. retVal];
     }
 
-    public Entity? EntityFromJSON(List<Entity> entityCache, Dictionary<string, Dictionary<string, float[]>> embeddingCache, AIProvider aIProvider, SQLHelper helper, ILogger logger, JSONEntity jsonEntity) //string json)
+    public Entity? EntityFromJSON(SearchdomainManager searchdomainManager, ILogger logger, JSONEntity jsonEntity) //string json)
     {
-        Dictionary<string, Dictionary<string, float[]>> embeddingsLUT = []; // embeddingsLUT: hash -> model -> [embeddingValues * n]
-        int? preexistingEntityID = _databaseHelper.GetEntityID(helper, jsonEntity.Name, jsonEntity.Searchdomain);
-        if (preexistingEntityID is not null)
+        SQLHelper helper = searchdomainManager.helper.DuplicateConnection();
+        Searchdomain searchdomain = searchdomainManager.GetSearchdomain(jsonEntity.Searchdomain);
+        List<Entity> entityCache = searchdomain.entityCache;
+        AIProvider aIProvider = searchdomain.aIProvider;
+        Dictionary<string, Dictionary<string, float[]>> embeddingCache = searchdomain.embeddingCache;
+        Entity? preexistingEntity = entityCache.FirstOrDefault(entity => entity.name == jsonEntity.Name);
+        
+        if (preexistingEntity is not null)
         {
-            lock (helper.connection) // TODO change this to helper and do A/B tests (i.e. before/after)
+            int? preexistingEntityID = _databaseHelper.GetEntityID(helper, jsonEntity.Name, jsonEntity.Searchdomain);
+            if (preexistingEntityID is null)
             {
-                Dictionary<string, dynamic> parameters = new()
-                {
-                    { "id", preexistingEntityID }
-                };
-                System.Data.Common.DbDataReader reader = helper.ExecuteSQLCommand("SELECT e.model, e.embedding, d.hash FROM datapoint d JOIN embedding e ON d.id = e.id_datapoint WHERE d.id_entity = @id", parameters);
-                while (reader.Read())
-                {
-                    string model = reader.GetString(0);
-                    long length = reader.GetBytes(1, 0, null, 0, 0);
-                    byte[] embeddingBytes = new byte[length];
-                    reader.GetBytes(1, 0, embeddingBytes, 0, (int)length);
-                    float[] embeddingValues = FloatArrayFromBytes(embeddingBytes);
-                    string hash = reader.GetString(2);
-                    if (!embeddingsLUT.ContainsKey(hash))
-                    {
-                        embeddingsLUT[hash] = [];
-                    }
-                    embeddingsLUT[hash].TryAdd(model, embeddingValues);
-                }
-                reader.Close();
+                _logger.LogCritical("Unable to index entity {jsonEntity.Name} because it already exists in the searchdomain but not in the database.", [jsonEntity.Name]);
+                throw new Exception($"Unable to index entity {jsonEntity.Name} because it already exists in the searchdomain but not in the database.");
             }
-            _databaseHelper.RemoveEntity(entityCache, helper, jsonEntity.Name, jsonEntity.Searchdomain); // TODO only remove entity if there is actually a change somewhere. Perhaps create 3 datapoint lists to operate with: 1. delete, 2. update, 3. create
-        }
-        int id_entity = DatabaseHelper.DatabaseInsertEntity(helper, jsonEntity.Name, jsonEntity.Probmethod, _databaseHelper.GetSearchdomainID(helper, jsonEntity.Searchdomain));
-        foreach (KeyValuePair<string, string> attribute in jsonEntity.Attributes)
-        {
-            DatabaseHelper.DatabaseInsertAttribute(helper, attribute.Key, attribute.Value, id_entity); // TODO implement bulk insert to reduce number of queries
-        }
-
-        List<Datapoint> datapoints = [];
-        foreach (JSONDatapoint jsonDatapoint in jsonEntity.Datapoints)
-        {
-            string hash = Convert.ToBase64String(SHA256.HashData(Encoding.UTF8.GetBytes(jsonDatapoint.Text)));
-            Dictionary<string, float[]> embeddings = [];
-            if (embeddingsLUT.ContainsKey(hash))
+            Dictionary<string, string> attributes = jsonEntity.Attributes;
+            
+            // Attribute
+            foreach (KeyValuePair<string, string> attributesKV in preexistingEntity.attributes.ToList())
             {
-                Dictionary<string, float[]> hashLUT = embeddingsLUT[hash];
-                foreach (string model in jsonDatapoint.Model)
+                string oldAttributeKey = attributesKV.Key;
+                string oldAttribute = attributesKV.Value;
+                bool newHasAttribute = jsonEntity.Attributes.TryGetValue(oldAttributeKey, out string? newAttribute);
+                if (newHasAttribute && newAttribute is not null && newAttribute != oldAttribute)
                 {
-                    if (hashLUT.ContainsKey(model))
+                    // Attribute - Updated
+                    Dictionary<string, dynamic> parameters = new()
                     {
-                        embeddings.Add(model, hashLUT[model]);
-                    }
-                    else
+                        { "newValue", newAttribute },
+                        { "entityId", preexistingEntityID },
+                        { "attribute", oldAttributeKey}
+                    };
+                    helper.ExecuteSQLNonQuery("UPDATE attribute SET value=@newValue WHERE id_entity=@entityId AND attribute=@attribute", parameters);
+                    preexistingEntity.attributes[oldAttributeKey] = newAttribute;
+                } else if (!newHasAttribute)
+                {
+                    // Attribute - Deleted
+                    Dictionary<string, dynamic> parameters = new()
                     {
-                        var additionalEmbeddings = Datapoint.GenerateEmbeddings(jsonDatapoint.Text, [model], aIProvider, embeddingCache);
-                        embeddings.Add(model, additionalEmbeddings.First().Value);
+                        { "entityId", preexistingEntityID },
+                        { "attribute", oldAttributeKey}
+                    };
+                    helper.ExecuteSQLNonQuery("DELETE FROM attribute WHERE id_entity=@entityId AND attribute=@attribute", parameters);
+                    preexistingEntity.attributes.Remove(oldAttributeKey);
+                }
+            }
+            foreach (var attributesKV in jsonEntity.Attributes)
+            {
+                string newAttributeKey = attributesKV.Key;
+                string newAttribute = attributesKV.Value;
+                bool preexistingHasAttribute = preexistingEntity.attributes.TryGetValue(newAttributeKey, out string? preexistingAttribute);
+                if (!preexistingHasAttribute)
+                {
+                    // Attribute - New
+                    DatabaseHelper.DatabaseInsertAttribute(helper, newAttributeKey, newAttribute, (int)preexistingEntityID);
+                    preexistingEntity.attributes.Add(newAttributeKey, newAttribute);
+                }
+            }
+
+            // Datapoint
+            foreach (Datapoint datapoint in preexistingEntity.datapoints.ToList())
+            {
+                bool newEntityHasDatapoint = jsonEntity.Datapoints.Any(x => x.Name == datapoint.name);
+                if (!newEntityHasDatapoint)
+                {
+                    // Datapoint - Deleted
+                    Dictionary<string, dynamic> parameters = new()
+                    {
+                        { "datapointName", datapoint.name },
+                        { "entityId", preexistingEntityID}
+                    };
+                    helper.ExecuteSQLNonQuery("DELETE e FROM embedding e JOIN datapoint d ON e.id_datapoint=d.id WHERE d.name=@datapointName AND d.id_entity=@entityId", parameters);
+                    helper.ExecuteSQLNonQuery("DELETE FROM datapoint WHERE id_entity=@entityId AND name=@datapointName", parameters);
+                    preexistingEntity.datapoints.Remove(datapoint);
+                } else
+                {
+                    JSONDatapoint? newEntityDatapoint = jsonEntity.Datapoints.FirstOrDefault(x => x.Name == datapoint.name);
+                    if (newEntityDatapoint is not null && newEntityDatapoint.Text is not null)
+                    {
+                        // Datapoint - Updated
+                        Dictionary<string, dynamic> parameters = new()
+                        {
+                            { "datapointName", datapoint.name },
+                            { "entityId", preexistingEntityID}
+                        };
+                        helper.ExecuteSQLNonQuery("DELETE e FROM embedding e JOIN datapoint d ON e.id_datapoint=d.id WHERE d.name=@datapointName AND d.id_entity=@entityId", parameters);
+                        helper.ExecuteSQLNonQuery("DELETE FROM datapoint WHERE id_entity=@entityId AND name=@datapointName", parameters);
+                        preexistingEntity.datapoints.Remove(datapoint);
+                        Datapoint newDatapoint = DatabaseInsertDatapointWithEmbeddings(helper, searchdomain, newEntityDatapoint, (int)preexistingEntityID);
+                        preexistingEntity.datapoints.Add(newDatapoint);
+
                     }
                 }
             }
-            else
+            foreach (JSONDatapoint jsonDatapoint in jsonEntity.Datapoints)
             {
-                embeddings = Datapoint.GenerateEmbeddings(jsonDatapoint.Text, [.. jsonDatapoint.Model], aIProvider, embeddingCache);
+                bool oldEntityHasDatapoint = preexistingEntity.datapoints.Any(x => x.name == jsonDatapoint.Name);
+                if (!oldEntityHasDatapoint)
+                {
+                    // Datapoint - New
+                    Datapoint datapoint = BuildDatapointFromJsonDatapoint(jsonDatapoint, (int)preexistingEntityID, searchdomain);
+                    preexistingEntity.datapoints.Add(datapoint);
+                }
             }
-            var probMethod_embedding = new ProbMethod(jsonDatapoint.Probmethod_embedding, logger) ?? throw new ProbMethodNotFoundException(jsonDatapoint.Probmethod_embedding);
-            var similarityMethod = new SimilarityMethod(jsonDatapoint.SimilarityMethod, logger) ?? throw new SimilarityMethodNotFoundException(jsonDatapoint.SimilarityMethod);
-            Datapoint datapoint = new(jsonDatapoint.Name, probMethod_embedding, similarityMethod, hash, [.. embeddings.Select(kv => (kv.Key, kv.Value))]);
-            int id_datapoint = DatabaseHelper.DatabaseInsertDatapoint(helper, jsonDatapoint.Name, jsonDatapoint.Probmethod_embedding, jsonDatapoint.SimilarityMethod, hash, id_entity); // TODO make this a bulk add action to reduce number of queries
-            List<(string model, byte[] embedding)> data = [];
-            foreach ((string, float[]) embedding in datapoint.embeddings)
-            {
-                data.Add((embedding.Item1, BytesFromFloatArray(embedding.Item2)));
-            }
-            DatabaseHelper.DatabaseInsertEmbeddingBulk(helper, id_datapoint, data);
-            datapoints.Add(datapoint);
-        }
 
-        var probMethod = Probmethods.GetMethod(jsonEntity.Probmethod) ?? throw new ProbMethodNotFoundException(jsonEntity.Probmethod);
-        Entity entity = new(jsonEntity.Attributes, probMethod, datapoints, jsonEntity.Name)
+
+            return preexistingEntity;
+        }
+        else
         {
-            id = id_entity
-        };
-        entityCache.Add(entity);
-        return entity;
+            int id_entity = DatabaseHelper.DatabaseInsertEntity(helper, jsonEntity.Name, jsonEntity.Probmethod, _databaseHelper.GetSearchdomainID(helper, jsonEntity.Searchdomain));
+            foreach (KeyValuePair<string, string> attribute in jsonEntity.Attributes)
+            {
+                DatabaseHelper.DatabaseInsertAttribute(helper, attribute.Key, attribute.Value, id_entity); // TODO implement bulk insert to reduce number of queries
+            }
+
+            List<Datapoint> datapoints = [];
+            foreach (JSONDatapoint jsonDatapoint in jsonEntity.Datapoints)
+            {
+                string hash = Convert.ToBase64String(SHA256.HashData(Encoding.UTF8.GetBytes(jsonDatapoint.Text)));
+                Datapoint datapoint = DatabaseInsertDatapointWithEmbeddings(helper, searchdomain, jsonDatapoint, id_entity, hash);
+                datapoints.Add(datapoint);
+            }
+
+            var probMethod = Probmethods.GetMethod(jsonEntity.Probmethod) ?? throw new ProbMethodNotFoundException(jsonEntity.Probmethod);
+            Entity entity = new(jsonEntity.Attributes, probMethod, jsonEntity.Probmethod, datapoints, jsonEntity.Name)
+            {
+                id = id_entity
+            };
+            entityCache.Add(entity);
+            return entity;
+        }
+    }
+
+    public Datapoint DatabaseInsertDatapointWithEmbeddings(SQLHelper helper, Searchdomain searchdomain, JSONDatapoint jsonDatapoint, int id_entity, string? hash = null)
+    {
+        if (jsonDatapoint.Text is null)
+        {
+            throw new Exception("jsonDatapoint.Text must not be null at this point");
+        }
+        hash ??= Convert.ToBase64String(SHA256.HashData(Encoding.UTF8.GetBytes(jsonDatapoint.Text)));
+        Datapoint datapoint = BuildDatapointFromJsonDatapoint(jsonDatapoint, id_entity, searchdomain, hash);
+        int id_datapoint = DatabaseHelper.DatabaseInsertDatapoint(helper, jsonDatapoint.Name, jsonDatapoint.Probmethod_embedding, jsonDatapoint.SimilarityMethod, hash, id_entity); // TODO make this a bulk add action to reduce number of queries
+        List<(string model, byte[] embedding)> data = [];
+        foreach ((string, float[]) embedding in datapoint.embeddings)
+        {
+            data.Add((embedding.Item1, BytesFromFloatArray(embedding.Item2)));
+        }
+        DatabaseHelper.DatabaseInsertEmbeddingBulk(helper, id_datapoint, data);
+        return datapoint;
+    }
+
+    public Datapoint BuildDatapointFromJsonDatapoint(JSONDatapoint jsonDatapoint, int entityId, Searchdomain searchdomain, string? hash = null)
+    {
+        if (jsonDatapoint.Text is null)
+        {
+            throw new Exception("jsonDatapoint.Text must not be null at this point");
+        }
+        using SQLHelper helper = searchdomain.helper.DuplicateConnection();
+        Dictionary<string, Dictionary<string, float[]>> embeddingCache = searchdomain.embeddingCache;
+        hash ??= Convert.ToBase64String(SHA256.HashData(Encoding.UTF8.GetBytes(jsonDatapoint.Text)));
+        DatabaseHelper.DatabaseInsertDatapoint(helper, jsonDatapoint.Name, jsonDatapoint.Probmethod_embedding, jsonDatapoint.SimilarityMethod, hash, entityId);
+        Dictionary<string, float[]> embeddings = Datapoint.GenerateEmbeddings(jsonDatapoint.Text, [.. jsonDatapoint.Model], searchdomain.aIProvider, embeddingCache);
+        var probMethod_embedding = new ProbMethod(jsonDatapoint.Probmethod_embedding, logger) ?? throw new ProbMethodNotFoundException(jsonDatapoint.Probmethod_embedding);
+        var similarityMethod = new SimilarityMethod(jsonDatapoint.SimilarityMethod, logger) ?? throw new SimilarityMethodNotFoundException(jsonDatapoint.SimilarityMethod);
+        return new Datapoint(jsonDatapoint.Name, probMethod_embedding, similarityMethod, hash, [.. embeddings.Select(kv => (kv.Key, kv.Value))]);
     }
 }
\ No newline at end of file
diff --git a/src/Server/Searchdomain.cs b/src/Server/Searchdomain.cs
index 7566363..1b0e0c3 100644
--- a/src/Server/Searchdomain.cs
+++ b/src/Server/Searchdomain.cs
@@ -142,7 +142,7 @@ public class Searchdomain
             Probmethods.probMethodDelegate? probmethod = Probmethods.GetMethod(probmethodString);
             if (datapoint_unassigned.TryGetValue(id, out List<Datapoint>? datapoints) && probmethod is not null)
             {
-                Entity entity = new(attributes, probmethod, datapoints, name)
+                Entity entity = new(attributes, probmethod, probmethodString, datapoints, name)
                 {
                     id = id
                 };
diff --git a/src/Shared/Models/JSONModels.cs b/src/Shared/Models/JSONModels.cs
index 86ca7b3..593ae96 100644
--- a/src/Shared/Models/JSONModels.cs
+++ b/src/Shared/Models/JSONModels.cs
@@ -12,7 +12,7 @@ public class JSONEntity
 public class JSONDatapoint
 {
     public required string Name { get; set; }
-    public required string Text { get; set; }
+    public required string? Text { get; set; }
     public required string Probmethod_embedding { get; set; }
     public required string SimilarityMethod { get; set; }
     public required string[] Model { get; set; }

From fb1766b2b52b446e0e23814c2eb078c05598d4bf Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Mon, 22 Dec 2025 12:08:09 +0100
Subject: [PATCH 13/18] Fixed embeddings not being created on index

---
 src/Server/Helper/SearchdomainHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Server/Helper/SearchdomainHelper.cs b/src/Server/Helper/SearchdomainHelper.cs
index 7f18f7c..2749539 100644
--- a/src/Server/Helper/SearchdomainHelper.cs
+++ b/src/Server/Helper/SearchdomainHelper.cs
@@ -187,7 +187,7 @@ public class SearchdomainHelper(ILogger<SearchdomainHelper> logger, DatabaseHelp
                 if (!oldEntityHasDatapoint)
                 {
                     // Datapoint - New
-                    Datapoint datapoint = BuildDatapointFromJsonDatapoint(jsonDatapoint, (int)preexistingEntityID, searchdomain);
+                    Datapoint datapoint = DatabaseInsertDatapointWithEmbeddings(helper, searchdomain, jsonDatapoint, (int)preexistingEntityID);
                     preexistingEntity.datapoints.Add(datapoint);
                 }
             }

From 4aa3015954c16bb19541ea33d6aedac19ad1b110 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Mon, 22 Dec 2025 12:57:52 +0100
Subject: [PATCH 14/18] Fixed probmethod and similaritymethod not updating with
 entity index

---
 src/Server/Helper/SearchdomainHelper.cs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Server/Helper/SearchdomainHelper.cs b/src/Server/Helper/SearchdomainHelper.cs
index 2749539..2dfee5a 100644
--- a/src/Server/Helper/SearchdomainHelper.cs
+++ b/src/Server/Helper/SearchdomainHelper.cs
@@ -166,7 +166,7 @@ public class SearchdomainHelper(ILogger<SearchdomainHelper> logger, DatabaseHelp
                     JSONDatapoint? newEntityDatapoint = jsonEntity.Datapoints.FirstOrDefault(x => x.Name == datapoint.name);
                     if (newEntityDatapoint is not null && newEntityDatapoint.Text is not null)
                     {
-                        // Datapoint - Updated
+                        // Datapoint - Updated (text)
                         Dictionary<string, dynamic> parameters = new()
                         {
                             { "datapointName", datapoint.name },
@@ -179,6 +179,21 @@ public class SearchdomainHelper(ILogger<SearchdomainHelper> logger, DatabaseHelp
                         preexistingEntity.datapoints.Add(newDatapoint);
 
                     }
+                    if (newEntityDatapoint is not null && (newEntityDatapoint.Probmethod_embedding != datapoint.probMethod.name || newEntityDatapoint.SimilarityMethod != datapoint.similarityMethod.name))
+                    {
+                        // Datapoint - Updated (probmethod or similaritymethod)
+                        Dictionary<string, dynamic> parameters = new()
+                        {
+                            { "probmethod", newEntityDatapoint.Probmethod_embedding },
+                            { "similaritymethod", newEntityDatapoint.SimilarityMethod },
+                            { "datapointName", datapoint.name },
+                            { "entityId", preexistingEntityID}
+                        };
+                        helper.ExecuteSQLNonQuery("UPDATE datapoint SET probmethod_embedding=@probmethod, similaritymethod=@similaritymethod WHERE id_entity=@entityId AND name=@datapointName", parameters);
+                        Datapoint preexistingDatapoint = preexistingEntity.datapoints.First(x => x == datapoint); // The for loop is a copy. This retrieves the original such that it can be updated.
+                        preexistingDatapoint.probMethod = datapoint.probMethod;
+                        preexistingDatapoint.similarityMethod = datapoint.similarityMethod;
+                    }
                 }
             }
             foreach (JSONDatapoint jsonDatapoint in jsonEntity.Datapoints)

From fd76da265b78464a9610d9934681594576887f20 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Mon, 22 Dec 2025 12:58:40 +0100
Subject: [PATCH 15/18] Added entity updating to front-end

---
 src/Server/Views/Home/Index.cshtml | 391 +++++++++++++++++++++--------
 1 file changed, 284 insertions(+), 107 deletions(-)

diff --git a/src/Server/Views/Home/Index.cshtml b/src/Server/Views/Home/Index.cshtml
index 2db39ee..7848b8b 100644
--- a/src/Server/Views/Home/Index.cshtml
+++ b/src/Server/Views/Home/Index.cshtml
@@ -281,10 +281,10 @@
 
       <div class="modal-footer">
         <button type="button" id="searchdomainConfirmDelete" class="btn btn-danger" data-bs-dismiss="modal">
-          Delete
+          @T["Delete"]
         </button>
         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
-          Close
+          @T["Close"]
         </button>
       </div>
 
@@ -426,6 +426,82 @@
   </div>
 </div>
 
+<!-- Update entity Modal -->
+<div class="modal fade" id="updateEntityModal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog modal-xl modal-dialog-scrollable">
+    <div class="modal-content">
+
+      <div class="modal-header bg-warning text">
+        <h2 class="modal-title" id="updateEntityTitle">@T["Update entity"]</h2>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+      </div>
+
+      <div class="modal-body">
+        <!-- Entity base -->
+        <div class="row g-3">
+          <div class="col-md-6">
+            <label for="updateEntityName" class="form-label">@T["Entity name"]</label>
+            <input type="text" class="form-control mb-3" id="updateEntityName" placeholder="@T["Entity name"]" />
+          </div>
+          <div class="col-md-6">
+            <label for="updateEntityProbMethod" class="form-label">@T["Probmethod"]</label>
+            <input list="probMethods" id="updateEntityProbMethod" class="form-control" aria-label="@T["Probmethod"]">
+            <datalist id="probMethods">
+              @foreach (string probMethod in probMethods)
+              {
+                <option value=@probMethod>@probMethod</option>
+              }
+            </datalist>
+          </div>
+        </div>
+        <!-- Attributes -->
+        <div class="row g-3">
+          <h3 class="fs-5">@T["Attributes"]</h3>
+          <table>
+            <thead>
+              <tr>
+                <td>@T["Name"]</td>
+                <td>@T["Value"]</td>
+                <td class="visually-hidden">@T["Action"]</td>
+              </tr>
+            </thead>
+            <tbody id="updateEntityAttributesContainer"></tbody>
+          </table>
+          <button type="button" id="updateEntityAttributesAdd" class="btn btn-primary">@T["Add attribute"]</button>
+        </div>
+        <!-- Datapoints -->
+        <div class="row g-3 mt-3">
+          <h3 class="fs-5">@T["Datapoints"]</h3>
+          <table>
+            <thead>
+              <tr>
+                <td>@T["Name"]</td>
+                <td>@T["Value"]</td>
+                <td>@T["Probmethod_embedding"]</td>
+                <td>@T["Similarity method"]</td>
+                <td>@T["Model"]</td>
+                <td class="visually-hidden">@T["Action"]</td>
+              </tr>
+            </thead>
+            <tbody id="updateEntityDatapointsContainer"></tbody>
+          </table>
+          <button type="button" id="updateEntityDatapointsAdd" class="btn btn-primary">@T["Add datapoint"]</button>
+        </div>
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" id="EntityConfirmUpdate" class="btn btn-warning" data-bs-dismiss="modal">
+          @T["Update"]
+        </button>
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+          @T["Close"]
+        </button>
+      </div>
+
+    </div>
+  </div>
+</div>
+
 <script>
     var domains = JSON.parse('@Html.Raw(System.Text.Json.JsonSerializer.Serialize(domains))');
     var probMethods = JSON.parse('@Html.Raw(System.Text.Json.JsonSerializer.Serialize(probMethods))');
@@ -519,113 +595,14 @@
             .getElementById('createEntityAttributesAdd')
             .addEventListener('click', () => {
                 var uuid = crypto.randomUUID();
-                var entityAttributesContainer = document.getElementById('createEntityAttributesContainer');
-                var tr = document.createElement('tr');
-                tr.setAttribute('data-uid', uuid);
-                var tdKey = document.createElement('td');
-                var keyInput = document.createElement('input');
-                keyInput.classList.add('form-control')
-                keyInput.ariaLabel = '@T["Key"]';
-                tdKey.append(keyInput);
-                var tdValue = document.createElement('td');
-                var ValueInput = document.createElement('textarea');
-                ValueInput.classList.add('form-control')                
-                ValueInput.ariaLabel = '@T["Value"]';
-                tdValue.append(ValueInput);
-                var tdAction = document.createElement('td');
-                var tdButton = document.createElement('button');
-                tdButton.classList.add('btn', 'btn-danger');
-                tdButton.textContent = '@T["Remove"]';
-                tdButton.ariaLabel = '@T["Remove attribute"]';
-                tdAction.append(tdButton);
-                tdButton.onclick = function() {
-                  tr.remove();
-                };
-                tr.append(tdKey);
-                tr.append(tdValue);
-                tr.append(tdAction);
-                entityAttributesContainer.append(tr);
+                addEntityAttribute('createEntityAttributesContainer', uuid);
             });
 
         document
             .getElementById('createEntityDatapointsAdd')
             .addEventListener('click', () => {
                 var uuid = crypto.randomUUID();
-                var enntityDatapointsContainer = document.getElementById('createEntityDatapointsContainer');
-                var tr = document.createElement('tr');
-                tr.setAttribute('data-uid', uuid);
-                var tdName = document.createElement('td');
-                var nameInput = document.createElement('input');
-                nameInput.classList.add('form-control')
-                nameInput.ariaLabel = '@T["Name"]';
-                tdName.append(nameInput);
-                var tdValue = document.createElement('td');
-                var ValueInput = document.createElement('textarea');
-                ValueInput.classList.add('form-control')                
-                ValueInput.ariaLabel = '@T["Value"]';
-                tdValue.append(ValueInput);
-
-                var tdProbmethodEmbedding = document.createElement('td');
-                var probMethodSelect = document.createElement('select');
-                probMethodSelect.classList.add('probmethod');
-                for (i in probMethods)
-                {
-                    let probMethodSelectElement = document.createElement('option');
-                    probMethodSelectElement.value = probMethods[i];
-                    probMethodSelectElement.text = probMethods[i];
-                    probMethodSelect.append(probMethodSelectElement);
-                }
-                probMethodSelect.classList.add('form-control')                
-                probMethodSelect.ariaLabel = '@T["Probmethod_embedding"]';
-                tdProbmethodEmbedding.append(probMethodSelect);
-
-                var tdSimilarityMethod = document.createElement('td');
-                var similarityMethodSelect = document.createElement('select');
-                similarityMethodSelect.classList.add('similarityMethod');
-                for (i in similarityMethods)
-                {
-                    let similarityMethodSelectElement = document.createElement('option');
-                    similarityMethodSelectElement.value = similarityMethods[i];
-                    similarityMethodSelectElement.text = similarityMethods[i];
-                    similarityMethodSelect.append(similarityMethodSelectElement);
-                }
-                similarityMethodSelect.classList.add('form-control')                
-                similarityMethodSelect.ariaLabel = '@T["Similarity method"]';
-                tdSimilarityMethod.append(similarityMethodSelect);
-
-                var tdModel = document.createElement('td');
-                var modelSelect = document.createElement('select');
-                modelSelect.classList.add('model');
-                modelSelect.multiple = true;
-                for (i in models)
-                {
-                    let modelSelectElement = document.createElement('option');
-                    modelSelectElement.value = models[i];
-                    modelSelectElement.text = models[i];
-                    modelSelect.append(modelSelectElement);
-                }
-                modelSelect.classList.add('form-control')
-                modelSelect.ariaLabel = '@T["Probmethod_embedding"]';
-                tdModel.append(modelSelect);
-                
-                
-                var tdAction = document.createElement('td');
-                var tdButton = document.createElement('button');
-                tdButton.classList.add('btn', 'btn-danger');
-                tdButton.textContent = '@T["Remove"]';
-                tdButton.ariaLabel = '@T["Remove attribute"]';
-                tdAction.append(tdButton);
-                tdButton.onclick = function() {
-                  tr.remove();
-                };
-                tr.append(tdName);
-                tr.append(tdValue);
-                tr.append(tdProbmethodEmbedding);
-                tr.append(tdSimilarityMethod);
-                tr.append(tdModel);
-                tr.append(tdAction);
-                enntityDatapointsContainer.append(tr);
-
+                addEntityDatapoint('createEntityDatapointsContainer', uuid, "", "");
             });
 
         document
@@ -734,6 +711,58 @@
                     console.error('Error deleting entity:', error);
                 });
           });
+
+        document
+            .getElementById('updateEntityAttributesAdd')
+            .addEventListener('click', () => {
+                var uuid = crypto.randomUUID();
+                addEntityAttribute('updateEntityAttributesContainer', uuid);
+            });
+
+        document
+            .getElementById('updateEntityDatapointsAdd')
+            .addEventListener('click', () => {
+                var uuid = crypto.randomUUID();
+                addEntityDatapoint('updateEntityDatapointsContainer', uuid, "", "");
+            });
+
+        document
+            .getElementById('EntityConfirmUpdate')
+            .addEventListener('click', () => {
+                var name = document.getElementById('updateEntityName').value;
+                var probMethod = document.getElementById('updateEntityProbMethod').value;
+                var attributes = getEntityAttributes('updateEntityAttributesContainer');
+                var datapoints = getEntityDatapoints('updateEntityDatapointsContainer');
+                var data = [{
+                  "name": name,
+                  "probmethod": probMethod,
+                  "searchdomain": encodeURIComponent(domains[getSelectedDomainKey()]),
+                  "attributes": attributes,
+                  "datapoints": datapoints
+                }];
+                console.log(data);
+                // TODO add throbber to indicate loading
+                fetch(`/Entity/Index`, {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    body: JSON.stringify(data)
+                }).then(async response => {
+                    result = await response.json();
+                    if (response.ok && result.Success) {
+                        // TODO add toast
+                        console.log('Entity was created successfully');
+                        selectDomain(getSelectedDomainKey());
+                    } else {
+                        // TODO add toast
+                        console.error('Failed to create entity:', result.Message);
+                    }
+                }).catch(error => {
+                    console.error('Error creating entity:', error);
+                });
+
+            });
     });
 
     function deleteSearchdomain(domainKey) {
@@ -837,7 +866,7 @@
         let databaseUtilizationPromise = getSearchdomainDatabaseUtilization(getSelectedDomainKey());
 
         /* ---------- ENTITIES ---------- */
-        let entitiesUrl = `/Entity/List?searchdomain=${encodeURIComponent(domainName)}&returnEmbeddings=false`;
+        let entitiesUrl = `/Entity/List?searchdomain=${encodeURIComponent(domainName)}&returnEmbeddings=false&returnModels=true`;
         let entitiesCard = document.querySelector("#entitiesTable").parentElement;
         clearEntitiesTable();
         showEntitiesLoading(entitiesCard);
@@ -955,7 +984,30 @@
             updateButton.textContent = '@T["Update"]';
             updateButton.setAttribute("data-index", entities.findIndex(en => en == entity));
             updateButton.addEventListener('click', () => {
-              updateEntity(entity);
+              const modal = new bootstrap.Modal(
+                  document.getElementById('updateEntityModal')
+              );
+              modal.show();
+
+              let updateEntityName = document.getElementById('updateEntityName');
+              updateEntityName.value = entity.Name;
+              let updateEntityProbMethod = document.getElementById('updateEntityProbMethod');
+              updateEntityProbMethod.value = entity.ProbMethod;
+
+              let updateEntityAttributesContainer = document.getElementById('updateEntityAttributesContainer');
+              updateEntityAttributesContainer.textContent = "";
+              for (i in entity.Attributes)
+              {
+                  let attribute = entity.Attributes[i];
+                  addEntityAttribute('updateEntityAttributesContainer', attribute.Name, attribute.Name, attribute.Value);
+              }
+              let updateEntityDatapointsContainer = document.getElementById('updateEntityDatapointsContainer');
+              updateEntityDatapointsContainer.textContent = "";
+              for (i in entity.Datapoints)
+              {
+                  let datapoint = entity.Datapoints[i];
+                  addEntityDatapoint('updateEntityDatapointsContainer', datapoint.Name, datapoint.Name, null, datapoint.ProbMethod, datapoint.SimilarityMethod, Array.from(datapoint.Embeddings, x => x.Model));
+              } 
             });
 
             var deleteButton = document.createElement('button');
@@ -966,7 +1018,7 @@
               const modal = new bootstrap.Modal(
                   document.getElementById('deleteEntityModal')
               );
-                modal.show();
+              modal.show();
               let entityConfirmDelete = document.getElementById('EntityConfirmDelete');
               entityConfirmDelete.setAttribute('data-name', entity.Name);
               let deleteEntityConfirmationModalName = document.getElementById('deleteEntityConfirmationModalName');
@@ -1191,7 +1243,10 @@
             
             if (keyInput && valueTextarea && probmethodSelect && modelSelect) {
                 const key = keyInput.value.trim();
-                const value = valueTextarea.value.trim();
+                var value = valueTextarea.value.trim();
+                if (value != null && value.length == 0) {
+                    value = null;
+                }
                 const probMethod = probmethodSelect.selectedOptions[0].value;
                 const similarityMethod = similaritymethodSelect.selectedOptions[0].value;
                 const modelSelection = Array.from(modelSelect.selectedOptions)
@@ -1213,4 +1268,126 @@
         return datapoints;
     }
 
+    function addEntityAttribute(containerName = 'createEntityAttributesContainer', uid, key = '', value = '')
+    {
+        var container = document.getElementById(containerName);
+        var tr = document.createElement('tr');
+        tr.setAttribute('data-uid', uid);
+        var tdKey = document.createElement('td');
+        var keyInput = document.createElement('input');
+        keyInput.classList.add('form-control');
+        keyInput.ariaLabel = '@T["Key"]';
+        keyInput.value = key;
+        tdKey.append(keyInput);
+        var tdValue = document.createElement('td');
+        var ValueInput = document.createElement('textarea');
+        ValueInput.classList.add('form-control');
+        ValueInput.ariaLabel = '@T["Value"]';
+        ValueInput.value = value;
+        tdValue.append(ValueInput);
+        var tdAction = document.createElement('td');
+        var tdButton = document.createElement('button');
+        tdButton.classList.add('btn', 'btn-danger');
+        tdButton.textContent = '@T["Remove"]';
+        tdButton.ariaLabel = '@T["Remove attribute"]';
+        tdAction.append(tdButton);
+        tdButton.onclick = function() {
+          tr.remove();
+        };
+        tr.append(tdKey);
+        tr.append(tdValue);
+        tr.append(tdAction);
+        container.append(tr);
+    }
+
+    function addEntityDatapoint(containerName = 'createEntityDatapointsContainer', uid, name = null, value = null, probmethod_embedding = null, similarityMethod = null, selectedModels = [])
+    {
+        var entityDatapointsContainer = document.getElementById(containerName);
+        var tr = document.createElement('tr');
+        tr.setAttribute('data-uid', uid);
+        var tdName = document.createElement('td');
+        var nameInput = document.createElement('input');
+        nameInput.classList.add('form-control')
+        nameInput.ariaLabel = '@T["Name"]';
+        if (name != null) nameInput.value = name;
+        tdName.append(nameInput);
+        var tdValue = document.createElement('td');
+        var ValueInput = document.createElement('textarea');
+        ValueInput.classList.add('form-control')                
+        ValueInput.ariaLabel = '@T["Value"]';
+        if (value != null) {
+            ValueInput.value = value;
+        } else {
+            nameInput.readOnly = true;
+            ValueInput.readOnly = true;
+        }
+        tdValue.append(ValueInput);
+
+        var tdProbmethodEmbedding = document.createElement('td');
+        var probMethodSelect = document.createElement('select');
+        probMethodSelect.classList.add('probmethod');
+        for (i in probMethods)
+        {
+            let probMethodSelectElement = document.createElement('option');
+            probMethodSelectElement.value = probMethods[i];
+            probMethodSelectElement.text = probMethods[i];
+            probMethodSelect.append(probMethodSelectElement);
+        }
+        probMethodSelect.classList.add('form-control')                
+        probMethodSelect.ariaLabel = '@T["Probmethod_embedding"]';
+        if (probmethod_embedding != null) probMethodSelect.value = probmethod_embedding;
+        tdProbmethodEmbedding.append(probMethodSelect);
+
+        var tdSimilarityMethod = document.createElement('td');
+        var similarityMethodSelect = document.createElement('select');
+        similarityMethodSelect.classList.add('similarityMethod');
+        for (i in similarityMethods)
+        {
+            let similarityMethodSelectElement = document.createElement('option');
+            similarityMethodSelectElement.value = similarityMethods[i];
+            similarityMethodSelectElement.text = similarityMethods[i];
+            similarityMethodSelect.append(similarityMethodSelectElement);
+        }
+        similarityMethodSelect.classList.add('form-control')                
+        similarityMethodSelect.ariaLabel = '@T["Similarity method"]';
+        if (similarityMethod != null) similarityMethodSelect.value = similarityMethod;
+        tdSimilarityMethod.append(similarityMethodSelect);
+
+        var tdModel = document.createElement('td');
+        var modelSelect = document.createElement('select');
+        modelSelect.classList.add('model');
+        modelSelect.multiple = true;
+        for (i in models)
+        {
+            let modelSelectElement = document.createElement('option');
+            modelSelectElement.value = models[i];
+            modelSelectElement.text = models[i];
+            modelSelectElement.selected = selectedModels.findIndex(x => x === models[i] || (x + ":latest") === models[i]) >= 0;
+            modelSelect.append(modelSelectElement);
+        }
+        modelSelect.classList.add('form-control')
+        modelSelect.ariaLabel = '@T["Probmethod_embedding"]';
+        if (value == null) {
+            modelSelect.disabled = true;
+        }
+        tdModel.append(modelSelect);
+        
+        
+        var tdAction = document.createElement('td');
+        var tdButton = document.createElement('button');
+        tdButton.classList.add('btn', 'btn-danger');
+        tdButton.textContent = '@T["Remove"]';
+        tdButton.ariaLabel = '@T["Remove attribute"]';
+        tdAction.append(tdButton);
+        tdButton.onclick = function() {
+          tr.remove();
+        };
+        tr.append(tdName);
+        tr.append(tdValue);
+        tr.append(tdProbmethodEmbedding);
+        tr.append(tdSimilarityMethod);
+        tr.append(tdModel);
+        tr.append(tdAction);
+        entityDatapointsContainer.append(tr);
+    }
 </script>
\ No newline at end of file

From ee12986fef895d703652e8ab3e20672308fac035 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Mon, 22 Dec 2025 14:22:16 +0100
Subject: [PATCH 16/18] Added query deleting

---
 .../Controllers/SearchdomainController.cs     | 29 +++++++
 src/Server/Views/Home/Index.cshtml            | 76 +++++++++++++++++--
 src/Shared/Models/SearchdomainResults.cs      |  9 +++
 3 files changed, 109 insertions(+), 5 deletions(-)

diff --git a/src/Server/Controllers/SearchdomainController.cs b/src/Server/Controllers/SearchdomainController.cs
index 6d75dbf..20f0f2e 100644
--- a/src/Server/Controllers/SearchdomainController.cs
+++ b/src/Server/Controllers/SearchdomainController.cs
@@ -1,5 +1,6 @@
 using System.Text.Json;
 using ElmahCore;
+using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.AspNetCore.Mvc;
 using Server.Exceptions;
 using Server.Helper;
@@ -156,6 +157,34 @@ public class SearchdomainController : ControllerBase
         return Ok(new SearchdomainSearchesResults() { Searches = searchCache, Success = true });
     }
 
+    [HttpDelete("Searches")]
+    public ActionResult<SearchdomainDeleteSearchResult> DeleteSearch(string searchdomain, string query)
+    {
+        Searchdomain searchdomain_;
+        try
+        {
+            searchdomain_ = _domainManager.GetSearchdomain(searchdomain);
+        }
+        catch (SearchdomainNotFoundException)
+        {
+            _logger.LogError("Unable to retrieve the searchdomain {searchdomain} - it likely does not exist yet", [searchdomain]);
+            return Ok(new SearchdomainDeleteSearchResult() { Success = false, Message = "Searchdomain not found" });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError("Unable to retrieve the searchdomain {searchdomain} - {ex.Message} - {ex.StackTrace}", [searchdomain, ex.Message, ex.StackTrace]);
+            return Ok(new SearchdomainDeleteSearchResult() { Success = false, Message = ex.Message });
+        }
+        Dictionary<string, DateTimedSearchResult> searchCache = searchdomain_.searchCache;
+        bool containsKey = searchCache.ContainsKey(query);
+        if (containsKey)
+        {
+            searchCache.Remove(query);
+            return Ok(new SearchdomainDeleteSearchResult() {Success = true});
+        }
+        return Ok(new SearchdomainDeleteSearchResult() {Success = false, Message = "Query not found in search cache"});
+    }
+
     [HttpGet("GetSettings")]
     public ActionResult<SearchdomainSettingsResults> GetSettings(string searchdomain)
     {
diff --git a/src/Server/Views/Home/Index.cshtml b/src/Server/Views/Home/Index.cshtml
index 7848b8b..240cd0e 100644
--- a/src/Server/Views/Home/Index.cshtml
+++ b/src/Server/Views/Home/Index.cshtml
@@ -502,6 +502,33 @@
   </div>
 </div>
 
+<!-- Delete query Modal -->
+<div class="modal fade" id="deleteQueryModal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog modal-m modal-dialog-scrollable">
+    <div class="modal-content">
+
+      <div class="modal-header bg-danger text-white">
+        <h2 class="modal-title" id="deleteQueryTitle">@T["Delete query"]</h2>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+      </div>
+
+      <div class="modal-body">
+        <p>@Html.Raw(T["GenericDeleteConfirmation", "deleteQueryConfirmationModalName"])</p>
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" id="queryConfirmDelete" class="btn btn-danger" data-bs-dismiss="modal">
+          @T["Delete"]
+        </button>
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+          @T["Close"]
+        </button>
+      </div>
+
+    </div>
+  </div>
+</div>
+
 <script>
     var domains = JSON.parse('@Html.Raw(System.Text.Json.JsonSerializer.Serialize(domains))');
     var probMethods = JSON.parse('@Html.Raw(System.Text.Json.JsonSerializer.Serialize(probMethods))');
@@ -763,6 +790,30 @@
                 });
 
             });
+        document
+            .getElementById('queryConfirmDelete')
+            .addEventListener('click', () => {
+                let searchdomain = domains[getSelectedDomainKey()];
+                let query = document.getElementById('deleteQueryConfirmationModalName').textContent;
+                fetch(`/Searchdomain/Searches?searchdomain=${searchdomain}&query=${query}`, {
+                    method: 'DELETE',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    }
+                }).then(async response => {
+                    result = await response.json();
+                    if (response.ok && result.Success) {
+                        // TODO add toast
+                        console.log('Search query was deleted successfully');
+                        selectDomain(getSelectedDomainKey());
+                    } else {
+                        // TODO add toast
+                        console.error('Failed to delete query:', result.Message);
+                    }
+                }).catch(error => {
+                    console.error('Error creating entity:', error);
+                });
+            });
     });
 
     function deleteSearchdomain(domainKey) {
@@ -1054,14 +1105,29 @@
                 row.appendChild(nameCell);
 
                 const actionCell = document.createElement('td');
-                const btn = document.createElement('button');
-                btn.className = 'btn btn-sm btn-info';
-                btn.textContent = '@T["Details"]';
-                btn.addEventListener('click', () => {
+                actionCell.classList.add('btn-group');
+                const btnDetails = document.createElement('button');
+                btnDetails.className = 'btn btn-sm btn-info';
+                btnDetails.textContent = '@T["Details"]';
+                btnDetails.addEventListener('click', () => {
                     showQueryDetails(query);
                 });
+                const btnDelete = document.createElement('button');
+                btnDelete.className = 'btn btn-sm btn-danger';
+                btnDelete.textContent = '@T["Delete"]';
+                btnDelete.addEventListener('click', () => {
+                    const modal = new bootstrap.Modal(
+                      document.getElementById('deleteQueryModal')
+                    );
+                    modal.show();
+                    let queryConfirmDelete = document.getElementById('queryConfirmDelete');
+                    queryConfirmDelete.setAttribute('data-name', query.Name);
+                    let deleteQueryConfirmationModalName = document.getElementById('deleteQueryConfirmationModalName');
+                    deleteQueryConfirmationModalName.textContent = query.Name;
+                });
 
-                actionCell.appendChild(btn);
+                actionCell.appendChild(btnDetails);
+                actionCell.appendChild(btnDelete);
                 row.appendChild(actionCell);
 
                 tbody.appendChild(row);
diff --git a/src/Shared/Models/SearchdomainResults.cs b/src/Shared/Models/SearchdomainResults.cs
index 92f6990..6866ca4 100644
--- a/src/Shared/Models/SearchdomainResults.cs
+++ b/src/Shared/Models/SearchdomainResults.cs
@@ -55,6 +55,15 @@ public class SearchdomainSearchesResults
     public required Dictionary<string, DateTimedSearchResult> Searches { get; set; }
 }
 
+public class SearchdomainDeleteSearchResult
+{
+    [JsonPropertyName("Success")]
+    public required bool Success { get; set; }
+
+    [JsonPropertyName("Message")]
+    public string? Message { get; set; }    
+}
+
 public class SearchdomainSettingsResults
 {
     [JsonPropertyName("Success")]

From 8b36c65437c48a74e54d1fbb53a98c8cd2691570 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Mon, 22 Dec 2025 16:52:06 +0100
Subject: [PATCH 17/18] Added search cache updating

---
 .../Controllers/SearchdomainController.cs     | 30 +++++++++++++++++++
 src/Shared/Models/SearchdomainModels.cs       | 13 ++++++--
 src/Shared/Models/SearchdomainResults.cs      |  9 ++++++
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/src/Server/Controllers/SearchdomainController.cs b/src/Server/Controllers/SearchdomainController.cs
index 20f0f2e..286d8b5 100644
--- a/src/Server/Controllers/SearchdomainController.cs
+++ b/src/Server/Controllers/SearchdomainController.cs
@@ -185,6 +185,36 @@ public class SearchdomainController : ControllerBase
         return Ok(new SearchdomainDeleteSearchResult() {Success = false, Message = "Query not found in search cache"});
     }
 
+    [HttpPatch("Searches")]
+    public ActionResult<SearchdomainUpdateSearchResult> UpdateSearch(string searchdomain, string query, [FromBody]List<ResultItem> results)
+    {
+        Searchdomain searchdomain_;
+        try
+        {
+            searchdomain_ = _domainManager.GetSearchdomain(searchdomain);
+        }
+        catch (SearchdomainNotFoundException)
+        {
+            _logger.LogError("Unable to retrieve the searchdomain {searchdomain} - it likely does not exist yet", [searchdomain]);
+            return Ok(new SearchdomainUpdateSearchResult() { Success = false, Message = "Searchdomain not found" });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError("Unable to retrieve the searchdomain {searchdomain} - {ex.Message} - {ex.StackTrace}", [searchdomain, ex.Message, ex.StackTrace]);
+            return Ok(new SearchdomainUpdateSearchResult() { Success = false, Message = ex.Message });
+        }
+        Dictionary<string, DateTimedSearchResult> searchCache = searchdomain_.searchCache;
+        bool containsKey = searchCache.ContainsKey(query);
+        if (containsKey)
+        {
+            DateTimedSearchResult element = searchCache[query];
+            element.Results = results;
+            searchCache[query] = element;
+            return Ok(new SearchdomainUpdateSearchResult() {Success = true});
+        }
+        return Ok(new SearchdomainUpdateSearchResult() {Success = false, Message = "Query not found in search cache"});
+    }
+
     [HttpGet("GetSettings")]
     public ActionResult<SearchdomainSettingsResults> GetSettings(string searchdomain)
     {
diff --git a/src/Shared/Models/SearchdomainModels.cs b/src/Shared/Models/SearchdomainModels.cs
index 646d701..f7cf407 100644
--- a/src/Shared/Models/SearchdomainModels.cs
+++ b/src/Shared/Models/SearchdomainModels.cs
@@ -2,12 +2,19 @@
 using System.Text.Json.Serialization;
 
 namespace Shared.Models;
-public readonly struct ResultItem(float score, string name)
+public readonly struct ResultItem
 {
     [JsonPropertyName("Score")]
-    public readonly float Score { get; } = score;
+    public readonly float Score { get; }
     [JsonPropertyName("Name")]
-    public readonly string Name { get; } = name;
+    public readonly string Name { get; }
+
+    [JsonConstructor]
+    public ResultItem(float score, string name)
+    {
+        Score = score;
+        Name = name;
+    }
 
     public static long EstimateSize(ResultItem item)
     {
diff --git a/src/Shared/Models/SearchdomainResults.cs b/src/Shared/Models/SearchdomainResults.cs
index 6866ca4..f6f1de7 100644
--- a/src/Shared/Models/SearchdomainResults.cs
+++ b/src/Shared/Models/SearchdomainResults.cs
@@ -64,6 +64,15 @@ public class SearchdomainDeleteSearchResult
     public string? Message { get; set; }    
 }
 
+public class SearchdomainUpdateSearchResult
+{
+    [JsonPropertyName("Success")]
+    public required bool Success { get; set; }
+
+    [JsonPropertyName("Message")]
+    public string? Message { get; set; }    
+}
+
 public class SearchdomainSettingsResults
 {
     [JsonPropertyName("Success")]

From a3cc5115fc9d23710c21655bb637e24f73e8b567 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Mon, 22 Dec 2025 16:52:49 +0100
Subject: [PATCH 18/18] Added query update functionality in the front-end

---
 src/Server/Views/Home/Index.cshtml | 240 +++++++++++++++++++++++++++--
 1 file changed, 231 insertions(+), 9 deletions(-)

diff --git a/src/Server/Views/Home/Index.cshtml b/src/Server/Views/Home/Index.cshtml
index 240cd0e..6afa4eb 100644
--- a/src/Server/Views/Home/Index.cshtml
+++ b/src/Server/Views/Home/Index.cshtml
@@ -207,26 +207,70 @@
       <div class="modal-body">
 
         <!-- Access times -->
-        <h3>Access times</h3>
-        <ul id="queryAccessTimes" class="list-group mb-4"></ul>
+        <h3>@T["Access times"]</h3>
+        <ul id="queryDetailsAccessTimes" class="list-group mb-4"></ul>
 
         <!-- Results -->
-        <h3>Results</h3>
+        <h3>@T["Results"]</h3>
         <table class="table table-sm table-striped">
           <thead>
             <tr>
-              <th>Score</th>
-              <th>Name</th>
+              <th>@T["Score"]</th>
+              <th>@T["Name"]</th>
             </tr>
           </thead>
-          <tbody id="queryResultsBody"></tbody>
+          <tbody id="queryDetailsResultsBody"></tbody>
         </table>
 
       </div>
 
       <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
-          Close
+          @T["Close"]
+        </button>
+      </div>
+
+    </div>
+  </div>
+</div>
+
+<!-- Query Update Modal -->
+<div class="modal fade" id="queryUpdateModal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog modal-xl modal-dialog-scrollable">
+    <div class="modal-content">
+
+      <div class="modal-header bg-warning">
+        <h2 class="modal-title" id="queryUpdateTitle">@T["Query Update"] - <span id="queryUpdateQueryName"></span></h2>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+      </div>
+
+      <div class="modal-body">
+
+        <!-- Access times -->
+        <h3>@T["Access times"]</h3>
+        <ul id="queryUpdateAccessTimes" class="list-group mb-4"></ul>
+
+        <!-- Results -->
+        <h3>@T["Results"]</h3>
+        <table class="table table-sm table-striped">
+          <thead>
+            <tr>
+              <th style="width: 85px;">@T["Score"]</th>
+              <th>@T["Name"]</th>
+              <th>@T["Action"]</th>
+            </tr>
+          </thead>
+          <tbody id="queryUpdateResultsBody"></tbody>
+        </table>
+
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" class="btn btn-warning" id="queryUpdateConfirm" data-bs-dismiss="modal">
+          @T["Update"]
+        </button>
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+          @T["Close"]
         </button>
       </div>
 
@@ -537,6 +581,60 @@
     var queries = null;
     var models = JSON.parse('@Html.Raw(System.Text.Json.JsonSerializer.Serialize(models))');
 
+    let draggedRow = null;
+    document.addEventListener("dragstart", e => {
+      if (e.target.tagName === "TR") {
+        draggedRow = e.target;
+        e.target.classList.add("table-warning");
+      }
+    });
+
+    document.addEventListener("dragend", e => {
+      if (e.target.tagName === "TR") {
+        e.target.classList.remove("table-warning");
+      }
+      document.querySelectorAll(".table-warning").forEach(x => x.classList.remove("table-warning"));
+    });
+
+    document.addEventListener("dragenter", e => {
+      if (e.target.tagName === "TR") {
+        e.target.classList.add("table-warning");
+      } else if (e.target.tagName == "TD") {
+        e.target.parentElement.classList.add("table-warning");
+      }
+    });
+
+    document.addEventListener("dragleave", e => {
+      if (e.target.tagName === "TR") {
+        e.target.classList.remove("table-warning");
+      } else if (e.target.tagName == "TD") {
+        e.target.parentElement.classList.remove("table-warning");
+      }
+    });
+    document.addEventListener("dragover", e => {
+      if (e.target.closest("tr")) {
+        e.preventDefault();
+      }
+    });
+
+    document.addEventListener("drop", e => {
+      const targetRow = e.target.closest("tr");
+      if (draggedRow && targetRow && draggedRow !== targetRow && targetRow.parentElement.tagName !== "THEAD") {        
+        if (!draggedRow || !targetRow || draggedRow === targetRow) return;
+
+        const rect = targetRow.getBoundingClientRect();
+        const isAfter = e.clientY > rect.top + rect.height / 2;
+
+        const parent = targetRow.parentNode;
+
+        if (isAfter) {
+          parent.insertBefore(draggedRow, targetRow.nextSibling);
+        } else {
+          parent.insertBefore(draggedRow, targetRow);
+        }
+      }
+    });
+
     document.addEventListener('DOMContentLoaded', () => {
         const filterInput = document.getElementById('entitiesFilter');
 
@@ -814,6 +912,33 @@
                     console.error('Error creating entity:', error);
                 });
             });
+        document
+            .getElementById('queryUpdateConfirm')
+            .addEventListener('click', () => {
+                let searchdomain = domains[getSelectedDomainKey()];
+                let query = document.getElementById('queryUpdateQueryName').textContent;
+                let data = getQueryUpdateTableData();
+                console.log()
+                fetch(`/Searchdomain/Searches?searchdomain=${searchdomain}&query=${query}`, {
+                    method: 'PATCH',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    body: JSON.stringify(data)
+                }).then(async response => {
+                    result = await response.json();
+                    if (response.ok && result.Success) {
+                        // TODO add toast
+                        console.log('Search query was deleted successfully');
+                        selectDomain(getSelectedDomainKey());
+                    } else {
+                        // TODO add toast
+                        console.error('Failed to delete query:', result.Message);
+                    }
+                }).catch(error => {
+                    console.error('Error creating entity:', error);
+                });
+            });
     });
 
     function deleteSearchdomain(domainKey) {
@@ -1112,6 +1237,13 @@
                 btnDetails.addEventListener('click', () => {
                     showQueryDetails(query);
                 });
+                const btnUpdate = document.createElement('button');
+                btnUpdate.className = 'btn btn-sm btn-warning';
+                btnUpdate.textContent = '@T["Update"]';
+                btnUpdate.addEventListener('click', () => {
+                    showQueryUpdate(query);
+                });
+
                 const btnDelete = document.createElement('button');
                 btnDelete.className = 'btn btn-sm btn-danger';
                 btnDelete.textContent = '@T["Delete"]';
@@ -1127,6 +1259,7 @@
                 });
 
                 actionCell.appendChild(btnDetails);
+                actionCell.appendChild(btnUpdate);
                 actionCell.appendChild(btnDelete);
                 row.appendChild(actionCell);
 
@@ -1216,7 +1349,7 @@
         document.getElementById('queryDetailsQueryName').innerText = query.Name;
 
         /* ---------- Access times ---------- */
-        const accessList = document.getElementById('queryAccessTimes');
+        const accessList = document.getElementById('queryDetailsAccessTimes');
         accessList.innerHTML = '';
 
         if (!query.AccessDateTimes || query.AccessDateTimes.length === 0) {
@@ -1234,7 +1367,7 @@
         }
 
         /* ---------- Results ---------- */
-        const resultsBody = document.getElementById('queryResultsBody');
+        const resultsBody = document.getElementById('queryDetailsResultsBody');
         resultsBody.innerHTML = '';
 
         if (!query.Results || query.Results.length === 0) {
@@ -1262,6 +1395,73 @@
         modal.show();
     }
 
+    function showQueryUpdate(query) {
+        // Title
+        document.getElementById('queryUpdateQueryName').innerText = query.Name;
+
+        /* ---------- Access times ---------- */
+        const accessList = document.getElementById('queryUpdateAccessTimes');
+        accessList.innerHTML = '';
+
+        if (!query.AccessDateTimes || query.AccessDateTimes.length === 0) {
+            accessList.innerHTML = `
+                <li class="list-group-item text-muted text-center">
+                    No access times
+                </li>`;
+        } else {
+            query.AccessDateTimes.forEach(dt => {
+                const li = document.createElement('li');
+                li.className = 'list-group-item';
+                li.textContent = new Date(dt).toLocaleString();
+                accessList.appendChild(li);
+            });
+        }
+
+        /* ---------- Results ---------- */
+        const resultsBody = document.getElementById('queryUpdateResultsBody');
+        resultsBody.innerHTML = '';
+
+        if (!query.Results || query.Results.length === 0) {
+            resultsBody.innerHTML = `
+                <tr>
+                  <td colspan="2" class="text-muted text-center">
+                    No results
+                  </td>
+                </tr>`;
+        } else {
+            query.Results.forEach(r => {
+                const row = document.createElement('tr');
+                row.setAttribute("draggable", true);
+                const tdScore = document.createElement('td');
+                const scoreInput = document.createElement('input');
+                scoreInput.classList.add('form-control');
+                scoreInput.value = r.Score.toFixed(4);
+                tdScore.append(scoreInput);
+                const tdName = document.createElement('td');
+                tdName.classList.add("text-break");
+                tdName.innerText = r.Name;
+                const tdAction = document.createElement('td');
+                const deleteButton = document.createElement('button');
+                deleteButton.classList.add('btn', 'btn-danger', 'btn-sm');
+                deleteButton.innerText = '@T["Delete"]';
+                deleteButton.onclick = function() {
+                    row.remove();
+                };
+                tdAction.append(deleteButton);
+                row.append(tdScore);
+                row.append(tdName);
+                row.append(tdAction);
+                resultsBody.appendChild(row);
+            });
+        }
+
+        // Show modal
+        const modal = new bootstrap.Modal(
+          document.getElementById('queryUpdateModal')
+        );
+        modal.show();
+    }
+
     function NumberOfBytesAsHumanReadable(bytes, decimals = 2) {
         if (bytes === 0) return '0 B';
         if (bytes > 1.20892581961*(10**27)) return "∞ B";
@@ -1456,4 +1656,26 @@
         tr.append(tdAction);
         entityDatapointsContainer.append(tr);
     }
+
+    function getQueryUpdateTableData() {
+        const tbody = document.getElementById('queryUpdateResultsBody');
+        const rows = tbody.getElementsByTagName('tr');
+        const result = [];
+        
+        for (let i = 0; i < rows.length; i++) {
+            const row = rows[i];
+            const cells = row.getElementsByTagName('td');
+            
+            // Get the text content from the second cell (index 1) which contains the path
+            const score = parseFloat(cells[0].firstChild.value);
+            const name = cells[1].textContent.trim();
+            
+            result.push({
+                "Score": score,
+                "Name": name
+            });
+        }
+        
+        return result;
+    }
 </script>
\ No newline at end of file