Misc dev improvements (#774)

microsoft · Sep 7, 2024 · 6c4d705 · 6c4d705
1 parent 9bad713
commit 6c4d705
Show file tree

Hide file tree

Showing 32 changed files with 60 additions and 30 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -37,7 +37,7 @@
     <PackageVersion Include="Microsoft.KernelMemory.Core" Version="0.72.240904.1" />
     <PackageVersion Include="Microsoft.KernelMemory.Service.AspNetCore" Version="0.72.240904.1" />
     <PackageVersion Include="MongoDB.Driver.GridFS" Version="2.28.0" />
-    <PackageVersion Include="Moq" Version="4.20.71" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="OllamaSharp" Version="3.0.4" />
     <PackageVersion Include="PdfPig" Version="0.1.8" />

diff --git a/applications/tests/Evaluation.Tests/Startup.cs b/applications/tests/Evaluation.Tests/Startup.cs
@@ -12,6 +12,7 @@ public void ConfigureHost(IHostBuilder hostBuilder)
         var config = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
             .AddJsonFile("appsettings.development.json", optional: true)
+            .AddJsonFile("appsettings.Development.json", optional: true)
             .AddUserSecrets<Startup>()
             .AddEnvironmentVariables()
             .Build();

diff --git a/examples/002-dotnet-Serverless/Program.cs b/examples/002-dotnet-Serverless/Program.cs
@@ -34,6 +34,7 @@ public static async Task Main()
 
         new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
+            .AddJsonFile("appsettings.development.json", optional: true)
             .AddJsonFile("appsettings.Development.json", optional: true)
             .Build()
             .BindSection("KernelMemory", memoryConfiguration)

diff --git a/examples/101-dotnet-custom-Prompts/Program.cs b/examples/101-dotnet-custom-Prompts/Program.cs
@@ -14,6 +14,7 @@ public static async Task Main()
 
         new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
+            .AddJsonFile("appsettings.development.json", optional: true)
             .AddJsonFile("appsettings.Development.json", optional: true)
             .Build()
             .BindSection("KernelMemory:Services:OpenAI", openAIConfig)

diff --git a/examples/103-dotnet-custom-EmbeddingGenerator/Program.cs b/examples/103-dotnet-custom-EmbeddingGenerator/Program.cs
@@ -16,6 +16,7 @@ public static void Main()
 
         new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
+            .AddJsonFile("appsettings.development.json", optional: true)
             .AddJsonFile("appsettings.Development.json", optional: true)
             .Build()
             .BindSection("KernelMemory:Services:AzureOpenAIText", azureOpenAITextConfig);

diff --git a/examples/104-dotnet-custom-LLM/Program.cs b/examples/104-dotnet-custom-LLM/Program.cs
@@ -18,6 +18,7 @@ public static void Main()
 
         new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
+            .AddJsonFile("appsettings.development.json", optional: true)
             .AddJsonFile("appsettings.Development.json", optional: true)
             .Build()
             .BindSection("KernelMemory:Services:AzureOpenAIEmbedding", azureOpenAIEmbeddingConfig);

diff --git a/examples/105-dotnet-serverless-llamasharp/Program.cs b/examples/105-dotnet-serverless-llamasharp/Program.cs
@@ -20,6 +20,7 @@
 
 new ConfigurationBuilder()
     .AddJsonFile("appsettings.json")
+    .AddJsonFile("appsettings.development.json", optional: true)
     .AddJsonFile("appsettings.Development.json", optional: true)
     .Build()
     .BindSection("KernelMemory:Services:LlamaSharp", llamaConfig)

diff --git a/examples/106-dotnet-retrieve-synthetics/Program.cs b/examples/106-dotnet-retrieve-synthetics/Program.cs
@@ -14,6 +14,7 @@
 WebApplicationBuilder appBuilder = WebApplication.CreateBuilder();
 appBuilder.Configuration
     .AddJsonFile("appsettings.json")
+    .AddJsonFile("appsettings.development.json", optional: true)
     .AddJsonFile("appsettings.Development.json", optional: true)
     .AddEnvironmentVariables()
     .Build()

diff --git a/examples/108-dotnet-custom-content-decoders/Program.cs b/examples/108-dotnet-custom-content-decoders/Program.cs
@@ -17,6 +17,7 @@
 
 new ConfigurationBuilder()
     .AddJsonFile("appsettings.json")
+    .AddJsonFile("appsettings.development.json", optional: true)
     .AddJsonFile("appsettings.Development.json", optional: true)
     .Build()
     .BindSection("KernelMemory:Services:OpenAI", openAIConfig)

diff --git a/examples/110-dotnet-anthropic/Program.cs b/examples/110-dotnet-anthropic/Program.cs
@@ -10,6 +10,7 @@
 
 new ConfigurationBuilder()
     .AddJsonFile("appsettings.json")
+    .AddJsonFile("appsettings.development.json", optional: true)
     .AddJsonFile("appsettings.Development.json", optional: true)
     .AddEnvironmentVariables()
     .Build()

diff --git a/examples/111-dotnet-azure-ai-hybrid-search/Program.cs b/examples/111-dotnet-azure-ai-hybrid-search/Program.cs
@@ -15,6 +15,7 @@ public static async Task Main()
 
         new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
+            .AddJsonFile("appsettings.development.json", optional: true)
             .AddJsonFile("appsettings.Development.json", optional: true)
             .Build()
             .BindSection("KernelMemory:Services:AzureOpenAIText", azureOpenAITextConfig)

diff --git a/examples/206-dotnet-configuration-and-logging/Program.cs b/examples/206-dotnet-configuration-and-logging/Program.cs
@@ -19,6 +19,7 @@ public static async Task Main()
         // new ConfigurationBuilder()
         //     // Read settings from files
         //     .AddJsonFile("appsettings.json")
+        //     .AddJsonFile("appsettings.development.json", optional: true)
         //     .AddJsonFile("appsettings.Development.json", optional: true)
         //     .AddIniFile("...")
         //     .AddXmlFile("...")

diff --git a/examples/207-dotnet-expanding-chunks-on-retrieval/Program.cs b/examples/207-dotnet-expanding-chunks-on-retrieval/Program.cs
@@ -51,6 +51,7 @@ public static async Task Main()
         var openAIConfig = new OpenAIConfig();
         new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
+            .AddJsonFile("appsettings.development.json", optional: true)
             .AddJsonFile("appsettings.Development.json", optional: true)
             .Build()
             .BindSection("KernelMemory:Services:OpenAI", openAIConfig);

diff --git a/examples/210-KM-without-builder/Program.cs b/examples/210-KM-without-builder/Program.cs
@@ -51,6 +51,7 @@ public static async Task Main()
         WebApplicationBuilder appBuilder = WebApplication.CreateBuilder();
         appBuilder.Configuration
             .AddJsonFile("appsettings.json")
+            .AddJsonFile("appsettings.development.json", optional: true)
             .AddJsonFile("appsettings.Development.json", optional: true)
             .AddEnvironmentVariables();
         var app = appBuilder.Build();

diff --git a/examples/301-discord-test-application/Program.cs b/examples/301-discord-test-application/Program.cs
@@ -30,6 +30,7 @@ public static void Main(string[] args)
 
         appBuilder.Configuration
             .AddJsonFile("appsettings.json")
+            .AddJsonFile("appsettings.development.json", optional: true)
             .AddJsonFile("appsettings.Development.json", optional: true)
             .AddEnvironmentVariables()
             .AddCommandLine(args);

diff --git a/examples/401-evaluation/Program.cs b/examples/401-evaluation/Program.cs
@@ -17,6 +17,7 @@
 
 new ConfigurationBuilder()
     .AddJsonFile("appsettings.json")
+    .AddJsonFile("appsettings.development.json", optional: true)
     .AddJsonFile("appsettings.Development.json", optional: true)
     .Build()
     .BindSection("KernelMemory", memoryConfiguration)

diff --git a/extensions/AzureAISearch/AzureAISearch.FunctionalTests/Startup.cs b/extensions/AzureAISearch/AzureAISearch.FunctionalTests/Startup.cs
@@ -12,6 +12,7 @@ public void ConfigureHost(IHostBuilder hostBuilder)
         var config = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
             .AddJsonFile("appsettings.development.json", optional: true)
+            .AddJsonFile("appsettings.Development.json", optional: true)
             .AddUserSecrets<Startup>()
             .AddEnvironmentVariables()
             .Build();

diff --git a/extensions/AzureAISearch/AzureAISearch.TestApplication/Program.cs b/extensions/AzureAISearch/AzureAISearch.TestApplication/Program.cs
@@ -32,6 +32,7 @@ public static async Task Main()
     {
         var cfg = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
+            .AddJsonFile("appsettings.development.json", optional: true)
             .AddJsonFile("appsettings.Development.json", optional: true)
             .Build();
 

diff --git a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Startup.cs b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Startup.cs
@@ -12,6 +12,7 @@ public void ConfigureHost(IHostBuilder hostBuilder)
         var config = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
             .AddJsonFile("appsettings.development.json", optional: true)
+            .AddJsonFile("appsettings.Development.json", optional: true)
             .AddUserSecrets<Startup>()
             .AddEnvironmentVariables()
             .Build();

diff --git a/extensions/LlamaSharp/LlamaSharp.FunctionalTests/Startup.cs b/extensions/LlamaSharp/LlamaSharp.FunctionalTests/Startup.cs
@@ -12,6 +12,7 @@ public void ConfigureHost(IHostBuilder hostBuilder)
         var config = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
             .AddJsonFile("appsettings.development.json", optional: true)
+            .AddJsonFile("appsettings.Development.json", optional: true)
             .AddUserSecrets<Startup>()
             .AddEnvironmentVariables()
             .Build();

diff --git a/extensions/MongoDbAtlas/MongoDbAtlas.FunctionalTests/Startup.cs b/extensions/MongoDbAtlas/MongoDbAtlas.FunctionalTests/Startup.cs
@@ -12,6 +12,7 @@ public void ConfigureHost(IHostBuilder hostBuilder)
         var config = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
             .AddJsonFile("appsettings.development.json", optional: true)
+            .AddJsonFile("appsettings.Development.json", optional: true)
             .AddUserSecrets<Startup>()
             .AddEnvironmentVariables()
             .Build();

diff --git a/extensions/Postgres/Postgres.FunctionalTests/ConcurrencyTests.cs b/extensions/Postgres/Postgres.FunctionalTests/ConcurrencyTests.cs
@@ -29,37 +29,35 @@ public async Task CreateDeleteIndexConcurrencyTest(string type)
                 break;
 
             case "customSQL":
-                config = new PostgresConfig
+                config = this.PostgresConfig;
+                config.TableNamePrefix = "custom_sql";
+                config.Columns = new Dictionary<string, string>
                 {
-                    ConnectionString = this.PostgresConfig.ConnectionString,
-                    TableNamePrefix = "custom_sql",
-                    Columns = new Dictionary<string, string>()
-                    {
-                        { "id", "id" },
-                        { "embedding", "embedding" },
-                        { "tags", "tags" },
-                        { "content", "content" },
-                        { "payload", "payload" }
-                    },
-                    CreateTableSql = new List<string>
-                    {
-                        """
-                        BEGIN;
-                        SELECT pg_advisory_xact_lock(%%lock_id%%);
-                        CREATE TABLE IF NOT EXISTS %%table_name%% (
-                            id            TEXT NOT NULL PRIMARY KEY,
-                            embedding     vector(%%vector_size%%),
-                            tags          TEXT[] DEFAULT '{}'::TEXT[] NOT NULL,
-                            content       TEXT DEFAULT '' NOT NULL,
-                            payload       JSONB DEFAULT '{}'::JSONB NOT NULL,
-                            some_text     TEXT DEFAULT '',
-                            last_update   TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP NOT NULL
-                        );
-                        CREATE INDEX IF NOT EXISTS idx_tags ON %%table_name%% USING GIN(tags);
-                        COMMIT;
-                        """
-                    }
+                    { "id", "id" },
+                    { "embedding", "embedding" },
+                    { "tags", "tags" },
+                    { "content", "content" },
+                    { "payload", "payload" }
                 };
+                config.CreateTableSql =
+                [
+                    """
+                    BEGIN;
+                    SELECT pg_advisory_xact_lock(%%lock_id%%);
+                    CREATE TABLE IF NOT EXISTS %%table_name%% (
+                        id            TEXT NOT NULL PRIMARY KEY,
+                        embedding     vector(%%vector_size%%),
+                        tags          TEXT[] DEFAULT '{}'::TEXT[] NOT NULL,
+                        content       TEXT DEFAULT '' NOT NULL,
+                        payload       JSONB DEFAULT '{}'::JSONB NOT NULL,
+                        some_text     TEXT DEFAULT '',
+                        last_update   TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP NOT NULL
+                    );
+                    CREATE INDEX IF NOT EXISTS idx_tags ON %%table_name%% USING GIN(tags);
+                    COMMIT;
+                    """
+                ];
+
                 break;
         }
 

diff --git a/extensions/Postgres/Postgres.FunctionalTests/Startup.cs b/extensions/Postgres/Postgres.FunctionalTests/Startup.cs
@@ -12,6 +12,7 @@ public void ConfigureHost(IHostBuilder hostBuilder)
         var config = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
             .AddJsonFile("appsettings.development.json", optional: true)
+            .AddJsonFile("appsettings.Development.json", optional: true)
             .AddUserSecrets<Startup>()
             .AddEnvironmentVariables()
             .Build();

diff --git a/extensions/Postgres/Postgres.TestApplication/Program.cs b/extensions/Postgres/Postgres.TestApplication/Program.cs
@@ -19,6 +19,7 @@ private static async Task Test1()
     {
         var cfg = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
+            .AddJsonFile("appsettings.development.json", optional: true)
             .AddJsonFile("appsettings.Development.json", optional: true)
             .Build();
 
@@ -96,6 +97,7 @@ private static async Task Test2()
 
         new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
+            .AddJsonFile("appsettings.development.json", optional: true)
             .AddJsonFile("appsettings.Development.json", optional: true)
             .Build()
             .BindSection("KernelMemory:Services:Postgres", postgresConfig)
@@ -145,6 +147,7 @@ private static async Task Test3()
         new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
             .AddJsonFile("appsettings.Development.json", optional: true)
+            .AddJsonFile("appsettings.development.json", optional: true)
             .AddJsonFile("appsettings.custom-sql.json")
             .Build()
             .BindSection("KernelMemory:Services:Postgres", postgresConfig)

diff --git a/extensions/Postgres/README.md b/extensions/Postgres/README.md
@@ -47,6 +47,7 @@ To use Postgres with Kernel Memory:
 
     new ConfigurationBuilder()
         .AddJsonFile("appsettings.json")
+        .AddJsonFile("appsettings.development.json", optional: true)
         .AddJsonFile("appsettings.Development.json", optional: true)
         .Build()
         .BindSection("KernelMemory:Services:Postgres", postgresConfig);

diff --git a/extensions/Qdrant/Qdrant.FunctionalTests/Startup.cs b/extensions/Qdrant/Qdrant.FunctionalTests/Startup.cs
@@ -12,6 +12,7 @@ public void ConfigureHost(IHostBuilder hostBuilder)
         var config = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
             .AddJsonFile("appsettings.development.json", optional: true)
+            .AddJsonFile("appsettings.Development.json", optional: true)
             .AddUserSecrets<Startup>()
             .AddEnvironmentVariables()
             .Build();

diff --git a/extensions/Qdrant/Qdrant.TestApplication/Program.cs b/extensions/Qdrant/Qdrant.TestApplication/Program.cs
@@ -13,6 +13,7 @@ public static async Task Main()
     {
         var cfg = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
+            .AddJsonFile("appsettings.development.json", optional: true)
             .AddJsonFile("appsettings.Development.json", optional: true)
             .Build();
 

diff --git a/extensions/Redis/Redis.FunctionalTests/Startup.cs b/extensions/Redis/Redis.FunctionalTests/Startup.cs
@@ -12,6 +12,7 @@ public void ConfigureHost(IHostBuilder hostBuilder)
         var config = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
             .AddJsonFile("appsettings.development.json", optional: true)
+            .AddJsonFile("appsettings.Development.json", optional: true)
             .AddUserSecrets<Startup>()
             .AddEnvironmentVariables()
             .Build();

diff --git a/extensions/Redis/Redis.TestApplication/Program.cs b/extensions/Redis/Redis.TestApplication/Program.cs
@@ -139,6 +139,7 @@ public static async Task Main()
     {
         IConfiguration config = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
+            .AddJsonFile("appsettings.development.json", optional: true)
             .AddJsonFile("appsettings.Development.json", optional: true)
             .Build();
 

diff --git a/extensions/SQLServer/SQLServer.FunctionalTests/Startup.cs b/extensions/SQLServer/SQLServer.FunctionalTests/Startup.cs
@@ -12,6 +12,7 @@ public void ConfigureHost(IHostBuilder hostBuilder)
         var config = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
             .AddJsonFile("appsettings.development.json", optional: true)
+            .AddJsonFile("appsettings.Development.json", optional: true)
             .AddUserSecrets<Startup>()
             .AddEnvironmentVariables()
             .Build();

diff --git a/service/tests/Core.FunctionalTests/Startup.cs b/service/tests/Core.FunctionalTests/Startup.cs
@@ -12,6 +12,7 @@ public void ConfigureHost(IHostBuilder hostBuilder)
         var config = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
             .AddJsonFile("appsettings.development.json", optional: true)
+            .AddJsonFile("appsettings.Development.json", optional: true)
             .AddUserSecrets<Startup>()
             .AddEnvironmentVariables()
             .Build();

diff --git a/service/tests/Service.FunctionalTests/Startup.cs b/service/tests/Service.FunctionalTests/Startup.cs
@@ -12,6 +12,7 @@ public void ConfigureHost(IHostBuilder hostBuilder)
         var config = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json")
             .AddJsonFile("appsettings.development.json", optional: true)
+            .AddJsonFile("appsettings.Development.json", optional: true)
             .AddUserSecrets<Startup>()
             .AddEnvironmentVariables()
             .Build();