Skip to content
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.

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

Error reporting improvements #22

Merged
merged 15 commits into from
Sep 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## v0.8.0-alpha
* Added the following exceptions:
- `NotFoundException` thrown from `GetEngineAsync(string engine)`, `GetDatabaseAsync(string database)`, etc. when requested resource (Engine/Database/Model/User/Client) doesn't exist or got deleted.
- `ApiException` thrown when RAI API responds with 5xx status codes or contains unsupported content type.
- `EngineProvisionFailedException` thrown from `CreateEngineWaitAsync` when requested engine failed to provision.
- `CredentialsNotSupportedException` thrown from every method when credentials to access RAI API are not provided or provided credentials are unsupported (i.e. not for OAuth Client credentials method).
- `InvalidResponseException` thrown when RAI API response has unexpected format or content type.

## v0.7.0-alpha
* Replaced String properties with Enums in the following models returned by corresponding API methods:
- `Database`.`State` property is of `DatabaseState` type.
Expand Down
27 changes: 22 additions & 5 deletions RelationalAI.Test/DatabaseTest.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
using RelationalAI.Errors;
using RelationalAI.Models.Database;
using Xunit;

Expand All @@ -10,13 +11,14 @@ public class DatabaseTests : UnitTest
public static string Uuid = Guid.NewGuid().ToString();
public static string Dbname = $"csharp-sdk-{Uuid}";
public static string EngineName = $"csharp-sdk-{Uuid}";

[Fact]
public async Task DatabaseTest()
{
var client = CreateClient();
await client.CreateEngineWaitAsync(EngineName);

await Assert.ThrowsAsync<SystemException>(async () => await client.DeleteDatabaseAsync(Dbname));
await Assert.ThrowsAsync<NotFoundException>(async () => await client.DeleteDatabaseAsync(Dbname));

var createRsp = await client.CreateDatabaseAsync(Dbname, EngineName, false);
Assert.Equal(Dbname, createRsp.Name);
Expand Down Expand Up @@ -62,7 +64,7 @@ await Assert.ThrowsAsync<ArgumentOutOfRangeException>(() =>
var deleteRsp = await client.DeleteDatabaseAsync(Dbname);
Assert.Equal(Dbname, deleteRsp.Name);

await Assert.ThrowsAsync<SystemException>(async () => await client.GetDatabaseAsync(Dbname));
await Assert.ThrowsAsync<NotFoundException>(async () => await client.GetDatabaseAsync(Dbname));
}

private const string TestModel = "def R = \"hello\", \"world\"";
Expand All @@ -79,7 +81,7 @@ public async Task DatabaseCloneTest()
var client = CreateClient();
await client.CreateEngineWaitAsync(EngineName);

await Assert.ThrowsAsync<SystemException>(async () => await client.DeleteDatabaseAsync(Dbname));
await Assert.ThrowsAsync<NotFoundException>(async () => await client.DeleteDatabaseAsync(Dbname));

// create a fresh database
var createRsp = await client.CreateDatabaseAsync(Dbname, EngineName);
Expand Down Expand Up @@ -151,8 +153,23 @@ public override async Task DisposeAsync()
{
var client = CreateClient();

try { await client.DeleteDatabaseAsync(Dbname); } catch { }
try { await client.DeleteEngineWaitAsync(EngineName); } catch { }
try
{
await client.DeleteDatabaseAsync(Dbname);
}
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}

try
{
await client.DeleteEngineWaitAsync(EngineName);
}
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}
}
}
}
14 changes: 11 additions & 3 deletions RelationalAI.Test/EngineTest.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
using RelationalAI.Errors;
using RelationalAI.Models.Engine;
using Xunit;

Expand Down Expand Up @@ -34,9 +35,9 @@ public async Task EngineTest()
await Assert.ThrowsAsync<ArgumentOutOfRangeException>(() =>
client.ListEnginesAsync((EngineState)1500));

await Assert.ThrowsAsync<SystemException>(async () => await client.DeleteEngineWaitAsync(EngineName));
await Assert.ThrowsAsync<NotFoundException>(async () => await client.DeleteEngineWaitAsync(EngineName));

await Assert.ThrowsAsync<SystemException>(async () => await client.GetEngineAsync(EngineName));
await Assert.ThrowsAsync<NotFoundException>(async () => await client.GetEngineAsync(EngineName));

engines = await client.ListEnginesAsync();
engine = engines.Find(item => item.Name.Equals(EngineName));
Expand All @@ -47,7 +48,14 @@ public override async Task DisposeAsync()
{
var client = CreateClient();

try { await client.DeleteEngineWaitAsync(EngineName); } catch { }
try
{
await client.DeleteEngineWaitAsync(EngineName);
}
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}
}
}
}
19 changes: 17 additions & 2 deletions RelationalAI.Test/ExecuteAsync.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,23 @@ public override async Task DisposeAsync()
{
var client = CreateClient();

try { await client.DeleteDatabaseAsync(Dbname); } catch { }
try { await client.DeleteEngineWaitAsync(EngineName); } catch { }
try
{
await client.DeleteDatabaseAsync(Dbname);
}
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}

try
{
await client.DeleteEngineWaitAsync(EngineName);
}
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}
}
}
}
19 changes: 17 additions & 2 deletions RelationalAI.Test/ExecuteV1Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,23 @@ public override async Task DisposeAsync()
{
var client = CreateClient();

try { await client.DeleteDatabaseAsync(Dbname); } catch { }
try { await client.DeleteEngineWaitAsync(EngineName); } catch { }
try
{
await client.DeleteDatabaseAsync(Dbname);
}
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}

try
{
await client.DeleteEngineWaitAsync(EngineName);
}
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}
}
}
}
19 changes: 17 additions & 2 deletions RelationalAI.Test/LoadCsvTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,23 @@ public override async Task DisposeAsync()
{
var client = CreateClient();

try { await client.DeleteDatabaseAsync(Dbname); } catch { }
try { await client.DeleteEngineWaitAsync(EngineName); } catch { }
try
{
await client.DeleteDatabaseAsync(Dbname);
}
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}

try
{
await client.DeleteEngineWaitAsync(EngineName);
}
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}
}
}
}
19 changes: 17 additions & 2 deletions RelationalAI.Test/LoadJsonTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,23 @@ public override async Task DisposeAsync()
{
var client = CreateClient();

try { await client.DeleteDatabaseAsync(Dbname); } catch { }
try { await client.DeleteEngineWaitAsync(EngineName); } catch { }
try
{
await client.DeleteDatabaseAsync(Dbname);
}
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}

try
{
await client.DeleteEngineWaitAsync(EngineName);
}
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}
}
}
}
22 changes: 19 additions & 3 deletions RelationalAI.Test/ModelsTest.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
using RelationalAI.Errors;
using Xunit;

namespace RelationalAI.Test
Expand Down Expand Up @@ -39,7 +40,7 @@ public async Task ModelsTest()
Assert.Empty(deleteRsp.Output);
Assert.Empty(deleteRsp.Problems);

await Assert.ThrowsAsync<SystemException>(async () => await client.GetModelAsync(Dbname, EngineName, "test_model"));
await Assert.ThrowsAsync<NotFoundException>(async () => await client.GetModelAsync(Dbname, EngineName, "test_model"));

modelNames = await client.ListModelNamesAsync(Dbname, EngineName);
modelName = modelNames.Find(item => item.Equals("test_model"));
Expand All @@ -54,8 +55,23 @@ public override async Task DisposeAsync()
{
var client = CreateClient();

try { await client.DeleteDatabaseAsync(Dbname); } catch { }
try { await client.DeleteEngineWaitAsync(EngineName); } catch { }
try
{
await client.DeleteDatabaseAsync(Dbname);
}
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}

try
{
await client.DeleteEngineWaitAsync(EngineName);
}
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}
}
}
}
10 changes: 7 additions & 3 deletions RelationalAI.Test/OAuthClientTest.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
using RelationalAI.Errors;
using Xunit;

namespace RelationalAI.Test
Expand All @@ -13,7 +14,7 @@ public async Task OAuthClientTest()
{
var client = CreateClient();

await Assert.ThrowsAsync<SystemException>(async () => await client.FindOAuthClientAsync(OAuthClientName));
await Assert.ThrowsAsync<NotFoundException>(async () => await client.FindOAuthClientAsync(OAuthClientName));

var rsp = await client.CreateOAuthClientAsync(OAuthClientName);
Assert.Equal(OAuthClientName, rsp.Name);
Expand All @@ -37,7 +38,7 @@ public async Task OAuthClientTest()
var deleteRsp = await client.DeleteOAuthClientAsync(clientId);
Assert.Equal(clientId, deleteRsp.Id);

await Assert.ThrowsAsync<SystemException>(async () => await client.FindOAuthClientAsync(OAuthClientName));
await Assert.ThrowsAsync<NotFoundException>(async () => await client.FindOAuthClientAsync(OAuthClientName));
}

public override async Task DisposeAsync()
Expand All @@ -49,7 +50,10 @@ public override async Task DisposeAsync()
var oauthClient = await client.FindOAuthClientAsync(OAuthClientName);
await client.DeleteOAuthClientAsync(oauthClient.Id);
}
catch { }
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}
}
}
}
8 changes: 6 additions & 2 deletions RelationalAI.Test/UserTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using RelationalAI.Errors;
using RelationalAI.Models.User;
using Xunit;

Expand All @@ -17,7 +18,7 @@ public async Task TestUser()
{
var client = CreateClient();

await Assert.ThrowsAsync<SystemException>(async () => await client.FindUserAsync(UserEmail));
await Assert.ThrowsAsync<NotFoundException>(async () => await client.FindUserAsync(UserEmail));

var rsp = await client.CreateUserAsync(UserEmail);
Assert.Equal(UserEmail, rsp.Email);
Expand Down Expand Up @@ -72,7 +73,10 @@ public override async Task DisposeAsync()
var oauthClient = await client.FindUserAsync(UserEmail);
await client.DeleteUserAsync(oauthClient.Id);
}
catch { }
catch (Exception e)
{
await Console.Error.WriteLineAsync(e.ToString());
}
}
}
}
2 changes: 1 addition & 1 deletion RelationalAI/Credentials/ClientCredentials.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class ClientCredentials : ICredentials
private const string DefaultClientCredentialsUrl = "https://login.relationalai.com/oauth/token";
private string _clientId;
private string _clientSecret;
private string _clientCredentialsUrl;
private string _clientCredentialsUrl = DefaultClientCredentialsUrl;

public ClientCredentials(string clientId, string clientSecret)
{
Expand Down
Loading