lucretia/embeddingsearch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved client Url building

Browse Source
This commit is contained in:
LD-Reborn
2025-12-13 18:38:17 +01:00
parent f0f01c3c66
commit 70b6885a2e
1 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/Client/Client.cs
View File

@@ -36,8 +36,7 @@ public class Client
public async Task<SearchdomainListResults> SearchdomainListAsync() public async Task<SearchdomainListResults> SearchdomainListAsync()
{ {
var url = $"{baseUri}/Searchdomain/List?apiKey={HttpUtility.UrlEncode(apiKey)}"; return await GetUrlAndProcessJson<SearchdomainListResults>(GetUrl($"{baseUri}/Searchdomain", "List", apiKey, []));
return await GetUrlAndProcessJson<SearchdomainListResults>(url);
} }
public async Task<SearchdomainDeleteResults> SearchdomainDeleteAsync() public async Task<SearchdomainDeleteResults> SearchdomainDeleteAsync()
@@ -47,8 +46,10 @@ public class Client
public async Task<SearchdomainDeleteResults> SearchdomainDeleteAsync(string searchdomain) public async Task<SearchdomainDeleteResults> SearchdomainDeleteAsync(string searchdomain)
{ {
var url = $"{baseUri}/Searchdomain/Delete?apiKey={HttpUtility.UrlEncode(apiKey)}&searchdomain={HttpUtility.UrlEncode(searchdomain)}"; return await GetUrlAndProcessJson<SearchdomainDeleteResults>(GetUrl($"{baseUri}/Searchdomain", "Delete", apiKey, new Dictionary<string, string>()
return await GetUrlAndProcessJson<SearchdomainDeleteResults>(url); {
{"searchdomain", searchdomain}
}));
} }
public async Task<SearchdomainCreateResults> SearchdomainCreateAsync() public async Task<SearchdomainCreateResults> SearchdomainCreateAsync()
@@ -58,8 +59,10 @@ public class Client
public async Task<SearchdomainCreateResults> SearchdomainCreateAsync(string searchdomain) public async Task<SearchdomainCreateResults> SearchdomainCreateAsync(string searchdomain)
{ {
var url = $"{baseUri}/Searchdomain/Create?apiKey={HttpUtility.UrlEncode(apiKey)}&searchdomain={HttpUtility.UrlEncode(searchdomain)}"; return await GetUrlAndProcessJson<SearchdomainCreateResults>(GetUrl($"{baseUri}/Searchdomain", "Create", apiKey, new Dictionary<string, string>()
return await GetUrlAndProcessJson<SearchdomainCreateResults>(url); {
{"searchdomain", searchdomain}
}));
} }
public async Task<SearchdomainUpdateResults> SearchdomainUpdateAsync(string newName, string settings = "{}") public async Task<SearchdomainUpdateResults> SearchdomainUpdateAsync(string newName, string settings = "{}")
@@ -71,8 +74,12 @@ public class Client
public async Task<SearchdomainUpdateResults> SearchdomainUpdateAsync(string searchdomain, string newName, string settings = "{}") public async Task<SearchdomainUpdateResults> SearchdomainUpdateAsync(string searchdomain, string newName, string settings = "{}")
{ {
var url = $"{baseUri}/Searchdomain/Update?apiKey={HttpUtility.UrlEncode(apiKey)}&searchdomain={HttpUtility.UrlEncode(searchdomain)}&newName={HttpUtility.UrlEncode(newName)}&settings={HttpUtility.UrlEncode(settings)}"; return await GetUrlAndProcessJson<SearchdomainUpdateResults>(GetUrl($"{baseUri}/Searchdomain", "Update", apiKey, new Dictionary<string, string>()
return await GetUrlAndProcessJson<SearchdomainUpdateResults>(url); {
{"searchdomain", searchdomain},
{"newName", newName},
{"settings", settings}
}));
} }
public async Task<EntityQueryResults> EntityQueryAsync(string query) public async Task<EntityQueryResults> EntityQueryAsync(string query)
@@ -82,8 +89,11 @@ public class Client
public async Task<EntityQueryResults> EntityQueryAsync(string searchdomain, string query) public async Task<EntityQueryResults> EntityQueryAsync(string searchdomain, string query)
{ {
var url = $"{baseUri}/Entity/Query?apiKey={HttpUtility.UrlEncode(apiKey)}&searchdomain={HttpUtility.UrlEncode(searchdomain)}&query={HttpUtility.UrlEncode(query)}"; return await GetUrlAndProcessJson<EntityQueryResults>(GetUrl($"{baseUri}/Entity", "Query", apiKey, new Dictionary<string, string>()
return await GetUrlAndProcessJson<EntityQueryResults>(url); {
{"searchdomain", searchdomain},
{"query", query}
}));
} }
public async Task<EntityIndexResult> EntityIndexAsync(List<JSONEntity> jsonEntity) public async Task<EntityIndexResult> EntityIndexAsync(List<JSONEntity> jsonEntity)
@@ -93,9 +103,8 @@ public class Client
public async Task<EntityIndexResult> EntityIndexAsync(string jsonEntity) public async Task<EntityIndexResult> EntityIndexAsync(string jsonEntity)
{ {
var url = $"{baseUri}/Entity/Index?apiKey={HttpUtility.UrlEncode(apiKey)}";
var content = new StringContent(jsonEntity, Encoding.UTF8, "application/json"); var content = new StringContent(jsonEntity, Encoding.UTF8, "application/json");
return await PostUrlAndProcessJson<EntityIndexResult>(url, content);//new FormUrlEncodedContent(values)); return await PostUrlAndProcessJson<EntityIndexResult>(GetUrl($"{baseUri}/Entity", "Index", apiKey, []), content);//new FormUrlEncodedContent(values));
} }
public async Task<EntityListResults> EntityListAsync(bool returnEmbeddings = false) public async Task<EntityListResults> EntityListAsync(bool returnEmbeddings = false)
@@ -138,4 +147,17 @@ public class Client
?? throw new Exception($"Failed to deserialize JSON to type {typeof(T).Name}"); ?? throw new Exception($"Failed to deserialize JSON to type {typeof(T).Name}");
return result; return result;
} }
public static string GetUrl(string baseUri, string endpoint, string apiKey, Dictionary<string, string> parameters)
{
var uriBuilder = new UriBuilder($"{baseUri}/{endpoint}");
var query = HttpUtility.ParseQueryString(uriBuilder.Query);
if (apiKey.Length > 0) query["apiKey"] = apiKey;
foreach (var param in parameters)
{
query[param.Key] = param.Value;
}
uriBuilder.Query = query.ToString() ?? "";
return uriBuilder.Uri.ToString();
}
} }