Merged redundant project onto server

src/Client/Client.cs

@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using System.Web;
 using System.Text.Json;
 using Models;
-using embeddingsearch;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Configuration;
 using System.Reflection.Metadata.Ecma335;
@@ -87,12 +86,12 @@ public class Client
             return await GetUrlAndProcessJson<EntityQueryResults>(url);
         }
 
-        public async Task<EntityIndexResult> EntityIndexAsync(List<JSONEntity> jsonEntity)
+        public async Task<EntityIndexResult> EntityIndexAsync(List<Server.JSONEntity> jsonEntity)
         {
             return await EntityIndexAsync(searchdomain, jsonEntity);
         }
 
-        public async Task<EntityIndexResult> EntityIndexAsync(string searchdomain, List<JSONEntity> jsonEntity)
+        public async Task<EntityIndexResult> EntityIndexAsync(string searchdomain, List<Server.JSONEntity> jsonEntity)
         {
             return await EntityIndexAsync(searchdomain, JsonSerializer.Serialize(jsonEntity));
         }

src/Client/Client.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <ProjectReference Include="..\server\server.csproj" />
+  <ItemGroup>
+    <ProjectReference Include="..\Server\Server.csproj" />
   </ItemGroup>
 
   <PropertyGroup>

src/Indexer/Indexer.csproj

@@ -13,7 +13,7 @@
     <PackageReference Include="Pythonnet" Version="3.0.5" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\server\server.csproj" />
+    <ProjectReference Include="..\Server\Server.csproj" />
     <ProjectReference Include="..\Client\Client.csproj" />
   </ItemGroup>
 </Project>

src/Indexer/Models/Script.cs

@@ -1,6 +1,5 @@
 using System.Text.Json;
 using System.Timers;
-using embeddingsearch;
 using Python.Runtime;
 
 namespace Indexer.Models;

src/Indexer/Program.cs

@@ -1,6 +1,6 @@
 using Indexer.Models;
 using Indexer.Services;
-using server;
+using Server;
 
 var builder = WebApplication.CreateBuilder(args);
 

src/Indexer/Services/IndexerService.cs

@@ -6,7 +6,6 @@ using Indexer.Exceptions;
 using Indexer.Models;
 using System.Timers;
 using Microsoft.AspNetCore.Http.HttpResults;
-using embeddingsearch;
 using Python.Runtime;
 
 namespace Indexer.Services;

src/Server/ApiKeyMiddleware.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Primitives;
 
-namespace server;
+namespace Server;
 
 public class ApiKeyMiddleware
 {
@@ -23,14 +23,14 @@ public class ApiKeyMiddleware
         }
 
         var validApiKeys = _configuration.GetSection("Embeddingsearch").GetSection("ApiKeys").Get<List<string>>();
-        #pragma warning disable CS8604
+#pragma warning disable CS8604
         if (validApiKeys == null || !validApiKeys.Contains(extractedApiKey)) // CS8604 extractedApiKey is not null here, but the compiler still thinks that it might be.
         {
             context.Response.StatusCode = 403;
             await context.Response.WriteAsync("Invalid API Key.");
             return;
         }
-        #pragma warning restore CS8604
+#pragma warning restore CS8604
 
         await _next(context);
     }

src/Server/Controllers/EntityController.cs

@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
-using embeddingsearch;
 using System.Text.Json;
 using Models;
 using System.Text.Json.Nodes;
-namespace server.Controllers;
+namespace Server.Controllers;
 
 [ApiController]
 [Route("[controller]")]

src/Server/Controllers/SearchdomainController.cs

@@ -1,8 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
-using embeddingsearch;
 using Models;
 
-namespace server.Controllers;
+namespace Server.Controllers;
 
 [ApiController]
 [Route("[controller]")]

src/Server/Datapoint.cs

@@ -7,7 +7,7 @@ using Microsoft.Extensions.AI;
 using OllamaSharp;
 using OllamaSharp.Models;
 
-namespace embeddingsearch;
+namespace Server;
 
 public class Datapoint
 {

src/Server/Entity.cs

@@ -1,6 +1,7 @@
 using System;
+using Server;
 
-namespace embeddingsearch;
+namespace Server;
 
 public class Entity(Dictionary<string, string> attributes, Probmethods.probMethodDelegate probMethod, List<Datapoint> datapoints, string name)
 {

src/Server/Exceptions/ServerExceptions.cs

@@ -1,4 +1,4 @@
-namespace server.Exceptions;
+namespace Server.Exceptions;
 
 public class ServerConfigurationException : Exception
 {

src/Server/JSONModels.cs

@@ -1,4 +1,4 @@
-namespace embeddingsearch;
+namespace Server;
 
 public class JSONEntity
 {

src/Server/Probmethods.cs

@@ -2,7 +2,7 @@
 
 using System.Numerics.Tensors;
 
-namespace embeddingsearch;
+namespace Server;
 
 
 public class Probmethods

src/Server/Program.cs

@@ -1,4 +1,4 @@
-using server;
+using Server;
 
 var builder = WebApplication.CreateBuilder(args);
 

src/Server/Searchdomain.cs

@@ -17,8 +17,9 @@ using Mysqlx.Resultset;
 using System.Collections.Immutable;
 using System.Text.Json;
 using System.Numerics.Tensors;
+using Server;
 
-namespace embeddingsearch;
+namespace Server;
 
 public class Searchdomain
 {

src/Server/SearchdomainManager.cs

@@ -1,11 +1,10 @@
-using embeddingsearch;
 using MySql.Data.MySqlClient;
 using System.Data.Common;
 using OllamaSharp;
 using Microsoft.IdentityModel.Tokens;
-using server.Exceptions;
+using Server.Exceptions;
 
-namespace server;
+namespace Server;
 
 public class SearchdomainManager
 {

src/Server/Server.csproj

@@ -8,11 +8,20 @@
 
   <ItemGroup>
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+        <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
+      <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.3" />
+      <PackageReference Include="MySql.Data" Version="9.2.0" />
+      <PackageReference Include="Npgsql" Version="9.0.3" />
+      <PackageReference Include="OllamaSharp" Version="5.1.9" />
+      <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.3" />
+      <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
+      <PackageReference Include="System.Data.Sqlite" Version="1.0.119" />
+      <PackageReference Include="System.Numerics.Tensors" Version="9.0.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\embeddingsearch\embeddingsearch.csproj" />
-    <ProjectReference Include="..\Models\Models.csproj" />
+  <ItemGroup>
+    <ProjectReference Include="..\embeddingsearch\embeddingsearch.csproj" />
+    <ProjectReference Include="..\Models\Models.csproj" />
   </ItemGroup>
 
 </Project>

src/cli/Program.cs

@@ -1,5 +1,4 @@
 using System.Drawing.Printing;
-using embeddingsearch;
 using Microsoft.Extensions.AI;
 using OllamaSharp;
 using OllamaSharp.Models;
@@ -11,6 +10,7 @@ using Org.BouncyCastle.Asn1.X509.Qualified;
 using Microsoft.Identity.Client;
 using System.Text.Json.Serialization;
 using System.Text.Json;
+using Server;
 
 // ParserSettings parserSettings = new()
 // {

src/cli/cli.csproj

@@ -14,6 +14,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="../Server/Server.csproj" />
     <ProjectReference Include="..\embeddingsearch\embeddingsearch.csproj" />
   </ItemGroup>
 </Project>

src/embeddingsearch/embeddingsearch.csproj

@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.3" />
-    <PackageReference Include="MySql.Data" Version="9.2.0" />
-    <PackageReference Include="Npgsql" Version="9.0.3" />
-    <PackageReference Include="OllamaSharp" Version="5.1.9" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.3" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
-    <PackageReference Include="System.Data.Sqlite" Version="1.0.119" />
-    <PackageReference Include="System.Numerics.Tensors" Version="9.0.3" />
-  </ItemGroup>
-
-</Project>