Skip to content

Add Meilisearch integration #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Oct 22, 2024
Merged

Add Meilisearch integration #66

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2b79293
Add Meilisearch hosting
Alirexaa Oct 4, 2024
316a4cd
Merge branch 'main' into alirexaa/meilisearch
Alirexaa Oct 17, 2024
b6123d7
Add public api files
Alirexaa Oct 17, 2024
3e8da2f
Clean up csproj
Alirexaa Oct 17, 2024
4b3ef7d
remove configuration schema stuff
Alirexaa Oct 17, 2024
2957152
add tests
Alirexaa Oct 17, 2024
78bc644
fix build
Alirexaa Oct 17, 2024
a05fedb
Fix test by addib Aspire.Hosting.AppHost to Testing proj
Alirexaa Oct 17, 2024
f27d9b9
Add test for client package
Alirexaa Oct 17, 2024
6d80111
fix test on windows
Alirexaa Oct 17, 2024
42d83ca
Add example
Alirexaa Oct 17, 2024
38a3881
Address PR feedback
Alirexaa Oct 18, 2024
40979ca
Add logging for tests
Alirexaa Oct 18, 2024
ab70c71
Add readme for packages
Alirexaa Oct 18, 2024
b46bf3e
fix xml docs
Alirexaa Oct 18, 2024
89462d4
rename file
Alirexaa Oct 18, 2024
a01d3ff
Merge branch 'main' into alirexaa/meilisearch
Alirexaa Oct 18, 2024
45792d3
Remove xunit test classes and use Microsoft.DotNet.XUnitExtensions in…
Alirexaa Oct 21, 2024
a4a4ce0
Merge branch 'alirexaa/meilisearch' of https://github.com/CommunityTo…
Alirexaa Oct 21, 2024
84f4af2
Merge branch 'main' into alirexaa/meilisearch
Alirexaa Oct 21, 2024
f09e9be
Remove polly and use WaitForText instead
Alirexaa Oct 21, 2024
f200d81
Merge branch 'alirexaa/meilisearch' of https://github.com/CommunityTo…
Alirexaa Oct 21, 2024
4fd4699
Update codeowners
Alirexaa Oct 21, 2024
d4a4d28
Merge branch 'main' into alirexaa/meilisearch
aaronpowell Oct 22, 2024
2ee554c
Matching the correct naming structure
aaronpowell Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 28 additions & 14 deletions Aspire.CommunityToolkit.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{414151D4-700
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Hosting.Java", "src\Aspire.CommunityToolkit.Hosting.Java\Aspire.CommunityToolkit.Hosting.Java.csproj", "{DAA67050-44B3-458F-9818-5877D606866A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps", "src\Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps\Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps.csproj", "{125DFA83-328D-4F8B-91EC-3057FFF410BE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps", "src\Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps\Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps.csproj", "{125DFA83-328D-4F8B-91EC-3057FFF410BE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{8519CC01-1370-47C8-AD94-B0F326B1563F}"
EndProject
Expand All @@ -25,37 +25,41 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{899F0713
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Hosting.Java.Tests", "tests\Aspire.CommunityToolkit.Hosting.Java.Tests\Aspire.CommunityToolkit.Hosting.Java.Tests.csproj", "{E2905A71-E25D-46FC-A128-D6A366D4D751}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps.Tests", "tests\Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps.Tests\Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps.Tests.csproj", "{1B55E682-B518-4E59-8972-07C82ED5A677}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps.Tests", "tests\Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps.Tests\Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps.Tests.csproj", "{1B55E682-B518-4E59-8972-07C82ED5A677}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.CommunityToolkit.Testing", "tests\Aspire.CommunityToolkit.Testing\Aspire.CommunityToolkit.Testing.csproj", "{4C1D5422-4C52-4603-A01A-E1E6304633EC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Testing", "tests\Aspire.CommunityToolkit.Testing\Aspire.CommunityToolkit.Testing.csproj", "{4C1D5422-4C52-4603-A01A-E1E6304633EC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "swa", "swa", "{564FA6A0-EC54-41C6-A35F-89890E1D06E3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.CommunityToolkit.StaticWebApps.AppHost", "examples\swa\Aspire.CommunityToolkit.StaticWebApps.AppHost\Aspire.CommunityToolkit.StaticWebApps.AppHost.csproj", "{C083A377-13CA-47C1-8B17-1FE353EA76F0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.StaticWebApps.AppHost", "examples\swa\Aspire.CommunityToolkit.StaticWebApps.AppHost\Aspire.CommunityToolkit.StaticWebApps.AppHost.csproj", "{C083A377-13CA-47C1-8B17-1FE353EA76F0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.CommunityToolkit.StaticWebApps.ApiApp", "examples\swa\Aspire.CommunityToolkit.StaticWebApps.ApiApp\Aspire.CommunityToolkit.StaticWebApps.ApiApp.csproj", "{BAEA0F6F-39E9-4893-8787-C4D292D3B169}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.StaticWebApps.ApiApp", "examples\swa\Aspire.CommunityToolkit.StaticWebApps.ApiApp\Aspire.CommunityToolkit.StaticWebApps.ApiApp.csproj", "{BAEA0F6F-39E9-4893-8787-C4D292D3B169}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.CommunityToolkit.StaticWebApps.ServiceDefaults", "examples\swa\Aspire.CommunityToolkit.StaticWebApps.ServiceDefaults\Aspire.CommunityToolkit.StaticWebApps.ServiceDefaults.csproj", "{83FF8083-7EE2-4196-86A8-239F921B443C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.StaticWebApps.ServiceDefaults", "examples\swa\Aspire.CommunityToolkit.StaticWebApps.ServiceDefaults\Aspire.CommunityToolkit.StaticWebApps.ServiceDefaults.csproj", "{83FF8083-7EE2-4196-86A8-239F921B443C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.CommunityToolkit.Hosting.NodeJS.Extensions", "src\Aspire.CommunityToolkit.Hosting.NodeJS.Extensions\Aspire.CommunityToolkit.Hosting.NodeJS.Extensions.csproj", "{1F299343-30DF-4599-A95D-BCFB1754DA48}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Hosting.NodeJS.Extensions", "src\Aspire.CommunityToolkit.Hosting.NodeJS.Extensions\Aspire.CommunityToolkit.Hosting.NodeJS.Extensions.csproj", "{1F299343-30DF-4599-A95D-BCFB1754DA48}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nodejs-ext", "nodejs-ext", "{261AC321-8982-4C3A-8DBF-DAFC95F97697}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.CommunityToolkit.Hosting.NodeJS.Extensions.AppHost", "examples\nodejs-ext\Aspire.CommunityToolkit.Hosting.NodeJS.Extensions.AppHost\Aspire.CommunityToolkit.Hosting.NodeJS.Extensions.AppHost.csproj", "{D3F5EF2B-CE37-4339-A8BD-50E6C5B2AFA1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Hosting.NodeJS.Extensions.AppHost", "examples\nodejs-ext\Aspire.CommunityToolkit.Hosting.NodeJS.Extensions.AppHost\Aspire.CommunityToolkit.Hosting.NodeJS.Extensions.AppHost.csproj", "{D3F5EF2B-CE37-4339-A8BD-50E6C5B2AFA1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.CommunityToolkit.Hosting.NodeJS.Extensions.Tests", "tests\Aspire.CommunityToolkit.Hosting.NodeJS.Extensions.Tests\Aspire.CommunityToolkit.Hosting.NodeJS.Extensions.Tests.csproj", "{E8F93376-1367-4A7B-A729-116199804356}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Hosting.NodeJS.Extensions.Tests", "tests\Aspire.CommunityToolkit.Hosting.NodeJS.Extensions.Tests\Aspire.CommunityToolkit.Hosting.NodeJS.Extensions.Tests.csproj", "{E8F93376-1367-4A7B-A729-116199804356}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.CommunityToolkit.Hosting.Ollama", "src\Aspire.CommunityToolkit.Hosting.Ollama\Aspire.CommunityToolkit.Hosting.Ollama.csproj", "{6C6696CB-8DCC-4E93-A667-A313D70E0220}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Hosting.Ollama", "src\Aspire.CommunityToolkit.Hosting.Ollama\Aspire.CommunityToolkit.Hosting.Ollama.csproj", "{6C6696CB-8DCC-4E93-A667-A313D70E0220}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.CommunityToolkit.Hosting.Ollama.Tests", "tests\Aspire.CommunityToolkit.Hosting.Ollama.Tests\Aspire.CommunityToolkit.Hosting.Ollama.Tests.csproj", "{1DB27FA0-E7E4-42C1-B062-4DE0128D4FA1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Hosting.Ollama.Tests", "tests\Aspire.CommunityToolkit.Hosting.Ollama.Tests\Aspire.CommunityToolkit.Hosting.Ollama.Tests.csproj", "{1DB27FA0-E7E4-42C1-B062-4DE0128D4FA1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ollama", "ollama", "{14BD8AE7-C8DF-4C7C-8244-7F74C101569D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.CommunityToolkit.Hosting.Ollama.AppHost", "examples\ollama\Aspire.CommunityToolkit.Hosting.Ollama.AppHost\Aspire.CommunityToolkit.Hosting.Ollama.AppHost.csproj", "{F4602DC8-3C17-4834-B640-9A3B27FE278A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Hosting.Ollama.AppHost", "examples\ollama\Aspire.CommunityToolkit.Hosting.Ollama.AppHost\Aspire.CommunityToolkit.Hosting.Ollama.AppHost.csproj", "{F4602DC8-3C17-4834-B640-9A3B27FE278A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.CommunityToolkit.Hosting.Ollama.ServiceDefaults", "examples\ollama\Aspire.CommunityToolkit.Hosting.Ollama.ServiceDefaults\Aspire.CommunityToolkit.Hosting.Ollama.ServiceDefaults.csproj", "{2F037600-2002-4A13-9359-98FB0D2416BE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Hosting.Ollama.ServiceDefaults", "examples\ollama\Aspire.CommunityToolkit.Hosting.Ollama.ServiceDefaults\Aspire.CommunityToolkit.Hosting.Ollama.ServiceDefaults.csproj", "{2F037600-2002-4A13-9359-98FB0D2416BE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.CommunityToolkit.Hosting.Ollama.Web", "examples\ollama\Aspire.CommunityToolkit.Hosting.Ollama.Web\Aspire.CommunityToolkit.Hosting.Ollama.Web.csproj", "{0A17021E-5F10-429B-88C8-E4073EADACB6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Hosting.Ollama.Web", "examples\ollama\Aspire.CommunityToolkit.Hosting.Ollama.Web\Aspire.CommunityToolkit.Hosting.Ollama.Web.csproj", "{0A17021E-5F10-429B-88C8-E4073EADACB6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Hosting.Meilisearch", "src\Aspire.CommunityToolkit.Hosting.Meilisearch\Aspire.CommunityToolkit.Hosting.Meilisearch.csproj", "{7BE7C12A-AE0A-4D0B-A076-325AD6E02475}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.CommunityToolkit.Meilisearch", "src\Aspire.CommunityToolkit.Meilisearch\Aspire.CommunityToolkit.Meilisearch.csproj", "{93031B72-2045-48C6-9585-DC7FA0BA967B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -143,6 +147,14 @@ Global
{0A17021E-5F10-429B-88C8-E4073EADACB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0A17021E-5F10-429B-88C8-E4073EADACB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A17021E-5F10-429B-88C8-E4073EADACB6}.Release|Any CPU.Build.0 = Release|Any CPU
{7BE7C12A-AE0A-4D0B-A076-325AD6E02475}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7BE7C12A-AE0A-4D0B-A076-325AD6E02475}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7BE7C12A-AE0A-4D0B-A076-325AD6E02475}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7BE7C12A-AE0A-4D0B-A076-325AD6E02475}.Release|Any CPU.Build.0 = Release|Any CPU
{93031B72-2045-48C6-9585-DC7FA0BA967B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{93031B72-2045-48C6-9585-DC7FA0BA967B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{93031B72-2045-48C6-9585-DC7FA0BA967B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{93031B72-2045-48C6-9585-DC7FA0BA967B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -172,6 +184,8 @@ Global
{F4602DC8-3C17-4834-B640-9A3B27FE278A} = {14BD8AE7-C8DF-4C7C-8244-7F74C101569D}
{2F037600-2002-4A13-9359-98FB0D2416BE} = {14BD8AE7-C8DF-4C7C-8244-7F74C101569D}
{0A17021E-5F10-429B-88C8-E4073EADACB6} = {14BD8AE7-C8DF-4C7C-8244-7F74C101569D}
{7BE7C12A-AE0A-4D0B-A076-325AD6E02475} = {414151D4-7009-4E78-A5C6-D99EBD1E67D1}
{93031B72-2045-48C6-9585-DC7FA0BA967B} = {414151D4-7009-4E78-A5C6-D99EBD1E67D1}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {08B1D4B8-D2C5-4A64-BB8B-E1A2B29525F0}
Expand Down
4 changes: 4 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<PackageVersion Include="Aspire.Hosting.NodeJS" Version="$(AspireVersion)" />
<!-- AspNetCore packages -->
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(AspNetCoreVersion)" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.8" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2" />
<!-- .NET packages -->
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.7.0" />
Expand All @@ -31,5 +34,6 @@
<PackageVersion Include="xunit.extensibility.execution" Version="2.9.1" />
<!-- External packages -->
<PackageVersion Include="OllamaSharp" Version="3.0.7" />
<PackageVersion Include="MeiliSearch" Version="0.15.3" />
</ItemGroup>
</Project>
27 changes: 27 additions & 0 deletions ...e.CommunityToolkit.Hosting.Meilisearch/Aspire.CommunityToolkit.Hosting.Meilisearch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<IsPackable>true</IsPackable>
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
<AdditionalPackageTags>integration hosting meilisearch</AdditionalPackageTags>
<Description>Meilisearch support for .NET Aspire.</Description>
<!-- Disable package validation as this package hasn't shipped yet. -->
<EnablePackageValidation>false</EnablePackageValidation>
<NoWarn>$(NoWarn);CS8002</NoWarn>
<!-- MeiliSearch package is not signed -->
</PropertyGroup>

<PropertyGroup>
<MinCodeCoverage>80</MinCodeCoverage>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\VolumeNameGenerator.cs" Link="Utils\VolumeNameGenerator.cs" />
<!--<Compile Include="$(ComponentsDir)Aspire.Meilisearch\MeilisearchHealthCheck.cs" Link="MeilisearchHealthCheck.cs"></Compile>-->
</ItemGroup>

<ItemGroup>
<PackageReference Include="MeiliSearch" />
</ItemGroup>

</Project>
Loading
Loading